Merge pull request #31 from Doble-Technologies/test-deploy

Test deploy

.github/workflows/api-container.yml

@@ -9,6 +9,8 @@ on:
       - reopened
       - synchronize
       - ready_for_review
+    paths:
+      - api/**
   push:
     branches:
       - main
@@ -66,8 +68,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write
@@ -88,8 +92,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write

.github/workflows/api-deploy-nonprod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_API: {}
+      TEAMCITY_API_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_API }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
+            echo "TEAMCITY_API_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_API secret is set"
+            echo "TEAMCITY_API_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -88,7 +102,12 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Deploy to Coolify
+      - name: Deploy to Team City
         run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_API_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null
+
 

.github/workflows/api-deploy-prod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_API: {}
+      TEAMCITY_API_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_API }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
+            echo "TEAMCITY_API_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_API secret is set"
+            echo "TEAMCITY_API_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -88,7 +102,10 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Deploy to Coolify
+      - name: Deploy to Team City
         run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
-    
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_API_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

.github/workflows/pr-validation.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: ['self-hosted', 'pi']
+    runs-on: 'ubuntu-latest'
     steps:
       - uses: TimonVS/pr-labeler-action@v5
         with:

.github/workflows/web-container.yml

@@ -9,6 +9,8 @@ on:
       - reopened
       - synchronize
       - ready_for_review
+    paths:
+      - web/**
   push:
     branches:
       - main
@@ -16,7 +18,7 @@ on:
       - web/**
 jobs:
   determine-workflow:
-    runs-on: ['self-hosted','pi']
+    runs-on: 'ubuntu-latest'
     outputs:
       workflow_type: ${{ steps.workflow.outputs.workflow_type }}
       workflow_envs: ${{ steps.workflow.outputs.workflow_envs }}
@@ -66,8 +68,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write
@@ -88,8 +92,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write

.github/workflows/web-deploy-nonprod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
+      TEAMCITY_WEB_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
+            echo "TEAMCITY_WEB_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -88,7 +102,10 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Deploy to Coolify
+      - name: Deploy to Team City
         run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
-    
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_WEB_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

.github/workflows/web-deploy-prod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
+      TEAMCITY_WEB_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
+            echo "TEAMCITY_WEB_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -88,7 +102,10 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Deploy to Coolify
+      - name: Deploy to Team City
         run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
-    
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_WEB_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

api/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY ./package*.json ./
 
-RUN npm cache clean --force && npm install --no-audit --no-fund
+RUN npm ci
 
 COPY . ./
 

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiftsync-website-api",
-  "version": "1.0.1",
+  "version": "1.0.11",
   "private": true,
   "type": "module",
   "scripts": {

api/server.js

@@ -1,6 +1,7 @@
 import express from 'express';
 import cors from 'cors';
 import dotenv from 'dotenv';
+import fs from 'fs/promises';
 import { medicationRouter } from './services/medications/index.js';
 import { shiftsRouter } from './services/shifts/index.js';
 import { shiftRunQuery } from './services/shiftConnection.js';
@@ -45,9 +46,12 @@ app.get('/api/db-health', async (req, res) => {
     res.status(500).json({ connected: false, error: err.message });
   }
 });
+
 app.get('/api/version', async (req, res) => {
   try {
-    res.json('1.0.1');
+    const packageData = await fs.readFile('./package.json', 'utf8');
+    const pkg = JSON.parse(packageData);
+    res.json(pkg.version);
   } catch (err) {
     console.error(err);
     res.status(500).json({ connected: false, error: err.message });

api/services/medications/index.js

@@ -33,9 +33,10 @@ medicationRouter.get('/base/', async (req, res) => {
 medicationRouter.post('/full/', async (req, res) => {
   let data;
   const body = req?.body;
+  
   try {
     await fullMedicationInformationSchema.validate(body);
-    data = await databaseServices.getFullMedicationInformation(body?.drugId);
+    data = await databaseServices.getFullMedicationInformation(body);
     res.status(200);
   } catch (err) {
     data = { Error: err?.message };

api/services/operations/helpers/medications.js

@@ -89,7 +89,7 @@ export const medicationHelpers = {
         ]);
 
         const fullMedicationInformation = {
-            ...medInformation
+            ...medInformation[0]
         };
 
         medRoutes?.forEach((row) => {

api/services/operations/medications.js

@@ -21,7 +21,8 @@ const getBaseMedications = async () => {
   }
 }
 
-const getFullMedicationInformation = async (drugId) => {
+const getFullMedicationInformation = async (drug) => {
+  const { drugId } = drug;
   try {
     const dataResp = medicationHelpers.getFullMedicationInformation(drugId);
     return dataResp;

package-lock.json

@@ -90,9 +90,9 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "2.2.1",
+      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz",
-      "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==",
+      "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==",
       "license": "MIT",
       "dependencies": {
         "bytes": "^3.1.2",
@@ -101,7 +101,7 @@
         "http-errors": "^2.0.0",
         "iconv-lite": "^0.7.0",
         "on-finished": "^2.4.1",
-        "qs": "^6.14.0",
+        "qs": "^6.14.1",
         "raw-body": "^3.0.1",
         "type-is": "^2.0.1"
       },
@@ -273,19 +273,18 @@
       "license": "MIT"
     },
     "node_modules/concurrently": {
-      "version": "9.1.2",
+      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
-      "integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
+      "integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.2",
+        "chalk": "4.1.2",
-        "lodash": "^4.17.21",
+        "rxjs": "7.8.2",
-        "rxjs": "^7.8.1",
+        "shell-quote": "1.8.3",
-        "shell-quote": "^1.8.1",
+        "supports-color": "8.1.1",
-        "supports-color": "^8.1.1",
+        "tree-kill": "1.2.2",
-        "tree-kill": "^1.2.2",
+        "yargs": "17.7.2"
-        "yargs": "^17.7.2"
       },
       "bin": {
         "conc": "dist/bin/concurrently.js",
@@ -299,15 +298,16 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
-      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
+      "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
       "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/content-type": {
@@ -524,9 +524,9 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "2.1.0",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz",
-      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
+      "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==",
       "license": "MIT",
       "dependencies": {
         "debug": "^4.4.0",
@@ -537,7 +537,11 @@
         "statuses": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/forwarded": {
@@ -709,9 +713,9 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.7.0",
+      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
+      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -808,13 +812,6 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "license": "MIT"
     },
-    "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -855,15 +852,19 @@
       }
     },
     "node_modules/mime-types": {
-      "version": "3.0.1",
+      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
-      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
       "license": "MIT",
       "dependencies": {
         "mime-db": "^1.54.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/minimatch": {
@@ -895,9 +896,9 @@
       }
     },
     "node_modules/nodemon": {
-      "version": "3.1.10",
+      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz",
-      "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==",
+      "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1008,12 +1009,13 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "8.2.0",
+      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
       "license": "MIT",
-      "engines": {
+      "funding": {
-        "node": ">=16"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/picomatch": {
@@ -1137,26 +1139,6 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -1164,9 +1146,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.2",
+      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -1177,31 +1159,35 @@
       }
     },
     "node_modules/send": {
-      "version": "1.2.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz",
-      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
+      "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==",
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.3.5",
+        "debug": "^4.4.3",
         "encodeurl": "^2.0.0",
         "escape-html": "^1.0.3",
         "etag": "^1.8.1",
         "fresh": "^2.0.0",
-        "http-errors": "^2.0.0",
+        "http-errors": "^2.0.1",
-        "mime-types": "^3.0.1",
+        "mime-types": "^3.0.2",
         "ms": "^2.1.3",
         "on-finished": "^2.4.1",
         "range-parser": "^1.2.1",
-        "statuses": "^2.0.1"
+        "statuses": "^2.0.2"
       },
       "engines": {
         "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/serve-static": {
-      "version": "2.2.0",
+      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
-      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
+      "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==",
       "license": "MIT",
       "dependencies": {
         "encodeurl": "^2.0.0",
@@ -1211,6 +1197,10 @@
       },
       "engines": {
         "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/setprototypeof": {

web/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY ./package*.json ./
 
-RUN npm cache clean --force && npm install --no-audit --no-fund
+RUN npm ci
 
 COPY . ./
 

web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiftsync-website-web",
+  "version": "1.0.10",
   "private": true,
-  "version": "1.0.5",
   "type": "module",
   "scripts": {
     "local": "vite",

web/src/pages/Home/Home.jsx

@@ -14,10 +14,11 @@ export const Home = () => {
   }, []);
 
   return (
-    <div>
+    <div >
       <h1>Home Page</h1>
       <Link to="/settings">Go to Settings</Link>
       <p>Version: {pkg.version}</p>
+      <p>This site does nothing</p>
     </div>
   );
 };