Merge branch 'main' into feat/logo-and-webpages-title

.devcontainer/full/devcontainer.json

@@ -1,6 +1,10 @@
 {
     "name": "ASPA Dev Container (Full)",
-    "dockerFile": "../dockerfile/Dockerfile",
+    "dockerComposeFile": [
+        "../../docker/docker-compose.microservice.yml",
+        "../../docker/docker-compose.workspace.yml"
+    ],
+    "service": "app",
     "customizations": {
         "vscode": {
             "settings": {
@@ -10,15 +14,15 @@
                 "GitHub.copilot-chat",
                 "GitHub.copilot",
                 "ms-vscode.vscode-typescript-next",
-                "material-theme-icons",
+                "material-theme-icons"
             ]
         }
     },
-    "workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached",
     "workspaceFolder": "/repo",
-    "postCreateCommand": "yarn install && cd backend && docker compose up --build -d",
-    "postStartCommand": "cd backend && docker compose up -d",
+    "postCreateCommand": "yarn install:all && yarn prepare",
+    "postStartCommand": "",
     "mounts": [
-        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
+        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
+        "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached"
     ]
 }

.devcontainer/minimal/devcontainer.json

@@ -1,6 +1,10 @@
 {
     "name": "ASPA Dev Container (Minimal)",
-    "dockerFile": "../dockerfile/Dockerfile",
+    "dockerComposeFile": [
+        "../../docker/docker-compose.microservice.yml",
+        "../../docker/docker-compose.workspace.yml"
+    ],
+    "service": "app",
     "customizations": {
         "vscode": {
             "settings": {
@@ -9,10 +13,16 @@
             "extensions": [
                 "GitHub.copilot-chat",
                 "GitHub.copilot",
-                "ms-vscode.vscode-typescript-next"
+                "ms-vscode.vscode-typescript-next",
+                "material-theme-icons"
             ]
         }
     },
-    "workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached",
-    "workspaceFolder": "/repo"
+    "workspaceFolder": "/repo",
+//    "postCreateCommand": "yarn install && cd docker && docker compose up --build -d",
+//    "postStartCommand": "cd docker && docker compose up -d",
+    "mounts": [
+        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
+        "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached"
+    ]
 }

.github/workflows/generate-api-client.yml

@@ -1,8 +1,7 @@
 name: Build API Client
 
 on:
-    pull_request:
-      types: [opened, reopened, closed]
+    push
 
 jobs:
     build:
@@ -27,5 +26,6 @@ jobs:
                 commit_user_name: "github-api-actions[bot]"
                 commit_user_email: "github-api-actions[bot]@users.noreply.github.com"
                 commit_author: Author <[email protected]>
+                commit_options: '--no-verify'
 
 

.github/workflows/prettier.yml

@@ -0,0 +1,22 @@
+name: Continuous Integration
+
+# This action works with pull requests and pushes
+on:
+  push
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # Make sure the actual branch is checked out when running on pull requests
+          ref: ${{ github.head_ref }}
+
+      - name: Prettify code
+        uses: creyD/[email protected]
+        with:
+          # This part is also where you can pass other options, for example:
+            commit_message: "Chore: Prettify code"

.husky/pre-commit

@@ -0,0 +1,22 @@
+#!/bin/sh
+# .husky/pre-commit
+
+# Try to curl the URL and pipe the output to a file
+curl http://0.0.0.0:8055/server/specs/oas -o ./backend/docs/api_docs.json
+
+
+
+# Check if the curl command was successful
+if [ $? -ne 0 ]; then
+  echo "Curl command failed are you in the dev-container? Aborting commit."
+  exit 1
+fi
+
+# Format the JSON file
+jq . ./backend/docs/api_docs.json > ./backend/docs/api_docs.tmp && mv ./backend/docs/api_docs.tmp ./backend/docs/api_docs.json
+
+# Find and replace "url": "0.0.0.0:8055" with "url": "http://0.0.0.0:8055"
+sed -i 's|"url": "0.0.0.0:8055"|"url": "http://0.0.0.0:8055"|g' ./backend/docs/api_docs.json
+
+# If successful, proceed with the commit
+echo "Curl command succeeded. Proceeding with commit."

backend/.gitignore

@@ -1,6 +1,3 @@
 node_modules
 # Keep environment variables out of version control
-.env
-
-# Keep generated files out of version control
-docs/api-doc.json
+.env