Merge branch 'main' into renovate/vitejs-plugin-vue-5.x-lockfile

.forgejo/workflows/deploy.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - gold
 
-
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -13,35 +12,20 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Deploy to OCI Registry
-        uses: https://git.smgames.club/SevenOfAces/PublishImage@main
-        with:
-          registry-url: 'git.smgames.club'
-          registry-token: ${{ secrets.DOCKER_TOKEN }}
-          architectures: 'amd64,arm64'
-          tags: 'latest'
-          name: 'auto'
-          dockerfile: './Dockerfile'
-          owner: 'SevenOfAces'
+      - name: Set repository name to lowercase
+        run: echo "REPO_NAME=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
-    #  - name: Set repository name to lowercase
-    #    run: echo "REPO_NAME=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-   #   - name: Set up Docker
-     #   uses: https://github.com/docker-practice/actions-setup-docker@master
-     #   timeout-minutes: 12
+      - name: Authenticate with registry
+        run: docker login git.smgames.club -u ${{ github.repository_owner }} -p ${{ secrets.DOCKER_TOKEN }}
 
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-
-#      - name: Authenticate with registry
-#        run: docker login git.smgames.club -u ${{ github.repository_owner }} -p ${{ secrets.DOCKER_TOKEN }}
-
- #     - name: Build and push multi-architecture Docker image
- #       run: |
- #         docker buildx create --use
- #         docker buildx build \
- #           --platform linux/amd64,linux/arm64 \
- #           --tag git.smgames.club/${{ env.REPO_NAME }}:latest \
- #           --push \
- #           .
+      - name: Build and push multi-architecture Docker image
+        run: |
+          docker buildx create --use
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag git.smgames.club/${{ env.REPO_NAME }}:latest \
+            --push \
+            .

.forgejo/workflows/test.yml

@@ -46,12 +46,6 @@ jobs:
           path: ~/.cache/Cypress
           key: cypress-${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
 
-      - name: Cache Node modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: node-modules-${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
-
       - name: Install Cypress
         run: npx cypress install
 
@@ -84,18 +78,11 @@ jobs:
           name: build
           path: dist
 
-      - name: Restore Node modules cache
-        uses: actions/cache@v4
-        with:
-          name: node-modules
-          key: node-modules-${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
-          path: node_modules
-          
       - name: Run unit tests
         run: npm run test:unit
 
   cypress-tests:
-    name: Run E2E tests (${{ matrix.browser }})
+    name: Run E2E tests
     runs-on: ubuntu-latest
     needs: install
     strategy:
@@ -122,7 +109,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y ${{ env.APT_PACKAGES }}
 
       - name: Cypress run (${{ matrix.browser }})
-        uses: https://github.com/cypress-io/github-action@v6
+        uses: cypress-io/github-action@v6
         with:
           start: npm start
           browser: ${{ matrix.browser }}

Dockerfile

@@ -1,7 +1,7 @@
 # build stage
 FROM node:lts-alpine AS build-stage
-WORKDIR ./app
-COPY package.json ./
+WORKDIR /app
+COPY package.json package-lock.json ./
 RUN npm i
 COPY . .
 RUN npm run build
@@ -16,7 +16,6 @@ COPY --from=build-stage /app/dist /usr/share/nginx/html
 EXPOSE 80
 
 # Use a non-root user for security
-RUN chown -R 101:101 /usr/share/nginx/html /var/cache/nginx /var/run /etc/nginx
-USER 101
+USER 1000
 
 CMD ["nginx", "-g", "daemon off;"]

package.json

@@ -19,7 +19,11 @@
   "dependencies": {
     "@tsparticles/slim": "^3.5.0",
     "@tsparticles/vue3": "^3.0.1",
+    "axios": "^1.7.7",
+    "bcrypt": "^5.1.1",
     "express": "^4.21.1",
+    "jsonwebtoken": "^9.0.2",
+    "pg": "^8.13.1",
     "pinia": "^2.2.6",
     "vue": "^3.5.12",
     "vue-router": "^4.4.5"