fix: eslint and build

.gitea/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Build & Deploy Mintel.me
+name: Build & Deploy
 
 on:
   push:
@@ -7,23 +7,17 @@ on:
     tags:
       - 'v*'
   workflow_dispatch:
-    inputs:
-      skip_long_checks:
-        description: 'Skip tests? (true/false)'
-        required: false
-        default: 'false'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.ref_type == 'tag' && !contains(github.ref_name, '-')) && 'prod' || (github.ref_type == 'tag' && 'staging' || 'testing') }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 1: Prepare & Determine Environment
-  # ──────────────────────────────────────────────────────────────────────────────
   prepare:
     name: 🔍 Prepare Environment
     runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
     outputs:
       target:           ${{ steps.determine.outputs.target }}
       image_tag:        ${{ steps.determine.outputs.image_tag }}
@@ -32,106 +26,184 @@ jobs:
       next_public_base_url: ${{ steps.determine.outputs.next_public_base_url }}
       directus_url:     ${{ steps.determine.outputs.directus_url }}
       directus_host:    ${{ steps.determine.outputs.directus_host }}
+      gatekeeper_host:  ${{ steps.determine.outputs.gatekeeper_host }}
+      traefik_rule:     ${{ steps.determine.outputs.traefik_rule }}
+      gatekeeper_rule:  ${{ steps.determine.outputs.gatekeeper_rule }}
       project_name:     ${{ steps.determine.outputs.project_name }}
-      is_prod:          ${{ steps.determine.outputs.is_prod }}
-      gotify_title:     ${{ steps.determine.outputs.gotify_title }}
-      gotify_priority:  ${{ steps.determine.outputs.gotify_priority }}
-      short_sha:        ${{ steps.determine.outputs.short_sha }}
-      commit_msg:       ${{ steps.determine.outputs.commit_msg }}
-    container:
-      image: catthehacker/ubuntu:act-latest
     steps:
-      - name: 🧹 Maintenance (High Density Cleanup)
+      - name: 🔍 Debug Info
         shell: bash
         run: |
-          echo "Purging old build layers and dangling images..."
-          docker image prune -f
-          docker builder prune -f --filter "until=6h"
+          echo "ref_name: ${{ github.ref_name }}"
+          echo "ref_type: ${{ github.ref_type }}"
+          echo "tag: ${{ github.ref_name }}"
+
+      - name: 🧹 Maintenance (Runner Cleanup)
+        continue-on-error: true
+        shell: bash
+        run: |
+          docker image prune -f || true
+          docker builder prune -f --filter "until=24h" || true
 
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 1
+          fetch-depth: 2
 
-      - name: 🔍 Environment & Version ermitteln
+      - name: 🔍 Determine Environment
         id: determine
         shell: bash
         run: |
-          TAG="${{ github.ref_name }}"
-          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-9)
-          IMAGE_TAG="sha-${SHORT_SHA}"
-          COMMIT_MSG=$(git log -1 --pretty=%s || echo "No commit message available")
+          REF="${{ github.ref }}"
+          REF_NAME="${{ github.ref_name }}"
+          REF_TYPE="${{ github.ref_type }}"
+          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+          DOMAIN_BASE="mintel.me"
+          PRJ_ID="mintel-me"
 
