Compare commits

...

10 Commits

Author SHA1 Message Date
3dff19eca2 chore: update auto-generated types
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 11s
Build & Deploy / 🧪 QA (push) Successful in 2m9s
Build & Deploy / 🏗️ Build (push) Successful in 5m38s
Build & Deploy / 🚀 Deploy (push) Successful in 27s
Build & Deploy / 🧪 Post-Deploy Verification (push) Failing after 5m12s
Build & Deploy / 🔔 Notify (push) Successful in 2s
2026-03-12 13:41:23 +01:00
07b01c622a fix(deps): update pnpm-lock.yaml to fix CI registry checksums
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 14s
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 / 🔔 Notify (push) Has been cancelled
Build & Deploy / 🧪 QA (push) Has been cancelled
2026-03-12 13:34:32 +01:00
50de18c09c fix(docker): use latest tags for base images
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 5s
Build & Deploy / 🧪 QA (push) Successful in 2m7s
Build & Deploy / 🚀 Deploy (push) Has been cancelled
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been cancelled
Build & Deploy / 🔔 Notify (push) Has been cancelled
Build & Deploy / 🏗️ Build (push) Has been cancelled
2026-03-12 13:29:45 +01:00
dbee0cd8bc fix(docker): use correct mmintel namespace for base images
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 5s
Build & Deploy / 🧪 QA (push) Successful in 2m12s
Build & Deploy / 🏗️ Build (push) Failing after 14s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 13:24:33 +01:00
f30f8ddd8d fix(docker): migrate base image to git.infra.mintel.me registry
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 6s
Build & Deploy / 🧪 QA (push) Successful in 2m11s
Build & Deploy / 🏗️ Build (push) Failing after 14s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 13:20:48 +01:00
bb9fd65dbb fix(og): convert font buffers to ArrayBuffer for Satori compatibility
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 6s
Build & Deploy / 🧪 QA (push) Successful in 2m8s
Build & Deploy / 🏗️ Build (push) Failing after 14s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 13:17:18 +01:00
036fba8b53 feat(payload): add redirect settings to pages
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 5s
Build & Deploy / 🧪 QA (push) Successful in 2m6s
Build & Deploy / 🏗️ Build (push) Failing after 15s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 13:12:13 +01:00
3e8d5ad8b6 chore: backup script
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 6s
Build & Deploy / 🧪 QA (push) Successful in 2m13s
Build & Deploy / 🏗️ Build (push) Failing after 15s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 13:05:19 +01:00
70ad2e3041 fix(build): remove swcMinify and fix staleTimes/serverActions config object to pass Next.js validation
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 5s
Build & Deploy / 🧪 QA (push) Successful in 2m14s
Build & Deploy / 🏗️ Build (push) Failing after 14s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 12:52:51 +01:00
5376b939d5 fix(cache): disable client router cache and fix terms routing
Some checks failed
Build & Deploy / 🔍 Prepare (push) Successful in 6s
Build & Deploy / 🧪 QA (push) Successful in 2m8s
Build & Deploy / 🏗️ Build (push) Failing after 16s
Build & Deploy / 🚀 Deploy (push) Has been skipped
Build & Deploy / 🧪 Post-Deploy Verification (push) Has been skipped
Build & Deploy / 🔔 Notify (push) Successful in 1s
2026-03-12 12:44:42 +01:00
11 changed files with 1822 additions and 1848 deletions

View File

@@ -1,5 +1,5 @@
# Stage 1: Builder # Stage 1: Builder
FROM registry.infra.mintel.me/mintel/nextjs:v1.8.20 AS base FROM git.infra.mintel.me/mmintel/nextjs:latest AS base
WORKDIR /app WORKDIR /app
# Arguments for build-time configuration # Arguments for build-time configuration
@@ -52,7 +52,7 @@ ENV UV_THREADPOOL_SIZE=3
RUN pnpm build RUN pnpm build
# Stage 2: Runner # Stage 2: Runner
FROM registry.infra.mintel.me/mintel/runtime:v1.8.20 AS runner FROM git.infra.mintel.me/mmintel/runtime:latest AS runner
WORKDIR /app WORKDIR /app
# Create nextjs user and group (standardized in runtime image but ensuring local ownership) # Create nextjs user and group (standardized in runtime image but ensuring local ownership)

