Compare commits

...

4 Commits

Author SHA1 Message Date
2ba67af68a fix: add /de/kontakt rewrite, fix CTA button overflow & use translated contact slug
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 8s
Build & Deploy / 🧪 QA (push) Successful in 2m24s
Build & Deploy / 🏗️ Build (push) Successful in 5m57s
Build & Deploy / 🚀 Deploy (push) Successful in 36s
Build & Deploy / 🧪 Post-Deploy Verification (push) Successful in 1m40s
Build & Deploy / ⚡ Performance & Accessibility (push) Failing after 4m46s
Build & Deploy / 🔔 Notify (push) Successful in 2s
2026-02-25 01:30:22 +01:00
b0f088a1dc fix: replace --info=progress2 with --progress for macOS rsync compat
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 12s
Build & Deploy / 🧪 QA (push) Successful in 1m46s
Build & Deploy / 🏗️ Build (push) Successful in 3m53s
Build & Deploy / 🚀 Deploy (push) Successful in 19s
Build & Deploy / 🧪 Post-Deploy Verification (push) Failing after 1m17s
Build & Deploy / ⚡ Performance & Accessibility (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 2s
2026-02-25 01:21:57 +01:00
f358492a99 fix: tolerate missing payload_migrations table and auto-detect DB credentials in pipeline
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 9s
Build & Deploy / 🧪 QA (push) Successful in 2m4s
Build & Deploy / 🏗️ Build (push) Successful in 3m53s
Build & Deploy / 🚀 Deploy (push) Successful in 22s
Build & Deploy / 🧪 Post-Deploy Verification (push) Failing after 1m12s
Build & Deploy / ⚡ Performance & Accessibility (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 2s
2026-02-25 01:06:58 +01:00
32576b5391 fix: auto-detect remote DB credentials and auto-start local DB in cms-sync
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 9s
Build & Deploy / 🏗️ Build (push) Has been cancelled
Build & Deploy / 🚀 Deploy (push) Has been cancelled
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been cancelled
Build & Deploy / ⚡ Performance & Accessibility (push) Has been cancelled
Build & Deploy / 🔔 Notify (push) Has been cancelled
Build & Deploy / 🧪 QA (push) Has been cancelled
2026-02-25 01:02:10 +01:00
4 changed files with 80 additions and 27 deletions

View File

@@ -371,17 +371,25 @@ jobs:
sleep 2
done
echo "🔧 Sanitizing payload_migrations table..."
ssh root@alpha.mintel.me "docker exec $DB_CONTAINER psql -U payload -d payload -c \"
DELETE FROM payload_migrations WHERE batch = -1;
INSERT INTO payload_migrations (name, batch)
SELECT name, batch FROM (VALUES
('20260223_195005_products_collection', 1),
('20260223_195151_remove_sku_unique', 2),
('20260225_003500_add_pages_collection', 3)
) AS v(name, batch)
WHERE NOT EXISTS (SELECT 1 FROM payload_migrations pm WHERE pm.name = v.name);
\""
echo "🔧 Sanitizing payload_migrations table (if exists)..."
REMOTE_DB_USER=$(ssh root@alpha.mintel.me "grep -h '^PAYLOAD_DB_USER=' $SITE_DIR/.env* 2>/dev/null | tail -1 | cut -d= -f2" || echo "payload")
REMOTE_DB_NAME=$(ssh root@alpha.mintel.me "grep -h '^PAYLOAD_DB_NAME=' $SITE_DIR/.env* 2>/dev/null | tail -1 | cut -d= -f2" || echo "payload")
REMOTE_DB_USER="${REMOTE_DB_USER:-payload}"
REMOTE_DB_NAME="${REMOTE_DB_NAME:-payload}"
ssh root@alpha.mintel.me "docker exec $DB_CONTAINER psql -U $REMOTE_DB_USER -d $REMOTE_DB_NAME -c \"
DO \\\$\\\$ BEGIN
DELETE FROM payload_migrations WHERE batch = -1;
INSERT INTO payload_migrations (name, batch)
SELECT name, batch FROM (VALUES
('20260223_195005_products_collection', 1),
('20260223_195151_remove_sku_unique', 2),
('20260225_003500_add_pages_collection', 3)
) AS v(name, batch)
WHERE NOT EXISTS (SELECT 1 FROM payload_migrations pm WHERE pm.name = v.name);
EXCEPTION WHEN undefined_table THEN
RAISE NOTICE 'payload_migrations table does not exist yet — skipping sanitization';
END \\\$\\\$;
\"" || echo "⚠️ Migration sanitization skipped (table may not exist yet)"
# Restart app to pick up clean migration state
APP_CONTAINER="${{ needs.prepare.outputs.project_name }}-klz-app-1"

View File

@@ -59,6 +59,7 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
const solarSlug = await mapFileSlugToTranslated('solar-cables', locale);
const productsSlug = await mapFileSlugToTranslated('products', locale);
const contactSlug = await mapFileSlugToTranslated('contact', locale);
const categories = [
{
@@ -230,10 +231,10 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
</p>
</div>
<Button
href={`/${locale}/contact`}
href={`/${locale}/${contactSlug}`}
variant="accent"
size="lg"
className="group whitespace-nowrap w-full md:w-auto md:h-16 md:px-10 md:text-xl"
className="group whitespace-nowrap w-full md:w-auto md:h-16 px-6 md:px-10 text-sm md:text-xl"
>
{t('cta.button')}
<span className="ml-2 md:ml-4 transition-transform group-hover:translate-x-2">

View File

@@ -424,6 +424,10 @@ const nextConfig = {
source: '/de/produkte/:path*',
destination: '/de/products/:path*',
},
{
source: '/de/kontakt',
destination: '/de/contact',
},
];
},
};

View File

@@ -20,13 +20,17 @@ fi
DIRECTION="${1:-}" # push | pull
TARGET="${2:-}" # testing | prod
SSH_HOST="root@alpha.mintel.me"
DB_USER="${PAYLOAD_DB_USER:-payload}"
DB_NAME="${PAYLOAD_DB_NAME:-payload}"
LOCAL_DB_USER="${PAYLOAD_DB_USER:-payload}"
LOCAL_DB_NAME="${PAYLOAD_DB_NAME:-payload}"
LOCAL_DB_CONTAINER="klz-2026-klz-db-1"
LOCAL_MEDIA_DIR="./public/media"
BACKUP_DIR="./backups"
TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
# Remote credentials (resolved per-target from server env files)
REMOTE_DB_USER=""
REMOTE_DB_NAME=""
# Migration names to insert after restore (keeps Payload from prompting)
MIGRATIONS=(
"20260223_195005_products_collection:1"
@@ -42,12 +46,14 @@ resolve_target() {
REMOTE_DB_CONTAINER="klz-testing-klz-db-1"
REMOTE_APP_CONTAINER="klz-testing-klz-app-1"
REMOTE_MEDIA_VOLUME="/var/lib/docker/volumes/klz-testing_klz_media_data/_data"
REMOTE_SITE_DIR="/home/deploy/sites/testing.klz-cables.com"
;;
prod|production)
REMOTE_PROJECT="klz-cablescom"
REMOTE_DB_CONTAINER="klz-cablescom-klz-db-1"
REMOTE_APP_CONTAINER="klz-cablescom-klz-app-1"
REMOTE_MEDIA_VOLUME="/var/lib/docker/volumes/klz-cablescom_klz_media_data/_data"
REMOTE_SITE_DIR="/home/deploy/sites/klz-cables.com"
;;
*)
echo "❌ Unknown target: $TARGET"
@@ -55,12 +61,40 @@ resolve_target() {
exit 1
;;
esac
# Auto-detect remote DB credentials from the env file on the server
echo "🔍 Detecting $TARGET database credentials..."
REMOTE_DB_USER=$(ssh "$SSH_HOST" "grep -h '^PAYLOAD_DB_USER=' $REMOTE_SITE_DIR/.env* 2>/dev/null | tail -1 | cut -d= -f2" || echo "")
REMOTE_DB_NAME=$(ssh "$SSH_HOST" "grep -h '^PAYLOAD_DB_NAME=' $REMOTE_SITE_DIR/.env* 2>/dev/null | tail -1 | cut -d= -f2" || echo "")
REMOTE_DB_USER="${REMOTE_DB_USER:-payload}"
REMOTE_DB_NAME="${REMOTE_DB_NAME:-payload}"
echo " User: $REMOTE_DB_USER | DB: $REMOTE_DB_NAME"
}
# ── Ensure local DB is running ─────────────────────────────────────────────
ensure_local_db() {
if ! docker ps --format '{{.Names}}' | grep -q "$LOCAL_DB_CONTAINER"; then
echo "⏳ Local DB container not running. Starting..."
docker compose up -d klz-db
echo "⏳ Waiting for local DB to be ready..."
for i in $(seq 1 10); do
if docker exec "$LOCAL_DB_CONTAINER" pg_isready -U "$LOCAL_DB_USER" -q 2>/dev/null; then
echo "✅ Local DB is ready."
return
fi
sleep 1
done
echo "❌ Local DB failed to start."
exit 1
fi
}
# ── Sanitize migrations table ──────────────────────────────────────────────
sanitize_migrations() {
local container="$1"
local exec_prefix="$2" # "" for local, "ssh $SSH_HOST" for remote
local db_user="$2"
local db_name="$3"
local is_remote="$4" # "true" or "false"
echo "🔧 Sanitizing payload_migrations table..."
local SQL="DELETE FROM payload_migrations WHERE batch = -1;"
@@ -70,10 +104,10 @@ sanitize_migrations() {
SQL="$SQL INSERT INTO payload_migrations (name, batch) SELECT '$name', $batch WHERE NOT EXISTS (SELECT 1 FROM payload_migrations WHERE name = '$name');"
done
if [ -z "$exec_prefix" ]; then
docker exec "$container" psql -U "$DB_USER" -d "$DB_NAME" -c "$SQL"
if [ "$is_remote" = "true" ]; then
ssh "$SSH_HOST" "docker exec $container psql -U $db_user -d $db_name -c \"$SQL\""
else
$exec_prefix "docker exec $container psql -U $DB_USER -d $DB_NAME -c \"$SQL\""
docker exec "$container" psql -U "$db_user" -d "$db_name" -c "$SQL"
fi
}
@@ -82,14 +116,14 @@ backup_local_db() {
mkdir -p "$BACKUP_DIR"
local file="$BACKUP_DIR/payload_pre_sync_${TIMESTAMP}.sql.gz"
echo "📦 Creating safety backup of local DB → $file"
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" -d "$DB_NAME" --clean --if-exists | gzip > "$file"
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$LOCAL_DB_USER" -d "$LOCAL_DB_NAME" --clean --if-exists | gzip > "$file"
echo "✅ Backup: $file ($(du -h "$file" | cut -f1))"
}
backup_remote_db() {
local file="/tmp/payload_pre_sync_${TIMESTAMP}.sql.gz"
echo "📦 Creating safety backup of $TARGET DB → $SSH_HOST:$file"
ssh "$SSH_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER -d $DB_NAME --clean --if-exists | gzip > $file"
ssh "$SSH_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $REMOTE_DB_USER -d $REMOTE_DB_NAME --clean --if-exists | gzip > $file"
echo "✅ Remote backup: $file"
}
@@ -106,27 +140,30 @@ do_push() {
echo ""
[[ ! $REPLY =~ ^[Yy]$ ]] && { echo "Cancelled."; exit 0; }
# 0. Ensure local DB is running
ensure_local_db
# 1. Safety backup of remote
backup_remote_db
# 2. Dump local DB
echo "📤 Dumping local database..."
local dump="/tmp/payload_push_${TIMESTAMP}.sql.gz"
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" -d "$DB_NAME" --clean --if-exists | gzip > "$dump"
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$LOCAL_DB_USER" -d "$LOCAL_DB_NAME" --clean --if-exists | gzip > "$dump"
# 3. Transfer and restore
echo "📤 Transferring to $SSH_HOST..."
scp "$dump" "$SSH_HOST:/tmp/payload_push.sql.gz"
echo "🔄 Restoring database on $TARGET..."
ssh "$SSH_HOST" "gunzip -c /tmp/payload_push.sql.gz | docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER -d $DB_NAME --quiet"
ssh "$SSH_HOST" "gunzip -c /tmp/payload_push.sql.gz | docker exec -i $REMOTE_DB_CONTAINER psql -U $REMOTE_DB_USER -d $REMOTE_DB_NAME --quiet"
# 4. Sanitize migrations
sanitize_migrations "$REMOTE_DB_CONTAINER" "ssh $SSH_HOST"
sanitize_migrations "$REMOTE_DB_CONTAINER" "$REMOTE_DB_USER" "$REMOTE_DB_NAME" "true"
# 5. Sync media
echo "🖼️ Syncing media files..."
rsync -az --delete --info=progress2 "$LOCAL_MEDIA_DIR/" "$SSH_HOST:$REMOTE_MEDIA_VOLUME/"
rsync -az --delete --progress "$LOCAL_MEDIA_DIR/" "$SSH_HOST:$REMOTE_MEDIA_VOLUME/"
# 6. Restart app
echo "🔄 Restarting $TARGET app container..."
@@ -153,19 +190,22 @@ do_pull() {
echo ""
[[ ! $REPLY =~ ^[Yy]$ ]] && { echo "Cancelled."; exit 0; }
# 0. Ensure local DB is running
ensure_local_db
# 1. Safety backup of local
backup_local_db
# 2. Dump remote DB
echo "📥 Dumping $TARGET database..."
ssh "$SSH_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER -d $DB_NAME --clean --if-exists | gzip > /tmp/payload_pull.sql.gz"
ssh "$SSH_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $REMOTE_DB_USER -d $REMOTE_DB_NAME --clean --if-exists | gzip > /tmp/payload_pull.sql.gz"
# 3. Transfer and restore
echo "📥 Downloading from $SSH_HOST..."
scp "$SSH_HOST:/tmp/payload_pull.sql.gz" "/tmp/payload_pull.sql.gz"
echo "🔄 Restoring database locally..."
gunzip -c "/tmp/payload_pull.sql.gz" | docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" -d "$DB_NAME" --quiet
gunzip -c "/tmp/payload_pull.sql.gz" | docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$LOCAL_DB_USER" -d "$LOCAL_DB_NAME" --quiet
# 4. Sync media
echo "🖼️ Syncing media files..."