chore: resolve merge conflict in deploy workflow and sync docker-compose

lib/config.ts

@@ -57,6 +57,13 @@ function createConfig() {
       from: env.MAIL_FROM,
       recipients: env.MAIL_RECIPIENTS,
     },
+    directus: {
+      url: env.DIRECTUS_URL,
+      adminEmail: env.DIRECTUS_ADMIN_EMAIL,
+      password: env.DIRECTUS_ADMIN_PASSWORD,
+      token: env.DIRECTUS_API_TOKEN,
+      proxyPath: '/cms',
+    },
   } as const;
 }
 
@@ -86,6 +93,7 @@ export const config = {
   get cache() { return getConfig().cache; },
   get logging() { return getConfig().logging; },
   get mail() { return getConfig().mail; },
+  get directus() { return getConfig().directus; },
 };
 
 /**
@@ -124,5 +132,11 @@ export function getMaskedConfig() {
       from: c.mail.from,
       recipients: c.mail.recipients,
     },
+    directus: {
+      url: c.directus.url,
+      adminEmail: mask(c.directus.adminEmail),
+      password: mask(c.directus.password),
+      token: mask(c.directus.token),
+    },
   };
 }

lib/directus.ts

@@ -0,0 +1,92 @@
+import { createDirectus, rest, authentication, readItems } from '@directus/sdk';
+import { config } from './config';
+
+const { url, adminEmail, password, token, proxyPath } = config.directus;
+
+const client = createDirectus(url)
+    .with(rest())
+    .with(authentication());
+
+export async function ensureAuthenticated() {
+    if (token) {
+        client.setToken(token);
+        return;
+    }
+    if (adminEmail && password) {
+        try {
+            await client.login(adminEmail, password);
+        } catch (e) {
+            console.error("Failed to authenticate with Directus:", e);
+        }
+    }
+}
+
+/**
+ * Maps the new translation-based schema back to the application's Product interface
+ */
+function mapDirectusProduct(item: any, locale: string): any {
+    const langCode = locale === 'en' ? 'en-US' : 'de-DE';
+    const translation = item.translations?.find((t: any) => t.languages_code === langCode) || item.translations?.[0] || {};
+
+    return {
+        id: item.id,
+        sku: item.sku,
+        title: translation.name || '',
+        description: translation.description || '',
+        content: translation.content || '',
+        technicalData: {
+            technicalItems: translation.technical_items || [],
+            voltageTables: translation.voltage_tables || []
+        },
+        locale: locale,
+        // Use proxy URL for assets to avoid CORS and handle internal/external issues
+        data_sheet_url: item.data_sheet ? `${proxyPath}/assets/${item.data_sheet}` : null,
+        categories: (item.categories_link || []).map((c: any) => c.categories_id?.translations?.[0]?.name).filter(Boolean)
+    };
+}
+
+export async function getProducts(locale: string = 'de') {
+    await ensureAuthenticated();
+    try {
+        const items = await client.request(readItems('products', {
+            fields: [
+                '*',
+                'translations.*',
+                'categories_link.categories_id.translations.name'
+            ]
+        }));
+        return items.map(item => mapDirectusProduct(item, locale));
+    } catch (error) {
+        console.error('Error fetching products:', error);
+        return [];
+    }
+}
+
+export async function getProductBySlug(slug: string, locale: string = 'de') {
+    await ensureAuthenticated();
+    const langCode = locale === 'en' ? 'en-US' : 'de-DE';
+    try {
+        const items = await client.request(readItems('products', {
+            filter: {
+                translations: {
+                    slug: { _eq: slug },
+                    languages_code: { _eq: langCode }
+                }
+            },
+            fields: [
+                '*',
+                'translations.*',
+                'categories_link.categories_id.translations.name'
+            ],
+            limit: 1
+        }));
+
+        if (!items || items.length === 0) return null;
+        return mapDirectusProduct(items[0], locale);
+    } catch (error) {
+        console.error(`Error fetching product ${slug}:`, error);
+        return null;
+    }
+}
+
+export default client;

lib/env.ts

