fix(blog): restore TOC, list styling, and dynamic OG images

This commit reapplies fixes directly to main after reverting an accidental feature branch merge.

chore(release): bump version to 2.2.6

.env

@@ -7,6 +7,7 @@ SENTRY_DSN=https://c10957d0182245b1a2a806ac2d34a197@errors.infra.mintel.me/1
 LOG_LEVEL=info
 NEXT_PUBLIC_FEEDBACK_ENABLED=false
 NEXT_PUBLIC_RECORD_MODE_ENABLED=false
+NPM_TOKEN=263e7f75d8ada27f3a2e71fd6bd9d95298d48a4d
 
 # SMTP Configuration
 MAIL_HOST=smtp.eu.mailgun.org

.gitea/workflows/deploy.yml

@@ -446,7 +446,9 @@ jobs:
           echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
       - name: Install dependencies
         id: deps
-        run: pnpm install --no-frozen-lockfile
+        run: |
+          pnpm store prune
+          pnpm install --no-frozen-lockfile
       - name: 📦 Cache APT Packages
         uses: actions/cache@v4
         with:
@@ -508,68 +510,22 @@ jobs:
         env:
           TEST_URL: ${{ needs.prepare.outputs.next_public_url }}
         run: pnpm run check:og
-      - name: 🌐 Full Sitemap HTTP Validation
+      - name: 🌐 Core Smoke Tests (HTTP, API, Locale)
         if: always() && steps.deps.outcome == 'success'
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
+        uses: https://git.infra.mintel.me/mmintel/at-mintel/.gitea/actions/core-smoke-tests@main
+        with:
+          TARGET_URL: ${{ needs.prepare.outputs.next_public_url }}
           GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm run check:http
-      - name: 🌐 Locale & Language Switcher Validation
-        if: always() && steps.deps.outcome == 'success'
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm run check:locale
+          UMAMI_API_ENDPOINT: ${{ secrets.UMAMI_API_ENDPOINT || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}
 
-      # ── Quality Gates (informational, don't block pipeline) ───────────────
-      - name: 🌐 HTML DOM Validation
+      - name: 📝 E2E Form Submission Test
         if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:html
-      - name: 🔒 Security Headers Scan
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:security
-      - name: 🔗 Lychee Deep Link Crawl
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:links
-      - name: 🖼️ Dynamic Asset & Image Integrity Scan
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
         env:
           NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
           GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
           PUPPETEER_EXECUTABLE_PATH: /usr/bin/chromium
-          CHROME_PATH: /usr/bin/chromium
-        run: pnpm check:assets
-      - name: ⚡ Lighthouse CI
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-          CHROME_PATH: /usr/bin/chromium
-          PAGESPEED_LIMIT: 8
-        run: pnpm run pagespeed:test
-      - name: ♿ WCAG Audit
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-          CHROME_PATH: /usr/bin/chromium
-          PAGESPEED_LIMIT: 8
-        run: pnpm run check:wcag
+        run: pnpm run check:forms
 
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 7: Notifications

.gitea/workflows/qa.yml

@@ -0,0 +1,17 @@
+name: Nightly QA
+
+on:
+  schedule:
+    - cron: '0 3 * * *'
+  workflow_dispatch:
+
+jobs:
+  call-qa-workflow:
+    uses: mmintel/at-mintel/.gitea/workflows/quality-assurance-template.yml@main
+    with:
+      TARGET_URL: 'https://testing.klz-cables.com'
+      PROJECT_NAME: 'klz-2026'
+    secrets:
+      GOTIFY_URL: ${{ secrets.GOTIFY_URL }}
+      GOTIFY_TOKEN: ${{ secrets.GOTIFY_TOKEN }}
+      GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}

.npmrc

@@ -1,2 +1,2 @@
-@mintel:registry=https://npm.infra.mintel.me/
-//npm.infra.mintel.me/:_authToken=${NPM_TOKEN}
+@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm/
+//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${NPM_TOKEN}

Dockerfile

@@ -27,6 +27,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     export NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) && \
     echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc && \
     echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=\${NPM_TOKEN}" >> .npmrc && \
+    pnpm store prune && \
     pnpm install --no-frozen-lockfile && \
     rm .npmrc
 

app/[locale]/[slug]/page.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import { Container, Badge, Heading } from '@/components/ui';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
@@ -21,15 +21,18 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
 
   if (!pageData) return {};
 
-  const fileSlug = await mapSlugToFileSlug(slug, locale);
+  const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale);
   const deSlug = await mapFileSlugToTranslated(fileSlug, 'de');
   const enSlug = await mapFileSlugToTranslated(fileSlug, 'en');
 
