From 4f5fb2a118a9180dd042720288d3a6c175537799 Mon Sep 17 00:00:00 2001 From: JManion32 Date: Sun, 15 Mar 2026 14:44:45 -0400 Subject: [PATCH 01/11] Fix docker env --- .dockerignore | 2 -- Dockerfile | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index af0a812..1c95ff7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,4 @@ coverage .idea .DS_Store *.log -.env -.env.* README.md diff --git a/Dockerfile b/Dockerfile index b793d84..fcafc5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,18 @@ FROM node:22-alpine AS build WORKDIR /app + COPY package*.json ./ RUN npm ci + COPY . . +COPY .env .env + RUN npm run build + FROM nginx:stable-alpine COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf + EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 89040836821009a4731da13910b3a7f7a3ddbe2b Mon Sep 17 00:00:00 2001 From: JManion32 Date: Sun, 15 Mar 2026 14:47:09 -0400 Subject: [PATCH 02/11] Fix spacing --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fcafc5e..ff96ae9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,13 @@ FROM node:22-alpine AS build WORKDIR /app - COPY package*.json ./ RUN npm ci - COPY . . COPY .env .env - RUN npm run build - FROM nginx:stable-alpine COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf - EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 8ba26957e6c00a57bd2be016cbdc522bb140c24e Mon Sep 17 00:00:00 2001 From: JManion32 Date: Sun, 15 Mar 2026 15:09:45 -0400 Subject: [PATCH 03/11] Fix CI --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 282bb11..908b112 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,6 +88,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Create .env file + run: | + echo "VITE_API_URL=http://localhost:8080" >> .env + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -103,8 +107,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v4 + - name: Create .env file + run: | + echo "VITE_API_URL=http://localhost:8080" >> .env + - name: Install dependencies run: npm ci @@ -125,8 +134,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v4 + - name: Create .env file + run: | + echo "VITE_API_URL=http://localhost:8080" >> .env + - name: Install dependencies run: npm ci @@ -147,8 +161,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v4 + - name: Create .env file + run: | + echo "VITE_API_URL=http://localhost:8080" >> .env + - name: Install dependencies run: npm ci @@ -169,8 +188,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v4 + - name: Create .env file + run: | + echo "VITE_API_URL=http://localhost:8080" >> .env + - name: Install dependencies run: npm ci From d267aac014dd11cb43467f152855404cf4810351 Mon Sep 17 00:00:00 2001 From: JManion32 Date: Sun, 15 Mar 2026 15:11:42 -0400 Subject: [PATCH 04/11] Fix CI run --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 908b112..fe12f68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: steps: - name: Checkout code - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - name: Create .env file run: | @@ -135,7 +135,7 @@ jobs: steps: - name: Checkout code - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - name: Create .env file run: | @@ -162,7 +162,7 @@ jobs: steps: - name: Checkout code - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - name: Create .env file run: | @@ -189,7 +189,7 @@ jobs: steps: - name: Checkout code - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - name: Create .env file run: | From 614a803bd4e02e919caf29374f3372c6231f9c6c Mon Sep 17 00:00:00 2001 From: JManion32 Date: Sun, 15 Mar 2026 15:13:14 -0400 Subject: [PATCH 05/11] Run Prettier --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe12f68..5af38de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -112,7 +112,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env - name: Install dependencies run: npm ci @@ -139,7 +139,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env - name: Install dependencies run: npm ci @@ -166,7 +166,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env - name: Install dependencies run: npm ci @@ -193,7 +193,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env - name: Install dependencies run: npm ci From 76c24ef31bc9036a56a60fe08a393a19216420d9 Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 16:28:54 -0400 Subject: [PATCH 06/11] Fix diff --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff96ae9..52a4fd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,4 @@ FROM nginx:stable-alpine COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"] From 77ac6326619f8bdd529ef06b41d0e209975959c8 Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 18:10:31 -0400 Subject: [PATCH 07/11] Update Code --- .github/workflows/ci.yml | 10 +++++----- Dockerfile | 1 - package.json | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5af38de..95fc059 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env.domain - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -112,7 +112,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env.domain - name: Install dependencies run: npm ci @@ -139,7 +139,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env.domain - name: Install dependencies run: npm ci @@ -166,7 +166,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env.domain - name: Install dependencies run: npm ci @@ -193,7 +193,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env + echo "VITE_API_URL=http://localhost:8080" >> .env.domain - name: Install dependencies run: npm ci diff --git a/Dockerfile b/Dockerfile index 52a4fd9..b793d84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ WORKDIR /app COPY package*.json ./ RUN npm ci COPY . . -COPY .env .env RUN npm run build FROM nginx:stable-alpine diff --git a/package.json b/package.json index 91f7fcc..7534389 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", - "build": "tsc -b && vite build", + "dev": "vite --mode domain", + "build": "tsc -b && vite build --mode domain", "preview": "vite preview", "lint-check": "eslint . && prettier --check . && stylelint \"**/*.{css,scss}\"", "lint-fix": "eslint . --fix && prettier --write . && stylelint \"**/*.{css,scss}\" --fix" From 55b943585e3f96f05c0ec4051a5f5394563dac8d Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 18:17:50 -0400 Subject: [PATCH 08/11] domain -> webui --- .dockerignore | 2 ++ .github/workflows/ci.yml | 10 +++++----- package.json | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 1c95ff7..dc9447a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,3 +8,5 @@ coverage .DS_Store *.log README.md +.env* +!.env.webui \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95fc059..6a04226 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env.domain + echo "VITE_API_URL=http://localhost:8080" >> .env.webui - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -112,7 +112,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env.domain + echo "VITE_API_URL=http://localhost:8080" >> .env.webui - name: Install dependencies run: npm ci @@ -139,7 +139,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env.domain + echo "VITE_API_URL=http://localhost:8080" >> .env.webui - name: Install dependencies run: npm ci @@ -166,7 +166,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env.domain + echo "VITE_API_URL=http://localhost:8080" >> .env.webui - name: Install dependencies run: npm ci @@ -193,7 +193,7 @@ jobs: - name: Create .env file run: | - echo "VITE_API_URL=http://localhost:8080" >> .env.domain + echo "VITE_API_URL=http://localhost:8080" >> .env.webui - name: Install dependencies run: npm ci diff --git a/package.json b/package.json index 7534389..6d3cd18 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite --mode domain", - "build": "tsc -b && vite build --mode domain", + "dev": "vite --mode webui", + "build": "tsc -b && vite build --mode webui", "preview": "vite preview", "lint-check": "eslint . && prettier --check . && stylelint \"**/*.{css,scss}\"", "lint-fix": "eslint . --fix && prettier --write . && stylelint \"**/*.{css,scss}\" --fix" From 2ef40cdd667190b28e4a575c787ecaf6c605867f Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 18:24:22 -0400 Subject: [PATCH 09/11] Updated README --- .env.webui | 4 ++++ README.md | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .env.webui diff --git a/.env.webui b/.env.webui new file mode 100644 index 0000000..52e68eb --- /dev/null +++ b/.env.webui @@ -0,0 +1,4 @@ +# ============================================================================= +# WEBUI +# ============================================================================= +VITE_API_URL=http://localhost:8080 \ No newline at end of file diff --git a/README.md b/README.md index 9002292..04f43d3 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,15 @@ From the root level of the repository: npm install ``` +### Environment Variables +Store this in `.env.webui` +``` +# ============================================================================= +# WEBUI +# ============================================================================= +VITE_API_URL=http://localhost:8080 +``` + ### Run the Site ```bash @@ -90,7 +99,7 @@ npx prettier . --check #### Apply Fixes -``` +```bash npx prettier . --write ``` From 4325e6fd982f252add5400706dac421d0cbdbb1f Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 18:25:38 -0400 Subject: [PATCH 10/11] Updated gitignore --- .env.example | 4 ---- .gitignore | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index 52e68eb..0000000 --- a/.env.example +++ /dev/null @@ -1,4 +0,0 @@ -# ============================================================================= -# WEBUI -# ============================================================================= -VITE_API_URL=http://localhost:8080 \ No newline at end of file diff --git a/.gitignore b/.gitignore index a0d218e..55cdf98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules dist -.env \ No newline at end of file +.env* \ No newline at end of file From 718dad29864f74ed5e024834b8d77f8dfab0ad2d Mon Sep 17 00:00:00 2001 From: JManion32 Date: Mon, 16 Mar 2026 18:30:18 -0400 Subject: [PATCH 11/11] Remove diff --- .env.webui | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .env.webui diff --git a/.env.webui b/.env.webui deleted file mode 100644 index 52e68eb..0000000 --- a/.env.webui +++ /dev/null @@ -1,4 +0,0 @@ -# ============================================================================= -# WEBUI -# ============================================================================= -VITE_API_URL=http://localhost:8080 \ No newline at end of file