fix: traefik issues

refactor: use explicit Git reference variables for more robust deployment target and image tag determination in Gitea workflow.
fix: logo position
2026-02-06 23:15:22 +01:00 · 2026-02-06 22:51:40 +01:00 · 2026-02-06 21:42:43 +01:00 · 2026-02-06 21:35:00 +01:00 · 2026-02-06 19:23:35 +01:00 · 2026-02-06 19:11:19 +01:00
7 changed files with 197 additions and 60 deletions
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -26,6 +26,9 @@ 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 }}
    steps:
      - name: 🔍 Debug Info
@@ -51,48 +54,82 @@ jobs:
        id: determine
        shell: bash
        run: |
-          TAG="${{ github.ref_name }}"
+          REF="${{ github.ref }}"
+          REF_NAME="${{ github.ref_name }}"
+          REF_TYPE="${{ github.ref_type }}"
          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
          DOMAIN_BASE="mb-grid-solutions.com"
          PRJ_ID="mb-grid-solutions"

-          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="testing-${SHORT_SHA}"
            ENV_FILE=".env.testing"
            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 [[ "${{ github.ref_type }}" == "tag" ]]; then
-            if [[ "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          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="${DOMAIN_BASE}, www.${DOMAIN_BASE}"
+              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 [[ "$TAG" =~ -rc || "$TAG" =~ -beta || "$TAG" =~ -alpha ]]; then
+            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.${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"
+              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
+
+          # 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"
@@ -189,12 +226,16 @@ jobs:
          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 }}
          
          # Directus
          DIRECTUS_URL=${{ needs.prepare.outputs.directus_url }}
          DIRECTUS_HOST=${{ needs.prepare.outputs.directus_host }}
+          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 }}
--- a/components/Layout.tsx
+++ b/components/Layout.tsx
@@ -52,10 +52,10 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
        className="fixed top-0 left-0 right-0 z-[100]"
      >
        <header
