feat: Add COOKIE_DOMAIN to .env and improve project name fallback logic in sync-directus script

.env

@@ -33,3 +33,4 @@ PROJECT_NAME=klz-cables
 TRAEFIK_HOST=klz.localhost
 DIRECTUS_HOST=cms.klz.localhost
 GATEKEEPER_PASSWORD=klz2026
+COOKIE_DOMAIN=localhost

cookies.txt

@@ -0,0 +1,4 @@
+# Netscape HTTP Cookie File
+# https://curl.se/docs/http-cookies.html
+# This file was generated by libcurl! Edit at your own risk.
+

package.json

@@ -74,15 +74,15 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run --passWithNoTests",
     "test:og": "vitest run tests/og-image.test.ts",
-    "directus:bootstrap": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:bootstrap": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus-branding.ts",
     "pdf:datasheets": "tsx ./scripts/generate-pdf-datasheets.ts",
     "pdf:datasheets:legacy": "tsx ./scripts/generate-pdf-datasheets-pdf-lib.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: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": "tsx ./scripts/pagespeed-sitemap.ts",
     "pagespeed:urls": "tsx -e \"import sitemap from './app/sitemap'; sitemap().then(urls => console.log(urls.map(u => u.url).join('\\n')))\"",
     "prepare": "husky"

scripts/sync-directus.sh

@@ -36,6 +36,8 @@ case $ENV in
     ;;
   production)
     PROJECT_NAME="klz-cables-prod"
+    # Fallback to older project name if prod-specific one isn't found later in the script
+    OLD_PROJECT_NAME="klz-cablescom"
     ENV_FILE=".env.prod"
     ;;
   *)
@@ -58,6 +60,7 @@ if [ "$ACTION" == "push" ]; then
     
     # 1. DB Dump
     echo "📦 Dumping local database..."
+    # Note: we use --no-owner --no-privileges to ensure restore works on remote with different user setup
     docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
     
     # 2. Upload Dump
@@ -67,10 +70,21 @@ if [ "$ACTION" == "push" ]; then
     # 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" ] && [ -n "$OLD_PROJECT_NAME" ]; then
+        echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
+        REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
+    fi
+
     if [ -z "$REMOTE_DB_CONTAINER" ]; then
         echo "❌ Remote $ENV-db container not found!"
         exit 1
     fi
+
+    # Wipe remote DB clean before restore to avoid constraint errors
+    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
@@ -91,6 +105,11 @@ elif [ "$ACTION" == "pull" ]; then
     # 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" ] && [ -n "$OLD_PROJECT_NAME" ]; then
+        echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
+        REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
+    fi
+
     if [ -z "$REMOTE_DB_CONTAINER" ]; then
         echo "❌ Remote $ENV-db container not found!"
         exit 1
@@ -101,8 +120,11 @@ elif [ "$ACTION" == "pull" ]; then
     echo "📥 Downloading dump..."
     scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
     
-    # 3. Restore Locally
-    echo "🔄 Restoring dump locally..."
+    # Wipe local DB clean before restore to avoid constraint errors
+    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