Compare commits
7 Commits
9054c8d2fd
...
live
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66a1efd87b | ||
|
|
2c0b7aa84d | ||
|
|
a56377a1fd | ||
|
|
468eb1c3ae | ||
|
|
e699a8003f | ||
|
|
b5256d6597 | ||
|
|
18c528302d |
1
docs/README.md
Normal file
1
docs/README.md
Normal file
@@ -0,0 +1 @@
|
||||
src/components/MainPageLayout.js is the Main gues homepage.
|
||||
@@ -6,6 +6,30 @@ import babelParser from '@babel/eslint-parser';
|
||||
|
||||
export default [
|
||||
js.configs.recommended,
|
||||
{
|
||||
files: ['**/*.cjs'],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2022,
|
||||
sourceType: 'commonjs',
|
||||
globals: {
|
||||
...globals.node,
|
||||
},
|
||||
},
|
||||
rules: {
|
||||
'no-unused-vars': 'warn',
|
||||
//'no-console': 'warn',
|
||||
'no-debugger': 'warn',
|
||||
'no-alert': 'warn',
|
||||
'no-unused-expressions': 'warn',
|
||||
'no-var': 'warn',
|
||||
'prefer-const': 'warn',
|
||||
'no-trailing-spaces': 'warn',
|
||||
'eqeqeq': ['warn', 'always'],
|
||||
'no-empty': 'warn',
|
||||
'no-eval': 'warn',
|
||||
'no-script-url': 'warn',
|
||||
},
|
||||
},
|
||||
{
|
||||
files: ['**/*.{js,jsx}'],
|
||||
languageOptions: {
|
||||
|
||||
10
package-lock.json
generated
10
package-lock.json
generated
@@ -11,6 +11,7 @@
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.0",
|
||||
"@fontsource-variable/outfit": "^5.2.8",
|
||||
"@mui/icons-material": "^7.1.1",
|
||||
"@mui/material": "^7.1.1",
|
||||
"@stripe/react-stripe-js": "^3.7.0",
|
||||
@@ -2222,6 +2223,15 @@
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@fontsource-variable/outfit": {
|
||||
"version": "5.2.8",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource-variable/outfit/-/outfit-5.2.8.tgz",
|
||||
"integrity": "sha512-4oUDCZx/Tcz6HZP423w/niqEH31Gks5IsqHV2ZZz1qKHaVIZdj2f0/S1IK2n8jl6Xo0o3N+3RjNHlV9R73ozQA==",
|
||||
"license": "OFL-1.1",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ayuhito"
|
||||
}
|
||||
},
|
||||
"node_modules/@humanfs/core": {
|
||||
"version": "0.19.1",
|
||||
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.0",
|
||||
"@fontsource-variable/outfit": "^5.2.8",
|
||||
"@mui/icons-material": "^7.1.1",
|
||||
"@mui/material": "^7.1.1",
|
||||
"@stripe/react-stripe-js": "^3.7.0",
|
||||
|
||||
@@ -131,6 +131,8 @@ const {
|
||||
generateHomepageJsonLd,
|
||||
generateSitemapJsonLd,
|
||||
generateKonfiguratorMetaTags,
|
||||
generateHerstellerMetaTags,
|
||||
generateHerstellerJsonLd,
|
||||
generateXmlSitemap,
|
||||
generateRobotsTxt,
|
||||
generateProductsXml,
|
||||
@@ -142,6 +144,7 @@ const {
|
||||
const {
|
||||
fetchCategoryProducts,
|
||||
fetchProductDetails,
|
||||
fetchManufacturers,
|
||||
saveProductImages,
|
||||
saveCategoryImages,
|
||||
} = require("./prerender/data-fetching.cjs");
|
||||
@@ -161,6 +164,7 @@ const Widerrufsrecht = require("./src/pages/Widerrufsrecht.js").default;
|
||||
const Sitemap = require("./src/pages/Sitemap.js").default;
|
||||
const PrerenderSitemap = require("./src/PrerenderSitemap.js").default;
|
||||
const PrerenderCategoriesPage = require("./src/PrerenderCategoriesPage.js").default;
|
||||
const PrerenderHerstellerPage = require("./src/PrerenderHerstellerPage.js").default;
|
||||
const AGB = require("./src/pages/AGB.js").default;
|
||||
const NotFound404 = require("./src/pages/NotFound404.js").default;
|
||||
|
||||
@@ -376,6 +380,29 @@ const renderApp = async (categoryData, socket) => {
|
||||
global.categoryCache = {};
|
||||
}
|
||||
|
||||
// Fetch manufacturers data for Hersteller page
|
||||
let manufacturerData = null;
|
||||
console.log("🏭 [renderApp] Starting manufacturer fetch...");
|
||||
console.log("🏭 [renderApp] socket exists:", !!socket);
|
||||
console.log("🏭 [renderApp] socket.connected:", socket ? socket.connected : "N/A");
|
||||
|
||||
if (!socket) {
|
||||
console.error("🏭 [renderApp] FATAL: No socket - cannot fetch manufacturers!");
|
||||
} else if (!socket.connected) {
|
||||
console.error("🏭 [renderApp] FATAL: Socket not connected - cannot fetch manufacturers!");
|
||||
} else {
|
||||
try {
|
||||
console.log("🏭 [renderApp] Calling fetchManufacturers...");
|
||||
manufacturerData = await fetchManufacturers(socket);
|
||||
console.log("🏭 [renderApp] ✅ Fetched " + manufacturerData.length + " manufacturers");
|
||||
} catch (error) {
|
||||
console.error("🏭 [renderApp] ❌ Failed to fetch manufacturers:", error.message);
|
||||
manufacturerData = [];
|
||||
}
|
||||
}
|
||||
|
||||
console.log("🏭 [renderApp] Final manufacturerData:", manufacturerData ? (manufacturerData.length + " items") : "null");
|
||||
|
||||
// Helper to call renderPage with config
|
||||
const render = (
|
||||
component,
|
||||
@@ -383,8 +410,10 @@ const renderApp = async (categoryData, socket) => {
|
||||
filename,
|
||||
description,
|
||||
metaTags = "",
|
||||
needsRouter = false
|
||||
needsRouter = false,
|
||||
manufacturerDataForPage = null
|
||||
) => {
|
||||
console.log(" 📦 [render helper] Calling renderPage for", filename, "with manufacturerData:", manufacturerDataForPage ? (manufacturerDataForPage.length + " items") : "null");
|
||||
return renderPage(
|
||||
component,
|
||||
location,
|
||||
@@ -392,7 +421,10 @@ const renderApp = async (categoryData, socket) => {
|
||||
description,
|
||||
metaTags,
|
||||
needsRouter,
|
||||
config
|
||||
config,
|
||||
false, // suppressLogs
|
||||
null, // productData
|
||||
manufacturerDataForPage // manufacturerData - 10th parameter!
|
||||
);
|
||||
};
|
||||
|
||||
@@ -474,6 +506,13 @@ const renderApp = async (categoryData, socket) => {
|
||||
description: "Categories page",
|
||||
needsCategoryData: true,
|
||||
},
|
||||
{
|
||||
component: PrerenderHerstellerPage,
|
||||
path: "/Hersteller",
|
||||
filename: "Hersteller",
|
||||
description: "Hersteller page",
|
||||
needsManufacturerData: true,
|
||||
},
|
||||
{ component: AGB, path: "/agb", filename: "agb", description: "AGB page" },
|
||||
{ component: NotFound404, path: "/404", filename: "404", description: "404 Not Found page" },
|
||||
{
|
||||
@@ -492,8 +531,17 @@ const renderApp = async (categoryData, socket) => {
|
||||
|
||||
let staticPagesRendered = 0;
|
||||
for (const page of staticPages) {
|
||||
// Pass category data as props if needed
|
||||
const pageProps = page.needsCategoryData ? { categoryData } : null;
|
||||
// Pass category and manufacturer data as props if needed
|
||||
let pageProps = null;
|
||||
if (page.needsCategoryData || page.needsManufacturerData) {
|
||||
pageProps = {};
|
||||
if (page.needsCategoryData) {
|
||||
pageProps.categoryData = categoryData;
|
||||
}
|
||||
if (page.needsManufacturerData) {
|
||||
pageProps.manufacturerData = manufacturerData;
|
||||
}
|
||||
}
|
||||
const pageComponent = React.createElement(page.component, pageProps);
|
||||
let metaTags = "";
|
||||
|
||||
@@ -509,13 +557,25 @@ const renderApp = async (categoryData, socket) => {
|
||||
metaTags = konfiguratorMetaTags;
|
||||
}
|
||||
|
||||
// Special handling for Hersteller page to include SEO tags
|
||||
if (page.filename === "Hersteller") {
|
||||
const manufacturerCount = manufacturerData ? manufacturerData.length : 0;
|
||||
const herstellerMetaTags = generateHerstellerMetaTags(shopConfig.baseUrl, shopConfig, manufacturerCount);
|
||||
const herstellerJsonLd = generateHerstellerJsonLd(shopConfig.baseUrl, shopConfig);
|
||||
metaTags = herstellerMetaTags + "\n" + herstellerJsonLd;
|
||||
}
|
||||
|
||||
// Pass manufacturerData only for Hersteller page
|
||||
const pageManufacturerData = page.needsManufacturerData ? manufacturerData : null;
|
||||
|
||||
const success = render(
|
||||
pageComponent,
|
||||
page.path,
|
||||
page.filename,
|
||||
page.description,
|
||||
metaTags,
|
||||
true
|
||||
true,
|
||||
pageManufacturerData
|
||||
);
|
||||
if (success) {
|
||||
staticPagesRendered++;
|
||||
|
||||
@@ -140,6 +140,38 @@ const fetchCategoryImage = (socket, categoryId) => {
|
||||
});
|
||||
};
|
||||
|
||||
const fetchManufacturers = (socket) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const timeout = setTimeout(() => {
|
||||
reject(new Error("Timeout fetching manufacturers"));
|
||||
}, 10000);
|
||||
|
||||
socket.emit("getHerstellerImages", {}, (response) => {
|
||||
clearTimeout(timeout);
|
||||
if (response?.success && Array.isArray(response.manufacturers)) {
|
||||
// Filter and format manufacturers similar to HerstellerPage.js
|
||||
const manufacturers = response.manufacturers
|
||||
.filter(m => m.imageBuffer)
|
||||
.map(m => ({
|
||||
id: m.id,
|
||||
name: m.name || '',
|
||||
slug: m.slug || '',
|
||||
imageBuffer: m.imageBuffer,
|
||||
}))
|
||||
.sort((a, b) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' }));
|
||||
|
||||
resolve(manufacturers);
|
||||
} else {
|
||||
reject(
|
||||
new Error(
|
||||
`Invalid manufacturers response: ${JSON.stringify(response)}`
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const saveProductImages = async (socket, products, categoryName, outputDir) => {
|
||||
if (!products || products.length === 0) return;
|
||||
|
||||
@@ -383,6 +415,7 @@ module.exports = {
|
||||
fetchProductDetails,
|
||||
fetchProductImage,
|
||||
fetchCategoryImage,
|
||||
fetchManufacturers,
|
||||
saveProductImages,
|
||||
saveCategoryImages,
|
||||
};
|
||||
|
||||
@@ -18,7 +18,8 @@ const renderPage = (
|
||||
needsRouter = false,
|
||||
config,
|
||||
suppressLogs = false,
|
||||
productData = null
|
||||
productData = null,
|
||||
manufacturerData = null
|
||||
) => {
|
||||
const {
|
||||
isProduction,
|
||||
@@ -171,22 +172,44 @@ const renderPage = (
|
||||
</script>
|
||||
`;
|
||||
|
||||
// @note Create script to populate window.productCache with ONLY the static category tree
|
||||
// @note Create script to populate window.productCache with static category tree and herstellerImages
|
||||
let productCacheScript = '';
|
||||
if (typeof global !== "undefined" && global.window && global.window.categoryCache) {
|
||||
// Only include the static categoryTree_209, not any dynamic data that gets added during rendering
|
||||
const staticCache = {};
|
||||
if (global.window.categoryCache["209_de"]) {
|
||||
staticCache["209_de"] = global.window.categoryCache["209_de"];
|
||||
const hasCategoryCache = typeof global !== "undefined" && global.window && global.window.categoryCache;
|
||||
const hasManufacturerData = manufacturerData && manufacturerData.length > 0;
|
||||
|
||||
console.log(" 📦 [" + filename + "] manufacturerData =", manufacturerData ? (manufacturerData.length + " items") : "null");
|
||||
|
||||
if (hasCategoryCache || hasManufacturerData) {
|
||||
const cacheData = {};
|
||||
|
||||
// Add static categoryTree_209
|
||||
if (hasCategoryCache && global.window.categoryCache["209_de"]) {
|
||||
cacheData["209_de"] = global.window.categoryCache["209_de"];
|
||||
}
|
||||
|
||||
const staticCacheData = JSON.stringify(staticCache);
|
||||
productCacheScript = `
|
||||
<script>
|
||||
// Populate window.categoryCache with static category tree only
|
||||
window.categoryCache = ${staticCacheData};
|
||||
</script>
|
||||
`;
|
||||
// Add herstellerImages
|
||||
if (hasManufacturerData) {
|
||||
cacheData.herstellerImages = manufacturerData;
|
||||
}
|
||||
|
||||
const cacheDataJson = JSON.stringify(cacheData);
|
||||
let extraScripts = '';
|
||||
|
||||
if (hasCategoryCache && cacheData["209_de"]) {
|
||||
const categoryCacheJson = JSON.stringify({ "209_de": cacheData["209_de"] });
|
||||
extraScripts += 'window.categoryCache = ' + categoryCacheJson + ';';
|
||||
}
|
||||
|
||||
if (hasManufacturerData) {
|
||||
const herstellerJson = JSON.stringify(manufacturerData);
|
||||
extraScripts += 'window.herstellerImages = ' + herstellerJson + ';';
|
||||
}
|
||||
|
||||
productCacheScript = '<script>' +
|
||||
'if (!window.productCache) { window.productCache = {}; }' +
|
||||
'Object.assign(window.productCache, ' + cacheDataJson + ');' +
|
||||
extraScripts +
|
||||
'</script>';
|
||||
}
|
||||
|
||||
// Create script to populate window.productDetailCache for individual product pages
|
||||
|
||||
116
prerender/seo/hersteller.cjs
Normal file
116
prerender/seo/hersteller.cjs
Normal file
@@ -0,0 +1,116 @@
|
||||
/** Safe for double-quoted HTML attributes */
|
||||
const escAttr = (str) =>
|
||||
String(str ?? "")
|
||||
.replace(/&/g, "&")
|
||||
.replace(/"/g, """)
|
||||
.replace(/</g, "<");
|
||||
|
||||
/**
|
||||
* Head tags for prerendered Hersteller (Manufacturers) page
|
||||
*/
|
||||
const generateHerstellerMetaTags = (baseUrl, config, manufacturerCount = 0) => {
|
||||
const root = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
|
||||
const herstellerUrl = root + "/Hersteller";
|
||||
const site = config.siteName || config.brandName;
|
||||
const desc = manufacturerCount + " Hersteller bei " + config.brandName + ": Top-Marken für Growshop-Produkte. Schnelle Lieferung, Laden Dresden.";
|
||||
const descShort = desc.length > 160 ? desc.slice(0, 157) + "..." : desc;
|
||||
const e = escAttr;
|
||||
const logoUrl =
|
||||
config.images && config.images.logo
|
||||
? root + config.images.logo
|
||||
: root + "/assets/images/nopicture.jpg";
|
||||
|
||||
return `
|
||||
<meta name="description" content="${e(descShort)}">
|
||||
<meta property="og:title" content="${e("Hersteller | " + site)}">
|
||||
<meta property="og:description" content="${e(descShort)}">
|
||||
<meta property="og:url" content="${herstellerUrl}">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:image" content="${e(logoUrl)}">
|
||||
<meta property="og:site_name" content="${e(site)}">
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="${e("Hersteller | " + site)}">
|
||||
<meta name="twitter:description" content="${e(descShort)}">
|
||||
<meta name="robots" content="index, follow">
|
||||
<link rel="canonical" href="${herstellerUrl}">
|
||||
`;
|
||||
};
|
||||
|
||||
const generateHerstellerJsonLd = (baseUrl, config) => {
|
||||
const root = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
|
||||
const herstellerUrl = root + "/Hersteller";
|
||||
|
||||
const id = {
|
||||
business: root + "#business",
|
||||
website: root + "#website",
|
||||
breadcrumb: herstellerUrl + "#breadcrumb",
|
||||
};
|
||||
|
||||
const logoUrl =
|
||||
config.images && config.images.logo
|
||||
? root + config.images.logo
|
||||
: undefined;
|
||||
|
||||
const businessNode = {
|
||||
"@id": id.business,
|
||||
"@type": ["GardenStore", "LocalBusiness", "Organization"],
|
||||
name: config.brandName,
|
||||
url: root,
|
||||
};
|
||||
|
||||
if (logoUrl) {
|
||||
businessNode.logo = { "@type": "ImageObject", url: logoUrl };
|
||||
businessNode.image = { "@type": "ImageObject", url: logoUrl };
|
||||
}
|
||||
|
||||
const websiteNode = {
|
||||
"@id": id.website,
|
||||
"@type": "WebSite",
|
||||
name: config.siteName || config.brandName,
|
||||
url: root,
|
||||
publisher: { "@id": id.business },
|
||||
};
|
||||
|
||||
const breadcrumbNode = {
|
||||
"@id": id.breadcrumb,
|
||||
"@type": "BreadcrumbList",
|
||||
itemListElement: [
|
||||
{
|
||||
"@type": "ListItem",
|
||||
position: 1,
|
||||
name: "Home",
|
||||
item: root,
|
||||
},
|
||||
{
|
||||
"@type": "ListItem",
|
||||
position: 2,
|
||||
name: "Hersteller",
|
||||
item: herstellerUrl,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const collectionPageNode = {
|
||||
"@id": herstellerUrl,
|
||||
"@type": "CollectionPage",
|
||||
name: "Hersteller",
|
||||
url: herstellerUrl,
|
||||
description: "Alle Hersteller und Marken für Growshop-Produkte",
|
||||
isPartOf: { "@id": id.website },
|
||||
breadcrumb: { "@id": id.breadcrumb },
|
||||
};
|
||||
|
||||
const graph = [businessNode, websiteNode, breadcrumbNode, collectionPageNode];
|
||||
|
||||
const herstellerGraph = {
|
||||
"@context": "https://schema.org",
|
||||
"@graph": graph,
|
||||
};
|
||||
|
||||
return "<script type=\"application/ld+json\">" + JSON.stringify(herstellerGraph) + "</script>";
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
generateHerstellerMetaTags,
|
||||
generateHerstellerJsonLd,
|
||||
};
|
||||
@@ -23,6 +23,11 @@ const {
|
||||
generateKonfiguratorMetaTags,
|
||||
} = require('./konfigurator.cjs');
|
||||
|
||||
const {
|
||||
generateHerstellerMetaTags,
|
||||
generateHerstellerJsonLd,
|
||||
} = require('./hersteller.cjs');
|
||||
|
||||
const {
|
||||
generateRobotsTxt,
|
||||
generateProductsXml,
|
||||
@@ -56,6 +61,10 @@ module.exports = {
|
||||
// Konfigurator functions
|
||||
generateKonfiguratorMetaTags,
|
||||
|
||||
// Hersteller functions
|
||||
generateHerstellerMetaTags,
|
||||
generateHerstellerJsonLd,
|
||||
|
||||
// Feed/Export functions
|
||||
generateRobotsTxt,
|
||||
generateProductsXml,
|
||||
|
||||
BIN
public/assets/images/cutlings2.avif
Normal file
BIN
public/assets/images/cutlings2.avif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
@@ -54,6 +54,7 @@ const AGB = lazy(() => import(/* webpackChunkName: "legal" */ "./pages/AGB.js"))
|
||||
//const NotFound404 = lazy(() => import(/* webpackChunkName: "legal" */ "./pages/NotFound404.js")); <Route path="/404" element={<NotFound404 />} />
|
||||
const Sitemap = lazy(() => import(/* webpackChunkName: "sitemap" */ "./pages/Sitemap.js"));
|
||||
const CategoriesPage = lazy(() => import(/* webpackChunkName: "categories" */ "./pages/CategoriesPage.js"));
|
||||
const HerstellerPage = lazy(() => import(/* webpackChunkName: "hersteller" */ "./pages/HerstellerPage.js"));
|
||||
const Impressum = lazy(() => import(/* webpackChunkName: "legal" */ "./pages/Impressum.js"));
|
||||
const Batteriegesetzhinweise = lazy(() => import(/* webpackChunkName: "legal" */ "./pages/Batteriegesetzhinweise.js"));
|
||||
const Widerrufsrecht = lazy(() => import(/* webpackChunkName: "legal" */ "./pages/Widerrufsrecht.js"));
|
||||
@@ -267,6 +268,11 @@ const AppContent = ({ currentTheme, dynamicTheme, onThemeChange }) => {
|
||||
path="/Kategorie/:categoryId"
|
||||
element={<Content />}
|
||||
/>
|
||||
{/* Manufacturer page - Render Content in parallel */}
|
||||
<Route
|
||||
path="/Hersteller/:categoryId"
|
||||
element={<Content />}
|
||||
/>
|
||||
{/* Single product page */}
|
||||
<Route
|
||||
path="/Artikel/:seoName"
|
||||
@@ -305,6 +311,7 @@ const AppContent = ({ currentTheme, dynamicTheme, onThemeChange }) => {
|
||||
<Route path="/agb" element={<AGB />} />
|
||||
<Route path="/sitemap" element={<Sitemap />} />
|
||||
<Route path="/Kategorien" element={<CategoriesPage />} />
|
||||
<Route path="/Hersteller" element={<HerstellerPage />} />
|
||||
<Route path="/impressum" element={<Impressum />} />
|
||||
<Route
|
||||
path="/batteriegesetzhinweise"
|
||||
|
||||
84
src/PrerenderHerstellerPage.js
Normal file
84
src/PrerenderHerstellerPage.js
Normal file
@@ -0,0 +1,84 @@
|
||||
import React from 'react';
|
||||
import Box from '@mui/material/Box';
|
||||
import Paper from '@mui/material/Paper';
|
||||
import Typography from '@mui/material/Typography';
|
||||
import Link from '@mui/material/Link';
|
||||
import LegalPage from './pages/LegalPage.js';
|
||||
|
||||
const PrerenderHerstellerPage = ({ manufacturerData }) => {
|
||||
// Use prop data (passed from prerender.cjs)
|
||||
const manufacturers = manufacturerData;
|
||||
|
||||
// If no manufacturer data, show empty state
|
||||
if (!manufacturers || manufacturers.length === 0) {
|
||||
const content = (
|
||||
<Box>
|
||||
<Typography variant="body1" paragraph>
|
||||
Keine Hersteller gefunden.
|
||||
</Typography>
|
||||
</Box>
|
||||
);
|
||||
return <LegalPage title="Hersteller" content={content} />;
|
||||
}
|
||||
|
||||
// Render manufacturers similar to HerstellerPage.js
|
||||
const content = (
|
||||
<Box
|
||||
sx={{
|
||||
display: 'grid',
|
||||
gridTemplateColumns: 'repeat(auto-fit, minmax(140px, 1fr))',
|
||||
gap: 2,
|
||||
}}
|
||||
>
|
||||
{manufacturers.map((manufacturer) => (
|
||||
<Paper
|
||||
key={manufacturer.id}
|
||||
component={Link}
|
||||
href={`/Hersteller/${encodeURIComponent(manufacturer.slug || '')}`}
|
||||
elevation={3}
|
||||
style={{
|
||||
width: '140px',
|
||||
height: '140px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
overflow: 'hidden',
|
||||
userSelect: 'none',
|
||||
textDecoration: 'none',
|
||||
cursor: 'pointer',
|
||||
borderRadius: '8px',
|
||||
position: 'relative',
|
||||
zIndex: 10,
|
||||
backgroundColor: '#f0f0f0',
|
||||
boxShadow: '0px 2px 1px -1px rgba(0,0,0,0.2), 0px 1px 1px 0px rgba(0,0,0,0.14), 0px 1px 3px 0px rgba(0,0,0,0.12)'
|
||||
}}
|
||||
sx={{
|
||||
transition: 'transform 0.2s ease, box-shadow 0.2s ease',
|
||||
'&:hover': {
|
||||
transform: 'translateY(-5px)',
|
||||
boxShadow: 8,
|
||||
},
|
||||
}}
|
||||
>
|
||||
{manufacturer.imageBuffer && (
|
||||
<img
|
||||
src={`data:image/avif;base64,${Buffer.from(manufacturer.imageBuffer).toString('base64')}`}
|
||||
alt={manufacturer.name}
|
||||
draggable={false}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
objectFit: 'contain',
|
||||
display: 'block',
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</Paper>
|
||||
))}
|
||||
</Box>
|
||||
);
|
||||
|
||||
return <LegalPage title="Hersteller" content={content} />;
|
||||
};
|
||||
|
||||
export default PrerenderHerstellerPage;
|
||||
@@ -551,7 +551,7 @@ class PrerenderProduct extends React.Component {
|
||||
})
|
||||
},
|
||||
style: {
|
||||
fontFamily: '"Roboto","Helvetica","Arial",sans-serif',
|
||||
fontFamily: '"Outfit Variable","Roboto","Helvetica","Arial",sans-serif',
|
||||
fontSize: '1rem',
|
||||
lineHeight: '1.7',
|
||||
color: '#333'
|
||||
|
||||
@@ -385,7 +385,7 @@ class AddToCartButton extends Component {
|
||||
startIcon={<ShoppingCartIcon />}
|
||||
sx={{
|
||||
borderRadius: 2,
|
||||
fontWeight: "bold",
|
||||
whiteSpace: "nowrap",
|
||||
backgroundColor: "#9ccc65", // yellowish green
|
||||
color: "#000000",
|
||||
"&:hover": {
|
||||
@@ -539,7 +539,6 @@ class AddToCartButton extends Component {
|
||||
startIcon={<ShoppingCartIcon />}
|
||||
sx={{
|
||||
borderRadius: 2,
|
||||
fontWeight: "bold",
|
||||
whiteSpace: "nowrap",
|
||||
"&:hover": {
|
||||
backgroundColor: "primary.dark",
|
||||
|
||||
@@ -55,7 +55,10 @@ class ChatAssistant extends Component {
|
||||
|
||||
buildPrivacyPromptHtml = () => {
|
||||
const { t } = this.props;
|
||||
return `${t('chat.privacyPromptBefore')}<a href="/datenschutz" target="_blank" rel="noopener noreferrer">${t('chat.privacyPolicyLink')}</a>${t('chat.privacyPromptAfter')}<button data-confirm-privacy="true">${t('chat.privacyRead')}</button>`;
|
||||
return `<div style="display: flex; flex-direction: column; gap: 8px; line-height: 1.5;">
|
||||
<div>${t('chat.privacyPromptBefore')}<a href="/datenschutz" target="_blank" rel="noopener noreferrer">${t('chat.privacyPolicyLink')}</a>${t('chat.privacyPromptAfter')}</div>
|
||||
<div><button data-confirm-privacy="true">${t('chat.privacyRead')}</button></div>
|
||||
</div>`;
|
||||
};
|
||||
|
||||
/** Keep stored privacy bubble in sync with i18n (language switcher, lazy bundle load). */
|
||||
@@ -228,7 +231,7 @@ class ChatAssistant extends Component {
|
||||
}, () => {
|
||||
// Emit message to socket server after state is updated
|
||||
if (userMessage.trim()) {
|
||||
window.socketManager.emit('aiassyMessage', userMessage);
|
||||
window.socketManager.emit('aiassyMessage', { message: userMessage, lang: this.props.i18n?.language });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import ProductList from './ProductList.js';
|
||||
import CategoryBoxGrid from './CategoryBoxGrid.js';
|
||||
import CategoryBox from './CategoryBox.js';
|
||||
|
||||
import { useParams, useSearchParams } from 'react-router-dom';
|
||||
import { useParams, useSearchParams, useLocation } from 'react-router-dom';
|
||||
import { getAllSettingsWithPrefix } from '../utils/sessionStorage.js';
|
||||
import { withI18n } from '../i18n/withTranslation.js';
|
||||
import { withCategory } from '../context/CategoryContext.js';
|
||||
@@ -24,17 +24,19 @@ const withRouter = (ClassComponent) => {
|
||||
return (props) => {
|
||||
const params = useParams();
|
||||
const [searchParams] = useSearchParams();
|
||||
return <ClassComponent {...props} params={params} searchParams={searchParams} />;
|
||||
const location = useLocation();
|
||||
const isHersteller = location.pathname.startsWith('/Hersteller/');
|
||||
return <ClassComponent {...props} params={params} searchParams={searchParams} isHersteller={isHersteller} />;
|
||||
};
|
||||
};
|
||||
|
||||
function getCachedCategoryData(categoryId, language = 'de') {
|
||||
function getCachedCategoryData(categoryId, language = 'de', isHersteller = false) {
|
||||
if (!window.productCache) {
|
||||
window.productCache = {};
|
||||
}
|
||||
|
||||
try {
|
||||
const cacheKey = `categoryProducts_${categoryId}_${language}`;
|
||||
const cacheKey = `${isHersteller ? 'manufacturer' : 'category'}Products_${categoryId}_${language}`;
|
||||
const cachedData = window.productCache[cacheKey];
|
||||
|
||||
if (cachedData) {
|
||||
@@ -166,7 +168,7 @@ function getFilteredProducts(unfilteredProducts, attributes, t) {
|
||||
|
||||
return { filteredProducts, activeAttributeFilters: activeAttributeFiltersWithNames, activeManufacturerFilters: activeManufacturerFiltersWithNames, activeAvailabilityFilters };
|
||||
}
|
||||
function setCachedCategoryData(categoryId, data, language = 'de') {
|
||||
function setCachedCategoryData(categoryId, data, language = 'de', isHersteller = false) {
|
||||
if (!window.productCache) {
|
||||
window.productCache = {};
|
||||
}
|
||||
@@ -175,7 +177,7 @@ function setCachedCategoryData(categoryId, data, language = 'de') {
|
||||
}
|
||||
|
||||
try {
|
||||
const cacheKey = `categoryProducts_${categoryId}_${language}`;
|
||||
const cacheKey = `${isHersteller ? 'manufacturer' : 'category'}Products_${categoryId}_${language}`;
|
||||
if (data.products) for (const product of data.products) {
|
||||
const productCacheKey = `product_${product.id}_${language}`;
|
||||
window.productDetailCache[productCacheKey] = product;
|
||||
@@ -221,9 +223,10 @@ class Content extends Component {
|
||||
componentDidUpdate(prevProps) {
|
||||
const currentLanguage = this.props.i18n?.language || 'de';
|
||||
const categoryChanged = this.props.params.categoryId && (prevProps.params.categoryId !== this.props.params.categoryId);
|
||||
const routeTypeChanged = !!prevProps.isHersteller !== !!this.props.isHersteller;
|
||||
const searchChanged = this.props.searchParams?.get('q') && (prevProps.searchParams?.get('q') !== this.props.searchParams?.get('q'));
|
||||
|
||||
if (categoryChanged) {
|
||||
if (categoryChanged || routeTypeChanged) {
|
||||
// Clear context for new category loading
|
||||
if (this.props.categoryContext && this.props.categoryContext.setCurrentCategory) {
|
||||
this.props.categoryContext.setCurrentCategory(null);
|
||||
@@ -233,7 +236,7 @@ class Content extends Component {
|
||||
this.setState({ loaded: false, unfilteredProducts: [], filteredProducts: [], attributes: [], categoryName: null, childCategories: [], lastFetchedLanguage: currentLanguage }, () => {
|
||||
this.fetchCategoryData(this.props.params.categoryId);
|
||||
});
|
||||
return; // Don't check language change if category changed
|
||||
return; // Don't check language change if category or route type changed
|
||||
}
|
||||
else if (searchChanged) {
|
||||
this.setState({ loaded: false, unfilteredProducts: [], filteredProducts: [], attributes: [], categoryName: null, childCategories: [], lastFetchedLanguage: currentLanguage }, () => {
|
||||
@@ -345,7 +348,8 @@ class Content extends Component {
|
||||
sessionStorage.setItem('filter_availability', '1');
|
||||
}
|
||||
const currentLanguage = this.props.languageContext?.currentLanguage || this.props.i18n?.language || 'de';
|
||||
const cachedData = getCachedCategoryData(categoryId, currentLanguage);
|
||||
const isHersteller = !!this.props.isHersteller;
|
||||
const cachedData = getCachedCategoryData(categoryId, currentLanguage, isHersteller);
|
||||
if (cachedData) {
|
||||
this.processDataWithCategoryTree(cachedData, categoryId);
|
||||
return;
|
||||
@@ -360,7 +364,7 @@ class Content extends Component {
|
||||
window.socketManager.on(`productList:${categoryId}`, (response) => {
|
||||
console.log("getCategoryProducts full response", response);
|
||||
receivedFullResponse = true;
|
||||
setCachedCategoryData(categoryId, response, currentLanguage);
|
||||
setCachedCategoryData(categoryId, response, currentLanguage, isHersteller);
|
||||
if (response && response.products !== undefined) {
|
||||
this.processDataWithCategoryTree(response, categoryId);
|
||||
} else {
|
||||
@@ -370,12 +374,17 @@ class Content extends Component {
|
||||
|
||||
window.socketManager.emit(
|
||||
"getCategoryProducts",
|
||||
{ categoryId: categoryId, language: currentLanguage, requestTranslation: currentLanguage === 'de' ? false : true },
|
||||
{
|
||||
categoryId: categoryId,
|
||||
language: currentLanguage,
|
||||
requestTranslation: currentLanguage === 'de' ? false : true,
|
||||
isHersteller,
|
||||
},
|
||||
(response) => {
|
||||
console.log("getCategoryProducts stub response", response);
|
||||
// Only process stub response if we haven't received the full response yet
|
||||
if (!receivedFullResponse) {
|
||||
setCachedCategoryData(categoryId, response, currentLanguage);
|
||||
setCachedCategoryData(categoryId, response, currentLanguage, isHersteller);
|
||||
if (response && response.products !== undefined) {
|
||||
this.processDataWithCategoryTree(response, categoryId);
|
||||
} else {
|
||||
@@ -454,7 +463,7 @@ class Content extends Component {
|
||||
const n = typeof v === 'number' ? v : parseInt(String(v), 10);
|
||||
return Number.isFinite(n) && n > 0;
|
||||
};
|
||||
if (categoryId !== 'neu' && categoryId !== 'bald' && !isValidJtlCategoryId(enhancedResponse.dataParam)) {
|
||||
if (!this.props.isHersteller && categoryId !== 'neu' && categoryId !== 'bald' && !isValidJtlCategoryId(enhancedResponse.dataParam)) {
|
||||
try {
|
||||
const currentLanguage = this.props.languageContext?.currentLanguage || this.props.i18n?.language || 'de';
|
||||
const categoryTreeCache = window.categoryService.getSync(209, currentLanguage);
|
||||
|
||||
@@ -291,8 +291,22 @@ const MainPageLayout = () => {
|
||||
const currentPath = location.pathname;
|
||||
const { t } = useTranslation();
|
||||
const [starHovered, setStarHovered] = React.useState(false);
|
||||
|
||||
// State to track kiosk mode
|
||||
const [isKiosk, setIsKiosk] = React.useState(() => window.growheadskiosk === true);
|
||||
|
||||
// Listen for the custom event
|
||||
React.useEffect(() => {
|
||||
const handleKioskChange = () => {
|
||||
setIsKiosk(window.growheadskiosk === true);
|
||||
};
|
||||
|
||||
window.addEventListener('growheadskiosk-change', handleKioskChange);
|
||||
return () => window.removeEventListener('growheadskiosk-change', handleKioskChange);
|
||||
}, []);
|
||||
|
||||
const translatedContent = {
|
||||
buildYourSet: t('sections.buildYourSet'),
|
||||
buildYourSet: isKiosk ? 'Schau in den Stecklingskatalog' : t('sections.buildYourSet'),
|
||||
selectSeedRate: t('sections.selectSeedRate'),
|
||||
outdoorSeason: t('sections.outdoorSeason')
|
||||
};
|
||||
@@ -317,7 +331,7 @@ const MainPageLayout = () => {
|
||||
const allContentBoxes = {
|
||||
home: [
|
||||
{ title: t('sections.seeds'), image: "/assets/images/seeds.avif", bgcolor: "#e1f0d3", link: "/Kategorie/Seeds" },
|
||||
{ title: t('sections.konfigurator'), image: "/assets/images/konfigurator.avif", bgcolor: "#e8f5d6", link: "/Konfigurator" }
|
||||
{ title: isKiosk ? 'Stecklingskatalog' : t('sections.konfigurator'), image: isKiosk ? "/assets/images/cutlings2.avif" : "/assets/images/konfigurator.avif", bgcolor: "#e8f5d6", link: isKiosk ? "https://cloneheads.de" : "/Konfigurator" }
|
||||
],
|
||||
aktionen: [
|
||||
{ title: t('sections.oilPress'), image: "/assets/images/presse.jpg", bgcolor: "#e1f0d3", link: "/Artikel/Graveda-10t-presse-tagesmiete-inkl-prepress-vorpressform" },
|
||||
|
||||
@@ -1,17 +1,25 @@
|
||||
import React from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import Box from "@mui/material/Box";
|
||||
import Typography from "@mui/material/Typography";
|
||||
import Paper from "@mui/material/Paper";
|
||||
import IconButton from "@mui/material/IconButton";
|
||||
import ChevronLeft from "@mui/icons-material/ChevronLeft";
|
||||
import ChevronRight from "@mui/icons-material/ChevronRight";
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import { withLanguage } from '../i18n/withTranslation.js';
|
||||
|
||||
const ITEM_WIDTH = 140 + 16; // 140px width + 16px gap
|
||||
const AUTO_SCROLL_SPEED = 1.0;
|
||||
const AUTOSCROLL_RESTART_DELAY = 5000;
|
||||
|
||||
class ManufacturerCarousel extends React.Component {
|
||||
_isMounted = false;
|
||||
originalItems = [];
|
||||
animationFrame = null;
|
||||
autoScrollActive = true;
|
||||
translateX = 0;
|
||||
inactivityTimer = null;
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@@ -28,10 +36,8 @@ class ManufacturerCarousel extends React.Component {
|
||||
|
||||
componentWillUnmount() {
|
||||
this._isMounted = false;
|
||||
if (this.animationFrame) {
|
||||
cancelAnimationFrame(this.animationFrame);
|
||||
this.animationFrame = null;
|
||||
}
|
||||
this.stopAutoScroll();
|
||||
this.clearInactivityTimer();
|
||||
// Revoke object URLs to avoid memory leaks
|
||||
for (const item of this.originalItems) {
|
||||
if (item.src) URL.revokeObjectURL(item.src);
|
||||
@@ -46,7 +52,12 @@ class ManufacturerCarousel extends React.Component {
|
||||
.filter(m => m.imageBuffer)
|
||||
.map(m => {
|
||||
const blob = new Blob([m.imageBuffer], { type: 'image/avif' });
|
||||
return { id: m.id, name: m.name || '', src: URL.createObjectURL(blob) };
|
||||
return {
|
||||
id: m.id,
|
||||
name: m.name || '',
|
||||
slug: m.slug || '',
|
||||
src: URL.createObjectURL(blob),
|
||||
};
|
||||
})
|
||||
.sort(() => Math.random() - 0.5);
|
||||
|
||||
@@ -60,13 +71,38 @@ class ManufacturerCarousel extends React.Component {
|
||||
};
|
||||
|
||||
startAutoScroll = () => {
|
||||
this.autoScrollActive = true;
|
||||
if (!this.animationFrame) {
|
||||
this.animationFrame = requestAnimationFrame(this.tick);
|
||||
}
|
||||
};
|
||||
|
||||
stopAutoScroll = () => {
|
||||
this.autoScrollActive = false;
|
||||
if (this.animationFrame) {
|
||||
cancelAnimationFrame(this.animationFrame);
|
||||
this.animationFrame = null;
|
||||
}
|
||||
};
|
||||
|
||||
clearInactivityTimer = () => {
|
||||
if (this.inactivityTimer) {
|
||||
clearTimeout(this.inactivityTimer);
|
||||
this.inactivityTimer = null;
|
||||
}
|
||||
};
|
||||
|
||||
startInactivityTimer = () => {
|
||||
this.clearInactivityTimer();
|
||||
this.inactivityTimer = setTimeout(() => {
|
||||
if (this._isMounted) {
|
||||
this.startAutoScroll();
|
||||
}
|
||||
}, AUTOSCROLL_RESTART_DELAY);
|
||||
};
|
||||
|
||||
tick = () => {
|
||||
if (!this._isMounted || this.originalItems.length === 0) return;
|
||||
if (!this._isMounted || !this.autoScrollActive || this.originalItems.length === 0) return;
|
||||
|
||||
this.translateX -= AUTO_SCROLL_SPEED;
|
||||
|
||||
@@ -82,6 +118,41 @@ class ManufacturerCarousel extends React.Component {
|
||||
this.animationFrame = requestAnimationFrame(this.tick);
|
||||
};
|
||||
|
||||
updateTrackTransform = () => {
|
||||
if (this.carouselTrackRef.current) {
|
||||
this.carouselTrackRef.current.style.transform = `translateX(${this.translateX}px)`;
|
||||
}
|
||||
};
|
||||
|
||||
scrollBy = (direction) => {
|
||||
if (this.originalItems.length === 0) return;
|
||||
|
||||
const originalItemCount = this.originalItems.length;
|
||||
const maxScroll = ITEM_WIDTH * originalItemCount;
|
||||
|
||||
this.translateX += direction * ITEM_WIDTH;
|
||||
|
||||
if (this.translateX > 0) {
|
||||
this.translateX = -(maxScroll - ITEM_WIDTH);
|
||||
} else if (Math.abs(this.translateX) >= maxScroll) {
|
||||
this.translateX = 0;
|
||||
}
|
||||
|
||||
this.updateTrackTransform();
|
||||
};
|
||||
|
||||
handleLeftClick = () => {
|
||||
this.stopAutoScroll();
|
||||
this.scrollBy(1);
|
||||
this.startInactivityTimer();
|
||||
};
|
||||
|
||||
handleRightClick = () => {
|
||||
this.stopAutoScroll();
|
||||
this.scrollBy(-1);
|
||||
this.startInactivityTimer();
|
||||
};
|
||||
|
||||
render() {
|
||||
const { t } = this.props;
|
||||
const { items } = this.state;
|
||||
@@ -90,19 +161,36 @@ class ManufacturerCarousel extends React.Component {
|
||||
|
||||
return (
|
||||
<Box sx={{ mt: 4, mb: 4 }}>
|
||||
<Box
|
||||
component={Link}
|
||||
to="/Hersteller"
|
||||
sx={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
textDecoration: 'none',
|
||||
color: 'primary.main',
|
||||
mb: 2,
|
||||
transition: 'all 0.3s ease',
|
||||
'&:hover': {
|
||||
transform: 'translateX(5px)',
|
||||
color: 'primary.dark',
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
variant="h4"
|
||||
component="div"
|
||||
component="span"
|
||||
sx={{
|
||||
fontFamily: 'SwashingtonCP',
|
||||
textShadow: '3px 3px 10px rgba(0, 0, 0, 0.4)',
|
||||
textAlign: 'center',
|
||||
mb: 2,
|
||||
color: 'primary.main',
|
||||
}}
|
||||
>
|
||||
{t('product.manufacturer')}
|
||||
</Typography>
|
||||
<ChevronRight sx={{ fontSize: '2.5rem', ml: 1 }} />
|
||||
</Box>
|
||||
|
||||
<div
|
||||
style={{
|
||||
@@ -129,6 +217,46 @@ class ManufacturerCarousel extends React.Component {
|
||||
zIndex: 2, pointerEvents: 'none',
|
||||
}} />
|
||||
|
||||
{/* Left Arrow */}
|
||||
<IconButton
|
||||
aria-label="Vorherige Hersteller anzeigen"
|
||||
onClick={this.handleLeftClick}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: '50%',
|
||||
left: '8px',
|
||||
transform: 'translateY(-50%)',
|
||||
zIndex: 1000,
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.9)',
|
||||
boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
|
||||
width: '48px',
|
||||
height: '48px',
|
||||
borderRadius: '50%'
|
||||
}}
|
||||
>
|
||||
<ChevronLeft />
|
||||
</IconButton>
|
||||
|
||||
{/* Right Arrow */}
|
||||
<IconButton
|
||||
aria-label="Nächste Hersteller anzeigen"
|
||||
onClick={this.handleRightClick}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: '50%',
|
||||
right: '8px',
|
||||
transform: 'translateY(-50%)',
|
||||
zIndex: 1000,
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.9)',
|
||||
boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
|
||||
width: '48px',
|
||||
height: '48px',
|
||||
borderRadius: '50%'
|
||||
}}
|
||||
>
|
||||
<ChevronRight />
|
||||
</IconButton>
|
||||
|
||||
<div
|
||||
style={{
|
||||
position: 'relative',
|
||||
@@ -151,8 +279,11 @@ class ManufacturerCarousel extends React.Component {
|
||||
}}
|
||||
>
|
||||
{items.map((item, index) => (
|
||||
<div
|
||||
<Paper
|
||||
key={`${item.id}-${index}`}
|
||||
component={Link}
|
||||
to={`/Hersteller/${encodeURIComponent(item.slug || '')}`}
|
||||
elevation={3}
|
||||
style={{
|
||||
flex: '0 0 140px',
|
||||
width: '140px',
|
||||
@@ -162,7 +293,20 @@ class ManufacturerCarousel extends React.Component {
|
||||
justifyContent: 'center',
|
||||
overflow: 'hidden',
|
||||
userSelect: 'none',
|
||||
pointerEvents: 'none',
|
||||
textDecoration: 'none',
|
||||
cursor: 'pointer',
|
||||
borderRadius: '8px',
|
||||
position: 'relative',
|
||||
zIndex: 10,
|
||||
backgroundColor: '#f0f0f0',
|
||||
boxShadow: '0px 2px 1px -1px rgba(0,0,0,0.2), 0px 1px 1px 0px rgba(0,0,0,0.14), 0px 1px 3px 0px rgba(0,0,0,0.12)'
|
||||
}}
|
||||
sx={{
|
||||
transition: 'transform 0.2s ease, box-shadow 0.2s ease',
|
||||
'&:hover': {
|
||||
transform: 'translateY(-5px)',
|
||||
boxShadow: 8,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<img
|
||||
@@ -176,7 +320,7 @@ class ManufacturerCarousel extends React.Component {
|
||||
display: 'block',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Paper>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -85,7 +85,7 @@ class Stripe extends Component {
|
||||
colorWarning: '#FF9800', // Orange for warnings
|
||||
|
||||
// Typography matching your Roboto setup
|
||||
fontFamily: "'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
fontFamily: "'Outfit Variable', 'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
fontSizeBase: '16px', // Base font size for mobile compatibility
|
||||
fontWeightNormal: '400', // Normal Roboto weight
|
||||
fontWeightMedium: '500', // Medium Roboto weight
|
||||
|
||||
@@ -71,7 +71,7 @@ const ThemeCustomizerDialog = ({ open, onClose, theme, onThemeChange }) => {
|
||||
},
|
||||
},
|
||||
typography: {
|
||||
fontFamily: "'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
fontFamily: "'Outfit Variable', 'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
h4: {
|
||||
fontWeight: 600,
|
||||
color: '#33691E',
|
||||
|
||||
@@ -197,7 +197,7 @@ class CategoryList extends Component {
|
||||
aria-label="Zur Startseite"
|
||||
onClick={isMobile ? this.handleMobileCategoryClick : undefined}
|
||||
sx={{
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
textTransform: "none",
|
||||
whiteSpace: "nowrap",
|
||||
opacity: 0.9,
|
||||
@@ -275,7 +275,7 @@ class CategoryList extends Component {
|
||||
aria-label="Neuheiten"
|
||||
onClick={isMobile ? this.handleMobileCategoryClick : undefined}
|
||||
sx={{
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
textTransform: "none",
|
||||
whiteSpace: "nowrap",
|
||||
opacity: 0.9,
|
||||
@@ -353,7 +353,7 @@ class CategoryList extends Component {
|
||||
aria-label={this.props.t ? this.props.t('navigation.soon') : 'Demnächst'}
|
||||
onClick={isMobile ? this.handleMobileCategoryClick : undefined}
|
||||
sx={{
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
textTransform: "none",
|
||||
whiteSpace: "nowrap",
|
||||
opacity: 0.9,
|
||||
@@ -435,7 +435,7 @@ class CategoryList extends Component {
|
||||
size="small"
|
||||
onClick={isMobile ? this.handleMobileCategoryClick : undefined}
|
||||
sx={{
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
textTransform: "none",
|
||||
whiteSpace: "nowrap",
|
||||
opacity: 0.9,
|
||||
@@ -506,7 +506,7 @@ class CategoryList extends Component {
|
||||
alignItems: "center",
|
||||
height: "33px", // Match small button height
|
||||
px: 1,
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
opacity: 0.9,
|
||||
}}
|
||||
>
|
||||
@@ -522,7 +522,7 @@ class CategoryList extends Component {
|
||||
aria-label={this.props.t ? this.props.t('navigation.konfiguratorAria') : 'Zum Konfigurator'}
|
||||
onClick={isMobile ? this.handleMobileCategoryClick : undefined}
|
||||
sx={{
|
||||
fontSize: "0.75rem",
|
||||
fontSize: "0.85rem",
|
||||
textTransform: "none",
|
||||
whiteSpace: "nowrap",
|
||||
opacity: 0.9,
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||
font-family: 'Outfit Variable', Roboto, Helvetica, Arial, sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
overflow-y: scroll; /* Always show vertical scrollbar */
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import "@fontsource-variable/outfit";
|
||||
import "./index.css";
|
||||
import App from "./App.js";
|
||||
import { BrowserRouter } from "react-router-dom";
|
||||
|
||||
168
src/pages/HerstellerPage.js
Normal file
168
src/pages/HerstellerPage.js
Normal file
@@ -0,0 +1,168 @@
|
||||
import React, { Component } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import Box from '@mui/material/Box';
|
||||
import Paper from '@mui/material/Paper';
|
||||
import LegalPage from './LegalPage.js';
|
||||
import { withI18n } from '../i18n/withTranslation.js';
|
||||
|
||||
class HerstellerPage extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
loading: true,
|
||||
manufacturers: [],
|
||||
};
|
||||
this._isMounted = false;
|
||||
this._objectUrls = [];
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this._isMounted = true;
|
||||
this.loadManufacturers();
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
this._isMounted = false;
|
||||
for (const url of this._objectUrls) {
|
||||
URL.revokeObjectURL(url);
|
||||
}
|
||||
this._objectUrls = [];
|
||||
}
|
||||
|
||||
loadManufacturers = () => {
|
||||
// Check if manufacturers data is already cached from prerendering
|
||||
if (window.herstellerImages && Array.isArray(window.herstellerImages) && window.herstellerImages.length > 0) {
|
||||
if (!this._isMounted) return;
|
||||
|
||||
const manufacturers = window.herstellerImages
|
||||
.filter(m => m.imageBuffer)
|
||||
.map(m => {
|
||||
const blob = new Blob([m.imageBuffer], { type: 'image/avif' });
|
||||
const src = URL.createObjectURL(blob);
|
||||
this._objectUrls.push(src);
|
||||
return {
|
||||
id: m.id,
|
||||
name: m.name || '',
|
||||
slug: m.slug || '',
|
||||
src,
|
||||
};
|
||||
})
|
||||
.sort((a, b) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' }));
|
||||
|
||||
this.setState({
|
||||
loading: false,
|
||||
manufacturers,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Fallback: fetch from socket if no cached data
|
||||
window.socketManager.emit('getHerstellerImages', {}, (res) => {
|
||||
if (!this._isMounted) return;
|
||||
|
||||
if (!res?.success || !Array.isArray(res.manufacturers)) {
|
||||
this.setState({ loading: false, manufacturers: [] });
|
||||
return;
|
||||
}
|
||||
|
||||
const manufacturers = res.manufacturers
|
||||
.filter(m => m.imageBuffer)
|
||||
.map(m => {
|
||||
const blob = new Blob([m.imageBuffer], { type: 'image/avif' });
|
||||
const src = URL.createObjectURL(blob);
|
||||
this._objectUrls.push(src);
|
||||
return {
|
||||
id: m.id,
|
||||
name: m.name || '',
|
||||
slug: m.slug || '',
|
||||
src,
|
||||
};
|
||||
})
|
||||
.sort((a, b) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' }));
|
||||
|
||||
this.setState({
|
||||
loading: false,
|
||||
manufacturers,
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
renderManufacturerGrid = () => {
|
||||
const { manufacturers } = this.state;
|
||||
|
||||
if (!manufacturers.length) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<Box
|
||||
sx={{
|
||||
display: 'grid',
|
||||
gridTemplateColumns: 'repeat(auto-fit, minmax(140px, 1fr))',
|
||||
gap: 2,
|
||||
}}
|
||||
>
|
||||
{manufacturers.map((manufacturer) => (
|
||||
<Paper
|
||||
key={manufacturer.id}
|
||||
component={Link}
|
||||
to={`/Hersteller/${encodeURIComponent(manufacturer.slug || '')}`}
|
||||
elevation={3}
|
||||
style={{
|
||||
width: '140px',
|
||||
height: '140px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
overflow: 'hidden',
|
||||
userSelect: 'none',
|
||||
textDecoration: 'none',
|
||||
cursor: 'pointer',
|
||||
borderRadius: '8px',
|
||||
position: 'relative',
|
||||
zIndex: 10,
|
||||
backgroundColor: '#f0f0f0',
|
||||
boxShadow: '0px 2px 1px -1px rgba(0,0,0,0.2), 0px 1px 1px 0px rgba(0,0,0,0.14), 0px 1px 3px 0px rgba(0,0,0,0.12)'
|
||||
}}
|
||||
sx={{
|
||||
transition: 'transform 0.2s ease, box-shadow 0.2s ease',
|
||||
'&:hover': {
|
||||
transform: 'translateY(-5px)',
|
||||
boxShadow: 8,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<img
|
||||
src={manufacturer.src}
|
||||
alt={manufacturer.name}
|
||||
draggable={false}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
objectFit: 'contain',
|
||||
display: 'block',
|
||||
}}
|
||||
/>
|
||||
</Paper>
|
||||
))}
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
render() {
|
||||
const { t } = this.props;
|
||||
const { loading } = this.state;
|
||||
|
||||
const content = (
|
||||
<Box>
|
||||
{loading ? null : (
|
||||
this.renderManufacturerGrid()
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
|
||||
return <LegalPage title={t ? t('product.manufacturer') : 'Hersteller'} content={content} />;
|
||||
}
|
||||
}
|
||||
|
||||
export default withI18n()(HerstellerPage);
|
||||
@@ -153,6 +153,12 @@ class SocketManager {
|
||||
auth: this._buildSocketAuth()
|
||||
});
|
||||
|
||||
this._socket.on('kiosk', () => {
|
||||
window.growheadskiosk = true;
|
||||
window.dispatchEvent(new Event('growheadskiosk-change'));
|
||||
console.warn('Kiosk mode enabled via socket event');
|
||||
});
|
||||
|
||||
// Always refresh auth data before reconnect attempts.
|
||||
if (this._socket.io && this._socket.io.on) {
|
||||
this._socket.io.on('reconnect_attempt', () => {
|
||||
|
||||
@@ -29,7 +29,7 @@ const theme = createTheme({
|
||||
},
|
||||
},
|
||||
typography: {
|
||||
fontFamily: "'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
fontFamily: "'Outfit Variable', 'Roboto', 'Helvetica', 'Arial', sans-serif",
|
||||
h4: {
|
||||
fontWeight: 600,
|
||||
color: '#33691E',
|
||||
|
||||
Reference in New Issue
Block a user