From b2f456c87abc97ca8a9fd82bf259440b030299bb Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:44:35 -0400 Subject: [PATCH 01/18] push version --- web/Dockerfile | 3 --- web/src/pages/Home/Home.jsx | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index bb9805c..ac87694 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,9 +2,6 @@ FROM node:20-alpine WORKDIR /app -RUN echo ":tools: Listing context:" && ls -R . && echo "************************" - - COPY ./package*.json ./ RUN npm ci diff --git a/web/src/pages/Home/Home.jsx b/web/src/pages/Home/Home.jsx index e783380..4a75291 100644 --- a/web/src/pages/Home/Home.jsx +++ b/web/src/pages/Home/Home.jsx @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; import { Link } from 'react-router-dom'; import { useLocalStore } from '@components'; +import pkg from '../../../package.json'; export const Home = () => { @@ -16,6 +17,7 @@ export const Home = () => {

Home Page

Go to Settings +

Version: {pkg.version}

); }; -- 2.45.2 From 6a92463aac97ab6ba15054acfa1e7e565dcfa5ef Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:48:58 -0400 Subject: [PATCH 02/18] Update Home.jsx --- web/src/pages/Home/Home.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/pages/Home/Home.jsx b/web/src/pages/Home/Home.jsx index 4a75291..70d33d3 100644 --- a/web/src/pages/Home/Home.jsx +++ b/web/src/pages/Home/Home.jsx @@ -17,6 +17,7 @@ export const Home = () => {

Home Page

Go to Settings +

Version: {pkg.version}

); -- 2.45.2 From 786ec7536cd48c44a679ccf2f83c6e703fc0654f Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:51:19 -0400 Subject: [PATCH 03/18] Update Home.jsx --- web/src/pages/Home/Home.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/pages/Home/Home.jsx b/web/src/pages/Home/Home.jsx index 70d33d3..4a75291 100644 --- a/web/src/pages/Home/Home.jsx +++ b/web/src/pages/Home/Home.jsx @@ -17,7 +17,6 @@ export const Home = () => {

Home Page

Go to Settings -

Version: {pkg.version}

); -- 2.45.2 From 88d870a6f4d62c5892f4651860fcc39618012707 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:15:28 -0400 Subject: [PATCH 04/18] Changes --- web/package-lock.json | 13 +++---------- web/vite.config.js | 8 +++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 4fac8da..dfe5eb3 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1748,9 +1748,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -3488,13 +3488,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/rollup/node_modules/@types/estree": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", - "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", - "dev": true, - "license": "MIT" - }, "node_modules/scheduler": { "version": "0.26.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz", diff --git a/web/vite.config.js b/web/vite.config.js index 3be5fa9..b5b25a3 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -7,7 +7,13 @@ export default defineConfig({ plugins: [react()], server:{ host: true, - allowedHosts: ['shift.code-catalyst.com'] + allowedHosts: ['shift.code-catalyst.com']\ + cors: true, + hmr: { + protocol: 'wss', + host: 'shift.code-catalyst.com', + clientPort: 443, + }, }, resolve: { alias: { -- 2.45.2 From 6944973f46d3305872e363e82b5053145d52f56e Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:19:34 -0400 Subject: [PATCH 05/18] Update vite.config.js --- web/vite.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/vite.config.js b/web/vite.config.js index b5b25a3..4de0c9d 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -7,13 +7,13 @@ export default defineConfig({ plugins: [react()], server:{ host: true, - allowedHosts: ['shift.code-catalyst.com']\ + allowedHosts: ['shift.code-catalyst.com'], cors: true, hmr: { protocol: 'wss', host: 'shift.code-catalyst.com', clientPort: 443, - }, + } }, resolve: { alias: { -- 2.45.2 From a2a75633e153614fcd9634dc27557c58a89981f7 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 16:09:46 -0400 Subject: [PATCH 06/18] Update vite.config.js --- web/vite.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/vite.config.js b/web/vite.config.js index 4de0c9d..3d94049 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -7,11 +7,11 @@ export default defineConfig({ plugins: [react()], server:{ host: true, - allowedHosts: ['shift.code-catalyst.com'], + allowedHosts: ['.code-catalyst.com'], cors: true, hmr: { protocol: 'wss', - host: 'shift.code-catalyst.com', + host: '.code-catalyst.com', clientPort: 443, } }, -- 2.45.2 From f183093be708059220d98cdf4242b4347f64c6d0 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 16:29:08 -0400 Subject: [PATCH 07/18] New Tag Update --- .github/workflows/web-deploy-prod.yml | 4 ++-- web/docker-compose.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-deploy-prod.yml b/.github/workflows/web-deploy-prod.yml index 7e01082..ae51347 100644 --- a/.github/workflows/web-deploy-prod.yml +++ b/.github/workflows/web-deploy-prod.yml @@ -71,9 +71,9 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Build Backend - run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }} + run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg TEST=${{ secrets.TEST }} - name: Docker Push Backend - run: docker push john4064/shiftsync:latest_web + run: docker push john4064/shiftsync:prod_web deploy: needs: build if: needs.build.result == 'success' && inputs.workflow_type == 'release' diff --git a/web/docker-compose.yaml b/web/docker-compose.yaml index e5d5886..11d208e 100644 --- a/web/docker-compose.yaml +++ b/web/docker-compose.yaml @@ -1,6 +1,6 @@ services: shiftsync-web: - image: 'docker.io/john4064/shiftsync:latest_web' + image: 'docker.io/john4064/shiftsync:prod_web' environment: - 'TESTVAR=${COOLIFY_VAR}' volumes: -- 2.45.2 From fafce681ed2eec985167ec4c83257b3595c38095 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 16:35:37 -0400 Subject: [PATCH 08/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index 3d94049..9362fe4 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig({ cors: true, hmr: { protocol: 'wss', - host: '.code-catalyst.com', + host: ['*.code-catalyst.com'], clientPort: 443, } }, -- 2.45.2 From 7153472ddfedbe53090b51ffdeb5068b7e376aaa Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 16:49:54 -0400 Subject: [PATCH 09/18] Change dev/prod ones --- package.json | 4 ++-- web/Dockerfile.prod | 15 +++++++++++++ web/package.json | 6 ++++-- web/vite.config.js | 51 ++++++++++++++++++++++++++++++--------------- 4 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 web/Dockerfile.prod diff --git a/package.json b/package.json index 69ef0b7..99c9cbc 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "shiftsync-website", "private": true, - "version": "1.0.1", + "version": "0.0.0", "main": "index.js", "scripts": { "api": "npm run dev --prefix api", - "web": "npm run dev --prefix web", + "web": "npm run local --prefix web", "dev": "concurrently \"npm run api\" \"npm run web\"", "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/web/Dockerfile.prod b/web/Dockerfile.prod new file mode 100644 index 0000000..b1c64d4 --- /dev/null +++ b/web/Dockerfile.prod @@ -0,0 +1,15 @@ +FROM node:20-alpine + +WORKDIR /app + +COPY ./package*.json ./ + +RUN npm ci + +COPY . ./ + +EXPOSE 5173 +EXPOSE 5171 + + +CMD ["npm", "run", "prod"] diff --git a/web/package.json b/web/package.json index ba586dd..1653901 100644 --- a/web/package.json +++ b/web/package.json @@ -1,10 +1,12 @@ { "name": "shiftsync-website-web", "private": true, - "version": "1.0.0", + "version": "1.0.1", "type": "module", "scripts": { - "dev": "vite --host", + "local": "vite", + "dev": "vite --host --mode dev", + "prod": "vite --host --mode prod", "build": "vite build", "lint": "eslint .", "preview": "vite preview" diff --git a/web/vite.config.js b/web/vite.config.js index 9362fe4..ffaabbd 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -3,22 +3,39 @@ import react from '@vitejs/plugin-react'; import path from 'path'; // https://vite.dev/config/ -export default defineConfig({ - plugins: [react()], - server:{ - host: true, - allowedHosts: ['.code-catalyst.com'], - cors: true, - hmr: { - protocol: 'wss', - host: ['*.code-catalyst.com'], - clientPort: 443, - } - }, - resolve: { - alias: { - '@src': path.resolve(__dirname, 'src'), - '@components': path.resolve(__dirname, 'components') +export default defineConfig(({ mode = 'local' }) => { + const isDev = mode === 'dev'; + const isProd = mode === 'prod'; + + return { + plugins: [react()], + server:{ + host: true, + allowedHosts: ['.code-catalyst.com'], + cors: true, + hmr: isDev + ? { + protocol: 'wss', + host: 'shift-dev.code-catalyst.com', + clientPort: 443, + } + : isProd ? + { + protocol: 'wss', + host: 'shift.code-catalyst.com', + clientPort: 443, + } + : { + protocol: 'wss', + host: 'localhost', + clientPort: 443, + }, }, - }, + resolve: { + alias: { + '@src': path.resolve(__dirname, 'src'), + '@components': path.resolve(__dirname, 'components') + }, + }, + } }); -- 2.45.2 From be14068a3e347cfda53dc6ba2a50d6e8b47130b2 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 16:52:56 -0400 Subject: [PATCH 10/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index ffaabbd..7dca159 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: ['.code-catalyst.com'], + allowedHosts: ['shift-dev.code-catalyst.com', 'shift.code-catalyst.com'], cors: true, hmr: isDev ? { -- 2.45.2 From 6942078f6220c67f860bc5dafdb2553bb160ce69 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:38:03 -0400 Subject: [PATCH 11/18] Dockerfile update --- .github/workflows/web-deploy-nonprod.yml | 2 +- .github/workflows/web-deploy-prod.yml | 2 +- web/Dockerfile | 4 +++- web/Dockerfile.prod | 15 --------------- 4 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 web/Dockerfile.prod diff --git a/.github/workflows/web-deploy-nonprod.yml b/.github/workflows/web-deploy-nonprod.yml index e2fe9e0..ab168ef 100644 --- a/.github/workflows/web-deploy-nonprod.yml +++ b/.github/workflows/web-deploy-nonprod.yml @@ -71,7 +71,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Build Backend - run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }} + run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg ENVIRONMENT=dev - name: Docker Push Backend run: docker push john4064/shiftsync:latest_web deploy: diff --git a/.github/workflows/web-deploy-prod.yml b/.github/workflows/web-deploy-prod.yml index ae51347..f1d000d 100644 --- a/.github/workflows/web-deploy-prod.yml +++ b/.github/workflows/web-deploy-prod.yml @@ -71,7 +71,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Build Backend - run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg TEST=${{ secrets.TEST }} + run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg ENVIRONMENT=prod - name: Docker Push Backend run: docker push john4064/shiftsync:prod_web deploy: diff --git a/web/Dockerfile b/web/Dockerfile index 79e60c4..cdef790 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -11,5 +11,7 @@ COPY . ./ EXPOSE 5173 EXPOSE 5171 +ARG ENVIRONMENT=PROD -CMD ["npm", "run", "dev"] + +CMD ["npm", "run", ENVIRONMENT] diff --git a/web/Dockerfile.prod b/web/Dockerfile.prod deleted file mode 100644 index b1c64d4..0000000 --- a/web/Dockerfile.prod +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:20-alpine - -WORKDIR /app - -COPY ./package*.json ./ - -RUN npm ci - -COPY . ./ - -EXPOSE 5173 -EXPOSE 5171 - - -CMD ["npm", "run", "prod"] -- 2.45.2 From 9fb4c3be5a8b354f296d49e9f04209e4d82707c8 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:41:17 -0400 Subject: [PATCH 12/18] Update Dockerfile --- web/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index cdef790..d1fb185 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -11,7 +11,8 @@ COPY . ./ EXPOSE 5173 EXPOSE 5171 -ARG ENVIRONMENT=PROD +ARG ENVIRONMENT +ENV ENVIRONMENT ${ENVIRONMENT} -CMD ["npm", "run", ENVIRONMENT] +CMD ["npm", "run", ${ENVIRONMENT}] -- 2.45.2 From 6f74713efa0a20b833d5df87fd34e462fdfff563 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:45:08 -0400 Subject: [PATCH 13/18] Update Dockerfile --- web/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index d1fb185..fa76806 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -13,6 +13,6 @@ EXPOSE 5171 ARG ENVIRONMENT ENV ENVIRONMENT ${ENVIRONMENT} +RUN echo ${ENVIRONMENT} - -CMD ["npm", "run", ${ENVIRONMENT}] +CMD npm run ${ENVIRONMENT} -- 2.45.2 From 7fb96430fc889f500623abea9f6e44dc8f7b0b2c Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:51:53 -0400 Subject: [PATCH 14/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index 7dca159..51ebd1c 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: ['shift-dev.code-catalyst.com', 'shift.code-catalyst.com'], + allowedHosts: true, cors: true, hmr: isDev ? { -- 2.45.2 From bf49e8d824d57fc3be8d160a7d222259836b43fc Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:55:09 -0400 Subject: [PATCH 15/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index 51ebd1c..7dca159 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: true, + allowedHosts: ['shift-dev.code-catalyst.com', 'shift.code-catalyst.com'], cors: true, hmr: isDev ? { -- 2.45.2 From a99c8d52bd67fb3162ca6533c903c3b040f86a80 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 17:58:31 -0400 Subject: [PATCH 16/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index 7dca159..ffaabbd 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: ['shift-dev.code-catalyst.com', 'shift.code-catalyst.com'], + allowedHosts: ['.code-catalyst.com'], cors: true, hmr: isDev ? { -- 2.45.2 From 8dc9ce9e132906556a84fe5d84faee43e930b36f Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 18:01:10 -0400 Subject: [PATCH 17/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index ffaabbd..51ebd1c 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: ['.code-catalyst.com'], + allowedHosts: true, cors: true, hmr: isDev ? { -- 2.45.2 From d134fffafb1754795a98d198bed08ae3c36a25b2 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Wed, 11 Jun 2025 18:04:44 -0400 Subject: [PATCH 18/18] Update vite.config.js --- web/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/vite.config.js b/web/vite.config.js index 51ebd1c..ffaabbd 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode = 'local' }) => { plugins: [react()], server:{ host: true, - allowedHosts: true, + allowedHosts: ['.code-catalyst.com'], cors: true, hmr: isDev ? { -- 2.45.2