From 6b147778e525ec614fa7ff0a2dd68c66b860b818 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Wed, 3 Sep 2025 00:46:12 +0800
Subject: [PATCH] =?UTF-8?q?app=E9=87=8C=E9=9D=A2=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=AE=9E=E7=8E=B0=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/[...slug]/page.jsx           | 225 ++++++++++++++++++
 app/(presentation)/presentation/layout.jsx    |  24 ++
 app/{ => (website)}/[...slug]/page.jsx        |   0
 .../api/get-component-data/route.js           |   0
 app/{ => (website)}/api/get-menu/route.js     |   0
 .../api/get-page-data/route.js                |   0
 app/{ => (website)}/api/revalidate/route.js   |   0
 app/{ => (website)}/api/send-email/route.js   |   0
 app/{ => (website)}/api/sitemap/route.js      |   0
 app/{ => (website)}/contact/page.jsx          |   0
 app/{ => (website)}/favicon.ico               | Bin
 app/{ => (website)}/globals.css               |   0
 app/{ => (website)}/layout.jsx                |   2 +-
 app/{ => (website)}/not-found.jsx             |   0
 app/{ => (website)}/page.jsx                  |   0
 .../products/[...slug]/page.jsx               |   0
 public/assets/style.css                       |   2 +-
 17 files changed, 251 insertions(+), 2 deletions(-)
 create mode 100644 app/(presentation)/presentation/[...slug]/page.jsx
 create mode 100644 app/(presentation)/presentation/layout.jsx
 rename app/{ => (website)}/[...slug]/page.jsx (100%)
 rename app/{ => (website)}/api/get-component-data/route.js (100%)
 rename app/{ => (website)}/api/get-menu/route.js (100%)
 rename app/{ => (website)}/api/get-page-data/route.js (100%)
 rename app/{ => (website)}/api/revalidate/route.js (100%)
 rename app/{ => (website)}/api/send-email/route.js (100%)
 rename app/{ => (website)}/api/sitemap/route.js (100%)
 rename app/{ => (website)}/contact/page.jsx (100%)
 rename app/{ => (website)}/favicon.ico (100%)
 rename app/{ => (website)}/globals.css (100%)
 rename app/{ => (website)}/layout.jsx (96%)
 rename app/{ => (website)}/not-found.jsx (100%)
 rename app/{ => (website)}/page.jsx (100%)
 rename app/{ => (website)}/products/[...slug]/page.jsx (100%)

