diff --git a/Sources/EnvVars/Interface.swift b/Sources/EnvVars/Interface.swift index 2b82d88..56e8269 100644 --- a/Sources/EnvVars/Interface.swift +++ b/Sources/EnvVars/Interface.swift @@ -63,9 +63,9 @@ public struct EnvVars: Codable, Equatable, Sendable { case pandocPath = "PANDOC_PATH" case pdfEngine = "PDF_ENGINE" case postgresHostname = "POSTGRES_HOSTNAME" - case postgresUsername = "POSTGRES_USERNAME" + case postgresUsername = "POSTGRES_USER" case postgresPassword = "POSTGRES_PASSWORD" - case postgresDatabase = "POSTGRES_DATABASE" + case postgresDatabase = "POSTGRES_DB" case sqlitePath = "SQLITE_PATH" } diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev deleted file mode 100644 index 3953ed6..0000000 --- a/docker/Dockerfile.dev +++ /dev/null @@ -1,49 +0,0 @@ -FROM docker.io/swift:6.2-noble - -# Make sure all system packages are up to date, and install only essential packages. -RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ - && apt-get -q update \ - && apt-get -q dist-upgrade -y \ - && apt-get -q install -y \ - libjemalloc2 \ - ca-certificates \ - tzdata \ -# If your app or its dependencies import FoundationNetworking, also install `libcurl4`. - libcurl4 \ -# If your app or its dependencies import FoundationXML, also install `libxml2`. - # libxml2 \ - sqlite3 \ - nodejs \ - npm \ - build-essential \ - curl \ - wkhtmltopdf \ - pandoc \ - weasyprint \ - && rm -r /var/lib/apt/lists/* - -# Set up a build area -WORKDIR /app - -# First just resolve dependencies. -# This creates a cached layer that can be reused -# as long as your Package.swift/Package.resolved -# files do not change. -COPY ./Package.* ./ -RUN swift package resolve \ - $([ -f ./Package.resolved ] && echo "--force-resolved-versions" || true) - -# Copy entire repo into container -COPY . . - -RUN curl -L https://github.com/watchexec/watchexec/releases/download/v2.3.2/watchexec-2.3.2-aarch64-unknown-linux-gnu.tar.xz --output watchexec.tar.xz \ - && tar -xvf watchexec.tar.xz \ - && cp ./watchexec-2.3.2-aarch64-unknown-linux-gnu/watchexec /bin - -RUN npm install -g browser-sync - -ENV SWIFT_BACKTRACE=enable=no -ENV LOG_LEVEL=debug - -CMD ["swift", "run", "App", "serve", "--hostname", "0.0.0.0", "--port", "8080"] - diff --git a/ductsizes.json b/ductsizes.json deleted file mode 100644 index 0131f7b..0000000 --- a/ductsizes.json +++ /dev/null @@ -1,359 +0,0 @@ -{ - "trunks": [ - { - "trunk": { - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663", - "type": "supply", - "name": "West", - "id": "AFBC5264-8129-4383-97D8-F44CF5258A53", - "rooms": [ - { - "room": { - "coolingTotal": 4567, - "id": "FA2F107F-5DF0-4D69-B231-DE3C6EF64134", - "registerCount": 3, - "heatingLoad": 9876, - "updatedAt": "2026-01-17T16:51:33Z", - "createdAt": "2026-01-17T16:51:33Z", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663", - "name": "Kitchen" - }, - "registers": [1, 2, 3] - }, - { - "room": { - "coolingTotal": 4567, - "id": "9A01CEE8-6A4B-4299-9353-58AFAD042903", - "registerCount": 3, - "heatingLoad": 9876, - "updatedAt": "2026-01-17T16:51:21Z", - "createdAt": "2026-01-17T16:51:21Z", - "name": "Master", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - }, - "registers": [1, 2, 3] - } - ], - "height": 8 - }, - "ductSize": { - "height": 8, - "roundSize": 12.3660960368007, - "width": 19, - "velocity": 737, - "finalSize": 14, - "flexSize": 14, - "designCFM": { - "cooling": { - "_0": 787.278055507671 - } - } - } - }, - { - "trunk": { - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663", - "name": "East", - "id": "C6A21594-0A28-4A20-BC15-628502010201", - "type": "supply", - "height": 8, - "rooms": [ - { - "room": { - "coolingTotal": 1234, - "id": "2420F9C7-0FCA-4E92-BAC9-8A054CB3201B", - "registerCount": 1, - "heatingLoad": 4567, - "updatedAt": "2026-01-17T16:51:10Z", - "createdAt": "2026-01-17T16:51:10Z", - "name": "Entry", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - }, - "registers": [1] - }, - { - "room": { - "coolingTotal": 1234, - "id": "449FE324-2ACF-4C12-83A3-EB86FD45A991", - "registerCount": 2, - "heatingLoad": 4567, - "updatedAt": "2026-01-17T16:51:02Z", - "createdAt": "2026-01-17T16:51:02Z", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663", - "name": "Bed-1" - }, - "registers": [1, 2] - } - ] - }, - "ductSize": { - "height": 8, - "roundSize": 8.39504804369037, - "width": 8, - "velocity": 643, - "flexSize": 10, - "finalSize": 9, - "designCFM": { - "heating": { - "_0": 284.587689538185 - } - } - } - }, - { - "trunk": { - "name": "Main", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663", - "id": "C65863A0-D2EE-4D90-8C71-B1FD2454A8DF", - "type": "return", - "rooms": [ - { - "registers": [1, 2, 3], - "room": { - "coolingTotal": 4567, - "id": "FA2F107F-5DF0-4D69-B231-DE3C6EF64134", - "registerCount": 3, - "heatingLoad": 9876, - "updatedAt": "2026-01-17T16:51:33Z", - "createdAt": "2026-01-17T16:51:33Z", - "name": "Kitchen", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - } - }, - { - "registers": [1, 2, 3], - "room": { - "coolingTotal": 4567, - "id": "9A01CEE8-6A4B-4299-9353-58AFAD042903", - "registerCount": 3, - "heatingLoad": 9876, - "updatedAt": "2026-01-17T16:51:21Z", - "createdAt": "2026-01-17T16:51:21Z", - "name": "Master", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - } - }, - { - "registers": [1], - "room": { - "coolingTotal": 1234, - "id": "2420F9C7-0FCA-4E92-BAC9-8A054CB3201B", - "registerCount": 1, - "heatingLoad": 4567, - "updatedAt": "2026-01-17T16:51:10Z", - "createdAt": "2026-01-17T16:51:10Z", - "name": "Entry", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - } - }, - { - "registers": [1, 2], - "room": { - "coolingTotal": 1234, - "id": "449FE324-2ACF-4C12-83A3-EB86FD45A991", - "registerCount": 2, - "heatingLoad": 4567, - "updatedAt": "2026-01-17T16:51:02Z", - "createdAt": "2026-01-17T16:51:02Z", - "name": "Bed-1", - "projectID": "E796C96C-F527-4753-A00A-EBCF25630663" - } - } - ] - }, - "ductSize": { - "designCFM": { - "cooling": { - "_0": 1000 - } - }, - "roundSize": 13.539327773393, - "velocity": 935, - "finalSize": 14, - "flexSize": 16 - } - } - ], - "rooms": [ - { - "ductSize": { - "velocity": 521, - "flexSize": 6, - "designCFM": { - "heating": { - "_0": 71.1469223845461 - } - }, - "roundSize": 4.95724506597333, - "finalSize": 5 - }, - "heatingCFM": 71.1469223845461, - "roomRegister": 1, - "heatingLoad": 2283.5, - "roomName": "Bed-1-1", - "roomID": "449FE324-2ACF-4C12-83A3-EB86FD45A991", - "coolingLoad": 512.11, - "coolingCFM": 53.1804861230822 - }, - { - "ductSize": { - "velocity": 521, - "flexSize": 6, - "designCFM": { - "heating": { - "_0": 71.1469223845461 - } - }, - "roundSize": 4.95724506597333, - "finalSize": 5 - }, - "heatingCFM": 71.1469223845461, - "roomRegister": 2, - "heatingLoad": 2283.5, - "roomName": "Bed-1-2", - "roomID": "449FE324-2ACF-4C12-83A3-EB86FD45A991", - "coolingLoad": 512.11, - "coolingCFM": 53.1804861230822 - }, - { - "ductSize": { - "velocity": 532, - "flexSize": 7, - "designCFM": { - "heating": { - "_0": 142.293844769092 - } - }, - "roundSize": 6.4510704920341, - "finalSize": 7 - }, - "heatingCFM": 142.293844769092, - "roomRegister": 1, - "heatingLoad": 4567, - "roomName": "Entry-1", - "roomID": "2420F9C7-0FCA-4E92-BAC9-8A054CB3201B", - "coolingLoad": 1024.22, - "coolingCFM": 106.360972246164 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 1, - "heatingLoad": 3292, - "roomName": "Kitchen-1", - "roomID": "FA2F107F-5DF0-4D69-B231-DE3C6EF64134", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 2, - "heatingLoad": 3292, - "roomName": "Kitchen-2", - "roomID": "FA2F107F-5DF0-4D69-B231-DE3C6EF64134", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 3, - "heatingLoad": 3292, - "roomName": "Kitchen-3", - "roomID": "FA2F107F-5DF0-4D69-B231-DE3C6EF64134", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 1, - "heatingLoad": 3292, - "roomName": "Master-1", - "roomID": "9A01CEE8-6A4B-4299-9353-58AFAD042903", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 2, - "heatingLoad": 3292, - "roomName": "Master-2", - "roomID": "9A01CEE8-6A4B-4299-9353-58AFAD042903", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - }, - { - "ductSize": { - "velocity": 490, - "flexSize": 7, - "designCFM": { - "cooling": { - "_0": 131.213009251279 - } - }, - "roundSize": 6.25641154872314, - "finalSize": 7 - }, - "heatingCFM": 102.568718410303, - "roomRegister": 3, - "heatingLoad": 3292, - "roomName": "Master-3", - "roomID": "9A01CEE8-6A4B-4299-9353-58AFAD042903", - "coolingLoad": 1263.53666666667, - "coolingCFM": 131.213009251279 - } -} - ]