Merge branch 'feature/excel' into feature-ai-search, resolve conflicts

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

@@ -2,7 +2,7 @@ import { notFound, redirect } from 'next/navigation';
 import { Container, Badge, Heading } from '@/components/ui';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
-import { getPageBySlug, getAllPages } from '@/lib/pages';
+import { getPageBySlug } from '@/lib/pages';
 import { mapSlugToFileSlug, mapFileSlugToTranslated } from '@/lib/slugs';
 import PayloadRichText from '@/components/PayloadRichText';
 import { SITE_URL } from '@/lib/schema';

app/[locale]/blog/page.tsx

@@ -14,7 +14,7 @@ interface BlogIndexProps {
   }>;
 }
 
-export async function generateMetadata({ params }: BlogIndexProps) {
+export async function generateMetadata({ params }: BlogIndexProps): Promise<Metadata> {
   const { locale } = await params;
   const t = await getTranslations({ locale, namespace: 'Blog.meta' });
   return {

app/[locale]/contact/page.tsx

@@ -5,7 +5,7 @@ import { Container, Heading, Section } from '@/components/ui';
 import { Metadata } from 'next';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { SITE_URL } from '@/lib/schema';
-import { getOGImageMetadata } from '@/lib/metadata';
+
 import { Suspense } from 'react';
 import ContactMap from '@/components/ContactMap';
 import ObfuscatedEmail from '@/components/ObfuscatedEmail';

app/[locale]/layout.tsx

@@ -7,10 +7,8 @@ import AnalyticsShell from '@/components/analytics/AnalyticsShell';
 import { Metadata, Viewport } from 'next';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
-import { Suspense } from 'react';
 import '../../styles/globals.css';
 import { SITE_URL } from '@/lib/schema';
-import { config } from '@/lib/config';
 import FeedbackClientWrapper from '@/components/FeedbackClientWrapper';
 import { setRequestLocale } from 'next-intl/server';
 import { Inter } from 'next/font/google';
@@ -61,6 +59,7 @@ export const viewport: Viewport = {
   themeColor: '#001a4d',
 };
 
+import AutoBrochureModal from '@/components/AutoBrochureModal';
 export default async function Layout(props: {
   children: React.ReactNode;
   params: Promise<{ locale: string }>;
@@ -77,7 +76,7 @@ export default async function Layout(props: {
   let messages: Record<string, any> = {};
   try {
     messages = await getMessages();
-  } catch (error) {
+  } catch {
     messages = {};
   }
 
@@ -91,6 +90,7 @@ export default async function Layout(props: {
     'Home',
     'Error',
     'StandardPage',
+    'Brochure',
   ];
   const clientMessages: Record<string, any> = {};
   for (const key of clientKeys) {
@@ -160,6 +160,8 @@ export default async function Layout(props: {
 
           <AnalyticsShell />
           <FeedbackClientWrapper feedbackEnabled={feedbackEnabled} />
+
+          <AutoBrochureModal />
         </NextIntlClientProvider>
       </body>
     </html>

app/[locale]/not-found.tsx

@@ -72,7 +72,7 @@ export default async function NotFound() {
           }
           suggestedUrl = '/' + pathParts.join('/');
         }
-      } catch (e) {
+      } catch {
         // Ignore Payload errors in 404
       }
     }

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

@@ -1,12 +1,11 @@
 import JsonLd from '@/components/JsonLd';
 import { SITE_URL } from '@/lib/schema';
 import ProductSidebar from '@/components/ProductSidebar';
-import ProductTabs from '@/components/ProductTabs';
-import ProductTechnicalData from '@/components/ProductTechnicalData';
+import ExcelDownload from '@/components/ExcelDownload';
 import RelatedProducts from '@/components/RelatedProducts';
 import DatasheetDownload from '@/components/DatasheetDownload';
 import { Badge, Card, Container, Heading, Section } from '@/components/ui';
-import { getDatasheetPath } from '@/lib/datasheets';
+import { getDatasheetPath, getExcelDatasheetPath } from '@/lib/datasheets';
 import { getAllProducts, getProductBySlug } from '@/lib/products';
 import { mapFileSlugToTranslated, mapSlugToFileSlug } from '@/lib/slugs';
 import { Metadata } from 'next';
@@ -278,6 +277,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
   }
 
   const datasheetPath = getDatasheetPath(productSlug, locale);
+  const excelPath = getExcelDatasheetPath(productSlug, locale);
   const isFallback = (product.frontmatter as any).isFallback;
   const categorySlug = slug[0];
   const categoryFileSlug = await mapSlugToFileSlug(categorySlug, locale);
@@ -343,6 +343,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
       productName={product.frontmatter.title}
       productImage={product.frontmatter.images?.[0]}
       datasheetPath={datasheetPath}
+      excelPath={excelPath}
     />
   );
 
@@ -496,7 +497,15 @@ export default async function ProductPage({ params }: ProductPageProps) {
                   </h2>
                   <div className="h-1.5 w-24 bg-accent rounded-full" />
                 </div>
-                <DatasheetDownload datasheetPath={datasheetPath} />
+                <div className="flex flex-row flex-wrap items-center gap-4 max-w-2xl">
+                  <DatasheetDownload
+                    datasheetPath={datasheetPath}
+                    className="mt-0 w-full sm:w-auto"
+                  />
+                  {excelPath && (
+                    <ExcelDownload excelPath={excelPath} className="mt-0 w-full sm:w-auto" />
+                  )}
+                </div>
               </div>
             )}
 

app/[locale]/team/page.tsx

@@ -2,7 +2,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
 import JsonLd from '@/components/JsonLd';
 import { getBreadcrumbSchema, SITE_URL } from '@/lib/schema';
-import { Section, Container, Heading, Badge, Button } from '@/components/ui';
+import { Section, Container, Heading, Badge } from '@/components/ui';
 import Image from 'next/image';
 import Reveal from '@/components/Reveal';
 import Gallery from '@/components/team/Gallery';

app/actions/brochure.ts

@@ -0,0 +1,123 @@
+'use server';
+
+import { getServerAppServices } from '@/lib/services/create-services.server';
+
+export async function requestBrochureAction(formData: FormData) {
+  const services = getServerAppServices();
+  const logger = services.logger.child({ action: 'requestBrochureAction' });
+
+  const { headers } = await import('next/headers');
+  const requestHeaders = await headers();
+
+  if ('setServerContext' in services.analytics) {
+    (services.analytics as any).setServerContext({
+      userAgent: requestHeaders.get('user-agent') || undefined,
+      language: requestHeaders.get('accept-language')?.split(',')[0] || undefined,
+      referrer: requestHeaders.get('referer') || undefined,
+      ip: requestHeaders.get('x-forwarded-for')?.split(',')[0] || undefined,
+    });
+  }
+
+  services.analytics.track('brochure-request-attempt');
+
+  const email = formData.get('email') as string;
+  const locale = (formData.get('locale') as string) || 'en';
+
+  // Anti-spam Honeypot Check
+  const honeypot = formData.get('company_website') as string;
+  if (honeypot) {
+    logger.warn('Spam detected via honeypot in brochure request', { email });
+    // Silently succeed to fool the bot without doing actual work
+    return { success: true };
+  }
+
+  if (!email) {
+    logger.warn('Missing email in brochure request');
+    return { success: false, error: 'Missing email address' };
+  }
+
+  // Basic email validation
+  if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+    return { success: false, error: 'Invalid email address' };
+  }
+
+  // 1. Save to CMS
+  try {
+    const { getPayload } = await import('payload');
+    const configPromise = (await import('@payload-config')).default;
+    const payload = await getPayload({ config: configPromise });
+
+    await payload.create({
+      collection: 'form-submissions',
+      data: {
+        name: email.split('@')[0],
+        email,
+        message: `Brochure download request (${locale})`,
+        type: 'brochure_download' as any,
+      },
+      overrideAccess: true,
+    });
+
+    logger.info('Successfully saved brochure request to Payload CMS', { email });
+  } catch (error) {
+    logger.error('Failed to store brochure request in Payload CMS', { error });
+    services.errors.captureException(error, { action: 'payload_store_brochure_request' });
+  }
+
+  // 2. Notify via Gotify
+  try {
+    await services.notifications.notify({
+      title: '📑 Brochure Download Request',
+      message: `New brochure download request from ${email} (${locale})`,
+      priority: 3,
+    });
+  } catch (error) {
+    logger.error('Failed to send notification', { error });
+  }
+
+  // 3. Send Brochure via Email
+  const brochureUrl = `https://klz-cables.com/brochure/klz-product-catalog-${locale}.pdf`;
+
+  try {
+    const { sendEmail } = await import('@/lib/mail/mailer');
+    const { render } = await import('@mintel/mail');
+    const React = await import('react');
+    const { BrochureDeliveryEmail } = await import('@/components/emails/BrochureDeliveryEmail');
+
+    const html = await render(
+      React.createElement(BrochureDeliveryEmail, {
+        _email: email,
+        brochureUrl,
+        locale: locale as 'en' | 'de',
+      }),
+    );
+
+    const emailResult = await sendEmail({
+      to: email,
+      subject: locale === 'de' ? 'Ihr KLZ Kabelkatalog' : 'Your KLZ Cable Catalog',
+      html,
+    });
+
+    if (emailResult.success) {
+      logger.info('Brochure email sent successfully', { email });
+    } else {
+      logger.error('Failed to send brochure email', { error: emailResult.error, email });
+      services.errors.captureException(new Error(`Brochure email failed: ${emailResult.error}`), {
+        action: 'requestBrochureAction_email',
+        email,
+      });
+      return { success: false, error: 'Failed to send email. Please try again later.' };
+    }
+  } catch (error) {
+    logger.error('Exception while sending brochure email', { error });
+    return { success: false, error: 'Failed to send email. Please try again later.' };
+  }
+
+  // 4. Track success
+  services.analytics.track('brochure-request-success', {
+    locale,
+    delivery_method: 'email',
+  });
+
+  return { success: true };
+}

app/actions/contact.ts

@@ -25,6 +25,14 @@ export async function sendContactFormAction(formData: FormData) {
   // Track attempt
   services.analytics.track('contact-form-attempt');
 
+  // Anti-spam Honeypot Check
+  const honeypot = formData.get('company_website') as string;
+  if (honeypot) {
+    logger.warn('Spam detected via honeypot in contact request', { email: formData.get('email') });
+    // Silently succeed to fool the bot without doing actual work
+    return { success: true };
+  }
+
   const name = formData.get('name') as string;
   const email = formData.get('email') as string;
   const message = formData.get('message') as string;
@@ -54,6 +62,7 @@ export async function sendContactFormAction(formData: FormData) {
         type: productName ? 'product_quote' : 'contact',
         productName: productName || undefined,
       },
+      overrideAccess: true,
     });
 
     logger.info('Successfully saved form submission to Payload CMS', {

app/api/health/cms/route.ts

@@ -16,6 +16,14 @@ export async function GET() {
     const payload = await getPayload({ config: configPromise });
     checks.init = 'ok';
 
+    // Ensure migrations are applied on startup (reliable for standalone builds)
+    try {
+      await payload.db.migrate();
+    } catch (e: any) {
+      console.error('Migration failed:', e.message);
+      // We continue to check the collections even if migration fails
+    }
+
     // Verify each collection can be queried (catches missing locale tables, broken migrations)
     const collections = ['posts', 'products', 'pages', 'media'] as const;
     for (const collection of collections) {

app/api/pages/[slug]/pdf/route.tsx

@@ -0,0 +1,64 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getPayload } from 'payload';
+import configPromise from '@payload-config';
+import { renderToStream } from '@react-pdf/renderer';
+import React from 'react';
+import { PDFPage } from '@/lib/pdf-page';
+
+export async function GET(req: NextRequest, { params }: { params: Promise<{ slug: string }> }) {
+  try {
+    const { slug } = await params;
+
+    // Get Payload App
+    const payload = await getPayload({ config: configPromise });
+
+    // Fetch the page
+    const pages = await payload.find({
+      collection: 'pages',
+      where: {
+        slug: { equals: slug },
+        _status: { equals: 'published' },
+      },
+      limit: 1,
+    });
+
+    if (pages.totalDocs === 0) {
+      return new NextResponse('Page not found', { status: 404 });
+    }
+
+    const page = pages.docs[0];
+
+    // Determine locale from searchParams or default to 'de'
+    const searchParams = req.nextUrl.searchParams;
+    const locale = (searchParams.get('locale') as 'en' | 'de') || 'de';
+
+    // Render the React-PDF document into a stream
+    const stream = await renderToStream(<PDFPage page={page} locale={locale} />);
+
+    // Pipe the Node.js Readable stream into a valid fetch/Web Response stream
+    const body = new ReadableStream({
+      start(controller) {
+        stream.on('data', (chunk) => controller.enqueue(chunk));
+        stream.on('end', () => controller.close());
+        stream.on('error', (err) => controller.error(err));
+      },
+      cancel() {
+        (stream as any).destroy?.();
+      },
+    });
+
+    const filename = `${slug}.pdf`;
+
+    return new NextResponse(body, {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/pdf',
+        'Content-Disposition': `attachment; filename="${filename}"`,
+        // Cache control if needed, skip for now.
+      },
+    });
+  } catch (error) {
+    console.error('Error generating PDF:', error);
+    return new NextResponse('Internal Server Error', { status: 500 });
+  }
+}