Develop

.gitattributes

@@ -0,0 +1 @@
+client/src/api/generated/ linguist-generated=true

.github/workflows/build_docker_image.yml

@@ -2,6 +2,7 @@ name: Build Docker Images
 
 on:
   push:
+    - mainx
 
 jobs:
   test:

.github/workflows/client-linters.yml

@@ -31,9 +31,5 @@ jobs:
         run: npx prettier --check "src/**/*.{ts,tsx}"
         working-directory: client
 
-      - name: Fix Prettier formatting
-        run: npm run format
-        working-directory: client
-        if: failure()
 
 

.github/workflows/deploy-to-k8.yml

@@ -0,0 +1,82 @@
+name: Build and Publish Docker Image to GHCR
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Set REPO, TAG, NAMESPACE, and VALUES_FILE environment variables
+        run: |
+          echo "REPO=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
+          if [[ "${GITHUB_REF##*/}" == "main" ]]; then
+            echo "TAG=latest" >> $GITHUB_ENV
+            echo "NAMESPACE=tsd-prod" >> $GITHUB_ENV
+            echo "VALUES_FILE=./helm/whiteboard-app/production.values.yaml" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF##*/}" == "develop" ]]; then
+            echo "TAG=develop" >> $GITHUB_ENV
+            echo "NAMESPACE=tsd-staging" >> $GITHUB_ENV
+            echo "VALUES_FILE=./helm/whiteboard-app/staging.values.yaml" >> $GITHUB_ENV
+          fi
+
+      - name: Client -> Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./client
+          file: ./client/Dockerfile
+          push: true
+          tags: ghcr.io/${{ env.REPO }}/client:${{ env.TAG }}
+          platforms: linux/amd64
+
+      - name: Server -> Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./server
+          file: ./server/Dockerfile
+          push: true
+          tags: ghcr.io/${{ env.REPO }}/server:${{ env.TAG }}
+          platforms: linux/amd64
+
+
+      - name: Set up Kubeconfig
+        run: |
+          echo "${{ secrets.KUBECONFIG }}" > kubeconfig
+          echo "KUBECONFIG=$(pwd)/kubeconfig" >> $GITHUB_ENV
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+
+      - name: Deploy App with Helm
+        run: |
+          helm upgrade whiteboard ./helm/whiteboard-app/ \
+            -f ${{ env.VALUES_FILE }} \
+            -n ${{ env.NAMESPACE }} \
+            --install \
+            --atomic \
+            --kubeconfig ${{ env.KUBECONFIG }}

.github/workflows/deploy_docker.yml

@@ -1,48 +1,48 @@
-name: Deploy Docker Images
-
-on:
-  push:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment:
-      name: AWS
-      url: 'https://client.${{ vars.EC2_PUBLIC_IP }}.nip.io' 
-    steps:      
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Copy Docker Compose File From Repo to VM Host
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ vars.EC2_PUBLIC_IP }}
-          username: ${{ vars.AWS_EC2_USER }}
-          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
-          source: "./compose.aws.yml"
-          target: /home/${{ vars.AWS_EC2_USER }}
-
-      - name: SSH to VM and Create .env.prod
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ vars.EC2_PUBLIC_IP }}
-          username: ${{ vars.AWS_EC2_USER }}
-          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
-          script: |
-            rm .env.prod
-            touch .env.prod
-            echo "CLIENT_HOST=client.${{ vars.EC2_PUBLIC_IP }}.nip.io" >> .env.prod
-            echo "SERVER_HOST=api.${{ vars.EC2_PUBLIC_IP }}.nip.io" >> .env.prod
-            echo "PUBLIC_API_URL=https://api.${{ vars.EC2_PUBLIC_IP }}.nip.io/api" >> .env.prod
-
-      - name: SSH to VM and Execute Docker-Compose Up
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ vars.EC2_PUBLIC_IP }}
-          username: ${{ vars.AWS_EC2_USER }}
-          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
-          script: |
-            echo "Logging into Docker registry..."
-            echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-            echo "Starting Docker Compose..."
-            docker compose -f compose.aws.yml --env-file=.env.prod up --pull=always -d
+#name: Deploy Docker Images
+#
+#on:
+#  push:
+#
+#jobs:
+#  deploy:
+#    runs-on: ubuntu-latest
+#    environment:
+#      name: AWS
+#      url: 'https://client.${{ vars.EC2_PUBLIC_IP }}.nip.io'
+#    steps:
+#      - name: Checkout Code
+#        uses: actions/checkout@v4
+#
+#      - name: Copy Docker Compose File From Repo to VM Host
+#        uses: appleboy/scp-action@v0.1.7
+#        with:
+#          host: ${{ vars.EC2_PUBLIC_IP }}
+#          username: ${{ vars.AWS_EC2_USER }}
+#          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
+#          source: "./compose.aws.yml"
+#          target: /home/${{ vars.AWS_EC2_USER }}
+#
+#      - name: SSH to VM and Create .env.prod
+#        uses: appleboy/ssh-action@v1.0.3
+#        with:
+#          host: ${{ vars.EC2_PUBLIC_IP }}
+#          username: ${{ vars.AWS_EC2_USER }}
+#          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
+#          script: |
+#            rm .env.prod
+#            touch .env.prod
+#            echo "CLIENT_HOST=client.${{ vars.EC2_PUBLIC_IP }}.nip.io" >> .env.prod
+#            echo "SERVER_HOST=api.${{ vars.EC2_PUBLIC_IP }}.nip.io" >> .env.prod
+#            echo "PUBLIC_API_URL=https://api.${{ vars.EC2_PUBLIC_IP }}.nip.io/api" >> .env.prod
+#
+#      - name: SSH to VM and Execute Docker-Compose Up
+#        uses: appleboy/ssh-action@v1.0.3
+#        with:
+#          host: ${{ vars.EC2_PUBLIC_IP }}
+#          username: ${{ vars.AWS_EC2_USER }}
+#          key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
+#          script: |
+#            echo "Logging into Docker registry..."
+#            echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+#            echo "Starting Docker Compose..."
+#            docker compose -f compose.aws.yml --env-file=.env.prod up --pull=always -d

client/.env.local

@@ -0,0 +1 @@
+NEXT_PUBLIC_API_URL=https://api.teamserverdown.devops.aet.cit.tum.de

client/Dockerfile

@@ -1,5 +1,7 @@
 # Install dependencies only when needed
-FROM node:18-alpine AS deps
+FROM node:24.2-bullseye-slim AS deps
+
+RUN apt update && apt install --yes --no-install-recommends curl default-jre
 
 # Set working directory
 WORKDIR /app
@@ -9,7 +11,7 @@ COPY package.json package-lock.json ./
 RUN npm ci
 
 # Rebuild the source code only when needed
-FROM node:20-slim AS builder
+FROM node:24.2-slim AS builder
 WORKDIR /app
 
 COPY . .
@@ -20,7 +22,7 @@ COPY --from=deps /app/node_modules ./node_modules
 RUN npm run build
 
 # Production image
-FROM node:20-alpine AS runner
+FROM node:24.2-alpine3.21 AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production

client/next.config.ts

@@ -2,6 +2,16 @@ import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
   /* config options here */
+    webpack(config) {
+        // Configure SVG files to be imported as React components
+        config.module.rules.push({
+            test: /\.svg$/,
+            use: ['@svgr/webpack'],
+        });
+
+        return config;
+    },
 };
 
+
 export default nextConfig;

client/openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.13.0"
+  }
+}