Fixed dev merge

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Wait for containers to start
         run: |
-          sleep 18
+          sleep 100
           docker run \
             --rm \
             --network mercury-project_default \
@@ -41,3 +41,26 @@ jobs:
         with:
           commit_message: Apply formatting
           branch: ${{ github.head_ref }}
+
+  cypress:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: isbang/[email protected]
+        with:
+          compose-file: "compose.yml"
+
+      - name: Wait for containers to start
+        run: |
+          sleep 100
+          docker run \
+            --rm \
+            --network mercury-project_default \
+            alpine/curl -o /dev/null --retry 3 --retry-connrefused backend:5000
+
+      - name: Run Cypress Tests
+        run: cd frontend; npm i && npm run cy:run

.gitignore

@@ -1 +1,2 @@
-node_modules/
+node_modules/
+build/

.prettierignore

@@ -1,2 +1,5 @@
 node_modules/
-coverage/
+coverage/
+frontend/.vite/
+keycloak/
+db/

.prettierrc

@@ -8,5 +8,7 @@
   "endOfLine": "lf",
   "semi": true,
   "bracketSpacing": true,
-  "quoteProps": "preserve"
+  "quoteProps": "preserve",
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrder": ["<BUILTIN_MODULES>", "", "<THIRD_PARTY_MODULES>", "", "^[.]"]
 }

backend/.env

@@ -1,3 +1,5 @@
 TOKEN_SECRET=27a0967eed44a78feec1ccd9225343258894288202c0a45a8f93adce6786dbc9ae5a7fc4df716f29eefed7067d9b94fa9f7c2ab7dd7781d36cb22206bf25b886
 LINK_SECRET=ijr2iq34rfeiadsfkjq3ew
-
+CLIENT_SECRET=fOP43IDxXavjRogZMQWKW1qmJAz5zeEf
+NEO4J_USERNAME=neo4j
+NEO4J_PASSWORD=password

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:21-alpine
 WORKDIR /home/node/app
 COPY *.json .
 COPY ./src ./src