-          if [[ "${{ github.ref_type }}" == "branch" && "$TAG" == "main" ]]; then
+          echo "Detecting environment for ref: $REF ($REF_NAME, type: $REF_TYPE)"
+
+          # Fallback for REF_TYPE if missing
+          if [[ -z "$REF_TYPE" ]]; then
+            if [[ "$REF" == refs/tags/* ]]; then
+              REF_TYPE="tag"
+            elif [[ "$REF" == refs/heads/* ]]; then
+              REF_TYPE="branch"
+            fi
+          fi
+
+          if [[ "$REF_TYPE" == "branch" && "$REF_NAME" == "main" ]]; then
             TARGET="testing"
-            IMAGE_TAG="main-${SHORT_SHA}"
+            IMAGE_TAG="testing-${SHORT_SHA}"
             ENV_FILE=".env.testing"
-            TRAEFIK_HOST='`testing.mintel.me`'
-            NEXT_PUBLIC_BASE_URL="https://testing.mintel.me"
-            DIRECTUS_URL="https://cms.testing.mintel.me"
-            DIRECTUS_HOST='`cms.testing.mintel.me`'
-            PROJECT_NAME="mintel-me-testing"
-            IS_PROD="false"
-            GOTIFY_TITLE="🧪 Testing-Deploy"
-            GOTIFY_PRIORITY=4
-          elif [[ "${{ github.ref_type }}" == "tag" ]]; then
-            if [[ "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            TRAEFIK_HOST="testing.${DOMAIN_BASE}"
+            GATEKEEPER_HOST="gatekeeper.testing.${DOMAIN_BASE}"
+            NEXT_PUBLIC_BASE_URL="https://testing.${DOMAIN_BASE}"
+            DIRECTUS_URL="https://cms.testing.${DOMAIN_BASE}"
+            DIRECTUS_HOST="cms.testing.${DOMAIN_BASE}"
+          elif [[ "$REF_TYPE" == "tag" ]]; then
+            if [[ "$REF_NAME" =~ ^v[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]; then
               TARGET="production"
-              IMAGE_TAG="$TAG"
+              IMAGE_TAG="$REF_NAME"
               ENV_FILE=".env.prod"
-              TRAEFIK_HOST='`mintel.me`, `www.mintel.me`'
-              NEXT_PUBLIC_BASE_URL="https://mintel.me"
-              DIRECTUS_URL="https://cms.mintel.me"
-              DIRECTUS_HOST='`cms.mintel.me`'
-              PROJECT_NAME="mintel-me-prod"
-              IS_PROD="true"
-              GOTIFY_TITLE="🚀 Production-Release"
-              GOTIFY_PRIORITY=6
-            elif [[ "$TAG" =~ -rc || "$TAG" =~ -beta || "$TAG" =~ -alpha ]]; then
+              TRAEFIK_HOST="${DOMAIN_BASE}" # Primary domain
+              GATEKEEPER_HOST="gatekeeper.${DOMAIN_BASE}"
+              NEXT_PUBLIC_BASE_URL="https://${DOMAIN_BASE}"
+              DIRECTUS_URL="https://cms.${DOMAIN_BASE}"
+              DIRECTUS_HOST="cms.${DOMAIN_BASE}"
+            elif [[ "$REF_NAME" =~ -rc || "$REF_NAME" =~ -beta || "$REF_NAME" =~ -alpha ]]; then
               TARGET="staging"
-              IMAGE_TAG="$TAG"
+              IMAGE_TAG="$REF_NAME"
               ENV_FILE=".env.staging"
-              TRAEFIK_HOST='`staging.mintel.me`'
-              NEXT_PUBLIC_BASE_URL="https://staging.mintel.me"
-              DIRECTUS_URL="https://cms.staging.mintel.me"
-              DIRECTUS_HOST='`cms.staging.mintel.me`'
-              PROJECT_NAME="mintel-me-staging"
-              IS_PROD="false"
-              GOTIFY_TITLE="🧪 Staging-Deploy (Pre-Release)"
-              GOTIFY_PRIORITY=5
+              TRAEFIK_HOST="staging.${DOMAIN_BASE}"
+              GATEKEEPER_HOST="gatekeeper.staging.${DOMAIN_BASE}"
+              NEXT_PUBLIC_BASE_URL="https://staging.${DOMAIN_BASE}"
+              DIRECTUS_URL="https://cms.staging.${DOMAIN_BASE}"
+              DIRECTUS_HOST="cms.staging.${DOMAIN_BASE}"
             else
               TARGET="skip"
-              GOTIFY_TITLE="❓ Unbekannter Tag"
-              GOTIFY_PRIORITY=3
+              echo "Tag $REF_NAME did not match any environment pattern."
             fi
           else
             TARGET="skip"
+            echo "Ref type $REF_TYPE is not handled for deployment."
           fi
 
-          {
-            echo "target=$TARGET"
-            echo "image_tag=$IMAGE_TAG"
-            echo "env_file=$ENV_FILE"
-            echo "traefik_host=$TRAEFIK_HOST"
-            echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL"
-            echo "directus_url=$DIRECTUS_URL"
-            echo "directus_host=$DIRECTUS_HOST"
-            echo "project_name=$PROJECT_NAME"
-            echo "is_prod=$IS_PROD"
-            echo "gotify_title=$GOTIFY_TITLE"
-            echo "gotify_priority=$GOTIFY_PRIORITY"
-            echo "short_sha=$SHORT_SHA"
-            echo "commit_msg=$COMMIT_MSG"
-          } >> "$GITHUB_OUTPUT"
+          # Determine Rules based on target (if not skipped)
+          if [[ "$TARGET" != "skip" ]]; then
+            if [[ "$TARGET" == "production" ]]; then
+              TRAEFIK_RULE="Host(\`${DOMAIN_BASE}\`) || Host(\`www.${DOMAIN_BASE}\`)"
+              GATEKEEPER_RULE="(Host(\`${DOMAIN_BASE}\`) || Host(\`www.${DOMAIN_BASE}\`)) && PathPrefix(\`/gatekeeper\`) || Host(\`gatekeeper.${DOMAIN_BASE}\`)"
+            else
+              TRAEFIK_RULE="Host(\`${TRAEFIK_HOST}\`)"
+              GATEKEEPER_RULE="(Host(\`${TRAEFIK_HOST}\`) && PathPrefix(\`/gatekeeper\`)) || Host(\`gatekeeper.${TRAEFIK_HOST}\`)"
+            fi
+          fi
+
+          echo "Target determined: $TARGET"
+          echo "Image tag: $IMAGE_TAG"
+          
+          echo "target=$TARGET" >> "$GITHUB_OUTPUT"
+          echo "image_tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
+          echo "env_file=$ENV_FILE" >> "$GITHUB_OUTPUT"
+          echo "traefik_host=$TRAEFIK_HOST" >> "$GITHUB_OUTPUT"
+          echo "traefik_rule=$TRAEFIK_RULE" >> "$GITHUB_OUTPUT"
+          echo "gatekeeper_rule=$GATEKEEPER_RULE" >> "$GITHUB_OUTPUT"
+          echo "gatekeeper_host=$GATEKEEPER_HOST" >> "$GITHUB_OUTPUT"
+          echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL" >> "$GITHUB_OUTPUT"
+          echo "directus_url=$DIRECTUS_URL" >> "$GITHUB_OUTPUT"
+          echo "directus_host=$DIRECTUS_HOST" >> "$GITHUB_OUTPUT"
+          echo "project_name=$PRJ_ID-$TARGET" >> "$GITHUB_OUTPUT"
 
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 2: Quality Assurance (pnpm Lint & Test)
-  # ──────────────────────────────────────────────────────────────────────────────
   qa:
-    name: 🧪 Quality Assurance
+    name: 🧪 QA
     needs: prepare
     if: needs.prepare.outputs.target != 'skip'
     runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        shell: bash
+        run: |
+          corepack enable
+          pnpm install --frozen-lockfile
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: 🧪 Lint
+        shell: bash
+        run: pnpm lint
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: 🏗️ Build Test
+        shell: bash
+        run: pnpm build
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NEXT_PUBLIC_BASE_URL: https://dummy.test
+
+  build:
+    name: 🏗️ Build
+    needs: prepare
+    if: needs.prepare.outputs.target != 'skip'
+    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: 🐳 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 🔐 Registry Login
+        run: echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
+      
+      - name: 🏗️ Build and Push
+        shell: bash
+        run: |
+          docker buildx build \
+            --pull \
+            --platform linux/arm64 \
+            --build-arg NPM_TOKEN=${{ secrets.NPM_TOKEN }} \
+            --build-arg NEXT_PUBLIC_BASE_URL=${{ needs.prepare.outputs.next_public_base_url }} \
+            --build-arg NEXT_PUBLIC_TARGET=${{ needs.prepare.outputs.target }} \
+            --build-arg DIRECTUS_URL=${{ needs.prepare.outputs.directus_url }} \
+            --build-arg UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }} \
+            -t registry.infra.mintel.me/mintel/mintel.me:${{ needs.prepare.outputs.image_tag }} \
+            --push .
+
+  deploy:
+    name: 🚀 Deploy
+    needs: [prepare, build, qa]
+    if: needs.prepare.outputs.target != 'skip'
+    runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
     steps:
@@ -140,235 +212,127 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: 🧪 Run Checks in Parallel
-        if: github.event.inputs.skip_long_checks != 'true'
-        run: |
-          pnpm lint &
-          LINT_PID=$!
-          pnpm --filter @mintel/web typecheck &
-          TYPE_PID=$!
-          # pnpm test &
-          # TEST_PID=$!
-
-          wait $LINT_PID || exit 1
-          wait $TYPE_PID || exit 1
-          # wait $TEST_PID || exit 1
-
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 3: Build & Push Docker Image
-  # ──────────────────────────────────────────────────────────────────────────────
-  build:
-    name: 🏗️ Build App
-    needs: prepare
-    if: ${{ needs.prepare.outputs.target != 'skip' }}
-    runs-on: docker
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: 🐳 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: 🔐 Registry Login
-        run: |
-          echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-
-      - name: 🏗️ App bauen & pushen
-        env:
-          IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }}
-          TARGET:    ${{ needs.prepare.outputs.target }}
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_base_url }}
-          DIRECTUS_URL:         ${{ needs.prepare.outputs.directus_url }}
-          NPM_TOKEN:            ${{ secrets.NPM_TOKEN }}
-        run: |
-          docker buildx build \
-            --pull \
-            --platform linux/arm64 \
-            --build-arg NEXT_PUBLIC_BASE_URL="$NEXT_PUBLIC_BASE_URL" \
-            --build-arg NEXT_PUBLIC_TARGET="$TARGET" \
-            --build-arg DIRECTUS_URL="$DIRECTUS_URL" \
-            --secret id=NPM_TOKEN,env=NPM_TOKEN \
-            -t registry.infra.mintel.me/mintel/mintel.me:$IMAGE_TAG \
-            --cache-from type=registry,ref=registry.infra.mintel.me/mintel/mintel.me:buildcache \
-            --cache-to type=registry,ref=registry.infra.mintel.me/mintel/mintel.me:buildcache,mode=max \
-            --push .
-
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 4: Deploy via SSH
-  # ──────────────────────────────────────────────────────────────────────────────
-  deploy:
-    name: 🚀 Deploy
-    needs: [prepare, build, qa]
-    if: ${{ needs.prepare.outputs.target != 'skip' }}
-    runs-on: docker
-    container:
-      image: catthehacker/ubuntu:act-latest
-    env:
-      TARGET:       ${{ needs.prepare.outputs.target }}
-      IMAGE_TAG:    ${{ needs.prepare.outputs.image_tag }}
-      ENV_FILE:     ${{ needs.prepare.outputs.env_file }}
-      PROJECT_NAME: ${{ needs.prepare.outputs.project_name }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
       - name: 🚀 Deploy via SSH
         shell: bash
         run: |
+          echo "Deploying to alpha.mintel.me"
+          
           mkdir -p ~/.ssh
           echo "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts 2>/dev/null
 
-          # Create .env on the fly
-          cat > /tmp/mintel.me.env << EOF
-          # Generated by CI - $TARGET - $(date -u)
+          # Generate Environment File
+          cat > .env.deploy << 'EOF'
+          ENV_FILE=${{ needs.prepare.outputs.env_file }}
+          IMAGE_TAG=${{ needs.prepare.outputs.image_tag }}
+          TRAEFIK_HOST=${{ needs.prepare.outputs.traefik_host }}
+          TRAEFIK_RULE=${{ needs.prepare.outputs.traefik_rule }}
+          GATEKEEPER_RULE=${{ needs.prepare.outputs.gatekeeper_rule }}
+          GATEKEEPER_HOST=${{ needs.prepare.outputs.gatekeeper_host }}
+          PROJECT_NAME=${{ needs.prepare.outputs.project_name }}
           NEXT_PUBLIC_BASE_URL=${{ needs.prepare.outputs.next_public_base_url }}
-          NEXT_PUBLIC_TARGET=$TARGET
+          
+          # Directus
           DIRECTUS_URL=${{ needs.prepare.outputs.directus_url }}
           DIRECTUS_HOST=${{ needs.prepare.outputs.directus_host }}
-          TRAEFIK_HOST=${{ needs.prepare.outputs.traefik_host }}
-          IMAGE_TAG=$IMAGE_TAG
-          PROJECT_NAME=$PROJECT_NAME
-          AUTH_MIDDLEWARE=$( [[ "$TARGET" == "production" ]] && echo "compress" || echo "${PROJECT_NAME}-auth,compress" )
+          INTERNAL_DIRECTUS_URL=http://directus:8055
+          DIRECTUS_API_TOKEN=${{ secrets.DIRECTUS_API_TOKEN || vars.DIRECTUS_API_TOKEN }}
+          DIRECTUS_ADMIN_EMAIL=${{ secrets.DIRECTUS_ADMIN_EMAIL || vars.DIRECTUS_ADMIN_EMAIL || 'admin@mintel.me' }}
+          DIRECTUS_ADMIN_PASSWORD=${{ secrets.DIRECTUS_ADMIN_PASSWORD || vars.DIRECTUS_ADMIN_PASSWORD }}
+          DIRECTUS_DB_NAME=${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }}
+          DIRECTUS_DB_USER=${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }}
+          DIRECTUS_DB_PASSWORD=${{ secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD }}
+          DIRECTUS_KEY=${{ secrets.DIRECTUS_KEY || vars.DIRECTUS_KEY }}
+          DIRECTUS_SECRET=${{ secrets.DIRECTUS_SECRET || vars.DIRECTUS_SECRET }}
           
-          # Secrets
-          DIRECTUS_KEY=${{ secrets.DIRECTUS_KEY }}
-          DIRECTUS_SECRET=${{ secrets.DIRECTUS_SECRET }}
-          DIRECTUS_DB_NAME=${{ secrets.DIRECTUS_DB_NAME || 'directus' }}
-          DIRECTUS_DB_USER=${{ secrets.DIRECTUS_DB_USER || 'directus' }}
-          DIRECTUS_DB_PASSWORD=${{ secrets.DIRECTUS_DB_PASSWORD }}
+          # SMTP Config
+          SMTP_HOST=${{ secrets.SMTP_HOST || vars.SMTP_HOST }}
+          SMTP_PORT=${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }}
+          SMTP_SECURE=${{ secrets.SMTP_SECURE || vars.SMTP_SECURE || 'false' }}
+          SMTP_USER=${{ secrets.SMTP_USER || vars.SMTP_USER }}
+          SMTP_PASS=${{ secrets.SMTP_PASS || vars.SMTP_PASS }}
+          SMTP_FROM=${{ secrets.SMTP_FROM || vars.SMTP_FROM }}
+          CONTACT_RECIPIENT=${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }}
+
+          # Authentication
+          GATEKEEPER_PASSWORD=${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD }}
+          AUTH_COOKIE_NAME=${{ secrets.AUTH_COOKIE_NAME || vars.AUTH_COOKIE_NAME || 'mintel_gatekeeper_session' }}
+          COOKIE_DOMAIN=${{ secrets.COOKIE_DOMAIN || vars.COOKIE_DOMAIN || '.mintel.me' }}
+          AUTH_MIDDLEWARE=$( [[ "${{ needs.prepare.outputs.target }}" == "production" ]] && echo "compress" || echo "${{ needs.prepare.outputs.project_name }}-auth,compress" )
+
+          # External Services
+          SENTRY_DSN=${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}
+          GOTIFY_URL=${{ secrets.GOTIFY_URL || vars.GOTIFY_URL }}
+          GOTIFY_TOKEN=${{ secrets.GOTIFY_TOKEN || vars.GOTIFY_TOKEN }}
+          UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
+          UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
           
-          # General
-          NODE_ENV=production
+          # Project
+          PROJECT_COLOR=${{ secrets.PROJECT_COLOR || vars.PROJECT_COLOR || '#ff00ff' }}
           EOF
 
-          # 1. Cleanup and Create Directories on server BEFORE SCP
+          APP_DIR="/home/deploy/sites/mintel.me"
+          ssh -o StrictHostKeyChecking=accept-new root@alpha.mintel.me "mkdir -p $APP_DIR"
+          
+          scp -o StrictHostKeyChecking=accept-new .env.deploy root@alpha.mintel.me:$APP_DIR/${{ needs.prepare.outputs.env_file }}
+          scp -o StrictHostKeyChecking=accept-new docker-compose.yaml root@alpha.mintel.me:$APP_DIR/docker-compose.yaml
+          
           ssh -o StrictHostKeyChecking=accept-new root@alpha.mintel.me bash << 'EOF'
             set -e
-            mkdir -p /home/deploy/sites/mintel.me/varnish
-            mkdir -p /home/deploy/sites/mintel.me/directus/uploads /home/deploy/sites/mintel.me/directus/extensions
-            if [ -d "/home/deploy/sites/mintel.me/varnish/default.vcl" ]; then
-              echo "🧹 Removing directory 'varnish/default.vcl' created by Docker..."
-              rm -rf /home/deploy/sites/mintel.me/varnish/default.vcl
-            fi
-            chown -R deploy:deploy /home/deploy/sites/mintel.me/directus /home/deploy/sites/mintel.me/varnish
-          EOF
-
-          # 2. Transfer files
-          scp /tmp/mintel.me.env root@alpha.mintel.me:/home/deploy/sites/mintel.me/$ENV_FILE
-          scp docker-compose.yml root@alpha.mintel.me:/home/deploy/sites/mintel.me/docker-compose.yml
-          scp -r varnish root@alpha.mintel.me:/home/deploy/sites/mintel.me/
-
-          ssh root@alpha.mintel.me IMAGE_TAG="$IMAGE_TAG" ENV_FILE="$ENV_FILE" PROJECT_NAME="$PROJECT_NAME" bash << 'EOF'
-            set -e
-            cd /home/deploy/sites/mintel.me
+            APP_DIR="/home/deploy/sites/mintel.me"
+            cd $APP_DIR
+            
             echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" pull
-            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" up -d --remove-orphans
+            docker compose -p "${{ needs.prepare.outputs.project_name }}" --env-file ${{ needs.prepare.outputs.env_file }} pull
+            docker compose -p "${{ needs.prepare.outputs.project_name }}" --env-file ${{ needs.prepare.outputs.env_file }} up -d --remove-orphans
             docker system prune -f --filter "until=24h"
-            echo "→ Waiting 15s for warmup..."
-            sleep 15
-            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" ps
           EOF
 
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 5: PageSpeed Test
-  # ──────────────────────────────────────────────────────────────────────────────
   pagespeed:
     name: ⚡ PageSpeed
     needs: [prepare, deploy]
     if: |
       always() && 
       needs.prepare.outputs.target != 'skip' &&
-      needs.deploy.result == 'success' && 
-      github.event.inputs.skip_long_checks != 'true'
+      needs.deploy.result == 'success'
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
-
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: |
+          corepack enable
+          pnpm install --frozen-lockfile
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: 🔍 Install Chromium (ARM64)
-        run: |
-          apt-get update
-          apt-get install -y gnupg wget ca-certificates
-          CODENAME=$(. /etc/os-release && echo $VERSION_CODENAME)
-          
-          mkdir -p /etc/apt/keyrings
-          KEY_ID="82BB6851C64F6880"
-          wget -qO- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$KEY_ID" | gpg --dearmor > /etc/apt/keyrings/xtradeb.gpg
-          echo "deb [signed-by=/etc/apt/keyrings/xtradeb.gpg] http://ppa.launchpad.net/xtradeb/apps/ubuntu $CODENAME main" > /etc/apt/sources.list.d/xtradeb-ppa.list
-          printf "Package: *\nPin: release o=LP-PPA-xtradeb-apps\nPin-Priority: 1001\n" > /etc/apt/preferences.d/xtradeb
-          
-          apt-get update
-          apt-get install -y --allow-downgrades chromium
-          [ -f /usr/bin/chromium ] && ln -sf /usr/bin/chromium /usr/bin/google-chrome
-        continue-on-error: true
-
-      - name: 🧪 Run PageSpeed (Lighthouse)
+      - name: 🧪 Run PageSpeed (Lighthouse CI)
         env:
           NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_base_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-          PAGESPEED_LIMIT: 8
-          CHROME_PATH: /usr/bin/chromium
-        run: pnpm --filter @mintel/web run pagespeed:test
+          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD }}
+        run: pnpm --filter @mintel/web pagespeed:test
 
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 6: Notifications
-  # ──────────────────────────────────────────────────────────────────────────────
   notifications:
     name: 🔔 Notifications
-    needs: [prepare, qa, build, deploy, pagespeed]
+    needs: [prepare, deploy]
     if: always()
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
     steps:
-      - name: 🔔 Gotify
+      - name: Notify Gotify
+        shell: bash
         run: |
-          STATUS="${{ needs.deploy.result == 'success' && '✅' || '❌' }}"
-          PRIORITY="${{ needs.deploy.result == 'success' && needs.prepare.outputs.gotify_priority || '8' }}"
-          curl -s -k -X POST "${{ secrets.GOTIFY_URL }}/message?token=${{ secrets.GOTIFY_TOKEN }}" \
-            -F "title=$STATUS ${{ needs.prepare.outputs.gotify_title }}" \
-            -F "message=Deploy to **${{ needs.prepare.outputs.target }}** ${{ needs.deploy.result }}.\n\nVersion: **${{ needs.prepare.outputs.image_tag }}**\nCommit: ${{ needs.prepare.outputs.short_sha }} (${{ needs.prepare.outputs.commit_msg }})\nActor: ${{ github.actor }}" \
-            -F "priority=$PRIORITY" || true
+          STATUS="${{ needs.deploy.result }}"
+          [[ "$STATUS" == "success" ]] && PRIORITY=5 || PRIORITY=8
+          
+          curl -X POST "${{ secrets.GOTIFY_URL }}/message?token=${{ secrets.GOTIFY_TOKEN }}" \
+            -F "title=mintel.me Deployment" \
+            -F "message=Status: $STATUS for ${{ needs.prepare.outputs.target }} (${{ needs.prepare.outputs.image_tag }})" \
+            -F "priority=$PRIORITY"