View File

@@ -1,4 +1,4 @@
import { notFound, redirect } from 'next/navigation'; import { notFound, redirect, permanentRedirect } from 'next/navigation';
import { Container, Badge, Heading } from '@/components/ui'; import { Container, Badge, Heading } from '@/components/ui';
import { getTranslations, setRequestLocale } from 'next-intl/server'; import { getTranslations, setRequestLocale } from 'next-intl/server';
import { Metadata } from 'next'; import { Metadata } from 'next';
@@ -62,6 +62,15 @@ export default async function StandardPage({ params }: PageProps) {
notFound(); notFound();
} }
// Handle explicit CMS redirects (e.g. /en/terms -> /de/terms)
if (pageData.redirectUrl) {
if (pageData.redirectPermanent) {
permanentRedirect(pageData.redirectUrl);
} else {
redirect(pageData.redirectUrl);
}
}
// Redirect if accessed via a different locale's slug // Redirect if accessed via a different locale's slug
const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale); const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale);
const correctSlug = await mapFileSlugToTranslated(fileSlug, locale); const correctSlug = await mapFileSlugToTranslated(fileSlug, locale);

View File

@@ -11,10 +11,21 @@ export async function getOgFonts() {
try { try {
console.log(`[OG] Loading fonts: bold=${boldFontPath}, regular=${regularFontPath}`); console.log(`[OG] Loading fonts: bold=${boldFontPath}, regular=${regularFontPath}`);
const boldFont = readFileSync(boldFontPath); const boldFontBuffer = readFileSync(boldFontPath);
const regularFont = readFileSync(regularFontPath); const regularFontBuffer = readFileSync(regularFontPath);
// Satori (Vercel OG) strictly requires an ArrayBuffer, not a Node Buffer view.
const boldFont = boldFontBuffer.buffer.slice(
boldFontBuffer.byteOffset,
boldFontBuffer.byteOffset + boldFontBuffer.byteLength,
);
const regularFont = regularFontBuffer.buffer.slice(
regularFontBuffer.byteOffset,
regularFontBuffer.byteOffset + regularFontBuffer.byteLength,
);
console.log( console.log(
`[OG] Fonts loaded successfully (${boldFont.length} and ${regularFont.length} bytes)`, `[OG] Fonts loaded successfully (${boldFont.byteLength} and ${regularFont.byteLength} bytes)`,
); );
return [ return [

View File

@@ -15,6 +15,8 @@ export interface PageFrontmatter {
export interface PageData { export interface PageData {
slug: string; slug: string;
redirectUrl?: string;
redirectPermanent?: boolean;
frontmatter: PageFrontmatter; frontmatter: PageFrontmatter;
content: any; // Lexical AST Document content: any; // Lexical AST Document
} }
@@ -96,6 +98,8 @@ export async function getPageBySlug(slug: string, locale: string): Promise<PageD
return { return {
slug: doc.slug, slug: doc.slug,
redirectUrl: doc.redirectUrl,
redirectPermanent: doc.redirectPermanent ?? true,
frontmatter: { frontmatter: {
title: doc.title, title: doc.title,
excerpt: doc.excerpt || '', excerpt: doc.excerpt || '',

View File

@@ -3,7 +3,7 @@
"pages": { "pages": {
"impressum": "impressum", "impressum": "impressum",
"datenschutz": "datenschutz", "datenschutz": "datenschutz",
"agbs": "agbs", "agbs": "terms",
"kontakt": "contact", "kontakt": "contact",
"team": "team", "team": "team",
"blog": "blog", "blog": "blog",
@@ -74,7 +74,7 @@
"privacyPolicy": "Datenschutz", "privacyPolicy": "Datenschutz",
"privacyPolicySlug": "datenschutz", "privacyPolicySlug": "datenschutz",
"terms": "AGB", "terms": "AGB",
"termsSlug": "agbs", "termsSlug": "terms",
"products": "Produkte", "products": "Produkte",
"lowVoltage": "Niederspannungskabel", "lowVoltage": "Niederspannungskabel",
"mediumVoltage": "Mittelspannungskabel", "mediumVoltage": "Mittelspannungskabel",

View File

@@ -3,7 +3,7 @@
"pages": { "pages": {
"legal-notice": "impressum", "legal-notice": "impressum",
"privacy-policy": "datenschutz", "privacy-policy": "datenschutz",
"terms": "agbs", "terms": "terms",
"contact": "contact", "contact": "contact",
"team": "team", "team": "team",
"blog": "blog", "blog": "blog",
@@ -396,4 +396,4 @@
"cta": "Back to Safety" "cta": "Back to Safety"
} }
} }
} }

View File

@@ -12,12 +12,18 @@ const nextConfig = {
maxInactiveAge: 60 * 1000, maxInactiveAge: 60 * 1000,
}, },
experimental: { experimental: {
staleTimes: {
dynamic: 0,
static: 30,
},
optimizePackageImports: ['lucide-react', 'framer-motion', '@/components/ui'], optimizePackageImports: ['lucide-react', 'framer-motion', '@/components/ui'],
cpus: 3, cpus: 3,
workerThreads: false, workerThreads: false,
serverActions: {
allowedOrigins: ["*.klz-cables.com", "*.branch.klz-cables.com", "localhost:3000", "klz.localhost"],
},
}, },
reactStrictMode: false, reactStrictMode: false,
swcMinify: true,
productionBrowserSourceMaps: false, productionBrowserSourceMaps: false,
logging: { logging: {
fetches: { fetches: {
@@ -437,6 +443,10 @@ const nextConfig = {
source: '/de/kontakt', source: '/de/kontakt',
destination: '/de/contact', destination: '/de/contact',
}, },
{
source: '/de/agbs',
destination: '/de/terms',
},
// Safety rewrites for English locale using German slugs (legacy or content errors) // Safety rewrites for English locale using German slugs (legacy or content errors)
{ {
source: '/en/produkte', source: '/en/produkte',

View File

@@ -87,7 +87,9 @@ export interface Config {
products: ProductsSelect<false> | ProductsSelect<true>; products: ProductsSelect<false> | ProductsSelect<true>;
pages: PagesSelect<false> | PagesSelect<true>; pages: PagesSelect<false> | PagesSelect<true>;
'payload-kv': PayloadKvSelect<false> | PayloadKvSelect<true>; 'payload-kv': PayloadKvSelect<false> | PayloadKvSelect<true>;
'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>; 'payload-locked-documents':
| PayloadLockedDocumentsSelect<false>
| PayloadLockedDocumentsSelect<true>;
'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>; 'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>; 'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
}; };
@@ -98,6 +100,9 @@ export interface Config {
globals: {}; globals: {};
globalsSelect: {}; globalsSelect: {};
locale: 'de' | 'en'; locale: 'de' | 'en';
widgets: {
collections: CollectionsWidget;
};
user: User; user: User;
jobs: { jobs: {
tasks: unknown; tasks: unknown;
@@ -328,6 +333,14 @@ export interface Page {
layout?: ('default' | 'fullBleed') | null; layout?: ('default' | 'fullBleed') | null;
excerpt?: string | null; excerpt?: string | null;
featuredImage?: (number | null) | Media; featuredImage?: (number | null) | Media;
/**
* If set, visiting this page will immediately redirect the user to this URL (e.g. /de/terms).
*/
redirectUrl?: string | null;
/**
* Check for a permanent (301) redirect. Uncheck for a temporary (302) redirect.
*/
redirectPermanent?: boolean | null;
content: { content: {
root: { root: {
type: string; type: string;
@@ -574,6 +587,8 @@ export interface PagesSelect<T extends boolean = true> {
layout?: T; layout?: T;
excerpt?: T; excerpt?: T;
featuredImage?: T; featuredImage?: T;
redirectUrl?: T;
redirectPermanent?: T;
content?: T; content?: T;
updatedAt?: T; updatedAt?: T;
createdAt?: T; createdAt?: T;
@@ -619,6 +634,16 @@ export interface PayloadMigrationsSelect<T extends boolean = true> {
updatedAt?: T; updatedAt?: T;
createdAt?: T; createdAt?: T;
} }
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "collections_widget".
*/
export interface CollectionsWidget {
data?: {
[k: string]: unknown;
};
width: 'full';
}
/** /**
* This interface was referenced by `Config`'s JSON-Schema * This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "StatsBlock". * via the `definition` "StatsBlock".
@@ -957,7 +982,6 @@ export interface Auth {
[k: string]: unknown; [k: string]: unknown;
} }
declare module 'payload' { declare module 'payload' {
export interface GeneratedTypes extends Config {} export interface GeneratedTypes extends Config {}
} }

3541
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,6 @@ fi
DB_NAME="${PAYLOAD_DB_NAME:-payload}" DB_NAME="${PAYLOAD_DB_NAME:-payload}"
DB_USER="${PAYLOAD_DB_USER:-payload}" DB_USER="${PAYLOAD_DB_USER:-payload}"
DB_CONTAINER="klz-2026-klz-db-1"
BACKUP_DIR="./backups" BACKUP_DIR="./backups"
TIMESTAMP=$(date +"%Y%m%d_%H%M%S") TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
BACKUP_FILE="${BACKUP_DIR}/payload_${TIMESTAMP}.sql.gz" BACKUP_FILE="${BACKUP_DIR}/payload_${TIMESTAMP}.sql.gz"
@@ -21,20 +20,21 @@ BACKUP_FILE="${BACKUP_DIR}/payload_${TIMESTAMP}.sql.gz"
# Ensure backup directory exists # Ensure backup directory exists
mkdir -p "$BACKUP_DIR" mkdir -p "$BACKUP_DIR"
# Check if container is running # Check if database container is running
if ! docker ps --format '{{.Names}}' | grep -q "$DB_CONTAINER"; then if ! docker compose ps --services --filter "status=running" | grep -qx "klz-db"; then
echo " Database container '$DB_CONTAINER' is not running." echo "⚠️ Database container 'klz-db' is not running. Starting it..."
echo " Start it with: docker compose up -d klz-db" docker compose up -d klz-db
exit 1 echo "⏳ Waiting for database to be ready..."
sleep 3
fi fi
echo "📦 Backing up Payload database..." echo "📦 Backing up Payload database..."
echo " Container: $DB_CONTAINER" echo " Service: klz-db"
echo " Database: $DB_NAME" echo " Database: $DB_NAME"
echo " Output: $BACKUP_FILE" echo " Output: $BACKUP_FILE"
# Run pg_dump inside the container and compress # Run pg_dump inside the container and compress
docker exec "$DB_CONTAINER" pg_dump -U "$DB_USER" -d "$DB_NAME" --clean --if-exists | gzip > "$BACKUP_FILE" docker compose exec -T klz-db pg_dump -U "$DB_USER" -d "$DB_NAME" --clean --if-exists | gzip > "$BACKUP_FILE"
# Show result # Show result
SIZE=$(du -h "$BACKUP_FILE" | cut -f1) SIZE=$(du -h "$BACKUP_FILE" | cut -f1)

View File

@@ -72,6 +72,33 @@ export const Pages: CollectionConfig = {
position: 'sidebar', position: 'sidebar',
}, },
}, },
{
type: 'collapsible',
label: 'Redirect Settings',
admin: {
position: 'sidebar',
},
fields: [
{
name: 'redirectUrl',
type: 'text',
localized: true,
admin: {
description:
'If set, visiting this page will immediately redirect the user to this URL (e.g. /de/terms).',
},
},
{
name: 'redirectPermanent',
type: 'checkbox',
defaultValue: true,
admin: {
description:
'Check for a permanent (301) redirect. Uncheck for a temporary (302) redirect.',
},
},
],
},
{ {
name: 'content', name: 'content',
type: 'richText', type: 'richText',