@@ -11,17 +11,17 @@ const preprocessEmptyString = (val: unknown) => (val === '' ? undefined : val);
 export const envSchema = z.object({
   NODE_ENV: z.enum(['development', 'production', 'test']).default('development'),
   NEXT_PUBLIC_BASE_URL: z.preprocess(preprocessEmptyString, z.string().url()),
-  
+
   // Analytics
   NEXT_PUBLIC_UMAMI_WEBSITE_ID: z.preprocess(preprocessEmptyString, z.string().optional()),
   NEXT_PUBLIC_UMAMI_SCRIPT_URL: z.preprocess(preprocessEmptyString, z.string().url().default('https://analytics.infra.mintel.me/script.js')),
-  
+
   // Error Tracking
   SENTRY_DSN: z.preprocess(preprocessEmptyString, z.string().optional()),
-  
+
   // Logging
   LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).default('info'),
-  
+
   // Mail
   MAIL_HOST: z.preprocess(preprocessEmptyString, z.string().optional()),
   MAIL_PORT: z.preprocess(preprocessEmptyString, z.coerce.number().default(587)),
@@ -32,6 +32,12 @@ export const envSchema = z.object({
     (val) => (typeof val === 'string' ? val.split(',').filter(Boolean) : val),
     z.array(z.string()).default([])
   ),
+
+  // Directus
+  DIRECTUS_URL: z.preprocess(preprocessEmptyString, z.string().url().default('http://localhost:8055')),
+  DIRECTUS_ADMIN_EMAIL: z.preprocess(preprocessEmptyString, z.string().optional()),
+  DIRECTUS_ADMIN_PASSWORD: z.preprocess(preprocessEmptyString, z.string().optional()),
+  DIRECTUS_API_TOKEN: z.preprocess(preprocessEmptyString, z.string().optional()),
 });
 
 export type Env = z.infer<typeof envSchema>;
@@ -54,5 +60,9 @@ export function getRawEnv() {
     MAIL_PASSWORD: process.env.MAIL_PASSWORD,
     MAIL_FROM: process.env.MAIL_FROM,
     MAIL_RECIPIENTS: process.env.MAIL_RECIPIENTS,
+    DIRECTUS_URL: process.env.DIRECTUS_URL,
+    DIRECTUS_ADMIN_EMAIL: process.env.DIRECTUS_ADMIN_EMAIL,
+    DIRECTUS_ADMIN_PASSWORD: process.env.DIRECTUS_ADMIN_PASSWORD,
+    DIRECTUS_API_TOKEN: process.env.DIRECTUS_API_TOKEN,
   };
 }

lib/strapi.ts

@@ -0,0 +1,85 @@
+import axios from 'axios';
+
+const STRAPI_URL = process.env.STRAPI_URL || 'http://localhost:1337';
+const STRAPI_TOKEN = process.env.STRAPI_API_TOKEN;
+
+const strapi = axios.create({
+  baseURL: `${STRAPI_URL}/api`,
+  headers: {
+    Authorization: `Bearer ${STRAPI_TOKEN}`,
+  },
+});
+
+export interface StrapiResponse<T> {
+  data: {
+    id: number;
+    attributes: T;
+  }[];
+  meta: {
+    pagination: {
+      page: number;
+      pageSize: number;
+      pageCount: number;
+      total: number;
+    };
+  };
+}
+
+export interface Product {
+  title: string;
+  sku: string;
+  description: string;
+  application: string;
+  content: string;
+  technicalData: any;
+  locale: string;
+  images?: {
+    data: {
+      attributes: {
+        url: string;
+        alternativeText: string;
+      };
+    }[];
+  };
+}
+
+export async function getProducts(locale: string = 'de') {
+  try {
+    const response = await strapi.get<StrapiResponse<Product>>('/products', {
+      params: {
+        locale,
+        populate: '*',
+      },
+    });
+    return response.data.data.map(item => ({
+      id: item.id,
+      ...item.attributes,
+    }));
+  } catch (error) {
+    console.error('Error fetching products from Strapi:', error);
+    return [];
+  }
+}
+
+export async function getProductBySku(sku: string, locale: string = 'de') {
+  try {
+    const response = await strapi.get<StrapiResponse<Product>>('/products', {
+      params: {
+        filters: { sku: { $eq: sku } },
+        locale,
+        populate: '*',
+      },
+    });
+    if (response.data.data.length === 0) return null;
+    const item = response.data.data[0];
+    return {
+      id: item.id,
+      ...item.attributes,
+    };
+  } catch (error) {
+    console.error(`Error fetching product ${sku} from Strapi:`, error);
+    return null;
+  }
+}
+
+export default strapi;