-          className={`transition-all duration-300 flex items-center py-1 ${
+          className={`transition-all duration-300 flex items-center ${
            isScrolled
-              ? "bg-white/90 backdrop-blur-lg border-b border-slate-200 shadow-sm"
-              : "bg-gradient-to-b from-white/80 via-white/40 to-transparent"
+              ? "bg-white/90 backdrop-blur-lg border-b border-slate-200 shadow-sm py-2"
+              : "bg-gradient-to-b from-white/80 via-white/40 to-transparent py-4"
          }`}
        >
          <div className="container-custom flex justify-between items-center w-full relative z-10">
@@ -65,7 +65,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
              aria-label={`${t("nav.home")} - Zur Startseite`}
            >
              <div
-                className={`relative transition-all duration-300 ${isScrolled ? "h-[50px] md:h-[80px] w-[120px] md:w-[200px] mt-0 mb-[-10px]" : "h-[80px] md:h-[140px] w-[180px] md:w-[320px] mt-2 md:mt-4 mb-[-20px] md:mb-[-40px]"}`}
+                className={`relative transition-all duration-300 ${isScrolled ? "h-[50px] md:h-[60px] w-[120px] md:w-[150px]" : "h-[70px] md:h-[100px] w-[160px] md:w-[240px]"}`}
              >
                <Image
                  src="/assets/logo.png"
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,27 +8,29 @@ services:
      - ${ENV_FILE:-.env}
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.${PROJECT_NAME}.rule=Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)"
+      - "traefik.http.routers.${PROJECT_NAME}.rule=${TRAEFIK_RULE:-Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)}"
      - "traefik.http.routers.${PROJECT_NAME}.entrypoints=websecure"
      - "traefik.http.routers.${PROJECT_NAME}.tls.certresolver=le"
      - "traefik.http.routers.${PROJECT_NAME}.tls=true"
      - "traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=3000"
      - "traefik.http.routers.${PROJECT_NAME}.middlewares=${PROJECT_NAME}-auth"
+      - "traefik.docker.network=infra"

      # Gatekeeper Router (Shared Host + dedicated Subdomain)
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.rule=(Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`) && PathPrefix(`/gatekeeper`)) || Host(`gatekeeper.${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)"
+      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.rule=${GATEKEEPER_RULE:-(Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`) && PathPrefix(`/gatekeeper`)) || Host(`gatekeeper.${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)}"
      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.entrypoints=websecure"
      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls.certresolver=le"
      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls=true"
      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.service=${PROJECT_NAME}-gatekeeper"

-      # Auth Middleware Definition
      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.address=http://${PROJECT_NAME}-gatekeeper:3000/api/verify"
      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.trustForwardHeader=true"
      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.authResponseHeaders=X-Auth-User"
+      - "traefik.docker.network=infra"

  gatekeeper:
    image: registry.infra.mintel.me/mintel/gatekeeper:latest
+    container_name: ${PROJECT_NAME:-mb-grid-solutions}-gatekeeper
    restart: always
    networks:
      infra:
@@ -41,11 +43,14 @@ services:
      PROJECT_NAME: ${PROJECT_NAME:-MB Grid Solutions}
      PROJECT_COLOR: ${PROJECT_COLOR:-#82ed20}
      COOKIE_DOMAIN: ${COOKIE_DOMAIN:-.mb-grid-solutions.com}
+      AUTH_COOKIE_NAME: ${AUTH_COOKIE_NAME:-mintel_gatekeeper_session}
+      GATEKEEPER_PASSWORD: ${GATEKEEPER_PASSWORD:-mintel}
      # Dedicated Base URL for Gatekeeper subdomain to prevent redirect loops
-      NEXT_PUBLIC_BASE_URL: https://gatekeeper.${TRAEFIK_HOST:-mb-grid-solutions.localhost}
+      NEXT_PUBLIC_BASE_URL: https://${GATEKEEPER_HOST:-gatekeeper.mb-grid-solutions.localhost}
    labels:
      - "traefik.enable=true"
      - "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
+      - "traefik.docker.network=infra"

  directus:
    image: directus/directus:11
@@ -68,6 +73,10 @@ services:
      DB_DATABASE: ${DIRECTUS_DB_NAME:-directus}
      DB_USER: ${DIRECTUS_DB_USER:-directus}
      DB_PASSWORD: ${DIRECTUS_DB_PASSWORD:-directus}
+      # Telemetry & Performance
+      LOGGER_LEVEL: ${LOG_LEVEL:-info}
+      SENTRY_DSN: ${SENTRY_DSN}
+      SENTRY_ENVIRONMENT: ${TARGET:-development}
    volumes:
      - ./directus/uploads:/directus/uploads
      - ./directus/extensions:/directus/extensions
@@ -77,8 +86,10 @@ services:
      - "traefik.http.routers.${PROJECT_NAME}-directus.entrypoints=websecure"
      - "traefik.http.routers.${PROJECT_NAME}-directus.tls.certresolver=le"
      - "traefik.http.routers.${PROJECT_NAME}-directus.tls=true"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${PROJECT_NAME}-auth"
+      - "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${PROJECT_NAME}-forward,compress"
      - "traefik.http.services.${PROJECT_NAME}-directus.loadbalancer.server.port=8055"
+      - "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
+      - "traefik.docker.network=infra"

  directus-db:
    image: postgres:15-alpine
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";

 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
--- a/package.json
+++ b/package.json
@@ -11,13 +11,13 @@
    "lint": "eslint app components lib scripts",
    "test": "vitest",
    "prepare": "husky",
-    "directus:bootstrap": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus.ts",
-    "directus:push:staging": "./scripts/sync-directus.sh push staging",
-    "directus:pull:staging": "./scripts/sync-directus.sh pull staging",
-    "directus:push:testing": "./scripts/sync-directus.sh push testing",
-    "directus:pull:testing": "./scripts/sync-directus.sh pull testing",
-    "directus:push:prod": "./scripts/sync-directus.sh push production",
-    "directus:pull:prod": "./scripts/sync-directus.sh pull production",
+    "cms:bootstrap": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus.ts",
+    "cms:push:staging": "./scripts/sync-directus.sh push staging",
+    "cms:pull:staging": "./scripts/sync-directus.sh pull staging",
+    "cms:push:testing": "./scripts/sync-directus.sh push testing",
+    "cms:pull:testing": "./scripts/sync-directus.sh pull testing",
+    "cms:push:prod": "./scripts/sync-directus.sh push production",
+    "cms:pull:prod": "./scripts/sync-directus.sh pull production",
    "pagespeed:test": "mintel pagespeed test"
  },
  "keywords": [],
--- a/scripts/setup-directus.ts
+++ b/scripts/setup-directus.ts
@@ -7,26 +7,36 @@ import { createCollection, createField, updateSettings } from "@directus/sdk";
 const client = createMintelDirectusClient();

 async function setupBranding() {
-  const prjName = process.env.PROJECT_NAME || "Mintel Project";
+  const prjName = process.env.PROJECT_NAME || "MB Grid Solutions";
  const prjColor = process.env.PROJECT_COLOR || "#82ed20";

-  console.log(`🎨 Setup Directus Branding for ${prjName}...`);
+  console.log(`🎨 Refining Directus Branding for ${prjName}...`);
  await ensureDirectusAuthenticated(client);

  const cssInjection = `
  <style>
-      @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
-      body, .v-app { font-family: 'Inter', sans-serif !important; }
+      @import url('https://fonts.googleapis.com/css2?family=Outfit:wght@400;500;600;700&display=swap');
+      
+      body, .v-app { font-family: 'Outfit', sans-serif !important; }
+      
      .public-view .v-card { 
          backdrop-filter: blur(20px);
+          background: rgba(255, 255, 255, 0.9) !important;
          border-radius: 32px !important; 
          box-shadow: 0 50px 100px -20px rgba(0, 0, 0, 0.4) !important;
+          border: 1px solid rgba(255, 255, 255, 0.3) !important;
      }
+
      .v-navigation-drawer { background: #000c24 !important; }
+      
+      .v-list-item--active {
+          color: ${prjColor} !important;
+          background: rgba(130, 237, 32, 0.1) !important;
+      }
  </style>
-  <div style="font-family: 'Inter', sans-serif; text-align: center; margin-top: 24px;">
-      <p style="color: rgba(255,255,255,0.7); font-size: 14px; margin-bottom: 4px; font-weight: 500;">MINTEL INFRASTRUCTURE ENGINE</p>
-      <h1 style="color: #ffffff; font-size: 18px; font-weight: 700; margin: 0;">${prjName.toUpperCase()} <span style="color: ${prjColor};">RELIABILITY.</span></h1>
+  <div style="font-family: 'Outfit', sans-serif; text-align: center; margin-top: 24px;">
+      <p style="color: rgba(255,255,255,0.6); font-size: 11px; letter-spacing: 2px; margin-bottom: 4px; font-weight: 600; text-transform: uppercase;">Mintel Infrastructure Engine</p>
+      <h1 style="color: #ffffff; font-size: 20px; font-weight: 700; margin: 0; letter-spacing: -0.5px;">${prjName.toUpperCase()} <span style="color: ${prjColor};">SYNC.</span></h1>
  </div>
  `;

@@ -36,25 +46,23 @@ async function setupBranding() {
        project_name: prjName,
        project_color: prjColor,
        public_note: cssInjection,
+        module_bar_background: "#00081a",
        theme_light_overrides: {
          primary: prjColor,
-          borderRadius: "16px",
+          borderRadius: "12px",
          navigationBackground: "#000c24",
          navigationForeground: "#ffffff",
+          moduleBarBackground: "#00081a",
        },
        // eslint-disable-next-line @typescript-eslint/no-explicit-any
      } as any),
    );
    console.log("✨ Branding applied!");

-    try {
-      await createCollectionAndFields();
-      console.log("🏗️ Schema alignment complete!");
-    } catch (error) {
-      console.error("❌ Error aligning schema:", error);
-    }
+    await createCollectionAndFields();
+    console.log("🏗️ Schema alignment complete!");
  } catch (error) {
-    console.error("❌ Error setting up branding:", error);
+    console.error("❌ Error during bootstrap:", error);
  }
 }

@@ -69,6 +77,9 @@ async function createCollectionAndFields() {
        meta: {
          icon: "contact_mail",
          display_template: "{{name}} <{{email}}>",
+          group: null,
+          sort: null,
+          collapse: "open",
        },
      }),
    );
@@ -84,9 +95,7 @@ async function createCollectionAndFields() {
    );
    console.log(`✅ Collection ${collectionName} created.`);
  } catch {
-    console.log(
-      `ℹ️ Collection ${collectionName} already exists or error occured.`,
-    );
+    console.log(`ℹ️ Collection ${collectionName} exists.`);
  }

  const safeAddField = async (
@@ -102,14 +111,40 @@ async function createCollectionAndFields() {
    }
  };

-  await safeAddField("name", "string", { interface: "input" });
-  await safeAddField("email", "string", { interface: "input" });
-  await safeAddField("company", "string", { interface: "input" });
-  await safeAddField("message", "text", { interface: "textarea" });
+  await safeAddField("name", "string", {
+    interface: "input",
+    display: "raw",
+    width: "half",
+  });
+  await safeAddField("email", "string", {
+    interface: "input",
+    display: "raw",
+    width: "half",
+  });
+  await safeAddField("company", "string", {
+    interface: "input",
+    display: "raw",
+    width: "half",
+  });
+  await safeAddField("message", "text", {
+    interface: "textarea",
+    display: "raw",
+    width: "full",
+  });
  await safeAddField("date_created", "timestamp", {
    interface: "datetime",
    special: ["date-created"],
+    display: "datetime",
+    display_options: { relative: true },
+    width: "half",
  });
 }

-setupBranding();
+setupBranding()
+  .then(() => {
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error("🚨 Fatal bootstrap error:", err);
+    process.exit(1);
+  });
--- a/scripts/sync-directus.sh
+++ b/scripts/sync-directus.sh
@@ -1,15 +1,13 @@
 #!/bin/bash

-# Mintel Directus Sync Engine
-# Synchronizes Directus Data (Postgres + Uploads) between Local and Remote
-
+# Configuration
 REMOTE_HOST="${SSH_HOST:-root@alpha.mintel.me}"
 ACTION=$1
 ENV=$2

 # Help
 if [ -z "$ACTION" ] || [ -z "$ENV" ]; then
-    echo "Usage: mintel-sync [push|pull] [testing|staging|production]"
+    echo "Usage: ./scripts/sync-directus.sh [push|pull] [testing|staging|production]"
    echo ""
    echo "Commands:"
    echo "  push   Sync LOCAL data -> REMOTE"
@@ -20,7 +18,10 @@ if [ -z "$ACTION" ] || [ -z "$ENV" ]; then
    exit 1
 fi

-PRJ_ID=$(jq -r .name package.json | sed 's/@mintel\///')
+# Project Configuration (extracted from package.json and aligned with deploy.yml)
+PRJ_ID=$(jq -r .name package.json | sed 's/@mintel\///' | sed 's/\.com$//')
+REMOTE_DIR="/home/deploy/sites/${PRJ_ID}.com"
+
 case $ENV in
  testing)    PROJECT_NAME="${PRJ_ID}-testing"; ENV_FILE=".env.testing" ;;
  staging)    PROJECT_NAME="${PRJ_ID}-staging"; ENV_FILE=".env.staging" ;;
@@ -28,41 +29,90 @@ case $ENV in
  *) echo "❌ Invalid environment: $ENV"; exit 1 ;;
 esac

-REMOTE_DIR="/home/deploy/sites/${PRJ_ID}.com"
-
-# DB Details
+# DB Details (matching docker-compose defaults)
 DB_USER="directus"
 DB_NAME="directus"

 echo "🔍 Detecting local database..."
 LOCAL_DB_CONTAINER=$(docker compose ps -q directus-db)
 if [ -z "$LOCAL_DB_CONTAINER" ]; then
-    echo "❌ Local directus-db container not found. Running?"
+    echo "❌ Local directus-db container not found. Is it running? (npm run dev)"
    exit 1
 fi

 if [ "$ACTION" == "push" ]; then
    echo "🚀 Pushing LOCAL -> $ENV ($PROJECT_NAME)..."
+    
+    # 1. DB Dump
+    echo "📦 Dumping local database..."
    docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
+    
+    # 2. Upload Dump
+    echo "📤 Uploading dump to remote server..."
    scp dump.sql "$REMOTE_HOST:$REMOTE_DIR/dump.sql"
    
+    # 3. Restore on Remote
+    echo "🔄 Restoring dump on $ENV..."
    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
+    
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+
+    echo "🧹 Wiping remote database schema..."
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
+    
+    echo "⚡ Restoring database..."
    ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads (Local -> $ENV)..."
    rsync -avz --progress ./directus/uploads/ "$REMOTE_HOST:$REMOTE_DIR/directus/uploads/"
+    
+    # Clean up
    rm dump.sql
    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
-    echo "✨ Push complete!"
+    
+    # 5. Restart Directus to trigger migrations and refresh schema cache
+    echo "🔄 Restarting remote Directus to apply migrations..."
+    ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME restart directus"
+    
+    echo "✨ Push to $ENV complete!"

 elif [ "$ACTION" == "pull" ]; then
-    echo "📥 Pulling $ENV -> LOCAL..."
+    echo "📥 Pulling $ENV Data -> LOCAL..."
+    
+    # 1. DB Dump on Remote
+    echo "📦 Dumping remote database ($ENV)..."
    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
+    
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+    
    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER --clean --if-exists --no-owner --no-privileges $DB_NAME > $REMOTE_DIR/dump.sql"
+    
+    # 2. Download Dump
+    echo "📥 Downloading dump..."
    scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
    
+    # 3. Restore Locally
+    echo "🧹 Wiping local database schema..."
+    docker exec "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
+    
+    echo "⚡ Restoring database locally..."
    docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
+    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads ($ENV -> Local)..."
    rsync -avz --progress "$REMOTE_HOST:$REMOTE_DIR/directus/uploads/" ./directus/uploads/
+    
+    # Clean up
    rm dump.sql
    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
-    echo "✨ Pull complete!"
+    
+    echo "✨ Pull to Local complete!"
 fi
+
Author	SHA1	Message	Date
Marc Mintel	29d474a102	fix: traefik issues All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 8s Details Build & Deploy / 🧪 QA (push) Successful in 1m13s Details Build & Deploy / 🚀 Deploy (push) Successful in 9s Details Build & Deploy / 🏗️ Build (push) Successful in 2m5s Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-06 23:15:22 +01:00
Marc Mintel	a31202f63b	refactor: use explicit Git reference variables for more robust deployment target and image tag determination in Gitea workflow. All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 5s Details Build & Deploy / 🧪 QA (push) Successful in 1m33s Details Build & Deploy / 🏗️ Build (push) Successful in 2m7s Details Build & Deploy / 🚀 Deploy (push) Successful in 9s Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-06 22:51:40 +01:00
Marc Mintel	0afd6bbb60	fix: logo position All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 7s Details Build & Deploy / 🧪 QA (push) Successful in 1m32s Details Build & Deploy / 🏗️ Build (push) Successful in 4m44s Details Build & Deploy / 🚀 Deploy (push) Successful in 13s Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-06 21:42:43 +01:00
Marc Mintel	2c647f0284	chore: directus sync All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 4s Details Build & Deploy / 🧪 QA (push) Successful in 1m57s Details Build & Deploy / 🏗️ Build (push) Successful in 2m3s Details Build & Deploy / 🚀 Deploy (push) Successful in 33s Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-06 21:35:00 +01:00
Marc Mintel	d9ff6d640d	feat: Configure Traefik to use the infra network for services, add an internal Directus URL, and enhance Directus and Gatekeeper configurations. All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 9s Details Build & Deploy / 🧪 QA (push) Successful in 1m13s Details Build & Deploy / 🏗️ Build (push) Successful in 4m51s Details Build & Deploy / 🚀 Deploy (push) Successful in 10s Details Build & Deploy / 🔔 Notifications (push) Successful in 1s Details	2026-02-06 19:23:35 +01:00
Marc Mintel	8ab9ec7d1f	chore: bootstrap command	2026-02-06 19:11:19 +01:00
Marc Mintel	0cc67d54ef	refactor: overhaul Directus sync script with schema wiping and restart, update branding, and rename CMS scripts.	2026-02-06 19:09:56 +01:00