diff --git a/app/(presentation)/presentation/[...slug]/page.jsx b/app/(presentation)/presentation/[...slug]/page.jsx
new file mode 100644
index 0000000..a525488
--- /dev/null
+++ b/app/(presentation)/presentation/[...slug]/page.jsx
@@ -0,0 +1,225 @@
+import { getSiteSettings } from "@/utils/data";
+import { notFound } from 'next/navigation';
+import { Suspense } from 'react';
+import { getPageData, getAllSlugs } from "@/utils/data";
+
+const LoadingSpinner = () => (
+  <div className="flex justify-center items-center min-h-screen">
+    <div className="animate-spin rounded-full h-16 w-16 border-b-4 border-blue-500"></div>
+  </div>
+);
+
+// Using a static value to comply with Next.js 15 build requirements.
+// On-demand revalidation will be handled via the API route.
+export const revalidate = 3600;
+
+export async function generateStaticParams() {
+  try {
+    const slugs = await getAllSlugs();
+    return slugs.map(slug => ({
+      slug: slug,
+    }));
+  } catch (error) {
+    console.error("Failed to generate static params:", error);
+    return [];
+  }
+}
+
+export async function generateMetadata({ params }) {
+  const resolvedParams = await params;
+  const slugArr = resolvedParams.slug;
+  const { data, error, page_info } = await getPageData({
+    slug_list: slugArr,
+    downloadFiles: false // Do not download files for metadata
+  });
+  const siteSettings = await getSiteSettings();
+  const siteTitle = siteSettings.site_title || '';
+  const siteName = siteSettings.site_name || '';
+  const siteNameInPageTitles = siteSettings.site_name_in_page_titles || 'None';
+
+  let title = '';
+  if (error) {
+    title = error.title || 'Page Error';
+    return {
+      title,
+      description: error.message || '',
+    };
+  }
+  if (Array.isArray(data) && page_info) {
+    title = page_info.meta_title || page_info.title || '';
+    if (siteName && title) {
+      if (siteNameInPageTitles === 'After') {
+        title = `${title} - ${siteName}`;
+      } else if (siteNameInPageTitles === 'Before') {
+        title = `${siteName} - ${title}`;
+      }
+    }
+    return {
+      title,
+      description: page_info.meta_description || '',
+    };
+  }
+  title = data?.meta_title || data?.title || '';
+  if (siteName && title) {
+    if (siteNameInPageTitles === 'After') {
+      title = `${title} - ${siteName}`;
+    } else if (siteNameInPageTitles === 'Before') {
+      title = `${siteName} - ${title}`;
+    }
+  }
+  return {
+    title,
+    description: data?.meta_description || '',
+  };
+}
+
+export default async function DynamicPage({ params, searchParams }) {
+  const resolvedParams = await params;
+  const slugArr = resolvedParams.slug;
+  const siteSettings = await getSiteSettings();
+  const pageSize = Number(siteSettings.page_size) || 12;
+
+  // 始终获取第一页的数据用于静态生成
+  const { data, error, total } = await getPageData({
+    slug_list: slugArr,
+    page: 1,
+    page_size: pageSize,
+    downloadFiles: true // Download files for page rendering
+  });
+
+  if (error) {
+    notFound();
+  }
+
+  if (Array.isArray(data)) {
+    // 列表页面 - 全屏展示
+    return (
+      <div className="min-h-screen bg-gray-50">
+        <Suspense fallback={<LoadingSpinner />}>
+          <div className="container mx-auto px-4 py-8">
+            <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
+              {data.map((item, index) => (
+                <div key={index} className="bg-white rounded-lg shadow-lg overflow-hidden hover:shadow-xl transition-shadow duration-300">
+                  {item.image && (
+                    <div className="aspect-video overflow-hidden">
+                      <img
+                        src={item.image}
+                        alt={item.title || 'Presentation item'}
+                        className="w-full h-full object-cover"
+                      />
+                    </div>
+                  )}
+                  <div className="p-6">
+                    <h3 className="text-xl font-semibold text-gray-800 mb-2">
+                      {item.title}
+                    </h3>
+                    {item.subtitle && (
+                      <p className="text-gray-600 text-sm mb-4 line-clamp-3">
+                        {item.subtitle}
+                      </p>
+                    )}
+                    {item.description && (
+                      <div className="text-gray-700 text-sm mb-4 line-clamp-4">
+                        {item.description}
+                      </div>
+                    )}
+                    {item.button_text && item.button_link && (
+                      <a
+                        href={item.button_link}
+                        className="inline-block bg-blue-600 text-white px-4 py-2 rounded-md hover:bg-blue-700 transition-colors duration-200"
+                      >
+                        {item.button_text}
+                      </a>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+        </Suspense>
+      </div>
+    );
+  } else if (data) {
+    // 单页内容 - 全屏展示
+    return (
+      <div className="min-h-screen bg-gray-50">
+        <div className="container mx-auto px-4 py-8">
+          <div className="bg-white rounded-lg shadow-lg overflow-hidden">
+            {/* 主图片区域 */}
+            {data.image && (
+              <div className="w-full h-96 md:h-[500px] overflow-hidden">
+                <img
+                  src={data.image}
+                  alt={data.title}
+                  className="w-full h-full object-cover"
+                />
+              </div>
+            )}
+            
+            {/* 内容区域 */}
+            <div className="p-8">
+              {/* 标题 */}
+              <h1 className="text-3xl md:text-4xl font-bold text-gray-800 mb-6">
+                {data.title}
+              </h1>
+              
+              {/* 副标题 */}
+              {data.subtitle && (
+                <div className="bg-blue-50 border-l-4 border-blue-500 p-4 mb-6 rounded-r-lg">
+                  <p className="text-gray-700 whitespace-pre-line">
+                    {data.subtitle}
+                  </p>
+                </div>
+              )}
+              
+              {/* 主内容 */}
+              <div className="prose max-w-none text-gray-700 mb-8 prose-img:max-w-full prose-img:h-auto prose-table:border prose-table:border-gray-300 prose-th:border prose-th:border-gray-300 prose-td:border prose-td:border-gray-300 prose-th:bg-gray-50 prose-table:rounded-lg prose-table:overflow-hidden" 
+                   dangerouslySetInnerHTML={{ __html: data.content || '' }} />
+              
+              {/* 附加内容 */}
+              {data.additional_content && (
+                <div className="border-t pt-8">
+                  <h2 className="text-2xl font-semibold text-gray-800 mb-4">附加信息</h2>
+                  <div className="prose max-w-none text-gray-700 prose-img:max-w-full prose-img:h-auto prose-table:border prose-table:border-gray-300 prose-th:border prose-th:border-gray-300 prose-td:border prose-td:border-gray-300 prose-th:bg-gray-50 prose-table:rounded-lg prose-table:overflow-hidden" 
+                       dangerouslySetInnerHTML={{ __html: data.additional_content }} />
+                </div>
+              )}
+              
+              {/* 按钮区域 */}
+              {(data.button_text || data.button_1_text || data.button_2_text) && (
+                <div className="flex flex-wrap gap-4 mt-8 pt-6 border-t">
+                  {data.button_text && data.button_link && (
+                    <a
+                      href={data.button_link}
+                      className="bg-blue-600 text-white px-6 py-3 rounded-lg hover:bg-blue-700 transition-colors duration-200 font-medium"
+                    >
+                      {data.button_text}
+                    </a>
+                  )}
+                  {data.button_1_text && data.button_1_link && (
+                    <a
+                      href={data.button_1_link}
+                      className="bg-gray-600 text-white px-6 py-3 rounded-lg hover:bg-gray-700 transition-colors duration-200 font-medium"
+                    >
+                      {data.button_1_text}
+                    </a>
+                  )}
+                  {data.button_2_text && data.button_2_link && (
+                    <a
+                      href={data.button_2_link}
+                      className="border border-gray-300 text-gray-700 px-6 py-3 rounded-lg hover:bg-gray-50 transition-colors duration-200 font-medium"
+                    >
+                      {data.button_2_text}
+                    </a>
+                  )}
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  } else {
+    notFound();
+  }
+}
diff --git a/app/(presentation)/presentation/layout.jsx b/app/(presentation)/presentation/layout.jsx
new file mode 100644
index 0000000..f85fd44
--- /dev/null
+++ b/app/(presentation)/presentation/layout.jsx
@@ -0,0 +1,24 @@
+import Context from "@/context/Context";
+
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <head>
+        <link
+          href="https://fonts.googleapis.com/css2?family=IBM+Plex+Serif:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=Manrope:wght@400;500;700"
+          rel="stylesheet"
+        />
+        <link
+          href="https://fonts.googleapis.com/css2?family=IBM+Plex+Serif:ital,wght@1,300;1,400;1,500;1,600;1,700&display=swap"
+          rel="stylesheet"
+        />
+      </head>
+      <body>
+        <Context>
+          {children}
+        </Context>
+      </body>
+    </html>
+  );
+}
diff --git a/app/[...slug]/page.jsx b/app/(website)/[...slug]/page.jsx
similarity index 100%
rename from app/[...slug]/page.jsx
rename to app/(website)/[...slug]/page.jsx
diff --git a/app/api/get-component-data/route.js b/app/(website)/api/get-component-data/route.js
similarity index 100%
rename from app/api/get-component-data/route.js
rename to app/(website)/api/get-component-data/route.js
diff --git a/app/api/get-menu/route.js b/app/(website)/api/get-menu/route.js
similarity index 100%
rename from app/api/get-menu/route.js
rename to app/(website)/api/get-menu/route.js
diff --git a/app/api/get-page-data/route.js b/app/(website)/api/get-page-data/route.js
similarity index 100%
rename from app/api/get-page-data/route.js
rename to app/(website)/api/get-page-data/route.js
diff --git a/app/api/revalidate/route.js b/app/(website)/api/revalidate/route.js
similarity index 100%
rename from app/api/revalidate/route.js
rename to app/(website)/api/revalidate/route.js
diff --git a/app/api/send-email/route.js b/app/(website)/api/send-email/route.js
similarity index 100%
rename from app/api/send-email/route.js
rename to app/(website)/api/send-email/route.js
diff --git a/app/api/sitemap/route.js b/app/(website)/api/sitemap/route.js
similarity index 100%
rename from app/api/sitemap/route.js
rename to app/(website)/api/sitemap/route.js
diff --git a/app/contact/page.jsx b/app/(website)/contact/page.jsx
similarity index 100%
rename from app/contact/page.jsx
rename to app/(website)/contact/page.jsx
diff --git a/app/favicon.ico b/app/(website)/favicon.ico
similarity index 100%
rename from app/favicon.ico
rename to app/(website)/favicon.ico
diff --git a/app/globals.css b/app/(website)/globals.css
similarity index 100%
rename from app/globals.css
rename to app/(website)/globals.css
diff --git a/app/layout.jsx b/app/(website)/layout.jsx
similarity index 96%
rename from app/layout.jsx
rename to app/(website)/layout.jsx
index de07543..319c5d8 100644
--- a/app/layout.jsx
+++ b/app/(website)/layout.jsx
@@ -1,4 +1,4 @@
-import "../public/assets/style.css";
+import "@/public/assets/style.css";
 import "photoswipe/dist/photoswipe.css";
 import Context from "@/context/Context";
 import ProgressWrap from "@/components/common/ProgressWrap";
diff --git a/app/not-found.jsx b/app/(website)/not-found.jsx
similarity index 100%
rename from app/not-found.jsx
rename to app/(website)/not-found.jsx
diff --git a/app/page.jsx b/app/(website)/page.jsx
similarity index 100%
rename from app/page.jsx
rename to app/(website)/page.jsx
diff --git a/app/products/[...slug]/page.jsx b/app/(website)/products/[...slug]/page.jsx
similarity index 100%
rename from app/products/[...slug]/page.jsx
rename to app/(website)/products/[...slug]/page.jsx
diff --git a/public/assets/style.css b/public/assets/style.css
index 5f784e2..14b1caf 100644
--- a/public/assets/style.css
+++ b/public/assets/style.css
@@ -1,7 +1,7 @@
 @import url("./fonts/unicons/unicons.css");
 @import url("./css/plugins.css");
 @import url("./css/icon.css");
-@import url("../../app/globals.css");
+@import url("../../app/(website)/globals.css");
 @import url("./css/colors/aqua.css");
 @import url("./css/colors/fuchsia.css");
 @import url("./css/colors/grape.css");