+  // Determine correct localized slug based on current locale
+  const currentLocaleSlug = locale === 'de' ? deSlug : enSlug;
+
   return {
     title: pageData.frontmatter.title,
     description: pageData.frontmatter.excerpt || '',
     alternates: {
-      canonical: `${SITE_URL}/${locale}/${slug}`,
+      canonical: `${SITE_URL}/${locale}/${currentLocaleSlug}`,
       languages: {
         de: `${SITE_URL}/de/${deSlug}`,
         en: `${SITE_URL}/en/${enSlug}`,
@@ -39,7 +42,7 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
     openGraph: {
       title: `${pageData.frontmatter.title} | KLZ Cables`,
       description: pageData.frontmatter.excerpt || '',
-      url: `${SITE_URL}/${locale}/${slug}`,
+      url: `${SITE_URL}/${locale}/${currentLocaleSlug}`,
     },
     twitter: {
       card: 'summary_large_image',
@@ -59,6 +62,13 @@ export default async function StandardPage({ params }: PageProps) {
     notFound();
   }
 
+  // Redirect if accessed via a different locale's slug
+  const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale);
+  const correctSlug = await mapFileSlugToTranslated(fileSlug, locale);
+  if (correctSlug && correctSlug !== slug) {
+    redirect(`/${locale}/${correctSlug}`);
+  }
+
   // Full-bleed pages render blocks edge-to-edge without the generic article wrapper
   if (pageData.frontmatter.layout === 'fullBleed') {
     return (

app/[locale]/blog/[slug]/opengraph-image.tsx

@@ -8,6 +8,20 @@ export const size = OG_IMAGE_SIZE;
 export const contentType = 'image/png';
 export const runtime = 'nodejs';
 
+async function fetchImageAsBase64(url: string) {
+  try {
+    const res = await fetch(url);
+    if (!res.ok) return undefined;
+    const arrayBuffer = await res.arrayBuffer();
+    const buffer = Buffer.from(arrayBuffer);
+    const contentType = res.headers.get('content-type') || 'image/jpeg';
+    return `data:${contentType};base64,${buffer.toString('base64')}`;
+  } catch (error) {
+    console.error('Failed to fetch OG image:', url, error);
+    return undefined;
+  }
+}
+
 export default async function Image({
   params,
 }: {
@@ -32,12 +46,19 @@ export default async function Image({
       : `${SITE_URL}${post.frontmatter.featuredImage}`
     : undefined;
 
+  // Fetch image explicitly and convert to base64 because Satori sometimes struggles
+  // fetching remote URLs directly inside ImageResponse correctly in various environments.
+  let base64Image: string | undefined = undefined;
+  if (featuredImage) {
+    base64Image = await fetchImageAsBase64(featuredImage);
+  }
+
   return new ImageResponse(
     <OGImageTemplate
       title={post.frontmatter.title}
       description={post.frontmatter.excerpt}
       label={post.frontmatter.category || 'Blog'}
-      image={featuredImage}
+      image={base64Image || featuredImage}
     />,
     {
       ...OG_IMAGE_SIZE,

app/[locale]/blog/[slug]/page.tsx

@@ -1,12 +1,18 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import JsonLd from '@/components/JsonLd';
 import { SITE_URL } from '@/lib/schema';
-import { getPostBySlug, getAdjacentPosts, getReadingTime } from '@/lib/blog';
+import {
+  getPostBySlug,
+  getAdjacentPosts,
+  getReadingTime,
+  extractLexicalHeadings,
+} from '@/lib/blog';
 import { Metadata } from 'next';
 import Link from 'next/link';
 import Image from 'next/image';
 import PostNavigation from '@/components/blog/PostNavigation';
 import PowerCTA from '@/components/blog/PowerCTA';
+import TableOfContents from '@/components/blog/TableOfContents';
 import { Heading } from '@/components/ui';
 import { setRequestLocale } from 'next-intl/server';
 import BlogEngagementTracker from '@/components/analytics/BlogEngagementTracker';
@@ -32,7 +38,7 @@ export async function generateMetadata({ params }: BlogPostProps): Promise<Metad
     title: post.frontmatter.title,
     description: description,
     alternates: {
-      canonical: `${SITE_URL}/${locale}/blog/${slug}`,
+      canonical: `${SITE_URL}/${locale}/blog/${post.slug}`,
     },
     openGraph: {
       title: `${post.frontmatter.title} | KLZ Cables`,
@@ -40,7 +46,7 @@ export async function generateMetadata({ params }: BlogPostProps): Promise<Metad
       type: 'article',
       publishedTime: post.frontmatter.date,
       authors: ['KLZ Cables'],
-      url: `${SITE_URL}/${locale}/blog/${slug}`,
+      url: `${SITE_URL}/${locale}/blog/${post.slug}`,
     },
     twitter: {
       card: 'summary_large_image',
@@ -54,12 +60,23 @@ export default async function BlogPost({ params }: BlogPostProps) {
   const { locale, slug } = await params;
   setRequestLocale(locale);
   const post = await getPostBySlug(slug, locale);
-  const { prev, next, isPrevRandom, isNextRandom } = await getAdjacentPosts(slug, locale);
 
   if (!post) {
     notFound();
   }
 
+  // If the user accessed this post using a slug from a different locale
+  // (e.g. via the generic language switcher), redirect them to the correct localized slug URL
+  if (post.slug && post.slug !== slug) {
+    redirect(`/${locale}/blog/${post.slug}`);
+  }
+
+  const { prev, next, isPrevRandom, isNextRandom } = await getAdjacentPosts(post.slug, locale);
+
+  // Convert Lexical content into a plain string to estimate reading time roughly
+  // Extract headings for TOC
+  const headings = extractLexicalHeadings(post.content?.root || post.content);
+
   // Convert Lexical content into a plain string to estimate reading time roughly
   const rawTextContent = JSON.stringify(post.content);
 
@@ -106,7 +123,7 @@ export default async function BlogPost({ params }: BlogPostProps) {
                 </Heading>
                 <div className="flex flex-wrap items-center gap-6 text-white/80 text-sm md:text-base font-medium">
                   <time dateTime={post.frontmatter.date} suppressHydrationWarning>
-                    {new Date(post.frontmatter.date).toLocaleDateString(locale, {
+                    {new Date(post.frontmatter.date).toLocaleDateString(locale || 'de', {
                       year: 'numeric',
                       month: 'long',
                       day: 'numeric',
@@ -143,7 +160,7 @@ export default async function BlogPost({ params }: BlogPostProps) {
             </Heading>
             <div className="flex items-center gap-6 text-text-primary/80 font-medium">
               <time dateTime={post.frontmatter.date} suppressHydrationWarning>
-                {new Date(post.frontmatter.date).toLocaleDateString(locale, {
+                {new Date(post.frontmatter.date).toLocaleDateString(locale || 'de', {
                   year: 'numeric',
                   month: 'long',
                   day: 'numeric',
@@ -224,10 +241,10 @@ export default async function BlogPost({ params }: BlogPostProps) {
             </div>
           </div>
 
-          {/* Right Column: Sticky Sidebar - Temporarily Hidden without ToC */}
+          {/* Right Column: Sticky Sidebar - TOC */}
           <aside className="sticky-narrative-sidebar hidden lg:block">
-            <div className="space-y-12">
-              {/* Future Payload Table of Contents Implementation */}
+            <div className="space-y-12 lg:sticky lg:top-32">
+              <TableOfContents headings={headings} locale={locale} />
             </div>
           </aside>
         </div>

app/[locale]/blog/page.tsx

@@ -198,7 +198,7 @@ export default async function BlogIndex({ params }: BlogIndexProps) {
 
                       <div className="flex items-center gap-3 text-xs md:text-sm font-bold text-white/80 mb-3 tracking-widest uppercase">
                         <time dateTime={post.frontmatter.date} suppressHydrationWarning>
-                          {new Date(post.frontmatter.date).toLocaleDateString(locale, {
+                          {new Date(post.frontmatter.date).toLocaleDateString(locale || 'de', {
                             year: 'numeric',
                             month: 'long',
                             day: 'numeric',

app/[locale]/contact/page.tsx

@@ -59,6 +59,21 @@ export default async function ContactPage({ params }: ContactPageProps) {
   const { locale } = await params;
   setRequestLocale(locale);
   const t = await getTranslations({ locale, namespace: 'Contact' });
+
+  // Get translated slug to redirect if user used incorrect static slug
+  const { headers } = await import('next/headers');
+  const headersList = await headers();
+  const urlPath = headersList.get('x-invoke-path') || '';
+  const currentSlug = urlPath.split('/').pop();
+
+  if (currentSlug) {
+    const contactSlugDe = locale === 'de' ? 'kontakt' : 'contact';
+    if (currentSlug !== contactSlugDe && (currentSlug === 'kontakt' || currentSlug === 'contact')) {
+      const { redirect } = await import('next/navigation');
+      redirect(`/${locale}/${contactSlugDe}`);
+    }
+  }
+
   return (
     <div className="flex flex-col min-h-screen bg-neutral-light">
       <JsonLd

app/[locale]/not-found.tsx

@@ -1,66 +1,137 @@
-'use client';
-import { useTranslations } from 'next-intl';
+import { getTranslations } from 'next-intl/server';
 import { Container, Button, Heading } from '@/components/ui';
 import Scribble from '@/components/Scribble';
-import { useEffect } from 'react';
-import { useAnalytics } from '@/components/analytics/useAnalytics';
-import { AnalyticsEvents } from '@/components/analytics/analytics-events';
+import { getPayload } from 'payload';
+import configPromise from '@payload-config';
+import { headers } from 'next/headers';
+import ClientNotFoundTracker from '@/components/analytics/ClientNotFoundTracker';
 
-export default function NotFound() {
-  const t = useTranslations('Error.notFound');
-  const { trackEvent } = useAnalytics();
+export default async function NotFound() {
+  const t = await getTranslations('Error.notFound');
 
-  useEffect(() => {
-    const errorUrl = typeof window !== 'undefined' ? window.location.pathname : 'unknown';
-    trackEvent(AnalyticsEvents.ERROR, {
-      type: '404_not_found',
-      path: errorUrl,
-    });
+  // Try to determine the requested path
+  const headersList = await headers();
+  const urlPath = headersList.get('x-invoke-path') || '';
 
-    // Explicitly send the 404 to Sentry so we have visibility into broken links
-    import('@sentry/nextjs').then((Sentry) => {
-      Sentry.withScope((scope) => {
-        scope.setTag('status_code', '404');
-        scope.setTag('path', errorUrl);
-        Sentry.captureMessage(`Route Not Found: ${errorUrl}`, 'warning');
-      });
-    });
-  }, [trackEvent]);
+  let suggestedUrl = null;
+  let suggestedLang = null;
+
+  // If we have a path, try to see if the last segment (slug) exists in ANY locale
+  if (urlPath) {
+    const slug = urlPath.split('/').filter(Boolean).pop();
+    if (slug) {
+      try {
+        const payload = await getPayload({ config: configPromise });
+
+        // Check posts
+        const postRes = await payload.find({
+          collection: 'posts',
+          where: { slug: { equals: slug } },
+          locale: 'all',
+          limit: 1,
+        });
+
+        // Check products
+        const productRes =
+          postRes.docs.length === 0
+            ? await payload.find({
+                collection: 'products',
+                where: { slug: { equals: slug } },
+                locale: 'all',
+                limit: 1,
+              })
+            : { docs: [] };
+
+        // Check pages
+        const pageRes =
+          postRes.docs.length === 0 && productRes.docs.length === 0
+            ? await payload.find({
+                collection: 'pages',
+                where: { slug: { equals: slug } },
+                locale: 'all',
+                limit: 1,
+              })
+            : { docs: [] };
+
+        const anyDoc = postRes.docs[0] || productRes.docs[0] || pageRes.docs[0];
+
+        if (anyDoc) {
+          // If the doc exists, we can figure out its native locale or
+          // offer the alternative locale (if we are in 'de', offer 'en')
+          const currentLocale = urlPath.startsWith('/en') ? 'en' : 'de';
+          const alternativeLocale = currentLocale === 'de' ? 'en' : 'de';
+
+          suggestedLang = alternativeLocale === 'de' ? 'Deutsch' : 'English';
+
+          // Reconstruct the URL for the alternative locale
+          const pathParts = urlPath.split('/').filter(Boolean);
+          if (pathParts.length > 0 && (pathParts[0] === 'en' || pathParts[0] === 'de')) {
+            pathParts[0] = alternativeLocale;
+          } else {
+            pathParts.unshift(alternativeLocale);
+          }
+          suggestedUrl = '/' + pathParts.join('/');
+        }
+      } catch (e) {
+        // Ignore Payload errors in 404
+      }
+    }
+  }
 
   return (
-    <Container className="relative py-24 flex flex-col items-center justify-center text-center min-h-[70vh] overflow-hidden">
-      {/* Industrial Background Element */}
-      <div className="absolute inset-0 -z-10 opacity-[0.03] pointer-events-none flex items-center justify-center">
-        <span className="text-[20rem] font-bold select-none">404</span>
-      </div>
+    <>
+      <ClientNotFoundTracker path={urlPath} />
+      <Container className="relative py-24 flex flex-col items-center justify-center text-center min-h-[70vh] overflow-hidden">
+        {/* Industrial Background Element */}
+        <div className="absolute inset-0 -z-10 opacity-[0.03] pointer-events-none flex items-center justify-center">
+          <span className="text-[20rem] font-bold select-none">404</span>
+        </div>
 
-      <div className="relative mb-8">
-        <Heading level={1} className="text-6xl md:text-8xl font-bold mb-2">
-          404
+        <div className="relative mb-8">
+          <Heading level={1} className="text-6xl md:text-8xl font-bold mb-2">
+            404
+          </Heading>
+          <Scribble
+            variant="circle"
+            className="w-[150%] h-[150%] -top-[25%] -left-[25%] text-accent/40"
+          />
+        </div>
+
+        <Heading level={2} className="text-2xl md:text-3xl font-bold mb-4 text-primary">
+          {t('title')}
         </Heading>
-        <Scribble
-          variant="circle"
-          className="w-[150%] h-[150%] -top-[25%] -left-[25%] text-accent/40"
-        />
-      </div>
 
-      <Heading level={2} className="text-2xl md:text-3xl font-bold mb-4 text-primary">
-        {t('title')}
-      </Heading>
+        <p className="text-text-secondary mb-10 max-w-md text-lg">{t('description')}</p>
 
-      <p className="text-white/60 mb-10 max-w-md text-lg">{t('description')}</p>
+        {suggestedUrl && (
+          <div className="mb-12 p-6 bg-accent/10 border border-accent/20 rounded-2xl animate-fade-in shadow-lg relative overflow-hidden group">
+            <div className="absolute inset-0 bg-accent/5 -skew-x-12 translate-x-full group-hover:translate-x-0 transition-transform duration-700" />
+            <div className="relative z-10">
+              <h3 className="text-primary font-bold mb-2 text-lg">
+                Did you mean to visit the {suggestedLang} version?
+              </h3>
+              <p className="text-text-secondary text-sm mb-4">
+                This page exists, but in another language.
+              </p>
+              <Button href={suggestedUrl} variant="accent" size="md" className="w-full sm:w-auto">
+                Go to {suggestedLang} Version
+              </Button>
+            </div>
+          </div>
+        )}
 
-      <div className="flex flex-col sm:flex-row gap-4">
-        <Button href="/" variant="accent" size="lg">
-          {t('cta')}
-        </Button>
-        <Button href="/contact" variant="outline" size="lg">
-          Contact Support
-        </Button>
-      </div>
+        <div className="flex flex-col sm:flex-row gap-4">
+          <Button href="/" variant={suggestedUrl ? 'outline' : 'accent'} size="lg">
+            {t('cta')}
+          </Button>
+          <Button href="/contact" variant={suggestedUrl ? 'ghost' : 'outline'} size="lg">
+            Contact Support
+          </Button>
+        </div>
 
-      {/* Decorative Industrial Line */}
-      <div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-px h-24 bg-gradient-to-t from-accent/50 to-transparent" />
-    </Container>
+        {/* Decorative Industrial Line */}
+        <div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-px h-24 bg-gradient-to-t from-accent/50 to-transparent" />
+      </Container>
+    </>
   );
 }

app/[locale]/products/[...slug]/page.tsx

@@ -14,7 +14,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { getProductOGImageMetadata } from '@/lib/metadata';
 import Image from 'next/image';
 import Link from 'next/link';
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import ProductEngagementTracker from '@/components/analytics/ProductEngagementTracker';
 import PayloadRichText from '@/components/PayloadRichText';
 
@@ -53,7 +53,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
       title: categoryTitle,
       description: categoryDesc,
       alternates: {
-        canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${productSlug}`,
+        canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${await mapFileSlugToTranslated(fileSlug, locale)}`,
         languages: {
           de: `${SITE_URL}/de/${await mapFileSlugToTranslated('products', 'de')}/${await mapFileSlugToTranslated(fileSlug, 'de')}`,
           en: `${SITE_URL}/en/${await mapFileSlugToTranslated('products', 'en')}/${await mapFileSlugToTranslated(fileSlug, 'en')}`,
@@ -75,11 +75,13 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
   const product = await getProductBySlug(productSlug, locale);
   if (!product) return {};
 
+  const currentLocalePath = await getLocalizedPath(locale);
+
   return {
     title: product.frontmatter.title,
     description: product.frontmatter.description,
     alternates: {
-      canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${slug.join('/')}`,
+      canonical: `${SITE_URL}/${locale}/${currentLocalePath}`,
       languages: {
         de: `${SITE_URL}/de/${await getLocalizedPath('de')}`,
         en: `${SITE_URL}/en/${await getLocalizedPath('en')}`,
@@ -90,7 +92,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
       title: product.frontmatter.title,
       description: product.frontmatter.description,
       type: 'website',
-      url: `${SITE_URL}/${locale}/products/${slug.join('/')}`,
+      url: `${SITE_URL}/${locale}/${currentLocalePath}`,
       images: getProductOGImageMetadata(productSlug, product.frontmatter.title, locale),
     },
     twitter: {
@@ -114,7 +116,19 @@ export default async function ProductPage({ params }: ProductPageProps) {
     'high-voltage-cables',
     'solar-cables',
   ];
-  const fileSlug = await mapSlugToFileSlug(productSlug, locale);
+
+  const fileSlugs = await Promise.all(slug.map((s) => mapSlugToFileSlug(s, locale)));
+  const translatedSlugsForLocale = await Promise.all(
+    fileSlugs.map((fs) => mapFileSlugToTranslated(fs, locale)),
+  );
+
+  // If the requested slugs don't exactly match the translated slugs for the current locale
+  // (i.e. if the user used the static language switcher but kept the original locale's slugs)
+  if (slug.join('/') !== translatedSlugsForLocale.join('/')) {
+    redirect(`/${locale}/${productsSlug}/${translatedSlugsForLocale.join('/')}`);
+  }
+
+  const fileSlug = fileSlugs[fileSlugs.length - 1];
 
   if (categories.includes(fileSlug)) {
     const allProducts = await getAllProducts(locale);
@@ -308,6 +322,8 @@ export default async function ProductPage({ params }: ProductPageProps) {
     }
   }
 
+  console.log(`[DEBUG PAGE] Slug: ${productSlug}, children count: ${descriptionChildren.length}`);
+
   const descriptionContent = {
     root: {
       ...product.content.root,
@@ -339,29 +355,31 @@ export default async function ProductPage({ params }: ProductPageProps) {
         categories={product.frontmatter.categories}
         sku={product.frontmatter.sku}
       />
-      <section className="relative pt-40 pb-24 overflow-hidden bg-primary-dark">
+      <section className="relative pt-28 md:pt-40 pb-12 md:pb-24 overflow-hidden bg-primary-dark">
         {/* Background Decorative Elements */}
         <div className="absolute top-0 right-0 w-1/2 h-full bg-gradient-to-l from-accent/5 to-transparent pointer-events-none" />
         <div className="absolute -top-24 -right-24 w-96 h-96 bg-accent/10 rounded-full blur-3xl pointer-events-none" />
 
         <Container className="relative z-10">
           <div className="max-w-4xl animate-slide-up">
-            <nav className="flex items-center mb-12 text-white/40 text-[10px] font-black uppercase tracking-[0.2em]">
+            <nav className="flex flex-wrap items-center gap-y-1 mb-6 md:mb-12 text-white/40 text-[10px] font-black uppercase tracking-[0.2em]">
               <Link
                 href={`/${locale}/${productsSlug}`}
-                className="hover:text-accent transition-colors"
+                className="hover:text-accent transition-colors shrink-0"
               >
                 {t.has('breadcrumb') ? t('breadcrumb') : 'Products'}
               </Link>
-              <span className="mx-4 opacity-20">/</span>
+              <span className="mx-2 md:mx-4 opacity-20">/</span>
               <Link
                 href={`/${locale}/${productsSlug}/${categorySlug}`}
-                className="hover:text-accent transition-colors"
+                className="hover:text-accent transition-colors shrink-0 max-w-[140px] truncate"
               >
                 {categoryTitle}
               </Link>
-              <span className="mx-4 opacity-20">/</span>
-              <span className="text-white/90">{product.frontmatter.title}</span>
+              <span className="mx-2 md:mx-4 opacity-20">/</span>
+              <span className="text-white/90 truncate max-w-[140px] md:max-w-none">
+                {product.frontmatter.title}
+              </span>
             </nav>
 
             <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-12">
@@ -372,7 +390,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
                     {t('englishVersion')}
                   </div>
                 )}
-                <div className="flex flex-wrap gap-3 mb-8">
+                <div className="flex flex-wrap gap-2 mb-4 md:mb-8">
                   {product.frontmatter.categories.map((cat, idx) => (
                     <Badge
                       key={idx}
@@ -383,10 +401,10 @@ export default async function ProductPage({ params }: ProductPageProps) {
                     </Badge>
                   ))}
                 </div>
-                <Heading level={1} className="text-white mb-8 uppercase">
+                <Heading level={1} className="text-white mb-4 md:mb-8 uppercase">
                   {product.frontmatter.title}
                 </Heading>
-                <p className="text-xl md:text-2xl text-white/60 max-w-2xl leading-relaxed font-medium">
+                <p className="text-base md:text-xl lg:text-2xl text-white/60 max-w-2xl leading-relaxed font-medium">
                   {product.frontmatter.description}
                 </p>
               </div>
@@ -400,11 +418,11 @@ export default async function ProductPage({ params }: ProductPageProps) {
           {/* Large Product Image Section */}
           {product.frontmatter.images && product.frontmatter.images.length > 0 && (
             <div
-              className="relative -mt-32 mb-32 animate-slide-up"
+              className="relative md:-mt-32 mb-8 md:mb-32 animate-slide-up"
               style={{ animationDelay: '200ms' }}
             >
-              <div className="bg-white shadow-[0_32px_64px_-12px_rgba(0,0,0,0.1)] rounded-[48px] border border-neutral-dark/5 overflow-hidden p-12 md:p-20 lg:p-24">
-                <div className="relative w-full aspect-[21/9]">
+              <div className="bg-white shadow-[0_32px_64px_-12px_rgba(0,0,0,0.1)] rounded-[24px] md:rounded-[48px] border border-neutral-dark/5 overflow-hidden p-6 md:p-20 lg:p-24">
+                <div className="relative w-full aspect-[4/3] md:aspect-[21/9]">
                   <Image
                     src={product.frontmatter.images[0]}
                     alt={product.frontmatter.title}
@@ -439,10 +457,10 @@ export default async function ProductPage({ params }: ProductPageProps) {
             </div>
           )}
 
-          <div className="grid grid-cols-1 lg:grid-cols-12 gap-12 lg:gap-20">
+          <div className="grid grid-cols-1 lg:grid-cols-12 gap-8 lg:gap-20">
             {/* Description Area Next to Sidebar */}
             <div className="lg:col-span-8">
-              <div className="max-w-none prose prose-primary prose-lg md:prose-xl mb-16 pb-16 border-b border-neutral-dark/5">
+              <div className="max-w-none prose prose-primary prose-base md:prose-lg xl:prose-xl mb-8 md:mb-16 pb-8 md:pb-16 border-b border-neutral-dark/5">
                 {descriptionChildren.length > 0 ? (
                   <PayloadRichText data={descriptionContent} />
                 ) : product.frontmatter.description ? (
@@ -450,6 +468,12 @@ export default async function ProductPage({ params }: ProductPageProps) {
                     {product.frontmatter.description}
                   </p>
                 ) : null}
+
+                {product.application?.root?.children?.length > 0 && (
+                  <div className="mt-12">
+                    <PayloadRichText data={product.application} />
+                  </div>
+                )}
               </div>
             </div>
 
@@ -458,7 +482,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
           </div>
 
           {/* Full-width Technical Data Below */}
-          <div className="mt-16 pt-16 border-t-0">
+          <div className="mt-8 md:mt-16 pt-8 md:pt-16 border-t-0">
             <div className="max-w-none prose prose-primary prose-lg md:prose-xl">
               <PayloadRichText data={technicalContent} />
             </div>
@@ -516,7 +540,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
           </div>
 
           {/* Related Products Section */}
-          <div className="mt-16 pt-16 border-t border-neutral-dark/5">
+          <div className="mt-10 md:mt-16 pt-10 md:pt-16 border-t border-neutral-dark/5">
             <RelatedProducts
               currentSlug={productSlug}
               categories={product.frontmatter.categories}

app/actions/contact.ts

@@ -72,6 +72,7 @@ export async function sendContactFormAction(formData: FormData) {
     ? `Product Inquiry: ${productName}`
     : 'New Contact Form Submission';
   const confirmationSubject = 'Thank you for your inquiry';
+  const isTestSubmission = email === 'testing@mintel.me';
 
   try {
     // 2a. Send notification to Mintel/Client
@@ -84,26 +85,30 @@ export async function sendContactFormAction(formData: FormData) {
       }),
     );
 
-    const notificationResult = await sendEmail({
-      replyTo: email,
-      subject: notificationSubject,
-      html: notificationHtml,
-    });
-
-    if (notificationResult.success) {
-      logger.info('Notification email sent successfully', {
-        messageId: notificationResult.messageId,
-      });
-    } else {
-      logger.error('Notification email FAILED', {
-        error: notificationResult.error,
+    if (!isTestSubmission) {
+      const notificationResult = await sendEmail({
+        replyTo: email,
         subject: notificationSubject,
-        email,
+        html: notificationHtml,
       });
-      services.errors.captureException(
-        new Error(`Notification email failed: ${notificationResult.error}`),
-        { action: 'sendContactFormAction_notification', email },
-      );
+
+      if (notificationResult.success) {
+        logger.info('Notification email sent successfully', {
+          messageId: notificationResult.messageId,
+        });
+      } else {
+        logger.error('Notification email FAILED', {
+          error: notificationResult.error,
+          subject: notificationSubject,
+          email,
+        });
+        services.errors.captureException(
+          new Error(`Notification email failed: ${notificationResult.error}`),
+          { action: 'sendContactFormAction_notification', email },
+        );
+      }
+    } else {
+      logger.info('Skipping notification email for test submission', { email });
     }
 
     // 2b. Send confirmation to Customer (branded as KLZ Cables)
@@ -115,26 +120,30 @@ export async function sendContactFormAction(formData: FormData) {
       }),
     );
 
-    const confirmationResult = await sendEmail({
-      to: email,
-      subject: confirmationSubject,
-      html: confirmationHtml,
-    });
-
-    if (confirmationResult.success) {
-      logger.info('Confirmation email sent successfully', {
-        messageId: confirmationResult.messageId,
-      });
-    } else {
-      logger.error('Confirmation email FAILED', {
-        error: confirmationResult.error,
-        subject: confirmationSubject,
+    if (!isTestSubmission) {
+      const confirmationResult = await sendEmail({
         to: email,
+        subject: confirmationSubject,
+        html: confirmationHtml,
       });
-      services.errors.captureException(
-        new Error(`Confirmation email failed: ${confirmationResult.error}`),
-        { action: 'sendContactFormAction_confirmation', email },
-      );
+
+      if (confirmationResult.success) {
+        logger.info('Confirmation email sent successfully', {
+          messageId: confirmationResult.messageId,
+        });
+      } else {
+        logger.error('Confirmation email FAILED', {
+          error: confirmationResult.error,
+          subject: confirmationSubject,
+          to: email,
+        });
+        services.errors.captureException(
+          new Error(`Confirmation email failed: ${confirmationResult.error}`),
+          { action: 'sendContactFormAction_confirmation', email },
+        );
+      }
+    } else {
+      logger.info('Skipping confirmation email for test submission', { email });
     }
 
     // Notify via Gotify (Internal)

components/Footer.tsx

@@ -15,14 +15,14 @@ export default function Footer() {
   const currentYear = new Date().getFullYear();
 
   return (
-    <footer className="bg-primary text-white py-24 relative overflow-hidden content-visibility-auto">
+    <footer className="bg-primary text-white py-14 md:py-24 relative overflow-hidden content-visibility-auto">
       <div className="absolute top-0 left-0 w-full h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
 
       <Container>
         <h2 className="sr-only">Footer Navigation</h2>
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-12 gap-16 mb-20">
-          {/* Brand Column */}
-          <div className="lg:col-span-4 space-y-8">
+        <div className="grid grid-cols-2 md:grid-cols-2 lg:grid-cols-12 gap-10 md:gap-16 mb-12 md:mb-20">
+          {/* Brand Column – full width on mobile */}
+          <div className="col-span-2 md:col-span-2 lg:col-span-4 space-y-6 md:space-y-8">
             <Link
               href={`/${locale}`}
               className="inline-block group"
@@ -67,9 +67,9 @@ export default function Footer() {
             </div>
           </div>
 
-          {/* Links Columns */}
-          <div className="lg:col-span-2">
-            <h3 className="text-accent font-bold uppercase tracking-widest text-xs md:text-sm mb-8">
+          {/* Legal Column */}
+          <div className="col-span-1 lg:col-span-2">
+            <h3 className="text-accent font-bold uppercase tracking-widest text-xs mb-5 md:mb-8">
               {t('legal')}
             </h3>
             <ul className="space-y-4 text-white/70 list-none m-0 p-0">
@@ -121,8 +121,9 @@ export default function Footer() {
             </ul>
           </div>
 
-          <div className="lg:col-span-2">
-            <h3 className="text-accent font-bold uppercase tracking-widest text-xs md:text-sm mb-8">
+          {/* Company Column */}
+          <div className="col-span-1 lg:col-span-2">
+            <h3 className="text-accent font-bold uppercase tracking-widest text-xs mb-5 md:mb-8">
               {t('company')}
             </h3>
             <ul className="space-y-4 text-white/70 list-none m-0 p-0">
@@ -189,9 +190,9 @@ export default function Footer() {
             </ul>
           </div>
 
-          {/* Recent Posts Column */}
-          <div className="lg:col-span-4">
-            <h3 className="text-accent font-bold uppercase tracking-widest text-xs md:text-sm mb-8">
+          {/* Recent Posts Column – full width on mobile */}
+          <div className="col-span-2 md:col-span-2 lg:col-span-4">
+            <h3 className="text-accent font-bold uppercase tracking-widest text-xs mb-5 md:mb-8">
               {t('recentPosts')}
             </h3>
             <ul className="space-y-6 list-none m-0 p-0">
@@ -242,7 +243,7 @@ export default function Footer() {
           </div>
         </div>
 
-        <div className="pt-12 border-t border-white/10 flex flex-col md:flex-row justify-between items-center gap-8 text-white/70 text-xs md:text-sm font-medium">
+        <div className="pt-8 md:pt-12 border-t border-white/10 flex flex-row justify-between items-center gap-4 text-white/70 text-xs md:text-sm font-medium">
           <p>{t('copyright', { year: currentYear })}</p>
           <div className="flex gap-8">
             <Link

components/Header.tsx

@@ -141,7 +141,8 @@ export default function Header() {
     {
       'bg-primary/95 backdrop-blur-md md:bg-transparent py-3 md:py-8 shadow-2xl md:shadow-none':
         isHomePage && !isScrolled && !isMobileMenuOpen,
-      'bg-primary py-3 md:py-4 shadow-2xl': !isHomePage || isScrolled || isMobileMenuOpen,
+      'bg-primary/90 backdrop-blur-md py-3 md:py-4 shadow-2xl':
+        !isHomePage || isScrolled || isMobileMenuOpen,
     },
   );
 
@@ -152,9 +153,7 @@ export default function Header() {
     <>
       <header className={headerClass} style={{ animationDuration: '800ms' }}>
         <div className="container mx-auto px-4 md:px-12 lg:px-16 max-w-7xl flex items-center justify-between">
-          <div
-            className="flex-shrink-0 group touch-target fill-mode-both"
-          >
+          <div className="flex-shrink-0 group touch-target fill-mode-both">
             <Link
               href={`/${currentLocale}`}
               onClick={() =>
@@ -336,115 +335,138 @@ export default function Header() {
             </button>
           </div>
         </div>
+      </header>
 
-        {/* Mobile Menu Overlay */}
-        <div
-          className={cn(
-            'fixed inset-0 bg-primary z-[60] lg:hidden transition-all duration-500 ease-in-out flex flex-col',
-            isMobileMenuOpen
-              ? 'opacity-100 translate-y-0'
-              : 'opacity-0 -translate-y-full pointer-events-none',
-          )}
-          id="mobile-menu"
-          role="dialog"
-          aria-modal="true"
-          aria-label={t('menu')}
-          ref={mobileMenuRef}
-          inert={isMobileMenuOpen ? undefined : true}
-        >
-          <nav className="flex-grow flex flex-col justify-center items-center p-8 space-y-8">
-            {menuItems.map((item, idx) => (
-              <div
-                key={item.href}
-                className={cn(
-                  'transition-all duration-500 transform',
-                  isMobileMenuOpen ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-8',
-                )}
-                style={{ transitionDelay: `${isMobileMenuOpen ? 200 + idx * 80 : 0}ms` }}
-              >
-                <Link
-                  href={`/${currentLocale}${item.href === '/' ? '' : item.href}`}
-                  aria-current={
-                    (
-                      item.href === '/'
-                        ? pathname === `/${currentLocale}` || pathname === '/'
-                        : pathname.startsWith(`/${currentLocale}${item.href}`)
-                    )
-                      ? 'page'
-                      : undefined
-                  }
-                  onClick={() => {
-                    setIsMobileMenuOpen(false);
-                    trackEvent(AnalyticsEvents.LINK_CLICK, {
-                      label: item.label,
-                      href: item.href,
-                      location: 'mobile_menu',
-                    });
-                  }}
-                  className={cn(
-                    'text-2xl md:text-3xl font-extrabold text-white hover:text-accent transition-all transform block py-4',
-                    (item.href === '/'
-                      ? pathname === `/${currentLocale}` || pathname === '/'
-                      : pathname.startsWith(`/${currentLocale}${item.href}`)) && 'text-accent',
-                  )}
-                >
-                  {item.label}
-                </Link>
-              </div>
-            ))}
-
+      {/* Mobile Menu Overlay */}
+      <div
+        className={cn(
+          'fixed inset-0 bg-primary/95 backdrop-blur-3xl z-[60] lg:hidden transition-all duration-500 ease-in-out flex flex-col',
+          isMobileMenuOpen
+            ? 'opacity-100 translate-y-0'
+            : 'opacity-0 -translate-y-full pointer-events-none',
+        )}
+        id="mobile-menu"
+        role="dialog"
+        aria-modal="true"
+        aria-label={t('menu')}
+        ref={mobileMenuRef}
+        inert={isMobileMenuOpen ? undefined : true}
+      >
+        {/* Close Button inside overlay */}
+        <div className="flex justify-end p-6 pt-8">
+          <button
+            className="touch-target p-2 rounded-xl bg-white/10 border border-white/20 text-white hover:bg-white/20 transition-all duration-300"
+            aria-label={t('toggleMenu')}
+            onClick={() => {
+              setIsMobileMenuOpen(false);
+              trackEvent(AnalyticsEvents.BUTTON_CLICK, {
+                type: 'mobile_menu',
+                action: 'close',
+              });
+            }}
+          >
+            <svg className="w-7 h-7" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M6 18L18 6M6 6l12 12"
+              />
+            </svg>
+          </button>
+        </div>
+        <nav className="flex-grow flex flex-col justify-center items-center p-8 space-y-8">
+          {menuItems.map((item, idx) => (
             <div
+              key={item.href}
               className={cn(
-                'pt-8 border-t border-white/10 w-full flex flex-col items-center space-y-8 transition-all duration-500',
+                'transition-all duration-500 transform',
                 isMobileMenuOpen ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-8',
               )}
-              style={{ transitionDelay: isMobileMenuOpen ? '600ms' : '0ms' }}
+              style={{ transitionDelay: `${isMobileMenuOpen ? 200 + idx * 80 : 0}ms` }}
             >
-              <div className="flex items-center space-x-8 text-lg md:text-xl font-extrabold tracking-widest uppercase text-white">
-                <div>
-                  <Link
-                    href={getPathForLocale('en')}
-                    className={`hover:text-accent transition-colors ${currentLocale === 'en' ? 'text-accent' : 'opacity-80'}`}
-                  >
-                    EN
-                  </Link>
-                </div>
-                <div className="w-px h-6 bg-white/30" />
-                <div>
-                  <Link
-                    href={getPathForLocale('de')}
-                    className={`hover:text-accent transition-colors ${currentLocale === 'de' ? 'text-accent' : 'opacity-80'}`}
-                  >
-                    DE
-                  </Link>
-                </div>
-              </div>
+              <Link
+                href={`/${currentLocale}${item.href === '/' ? '' : item.href}`}
+                aria-current={
+                  (
+                    item.href === '/'
+                      ? pathname === `/${currentLocale}` || pathname === '/'
+                      : pathname.startsWith(`/${currentLocale}${item.href}`)
+                  )
+                    ? 'page'
+                    : undefined
+                }
+                onClick={() => {
+                  setIsMobileMenuOpen(false);
+                  trackEvent(AnalyticsEvents.LINK_CLICK, {
+                    label: item.label,
+                    href: item.href,
+                    location: 'mobile_menu',
+                  });
+                }}
+                className={cn(
+                  'text-2xl md:text-3xl font-extrabold text-white hover:text-accent transition-all transform block py-4',
+                  (item.href === '/'
+                    ? pathname === `/${currentLocale}` || pathname === '/'
+                    : pathname.startsWith(`/${currentLocale}${item.href}`)) && 'text-accent',
+                )}
+              >
+                {item.label}
+              </Link>
+            </div>
+          ))}
 
-              <div className="w-full max-w-xs">
-                <Button
-                  href={`/${currentLocale}/${currentLocale === 'de' ? 'kontakt' : 'contact'}`}
-                  variant="accent"
-                  size="lg"
-                  className="w-full py-6 text-lg md:text-xl shadow-2xl hover:scale-105 transition-transform"
+          <div
+            className={cn(
+              'pt-8 border-t border-white/10 w-full flex flex-col items-center space-y-8 transition-all duration-500',
+              isMobileMenuOpen ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-8',
+            )}
+            style={{ transitionDelay: isMobileMenuOpen ? '600ms' : '0ms' }}
+          >
+            <div className="flex items-center space-x-8 text-lg md:text-xl font-extrabold tracking-widest uppercase text-white">
+              <div>
+                <Link
+                  href={getPathForLocale('en')}
+                  className={`hover:text-accent transition-colors ${currentLocale === 'en' ? 'text-accent' : 'opacity-80'}`}
                 >
-                  {t('contact')}
-                </Button>
+                  EN
+                </Link>
+              </div>
+              <div className="w-px h-6 bg-white/30" />
+              <div>
+                <Link
+                  href={getPathForLocale('de')}
+                  className={`hover:text-accent transition-colors ${currentLocale === 'de' ? 'text-accent' : 'opacity-80'}`}
+                >
+                  DE
+                </Link>
               </div>
             </div>
 
-            {/* Bottom Branding */}
-            <div
-              className={cn(
-                'p-12 flex justify-center transition-all duration-700',
-                isMobileMenuOpen ? 'opacity-20 scale-100' : 'opacity-0 scale-75',
-              )}
-              style={{ transitionDelay: isMobileMenuOpen ? '800ms' : '0ms' }}
-            >
-              <Image src="/logo-white.svg" alt={t('home')} width={80} height={80} unoptimized />
+            <div className="w-full max-w-xs">
+              <Button
+                href={`/${currentLocale}/${currentLocale === 'de' ? 'kontakt' : 'contact'}`}
+                variant="accent"
+                size="lg"
+                className="w-full py-6 text-lg md:text-xl shadow-2xl hover:scale-105 transition-transform"
+              >
+                {t('contact')}
+              </Button>
             </div>
-          </nav>
-        </div>
-      </header>
+          </div>
+
+          {/* Bottom Branding */}
+          <div
+            className={cn(
+              'p-12 flex justify-center transition-all duration-700',
+              isMobileMenuOpen ? 'opacity-20 scale-100' : 'opacity-0 scale-75',
+            )}
+            style={{ transitionDelay: isMobileMenuOpen ? '800ms' : '0ms' }}
+          >
+            <Image src="/logo-white.svg" alt={t('home')} width={80} height={80} unoptimized />
+          </div>
+        </nav>
+      </div>
     </>
   );
 }

components/PayloadRichText.tsx

@@ -39,93 +39,146 @@ import CTA from '@/components/home/CTA';
 const jsxConverters: JSXConverters = {
   ...defaultJSXConverters,
   // Let the default converters handle text nodes to preserve valid formatting
-  // If the text node contains raw HTML (from messy migrations), render it as HTML instead of escaping it
-  text: ({ node }: any) => {
-    const text = node.text;
-    // Handle markdown-style lists embedded in text nodes from Markdown migration
-    if (text && text.includes('\n- ')) {
-      const parts = text.split('\n- ').filter((p: string) => p.trim() !== '');
-      // If first part doesn't start with "- ", it's a prefix paragraph
-      const startsWithDash = text.trimStart().startsWith('- ');
-      const prefix = startsWithDash ? null : parts.shift();
-      return (
-        <>
-          {prefix && (
-            <span dangerouslySetInnerHTML={prefix.includes('<') ? { __html: prefix } : undefined}>
-              {!prefix.includes('<') ? prefix : undefined}
-            </span>
-          )}
-          <ul className="list-disc pl-6 my-4 space-y-2">
-            {parts.map((item: string, i: number) => {
-              const cleanItem = item.trim();
-              if (cleanItem.includes('<')) {
-                return <li key={i} dangerouslySetInnerHTML={{ __html: cleanItem }} />;
-              }
-              return <li key={i}>{cleanItem}</li>;
-            })}
-          </ul>
-        </>
-      );
-    }
-
-    if (text && (text.includes('<') || text.includes('data-start'))) {
-      return <span dangerouslySetInnerHTML={{ __html: text }} />;
-    }
-
-    // Handle markdown-style links [text](url) from Markdown migration
-    if (text && /\[([^\]]+)\]\(([^)]+)\)/.test(text)) {
-      const parts: React.ReactNode[] = [];
-      const remaining = text;
-      let key = 0;
-      const linkRegex = /\[([^\]]+)\]\(([^)]+)\)/g;
-      let match;
-      let lastIndex = 0;
-      while ((match = linkRegex.exec(remaining)) !== null) {
-        if (match.index > lastIndex) {
-          parts.push(<span key={key++}>{remaining.slice(lastIndex, match.index)}</span>);
-        }
-        parts.push(
-          <a
-            key={key++}
-            href={match[2]}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="text-primary underline decoration-primary/30 hover:decoration-primary transition-colors"
-          >
-            {match[1]}
-          </a>,
-        );
-        lastIndex = match.index + match[0].length;
-      }
-      if (lastIndex < remaining.length) {
-        parts.push(<span key={key++}>{remaining.slice(lastIndex)}</span>);
-      }
-      return <>{parts}</>;
-    }
-
-    // Handle newlines in text nodes — convert to <br> for proper line breaks
-    if (text && text.includes('\n')) {
-      const lines = text.split('\n');
-      return (
-        <>
-          {lines.map((line: string, i: number) => (
-            <span key={i}>
-              {line}
-              {i < lines.length - 1 && <br />}
-            </span>
-          ))}
-        </>
-      );
-    }
-
-    if (node.format === 1) return <strong>{text}</strong>;
-    if (node.format === 2) return <em>{text}</em>;
-    return <span>{text}</span>;
+  // Use div instead of p for paragraphs to allow nested block elements (like the lists above)
+  paragraph: ({ node, nodesToJSX }: any) => {
+    return (
+      <div className="mb-6 leading-relaxed text-text-secondary">
+        {nodesToJSX({ nodes: node.children })}
+      </div>
+    );
+  },
+  // Scale headings to prevent multiple H1s (H1 -> H2, etc) and style natively
+  heading: ({ node, nodesToJSX }: any) => {
+    const children = nodesToJSX({ nodes: node.children });
+    const tag = node?.tag;
+
+    // Extract text to generate an ID for the TOC
+    // Lexical children might contain various nodes; we need a plain text representation
+    const textContent = node.children ? node.children.map((c: any) => c.text || '').join('') : '';
+    const id = textContent
+      ? textContent
+          .toLowerCase()
+          .replace(/ä/g, 'ae')
+          .replace(/ö/g, 'oe')
+          .replace(/ü/g, 'ue')
+          .replace(/ß/g, 'ss')
+          .replace(/[*_`]/g, '')
+          .replace(/[^\w\s-]/g, '')
+          .replace(/\s+/g, '-')
+          .replace(/-+/g, '-')
+          .replace(/^-+|-+$/g, '')
+      : undefined;
+
+    if (tag === 'h1')
+      return (
+        <h2
+          id={id}
+          className="text-3xl md:text-4xl font-bold mt-12 mb-6 text-text-primary scroll-mt-24"
+        >
+          {children}
+        </h2>
+      );
+    if (tag === 'h2')
+      return (
+        <h3
+          id={id}
+          className="text-2xl md:text-3xl font-bold mt-10 mb-5 text-text-primary scroll-mt-24"
+        >
+          {children}
+        </h3>
+      );
+    if (tag === 'h3')
+      return (
+        <h4
+          id={id}
+          className="text-xl md:text-2xl font-bold mt-8 mb-4 text-text-primary scroll-mt-24"
+        >
+          {children}
+        </h4>
+      );
+    if (tag === 'h4')
+      return (
+        <h5
+          id={id}
+          className="text-lg md:text-xl font-bold mt-6 mb-4 text-text-primary scroll-mt-24"
+        >
+          {children}
+        </h5>
+      );
+    if (tag === 'h5')
+      return (
+        <h6
+          id={id}
+          className="text-base md:text-lg font-bold mt-6 mb-4 text-text-primary scroll-mt-24"
+        >
+          {children}
+        </h6>
+      );
+    return (
+      <h6 id={id} className="text-base font-bold mt-6 mb-4 text-text-primary scroll-mt-24">
+        {children}
+      </h6>
+    );
+  },
+  list: ({ node, nodesToJSX }: any) => {
+    const children = nodesToJSX({ nodes: node.children });
+    if (node?.listType === 'number') {
+      return (
+        <ol className="list-decimal pl-6 my-6 space-y-2 text-text-secondary marker:text-primary marker:font-bold">
+          {children}
+        </ol>
+      );
+    }
+    if (node?.listType === 'check') {
+      return <ul className="list-none pl-0 my-6 space-y-2 text-text-secondary">{children}</ul>;
+    }
+    return (
+      <ul className="list-disc pl-6 my-6 space-y-2 text-text-secondary marker:text-primary">
+        {children}
+      </ul>
+    );
+  },
+  listitem: ({ node, nodesToJSX }: any) => {
+    const children = nodesToJSX({ nodes: node.children });
+    if (node?.checked != null) {
+      return (
+        <li className="flex items-start gap-3 mb-2 leading-relaxed">
+          <input
+            type="checkbox"
+            checked={node.checked}
+            readOnly
+            className="mt-1.5 w-4 h-4 text-primary focus:ring-primary border-gray-300 rounded shrink-0"
+          />
+          <div className="flex-1">{children}</div>
+        </li>
+      );
+    }
+    return <li className="mb-2 leading-relaxed block">{children}</li>;
+  },
+  quote: ({ node, nodesToJSX }: any) => {
+    const children = nodesToJSX({ nodes: node.children });
+    return (
+      <blockquote className="border-l-4 border-primary bg-primary/5 rounded-r-2xl pl-6 py-4 my-8 italic text-text-secondary shadow-sm">
+        {children}
+      </blockquote>
+    );
+  },
+  link: ({ node, nodesToJSX }: any) => {
+    const children = nodesToJSX({ nodes: node.children });
+    // Handling Payload CMS link nodes
+    const href = node?.fields?.url || node?.url || '#';
+    const newTab = node?.fields?.newTab || node?.newTab;
+    return (
+      <a
+        href={href}
+        target={newTab ? '_blank' : undefined}
+        rel={newTab ? 'noopener noreferrer' : undefined}
+        className="text-primary no-underline hover:underline font-medium transition-colors"
+      >
+        {children}
+      </a>
+    );
   },
-  // Scale headings to prevent multiple H1s (H1 -> H2, etc)
-  h1: ({ children }: any) => <h2 className="text-3xl md:text-4xl font-bold my-6">{children}</h2>,
-  h2: ({ children }: any) => <h3 className="text-2xl md:text-3xl font-bold my-5">{children}</h3>,
-  h3: ({ children }: any) => <h4 className="text-xl md:text-2xl font-bold my-4">{children}</h4>,
 
   blocks: {
     // ... preserved existing blocks ...
@@ -170,10 +223,10 @@ const jsxConverters: JSXConverters = {
       />
     ),
     technicalGrid: ({ node }: any) => (
-      <TechnicalGrid title={node.fields.title} items={node.fields.items} />
+      <TechnicalGrid title={node?.fields?.title} items={node?.fields?.items} />
     ),
     'block-technicalGrid': ({ node }: any) => {
-      console.log('[PayloadRichText] Rendering block-technicalGrid:', node.fields.title);
+      if (!node?.fields) return null;
       return <TechnicalGrid title={node.fields.title} items={node.fields.items} />;
     },
     highlightBox: ({ node }: any) => (
@@ -246,20 +299,23 @@ const jsxConverters: JSXConverters = {
         {node.fields.title}
       </SplitHeading>
     ),
-    productTabs: ({ node }: any) => (
-      <ProductTabs
-        technicalData={
-          <ProductTechnicalData
-            data={{
-              technicalItems: node.fields.technicalItems,
-              voltageTables: node.fields.voltageTables,
-            }}
-          />
-        }
-      >
-        <></>
-      </ProductTabs>
-    ),
+    productTabs: ({ node }: any) => {
+      if (!node?.fields) return null;
+      return (
+        <ProductTabs
+          technicalData={
+            <ProductTechnicalData
+              data={{
+                technicalItems: node.fields.technicalItems,
+                voltageTables: node.fields.voltageTables,
+              }}
+            />
+          }
+        >
+          <></>
+        </ProductTabs>
+      );
+    },
     'block-productTabs': ({ node }: any) => (
       <ProductTabs
         technicalData={
@@ -1009,6 +1065,10 @@ export default function PayloadRichText({
 
   if (!data) return null;
 
+  if (data.root?.children?.length > 0) {
+    console.log('[PayloadRichText DEBUG] received children', data.root.children.length);
+  }
+
   const dynamicConverters: JSXConverters = {
     ...jsxConverters,
     blocks: {

components/ProductTechnicalData.tsx

@@ -38,14 +38,14 @@ export default function ProductTechnicalData({ data }: ProductTechnicalDataProps
   };
 
   return (
-    <div className="space-y-16">
+    <div className="space-y-8 md:space-y-16">
       {technicalItems.length > 0 && (
-        <div className="bg-white p-8 md:p-12 rounded-[32px] shadow-sm border border-neutral-dark/5">
+        <div className="bg-white p-5 md:p-12 rounded-[20px] md:rounded-[32px] shadow-sm border border-neutral-dark/5">
           <h3 className="text-2xl font-bold text-primary mb-8 flex items-center gap-3">
             <div className="w-2 h-8 bg-accent rounded-full" />
             General Data
           </h3>
-          <dl className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-x-12 gap-y-8">
+          <dl className="grid grid-cols-2 sm:grid-cols-2 lg:grid-cols-3 gap-x-6 gap-y-6 md:gap-x-12 md:gap-y-8">
             {technicalItems.map((item, idx) => (
               <div key={idx} className="flex flex-col group">
                 <dt className="text-sm font-bold uppercase tracking-widest text-primary/40 mb-2 group-hover:text-accent transition-colors">
@@ -72,7 +72,7 @@ export default function ProductTechnicalData({ data }: ProductTechnicalDataProps
         return (
           <div
             key={idx}
-            className="bg-white p-8 md:p-12 rounded-[32px] shadow-sm border border-neutral-dark/5 overflow-hidden"
+            className="bg-white p-5 md:p-12 rounded-[20px] md:rounded-[32px] shadow-sm border border-neutral-dark/5 overflow-hidden"
           >
             <h3 className="text-2xl font-bold text-primary mb-8 flex items-center gap-3">
               <div className="w-2 h-8 bg-accent rounded-full" />
@@ -83,7 +83,7 @@ export default function ProductTechnicalData({ data }: ProductTechnicalDataProps
             </h3>
 
             {table.metaItems.length > 0 && (
-              <dl className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-8 mb-12 bg-neutral-light/50 p-8 rounded-2xl border border-neutral-dark/5">
+              <dl className="grid grid-cols-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 md:gap-8 mb-6 md:mb-12 bg-neutral-light/50 p-4 md:p-8 rounded-xl md:rounded-2xl border border-neutral-dark/5">
                 {table.metaItems.map((item, mIdx) => (
                   <div key={mIdx}>
                     <dt className="text-[10px] font-black uppercase tracking-[0.2em] text-primary/40 mb-1">
@@ -98,9 +98,11 @@ export default function ProductTechnicalData({ data }: ProductTechnicalDataProps
             )}
 
             <div className="relative">
+              {/* Scroll hint gradient on right edge for mobile */}
+              <div className="pointer-events-none absolute right-0 top-0 h-full w-8 bg-gradient-to-l from-white to-transparent z-20 md:hidden" />
               <div
                 id={`voltage-table-${idx}`}
-                className={`overflow-x-auto -mx-8 md:-mx-12 px-8 md:px-12 transition-all duration-500 ease-in-out ${
+                className={`overflow-x-auto -mx-5 md:-mx-12 px-5 md:px-12 transition-all duration-500 ease-in-out ${
                   !isExpanded && hasManyRows ? 'max-h-[400px] overflow-y-hidden' : 'max-h-[none]'
                 }`}
               >

components/analytics/AnalyticsShell.tsx

@@ -9,6 +9,9 @@ const DynamicAnalyticsProvider = dynamic(() => import('./AnalyticsProvider'), {
 const DynamicScrollDepthTracker = dynamic(() => import('./ScrollDepthTracker'), {
   ssr: false,
 });
+const DynamicWebVitalsTracker = dynamic(() => import('./WebVitalsTracker'), {
+  ssr: false,
+});
 
 export default function AnalyticsShell() {
   const [shouldLoad, setShouldLoad] = useState(false);
@@ -34,6 +37,7 @@ export default function AnalyticsShell() {
     <Suspense fallback={null}>
       <DynamicAnalyticsProvider />
       <DynamicScrollDepthTracker />
+      <DynamicWebVitalsTracker />
     </Suspense>
   );
 }

components/analytics/ClientNotFoundTracker.tsx

@@ -0,0 +1,26 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useAnalytics } from './useAnalytics';
+import { AnalyticsEvents } from './analytics-events';
+
+export default function ClientNotFoundTracker({ path }: { path: string }) {
+  const { trackEvent } = useAnalytics();
+
+  useEffect(() => {
+    trackEvent(AnalyticsEvents.ERROR, {
+      type: '404_not_found',
+      path,
+    });
+
+    import('@sentry/nextjs').then((Sentry) => {
+      Sentry.withScope((scope) => {
+        scope.setTag('status_code', '404');
+        scope.setTag('path', path);
+        Sentry.captureMessage(`Route Not Found: ${path}`, 'warning');
+      });
+    });
+  }, [trackEvent, path]);
+
+  return null;
+}

components/analytics/WebVitalsTracker.tsx

@@ -0,0 +1,54 @@
+'use client';
+
+import { useReportWebVitals } from 'next/web-vitals';
+import { useAnalytics } from './useAnalytics';
+
+/**
+ * WebVitalsTracker component.
+ *
+ * Captures Next.js Web Vitals and reports them to Umami as custom events.
+ * This provides "meaningful" page speed tracking by measuring real user
+ * experiences (LCP, CLS, INP, etc.).
+ */
+export default function WebVitalsTracker() {
+  const { trackEvent } = useAnalytics();
+
+  useReportWebVitals((metric) => {
+    const { name, value, id, label } = metric;
+
+    // Determine rating (simplified version of web-vitals standards)
+    let rating: 'good' | 'needs-improvement' | 'poor' = 'good';
+
+    if (name === 'LCP') {
+      if (value > 4000) rating = 'poor';
+      else if (value > 2500) rating = 'needs-improvement';
+    } else if (name === 'CLS') {
+      if (value > 0.25) rating = 'poor';
+      else if (value > 0.1) rating = 'needs-improvement';
+    } else if (name === 'FID') {
+      if (value > 300) rating = 'poor';
+      else if (value > 100) rating = 'needs-improvement';
+    } else if (name === 'FCP') {
+      if (value > 3000) rating = 'poor';
+      else if (value > 1800) rating = 'needs-improvement';
+    } else if (name === 'TTFB') {
+      if (value > 1500) rating = 'poor';
+      else if (value > 800) rating = 'needs-improvement';
+    } else if (name === 'INP') {
+      if (value > 500) rating = 'poor';
+      else if (value > 200) rating = 'needs-improvement';
+    }
+
+    // Report to Umami
+    trackEvent('web-vital', {
+      metric: name,
+      value: Math.round(name === 'CLS' ? value * 1000 : value), // CLS is a score, multiply by 1000 to keep as integer if preferred
+      rating,
+      id,
+      label,
+      path: typeof window !== 'undefined' ? window.location.pathname : undefined,
+    });
+  });
+
+  return null;
+}

components/home/Hero.tsx

@@ -23,19 +23,27 @@ export default function Hero({ data }: { data?: any }) {
               className="text-center md:text-left mb-6 md:mb-8 md:max-w-none text-white text-4xl sm:text-5xl md:text-7xl font-extrabold [text-shadow:_-2px_-2px_0_#002b49,_2px_-2px_0_#002b49,_-2px_2px_0_#002b49,_2px_2px_0_#002b49,_-2px_0_0_#002b49,_2px_0_0_#002b49,_0_-2px_0_#002b49,_0_2px_0_#002b49]"
             >
               {data?.title ? (
-                <span
-                  dangerouslySetInnerHTML={{
-                    __html: data.title
-                      .replace(
-                        /<green>/g,
-                        '<span class="relative inline-block"><span class="relative z-10 text-accent italic inline-block">',
-                      )
-                      .replace(
-                        /<\/green>/g,
-                        '</span><div class="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block absolute -z-10 animate-in fade-in zoom-in-0 duration-1000 ease-out fill-mode-both" style="animation-delay: 500ms;"><Scribble variant="circle" /></div></span>',
-                      ),
-                  }}
-                />
+                <>
+                  {data.title.split(/(<green>.*?<\/green>)/g).map((part: string, i: number) => {
+                    if (part.startsWith('<green>') && part.endsWith('</green>')) {
+                      const content = part.replace(/<\/?green>/g, '');
+                      return (
+                        <span key={i} className="relative inline-block">
+                          <span className="relative z-10 text-accent italic inline-block">
+                            {content}
+                          </span>
+                          <div
+                            className="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block absolute -z-10 animate-in fade-in zoom-in-0 duration-1000 ease-out fill-mode-both"
+                            style={{ animationDelay: '500ms' }}
+                          >
+                            <Scribble variant="circle" />
+                          </div>
+                        </span>
+                      );
+                    }
+                    return <span key={i}>{part}</span>;
+                  })}
+                </>
               ) : (
                 t.rich('title', {
                   green: (chunks) => (

components/home/RecentPosts.tsx

@@ -3,7 +3,7 @@ import Image from 'next/image';
 import Link from 'next/link';
 import { getAllPosts } from '@/lib/blog';
 import { getTranslations } from 'next-intl/server';
-import { Section, Container, Heading, Card, Badge } from '../../components/ui';
+import { Section, Container, Heading } from '../../components/ui';
 
 interface RecentPostsProps {
   locale: string;
@@ -13,7 +13,7 @@ interface RecentPostsProps {
 export default async function RecentPosts({ locale, data }: RecentPostsProps) {
   const t = await getTranslations('Blog');
   const posts = await getAllPosts(locale);
-  const recentPosts = posts.slice(0, 3);
+  const recentPosts = posts.slice(0, 4);
 
   if (recentPosts.length === 0) return null;
 
@@ -21,9 +21,9 @@ export default async function RecentPosts({ locale, data }: RecentPostsProps) {
   const subtitle = data?.subtitle || t('latestNews');
 
   return (
-    <Section className="bg-neutral py-16 md:py-24">
-      <Container>
-        <div className="flex flex-col md:flex-row items-start md:items-end justify-between mb-12 md:mb-16 gap-6">
+    <Section className="bg-neutral-light py-0 md:py-0 lg:py-0">
+      <Container className="py-12 md:py-16">
+        <div className="flex flex-col md:flex-row items-start md:items-end justify-between gap-6">
           <Heading level={2} subtitle={subtitle} className="mb-0 text-primary">
             {title}
           </Heading>
@@ -35,91 +35,73 @@ export default async function RecentPosts({ locale, data }: RecentPostsProps) {
             <span className="ml-2 transition-transform group-hover:translate-x-2">&rarr;</span>
           </Link>
         </div>
-
-        <ul className="grid grid-cols-1 gap-10 list-none p-0 m-0">
-          {recentPosts.map((post, idx) => (
-            <li key={`${post.slug}-${idx}`}>
-              <Link
-                href={`/${locale}/blog/${post.slug}`}
-                className="group block h-full focus:outline-none"
-              >
-                <Card
-                  tag="article"
-                  className="relative flex flex-col justify-end border-none shadow-lg hover:shadow-2xl transition-all duration-500 rounded-3xl overflow-hidden min-h-[400px] md:min-h-[450px]"
-                >
-                  {post.frontmatter.featuredImage && (
-                    <>
-                      <Image
-                        src={post.frontmatter.featuredImage.split('?')[0]}
-                        alt={post.frontmatter.title}
-                        fill
-                        className="absolute inset-0 w-full h-full object-cover transition-transform duration-1000 group-hover:scale-105"
-                        style={{
-                          objectPosition: `${post.frontmatter.focalX ?? 50}% ${post.frontmatter.focalY ?? 50}%`,
-                        }}
-                        sizes="(max-width: 768px) 100vw, 100vw"
-                        loading="lazy"
-                      />
-                      <div className="absolute inset-0 bg-neutral-dark/10 group-hover:bg-neutral-dark/5 transition-colors duration-500" />
-                    </>
-                  )}
-
-                  <div className="relative z-10 w-full p-6 md:p-8 bg-gradient-to-t from-neutral-dark/90 via-neutral-dark/60 to-transparent flex flex-col pt-32">
-                    <div className="flex flex-wrap items-center gap-4 mb-4">
-                      {post.frontmatter.category && (
-                        <Badge variant="accent" className="shadow-md">
-                          {post.frontmatter.category}
-                        </Badge>
-                      )}
-                      {(new Date(post.frontmatter.date) > new Date() ||
-                        post.frontmatter.public === false) && (
-                        <span className="px-2 py-0.5 border border-white/40 text-white/90 rounded uppercase tracking-widest text-[10px] md:text-xs font-bold bg-neutral-dark/40 shadow-sm">
-                          Draft Preview
-                        </span>
-                      )}
-                    </div>
-
-                    <div className="flex items-center gap-3 text-xs md:text-sm font-bold text-white/80 mb-3 tracking-widest uppercase">
-                      <time dateTime={post.frontmatter.date} suppressHydrationWarning>
-                        {new Date(post.frontmatter.date).toLocaleDateString(locale, {
-                          year: 'numeric',
-                          month: 'long',
-                          day: 'numeric',
-                        })}
-                      </time>
-                    </div>
-
-                    <h3 className="text-xl md:text-2xl font-bold text-white mb-4 group-hover:text-accent transition-colors drop-shadow-md leading-tight max-w-4xl">
-                      {post.frontmatter.title}
-                    </h3>
-
-                    <div className="mt-auto flex items-center justify-between border-t border-white/20 pt-6">
-                      <span className="text-accent text-sm md:text-base font-extrabold group-hover:text-white transition-colors">
-                        {t('readMore')}
-                      </span>
-                      <div className="w-10 h-10 rounded-full bg-white/10 flex items-center justify-center text-accent group-hover:bg-accent group-hover:text-primary-dark transition-all duration-300 backdrop-blur-sm border border-white/20">
-                        <svg
-                          className="w-5 h-5 transition-transform group-hover:translate-x-1"
-                          fill="none"
-                          stroke="currentColor"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            strokeWidth={2}
-                            d="M17 8l4 4m0 0l-4 4m4-4H3"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </Card>
-              </Link>
-            </li>
-          ))}
-        </ul>
       </Container>
+
+      <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 m-0 p-0 list-none">
+        {recentPosts.map((post, idx) => (
+          <li key={`${post.slug}-${idx}`} className="block">
+            <Link
+              href={`/${locale}/blog/${post.slug}`}
+              className="group block relative h-[400px] md:h-[500px] lg:h-[650px] overflow-hidden border-b md:border-b-0 md:border-r border-white/10 last:border-0 focus:outline-none"
+            >
+              {post.frontmatter.featuredImage && (
+                <>
+                  <Image
+                    src={post.frontmatter.featuredImage.split('?')[0]}
+                    alt={post.frontmatter.title}
+                    fill
+                    className="object-cover transition-transform duration-1000 group-hover:scale-110"
+                    style={{
+                      objectPosition: `${post.frontmatter.focalX ?? 50}% ${post.frontmatter.focalY ?? 50}%`,
+                    }}
+                    sizes="(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 25vw"
+                    loading="lazy"
+                  />
+                  <div className="absolute inset-0 bg-primary-dark/40 group-hover:bg-primary-dark/60 transition-all duration-500" />
+                </>
+              )}
+
+              <div className="absolute inset-0 p-8 md:p-10 flex flex-col justify-end text-white">
+                <div className="mb-4 md:mb-6 transform transition-all duration-500 group-hover:-translate-y-4">
+                  <div className="flex flex-wrap items-center gap-2 mb-4">
+                    {post.frontmatter.category && (
+                      <span className="px-3 py-1 bg-accent text-primary-dark rounded-full text-[10px] md:text-xs font-bold uppercase tracking-wider shadow-sm">
+                        {post.frontmatter.category}
+                      </span>
+                    )}
+                    <time
+                      dateTime={post.frontmatter.date}
+                      suppressHydrationWarning
+                      className="px-3 py-1 text-white/80 text-[10px] md:text-xs font-bold uppercase tracking-widest border border-white/20 rounded-full bg-white/10 backdrop-blur-md"
+                    >
+                      {new Date(post.frontmatter.date).toLocaleDateString(locale || 'de', {
+                        year: 'numeric',
+                        month: 'short',
+                        day: 'numeric',
+                      })}
+                    </time>
+                    {(new Date(post.frontmatter.date) > new Date() ||
+                      post.frontmatter.public === false) && (
+                      <span className="px-2 py-0.5 border border-white/40 text-white/90 rounded uppercase tracking-widest text-[10px] md:text-xs font-bold bg-neutral-dark/40 shadow-sm">
+                        Draft Preview
+                      </span>
+                    )}
+                  </div>
+                  <h3 className="text-xl md:text-2xl font-bold mb-2 md:mb-4 leading-tight drop-shadow-md">
+                    {post.frontmatter.title}
+                  </h3>
+                </div>
+                <div className="flex items-center text-accent font-bold tracking-wider uppercase text-xs md:text-xs opacity-100 md:opacity-0 group-hover:opacity-100 transition-all duration-500 delay-100">
+                  {t('readMore')}{' '}
+                  <span className="ml-2 transition-transform group-hover:translate-x-2">
+                    &rarr;
+                  </span>
+                </div>
+              </div>
+            </Link>
+          </li>
+        ))}
+      </ul>
     </Section>
   );
 }

docker-compose.dev.yml

@@ -29,7 +29,7 @@ services:
       NEXT_TELEMETRY_DISABLED: "1"
       POSTGRES_URI: postgres://${PAYLOAD_DB_USER:-payload}:${PAYLOAD_DB_PASSWORD:-120in09oenaoinsd9iaidon}@klz-db:5432/${PAYLOAD_DB_NAME:-payload}
       PAYLOAD_SECRET: ${PAYLOAD_SECRET:-fallback-secret-for-dev}
-      NODE_OPTIONS: "--max-old-space-size=4096"
+      NODE_OPTIONS: "--max-old-space-size=8192"
       UV_THREADPOOL_SIZE: "4"
       NPM_TOKEN: ${NPM_TOKEN:-}
       CI: "true"

instrumentation-client.ts

@@ -1,4 +1,5 @@
 // Sentry initialization move to GlitchtipErrorReportingService to allow lazy-loading
 // for PageSpeed 100 optimizations. This file is now empty to prevent the SDK
 // from being included in the initial JS bundle.
-export {};
+import * as Sentry from '@sentry/nextjs';
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

lib/blog.ts

@@ -59,7 +59,8 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
   try {
     const payload = await getPayload({ config: configPromise });
 
-    const { docs } = await payload.find({
+    // First try: Find in the requested locale
+    let { docs } = await payload.find({
       collection: 'posts',
       where: {
         slug: { equals: slug },
@@ -70,6 +71,38 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
       limit: 1,
     });
 
+    // Fallback: If not found, try searching across all locales.
+    // This happens when a user uses the static language switcher
+    // e.g. switching from /en/blog/en-slug to /de/blog/en-slug.
+    if (!docs || docs.length === 0) {
+      const { docs: crossLocaleDocs } = await payload.find({
+        collection: 'posts',
+        where: {
+          slug: { equals: slug },
+          ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
+        },
+        locale: 'all',
+        draft: config.showDrafts,
+        limit: 1,
+      });
+
+      if (crossLocaleDocs && crossLocaleDocs.length > 0) {
+        // Fetch the found document again, but strictly in the requested locale
+        // so we get the correctly translated fields (like the localized slug)
+        const { docs: correctLocaleDocs } = await payload.find({
+          collection: 'posts',
+          where: {
+            id: { equals: crossLocaleDocs[0].id },
+          },
+          locale: locale as any,
+          draft: config.showDrafts,
+          limit: 1,
+        });
+
+        docs = correctLocaleDocs;
+      }
+    }
+
     if (!docs || docs.length === 0) return null;
 
     const doc = docs[0];
@@ -253,3 +286,38 @@ export function getHeadings(content: string): { id: string; text: string; level:
     return { id, text: cleanText, level };
   });
 }
+
+export function extractLexicalHeadings(
+  node: any,
+  headings: { id: string; text: string; level: number }[] = [],
+): { id: string; text: string; level: number }[] {
+  if (!node) return headings;
+
+  if (node.type === 'heading' && node.tag) {
+    const level = parseInt(node.tag.replace('h', ''));
+    const text = getTextContentFromLexical(node);
+    if (text) {
+      headings.push({
+        id: generateHeadingId(text),
+        text,
+        level,
+      });
+    }
+  }
+
+  if (node.children && Array.isArray(node.children)) {
+    node.children.forEach((child: any) => extractLexicalHeadings(child, headings));
+  }
+
+  return headings;
+}
+
+function getTextContentFromLexical(node: any): string {
+  if (node.type === 'text') {
+    return node.text || '';
+  }
+  if (node.children && Array.isArray(node.children)) {
+    return node.children.map(getTextContentFromLexical).join('');
+  }
+  return '';
+}

lib/pages.ts

@@ -1,5 +1,7 @@
 import { getPayload } from 'payload';
 import configPromise from '@payload-config';
+import { mapSlugToFileSlug } from './slugs';
+import { config } from '@/lib/config';
 
 export interface PageFrontmatter {
   title: string;
@@ -44,19 +46,81 @@ function mapDoc(doc: any): PageData {
 export async function getPageBySlug(slug: string, locale: string): Promise<PageData | null> {
   try {
     const payload = await getPayload({ config: configPromise });
+    const fileSlug = await mapSlugToFileSlug(slug, locale);
 
-    const result = await payload.find({
-      collection: 'pages' as any,
+    // Try finding exact match first
+    let result = await payload.find({
+      collection: 'pages',
       where: {
-        slug: { equals: slug },
+        and: [
+          { slug: { equals: fileSlug } },
+          ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+        ],
       },
       locale: locale as any,
+      depth: 1,
       limit: 1,
     });
 
-    const docs = result.docs as any[];
-    if (!docs || docs.length === 0) return null;
-    return mapDoc(docs[0]);
+    // Fallback: search ALL locales
+    if (result.docs.length === 0) {
+      const crossResult = await payload.find({
+        collection: 'pages',
+        where: {
+          and: [
+            { slug: { equals: fileSlug } },
+            ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+          ],
+        },
+        locale: 'all',
+        depth: 1,
+        limit: 1,
+      });
+
+      if (crossResult.docs.length > 0) {
+        // Fetch missing exact match by internal id
+        result = await payload.find({
+          collection: 'pages',
+          where: {
+            id: { equals: crossResult.docs[0].id },
+          },
+          locale: locale as any,
+          depth: 1,
+          limit: 1,
+        });
+      }
+    }
+
+    if (result.docs.length > 0) {
+      const doc = result.docs[0];
+
+      return {
+        slug: doc.slug,
+        frontmatter: {
+          title: doc.title,
+          excerpt: doc.excerpt || '',
+          featuredImage:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.sizes?.card?.url || doc.featuredImage.url
+              : null,
+          focalX:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalX
+              : 50,
+          focalY:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalY
+              : 50,
+          layout:
+            doc.layout === 'fullBleed' || doc.layout === 'default'
+              ? doc.layout
+              : ('default' as const),
+        },
+        content: doc.content,
+      };
+    }
+
+    return null;
   } catch (error) {
     console.error(`[Payload] getPageBySlug failed for ${slug}:`, error);
     return null;

lib/products.ts

@@ -18,6 +18,7 @@ export interface ProductData {
   slug: string;
   frontmatter: ProductFrontmatter;
   content: any; // Lexical AST from Payload
+  application?: any; // Lexical AST for Application field
 }
 
 export async function getProductMetadata(
@@ -113,6 +114,7 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
               : 50,
         },
         content: doc.content,
+        application: doc.application,
       };
     }
 
@@ -195,6 +197,7 @@ export async function getAllProducts(locale: string): Promise<ProductData[]> {
               : 50,
         },
         content: null,
+        application: null,
       };
     });
 

lib/services/create-services.server.ts

@@ -65,7 +65,15 @@ export function getServerAppServices(): AppServices {
   }
 
   const errors = config.errors.glitchtip.enabled
-    ? new GlitchtipErrorReportingService({ enabled: true }, logger, notifications)
+    ? new GlitchtipErrorReportingService(
+        {
+          enabled: true,
+          dsn: config.errors.glitchtip.dsn,
+          tracesSampleRate: 1.0, // Server-side we usually want higher visibility
+        },
+        logger,
+        notifications,
+      )
     : new NoopErrorReportingService();
 
   if (config.errors.glitchtip.enabled) {

lib/services/create-services.ts

@@ -69,7 +69,15 @@ export function getAppServices(): AppServices {
 
   // Create error reporting service (GlitchTip/Sentry or no-op)
   const errors = sentryEnabled
-    ? new GlitchtipErrorReportingService({ enabled: true }, logger, notifications)
+    ? new GlitchtipErrorReportingService(
+        {
+          enabled: true,
+          dsn: config.errors.glitchtip.dsn,
+          tracesSampleRate: 0.1, // Default to 10% sampling
+        },
+        logger,
+        notifications,
+      )
     : new NoopErrorReportingService();
 
   if (sentryEnabled) {

lib/services/errors/glitchtip-error-reporting-service.ts

@@ -8,6 +8,8 @@ import type { LoggerService } from '../logging/logger-service';
 
 export type GlitchtipErrorReportingServiceOptions = {
   enabled: boolean;
+  dsn?: string;
+  tracesSampleRate?: number;
 };
 
 // GlitchTip speaks the Sentry protocol; @sentry/nextjs can send to GlitchTip via DSN.
@@ -46,12 +48,12 @@ export class GlitchtipErrorReportingService implements ErrorReportingService {
     if (!this.sentryPromise) {
       this.sentryPromise = import('@sentry/nextjs').then((Sentry) => {
         // Client-side initialization must happen here since sentry.client.config.ts is empty
-        if (typeof window !== 'undefined' && process.env.NODE_ENV === 'production') {
+        if (typeof window !== 'undefined' && this.options.enabled) {
           Sentry.init({
-            dsn: 'https://public@errors.infra.mintel.me/1',
+            dsn: this.options.dsn || 'https://public@errors.infra.mintel.me/1',
             tunnel: '/errors/api/relay',
             enabled: true,
-            tracesSampleRate: 0,
+            tracesSampleRate: this.options.tracesSampleRate ?? 0.1,
             replaysOnErrorSampleRate: 1.0,
             replaysSessionSampleRate: 0.1,
           });

next.config.mjs

@@ -17,6 +17,7 @@ const nextConfig = {
     workerThreads: false,
   },
   reactStrictMode: false,
+  swcMinify: true,
   productionBrowserSourceMaps: false,
   logging: {
     fetches: {
@@ -393,6 +394,7 @@ const nextConfig = {
   },
   images: {
     formats: ['image/webp'],
+    deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
     remotePatterns: [
       {
         protocol: 'https',
@@ -402,6 +404,14 @@ const nextConfig = {
         protocol: 'https',
         hostname: '*.klz-cables.com',
       },
+      {
+        protocol: 'http',
+        hostname: 'klz-cables.com',
+      },
+      {
+        protocol: 'http',
+        hostname: '*.klz-cables.com',
+      },
       {
         protocol: 'http',
         hostname: 'klz.localhost',
@@ -427,6 +437,31 @@ const nextConfig = {
           source: '/de/kontakt',
           destination: '/de/contact',
         },
+        // Safety rewrites for English locale using German slugs (legacy or content errors)
+        {
+          source: '/en/produkte',
+          destination: '/en/products',
+        },
+        {
+          source: '/en/produkte/:path*',
+          destination: '/en/products/:path*',
+        },
+        {
+          source: '/en/kontakt',
+          destination: '/en/contact',
+        },
+        {
+          source: '/en/impressum',
+          destination: '/en/legal-notice',
+        },
+        {
+          source: '/en/datenschutz',
+          destination: '/en/privacy-policy',
+        },
+        {
+          source: '/en/agbs',
+          destination: '/en/terms',
+        },
       ],
       afterFiles: [],
       fallback: [],

package.json

@@ -15,9 +15,6 @@
     "@payloadcms/ui": "^3.77.0",
     "@react-email/components": "^1.0.7",
     "@react-pdf/renderer": "^4.3.2",
-    "@react-three/drei": "^10.7.7",
-    "@react-three/fiber": "^9.5.0",
-    "@react-three/postprocessing": "^3.0.4",
     "@sentry/nextjs": "^10.39.0",
     "@types/recharts": "^2.0.1",
     "axios": "^1.13.5",
@@ -48,7 +45,6 @@
     "sharp": "^0.34.5",
     "svg-to-pdfkit": "^0.1.8",
     "tailwind-merge": "^3.4.0",
-    "three": "^0.183.1",
     "xlsx": "npm:@e965/xlsx@^0.20.3",
     "zod": "3.25.76"
   },
@@ -57,7 +53,7 @@
     "@commitlint/config-conventional": "^20.4.0",
     "@cspell/dict-de-de": "^4.1.2",
     "@lhci/cli": "^0.15.1",
-    "@mintel/eslint-config": "^1.8.21",
+    "@mintel/eslint-config": "1.8.21",
     "@mintel/tsconfig": "^1.8.21",
     "@next/bundle-analyzer": "^16.1.6",
     "@tailwindcss/cli": "^4.1.18",
@@ -115,6 +111,8 @@
     "check:security": "tsx ./scripts/check-security.ts",
     "check:links": "bash ./scripts/check-links.sh",
     "check:assets": "tsx ./scripts/check-broken-assets.ts",
+    "check:forms": "tsx ./scripts/check-forms.ts",
+    "check:apis": "tsx ./scripts/check-apis.ts",
     "pdf:datasheets": "tsx ./scripts/generate-pdf-datasheets.ts",
     "pdf:datasheets:legacy": "tsx ./scripts/generate-pdf-datasheets-pdf-lib.ts",
     "cms:migrate": "payload migrate",
@@ -141,7 +139,7 @@
     "prepare": "husky",
     "preinstall": "npx only-allow pnpm"
   },
-  "version": "2.0.2",
+  "version": "2.2.6",
   "pnpm": {
     "onlyBuiltDependencies": [
       "@parcel/watcher",
@@ -163,4 +161,4 @@
   "peerDependencies": {
     "lucide-react": "^0.563.0"
   }
-}
+}

payload.config.ts

@@ -86,10 +86,14 @@ export default buildConfig({
         transportOptions: {
           host: process.env.MAIL_HOST || 'smtp.eu.mailgun.org',
           port: Number(process.env.MAIL_PORT) || 587,
-          auth: {
-            user: process.env.MAIL_USERNAME,
-            pass: process.env.MAIL_PASSWORD,
-          },
+          ...(process.env.MAIL_USERNAME
+            ? {
+                auth: {
+                  user: process.env.MAIL_USERNAME,
+                  pass: process.env.MAIL_PASSWORD,
+                },
+              }
+            : {}),
         },
       })
     : undefined,

scripts/check-apis.ts

@@ -0,0 +1,119 @@
+import axios from 'axios';
+import dns from 'dns';
+import { promisify } from 'util';
+import url from 'url';
+
+const resolve4 = promisify(dns.resolve4);
+
+// This script verifies that external logging and analytics APIs are reachable
+// from the deployment environment (which could be behind corporate firewalls or VPNs).
+
+const umamiEndpoint = process.env.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me';
+const sentryDsn = process.env.SENTRY_DSN || '';
+
+async function checkUmami() {
+  console.log(`\n🔍 Checking Umami Analytics API Availability...`);
+  console.log(`   Endpoint: ${umamiEndpoint}`);
+
+  try {
+    // Umami usually exposes a /api/heartbeat or /api/health if we know the route.
+    // Trying root or /api/auth/verify (which will give 401 but proves routing works).
+    // A simple GET to the configured endpoint should return a 200 or 401, not a 5xx/timeout.
+    const response = await axios.get(`${umamiEndpoint.replace(/\/$/, '')}/api/health`, {
+      timeout: 5000,
+      validateStatus: () => true, // Accept any status, we just want to know it's reachable and not 5xx
+    });
+
+    // As long as it's not a 502/503/504 Bad Gateway/Timeout, the service is "up" from our perspective
+    if (response.status >= 500) {
+      throw new Error(`Umami API responded with server error HTTP ${response.status}`);
+    }
+
+    console.log(`   ✅ Umami Analytics is reachable (HTTP ${response.status})`);
+    return true;
+  } catch (err: any) {
+    // If /api/health fails completely, maybe try a DNS check as a fallback
+    try {
+      console.warn(`   ⚠️ HTTP check failed, falling back to DNS resolution...`);
+      const umamiHost = new url.URL(umamiEndpoint).hostname;
+      await resolve4(umamiHost);
+      console.log(`   ✅ Umami Analytics DNS resolved successfully (${umamiHost})`);
+      return true;
+    } catch (dnsErr: any) {
+      console.error(
+        `   ❌ CRITICAL: Umami Analytics is completely unreachable! ${err.message} | DNS: ${dnsErr.message}`,
+      );
+      return false;
+    }
+  }
+}
+
+async function checkSentry() {
+  console.log(`\n🔍 Checking Glitchtip/Sentry Error Tracking Availability...`);
+
+  if (!sentryDsn) {
+    console.log(`   ℹ️ No SENTRY_DSN provided in environment. Skipping.`);
+    return true;
+  }
+
+  try {
+    const parsedDsn = new url.URL(sentryDsn);
+    const host = parsedDsn.hostname;
+    console.log(`   Host: ${host}`);
+
+    // We do a DNS lookup to ensure the runner can actually resolve the tracking server
+    const addresses = await resolve4(host);
+
+    if (addresses && addresses.length > 0) {
+      console.log(`   ✅ Glitchtip/Sentry domain resolved: ${addresses[0]}`);
+
+      // Optional: Quick TCP/HTTP check to the host root (Glitchtip usually runs on 80/443 root)
+      try {
+        const proto = parsedDsn.protocol || 'https:';
+        await axios.get(`${proto}//${host}/api/0/`, {
+          timeout: 5000,
+          validateStatus: () => true,
+        });
+        console.log(`   ✅ Glitchtip/Sentry API root responds to HTTP.`);
+      } catch (ignore) {
+        console.log(
+          `   ⚠️ Glitchtip/Sentry HTTP ping failed or timed out, but DNS is valid. Proceeding.`,
+        );
+      }
+
+      return true;
+    }
+    throw new Error('No IP addresses found for DSN host');
+  } catch (err: any) {
+    console.error(
+      `   ❌ CRITICAL: Glitchtip/Sentry DSN is invalid or hostname is unresolvable! ${err.message}`,
+    );
+    return false;
+  }
+}
+
+async function main() {
+  console.log('🚀 Starting External API Connectivity Smoke Test...');
+
+  let hasErrors = false;
+
+  const umamiOk = await checkUmami();
+  if (!umamiOk) hasErrors = true;
+
+  const sentryOk = await checkSentry();
+  if (!sentryOk) hasErrors = true;
+
+  if (hasErrors) {
+    console.error(
+      `\n🚨 POST-DEPLOY CHECK FAILED: One or more critical external APIs are unreachable.`,
+    );
+    console.error(`   This might mean the deployment environment lacks outbound internet access, `);
+    console.error(`   DNS is misconfigured, or the upstream services are down.`);
+    process.exit(1);
+  }
+
+  console.log(`\n🎉 SUCCESS: All required external APIs are reachable!`);
+  process.exit(0);
+}
+
+main();

scripts/check-forms.ts

@@ -0,0 +1,212 @@
+import puppeteer, { HTTPResponse } from 'puppeteer';
+import axios from 'axios';
+import * as cheerio from 'cheerio';
+
+const targetUrl = process.argv[2] || process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
+const gatekeeperPassword = process.env.GATEKEEPER_PASSWORD || 'klz2026';
+
+async function main() {
+  console.log(`\n🚀 Starting E2E Form Submission Check for: ${targetUrl}`);
+
+  // 1. Fetch Sitemap to discover the contact page and a product page
+  const sitemapUrl = `${targetUrl.replace(/\/$/, '')}/sitemap.xml`;
+  let urls: string[] = [];
+
+  try {
+    console.log(`📥 Fetching sitemap from ${sitemapUrl}...`);
+    const response = await axios.get(sitemapUrl, {
+      headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
+    });
+
+    const $ = cheerio.load(response.data, { xmlMode: true });
+    urls = $('url loc')
+      .map((i, el) => $(el).text())
+      .get();
+
+    // Normalize to target URL instance
+    const urlPattern = /https?:\/\/[^\/]+/;
+    urls = [...new Set(urls)]
+      .filter((u) => u.startsWith('http'))
+      .map((u) => u.replace(urlPattern, targetUrl.replace(/\/$/, '')))
+      .sort();
+  } catch (err: any) {
+    console.error(`❌ Failed to fetch sitemap: ${err.message}`);
+    process.exit(1);
+  }
+
+  const contactUrl = urls.find((u) => u.includes('/de/kontakt'));
+  // Ensure we select an actual product page (depth >= 7: http://host/de/produkte/category/product)
+  const productUrl = urls.find(
+    (u) =>
+      u.includes('/de/produkte/') && new URL(u).pathname.split('/').filter(Boolean).length >= 4,
+  );
+
+  if (!contactUrl) {
+    console.error(`❌ Could not find contact page in sitemap. Ensure /de/kontakt exists.`);
+    process.exit(1);
+  }
+
+  if (!productUrl) {
+    console.error(
+      `❌ Could not find a product page in sitemap. Form testing requires at least one product page.`,
+    );
+    process.exit(1);
+  }
+
+  console.log(`✅ Discovered Contact Page: ${contactUrl}`);
+  console.log(`✅ Discovered Product Page: ${productUrl}`);
+
+  // 2. Launch Headless Browser
+  console.log(`\n🕷️ Launching Puppeteer Headless Engine...`);
+  const browser = await puppeteer.launch({
+    headless: true,
+    executablePath: process.env.PUPPETEER_EXECUTABLE_PATH || process.env.CHROME_PATH || undefined,
+    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+  });
+
+  const page = await browser.newPage();
+
+  // 3. Authenticate through Gatekeeper login form
+  console.log(`\n🛡️ Authenticating through Gatekeeper...`);
+  try {
+    // Navigate to a protected page so Gatekeeper redirects us to the login screen
+    await page.goto(contactUrl, { waitUntil: 'networkidle0', timeout: 30000 });
+
+    // Check if we landed on the Gatekeeper login page
+    const isGatekeeperPage = await page.$('input[name="password"]');
+    if (isGatekeeperPage) {
+      await page.type('input[name="password"]', gatekeeperPassword);
+      await Promise.all([
+        page.waitForNavigation({ waitUntil: 'networkidle0', timeout: 30000 }),
+        page.click('button[type="submit"]'),
+      ]);
+      console.log(`✅ Gatekeeper authentication successful!`);
+    } else {
+      console.log(`✅ Already authenticated (no Gatekeeper gate detected).`);
+    }
+  } catch (err: any) {
+    console.error(`❌ Gatekeeper authentication failed: ${err.message}`);
+    await browser.close();
+    process.exit(1);
+  }
+
+  let hasErrors = false;
+
+  // 4. Test Contact Form
+  try {
+    console.log(`\n🧪 Testing Contact Form on: ${contactUrl}`);
+    await page.goto(contactUrl, { waitUntil: 'networkidle0', timeout: 30000 });
+
+    // Ensure React has hydrated completely
+    await page.waitForNetworkIdle({ idleTime: 1000, timeout: 15000 }).catch(() => {});
+
+    // Ensure form is visible and interactive
+    try {
+      // Find the form input by name
+      await page.waitForSelector('input[name="name"]', { visible: true, timeout: 15000 });
+    } catch (e) {
+      console.error('Failed to find Contact Form input. Page Title:', await page.title());
+      throw e;
+    }
+
+    // Fill form fields
+    await page.type('input[name="name"]', 'Automated E2E Test');
+    await page.type('input[name="email"]', 'testing@mintel.me');
+    await page.type(
+      'textarea[name="message"]',
+      'This is an automated test verifying the contact form submission.',
+    );
+
+    console.log(`   Submitting Contact Form...`);
+
+    // Explicitly click submit and wait for navigation/state-change
+    await Promise.all([
+      page.waitForSelector('[role="alert"][aria-live="polite"]', { timeout: 15000 }),
+      page.click('button[type="submit"]'),
+    ]);
+
+    console.log(`✅ Contact Form submitted successfully! (Success state verified)`);
+  } catch (err: any) {
+    console.error(`❌ Contact Form Test Failed: ${err.message}`);
+    hasErrors = true;
+  }
+
+  // 4. Test Product Quote Form
+  try {
+    console.log(`\n🧪 Testing Product Quote Form on: ${productUrl}`);
+    await page.goto(productUrl, { waitUntil: 'networkidle0', timeout: 30000 });
+
+    // Ensure React has hydrated completely
+    await page.waitForNetworkIdle({ idleTime: 1000, timeout: 15000 }).catch(() => {});
+
+    // The product form uses dynamic IDs, so we select by input type in the specific form context
+    try {
+      await page.waitForSelector('form input[type="email"]', { visible: true, timeout: 15000 });
+    } catch (e) {
+      console.error('Failed to find Product Quote Form input. Page Title:', await page.title());
+      throw e;
+    }
+
+    // In RequestQuoteForm, the email input is type="email" and message is a textarea.
+    await page.type('form input[type="email"]', 'testing@mintel.me');
+    await page.type(
+      'form textarea',
+      'Automated request for product quote via E2E testing framework.',
+    );
+
+    console.log(`   Submitting Product Quote Form...`);
+
+    // Submit and wait for success state
+    await Promise.all([
+      page.waitForSelector('[role="alert"][aria-live="polite"]', { timeout: 15000 }),
+      page.click('form button[type="submit"]'),
+    ]);
+
+    console.log(`✅ Product Quote Form submitted successfully! (Success state verified)`);
+  } catch (err: any) {
+    console.error(`❌ Product Quote Form Test Failed: ${err.message}`);
+    hasErrors = true;
+  }
+
+  // 5. Cleanup: Delete test submissions from Payload CMS
+  console.log(`\n🧹 Starting cleanup of test submissions...`);
+  try {
+    const apiUrl = `${targetUrl.replace(/\/$/, '')}/api/form-submissions`;
+    const searchUrl = `${apiUrl}?where[email][equals]=testing@mintel.me`;
+
+    // Fetch test submissions
+    const searchResponse = await axios.get(searchUrl, {
+      headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
+    });
+
+    const testSubmissions = searchResponse.data.docs || [];
+    console.log(`   Found ${testSubmissions.length} test submissions to clean up.`);
+
+    for (const doc of testSubmissions) {
+      try {
+        await axios.delete(`${apiUrl}/${doc.id}`, {
+          headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
+        });
+        console.log(`   ✅ Deleted submission: ${doc.id}`);
+      } catch (delErr: any) {
+        console.error(`   ❌ Failed to delete submission ${doc.id}: ${delErr.message}`);
+      }
+    }
+  } catch (err: any) {
+    console.error(`❌ Cleanup failed: ${err.message}`);
+    // Don't mark the whole test as failed just because cleanup failed
+  }
+
+  await browser.close();
+
+  // 6. Evaluation
+  if (hasErrors) {
+    console.error(`\n🚨 IMPORTANT: Form E2E checks failed. The CI build is failing.`);
+    process.exit(1);
+  } else {
+    console.log(`\n🎉 SUCCESS: All form submissions arrived and handled correctly!`);
+    process.exit(0);
+  }
+}
+
+main();

scripts/check-html.ts

@@ -50,7 +50,12 @@ async function main() {
           headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
           validateStatus: (status) => status < 400,
         });
-        const filename = `page-${i}.html`;
+
+        // Generate a safe filename that retains URL information
+        const urlStr = new URL(u);
+        const safePath = (urlStr.pathname + urlStr.search).replace(/[^a-zA-Z0-9]/g, '_');
+        const filename = `${safePath || 'index'}.html`;
+
         fs.writeFileSync(path.join(outputDir, filename), res.data);
       } catch (err: any) {
         console.error(`❌ HTTP Error fetching ${u}: ${err.message}`);

tests/og-image.test.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeAll } from 'vitest';
 
-const BASE_URL = process.env.TEST_URL || process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
+const BASE_URL =
+  process.env.TEST_URL || process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
 
 describe('OG Image Generation', () => {
   const locales = ['de', 'en'];
@@ -18,7 +19,9 @@ describe('OG Image Generation', () => {
           return;
         }
       }
-      console.log(`\n⚠️  KLZ Application not detected at ${BASE_URL}. Skipping integration tests.\n`);
+      console.log(
+        `\n⚠️  KLZ Application not detected at ${BASE_URL}. Skipping integration tests.\n`,
+      );
     } catch (e) {
       isServerUp = false;
     }
@@ -34,7 +37,7 @@ describe('OG Image Generation', () => {
     // Check for PNG signature: 89 50 4E 47 0D 0A 1A 0A
     expect(bytes[0]).toBe(0x89);
     expect(bytes[1]).toBe(0x50);
-    expect(bytes[2]).toBe(0x4E);
+    expect(bytes[2]).toBe(0x4e);
     expect(bytes[3]).toBe(0x47);
 
     // Check that the image is not empty and has a reasonable size
@@ -49,7 +52,9 @@ describe('OG Image Generation', () => {
       await verifyImageResponse(response);
     }, 30000);
 
-    it(`should generate product OG image for ${locale} with slug ${productSlugs[0]}`, async ({ skip }) => {
+    it(`should generate product OG image for ${locale} with slug ${productSlugs[0]}`, async ({
+      skip,
+    }) => {
       if (!isServerUp) skip();
       const url = `${BASE_URL}/${locale}/api/og/product?slug=${productSlugs[0]}`;
       const response = await fetch(url);
@@ -64,11 +69,26 @@ describe('OG Image Generation', () => {
     }, 30000);
   });
 
-  it('should generate blog OG image', async ({ skip }) => {
+  it('should generate static blog overview OG image', async ({ skip }) => {
     if (!isServerUp) skip();
     const url = `${BASE_URL}/de/blog/opengraph-image`;
     const response = await fetch(url);
     await verifyImageResponse(response);
   }, 30000);
-});
 
+  it('should generate dynamic blog post OG image', async ({ skip }) => {
+    if (!isServerUp) skip();
+    // Assuming 'hello-world' or a newly created post slug.
+    // If it 404s, it still tests the routing, though 200 is expected for an actual post.
+    const url = `${BASE_URL}/de/blog/hello-world/opengraph-image`;
+    const response = await fetch(url);
+    // Even if the post "hello-world" doesn't exist and returns 404 in some environments,
+    // we should at least check it doesn't 500. We'll accept 200 or 404 as valid "working" states
+    // vs a 500 compilation/satori error.
+    expect([200, 404]).toContain(response.status);
+
+    if (response.status === 200) {
+      await verifyImageResponse(response);
+    }
+  }, 30000);
+});