The merge of origin/main left 13 conflict markers across 9 files under frontend/src/app, so 'next build' failed with 21 parse errors and the Docker frontend image never built. Resolution: - Keep the HEAD side (views + PageRuntime shell) for all 8 route pages. - Rebuild layout.tsx by hand: it mixed both sides outside the conflict blocks (Viewport/headers/langFromCookie were only imported on the merged-in side). Kept IconSprite/SiteHeader/SiteFooter/SiteBoot, the mock CSS order (shared -> map -> shell -> responsive), the vendored K2D and Leaflet links, and set lang="th" because i18n.ts sets document.documentElement.lang at runtime. Verified: tsc --noEmit clean, npm run build compiles and prerenders all 12 static + 5 dynamic routes.
13 lines
303 B
TypeScript
13 lines
303 B
TypeScript
import AboutView from "@/components/views/AboutView";
|
|
import PageRuntime from "@/components/PageRuntime";
|
|
|
|
export const metadata = { title: "เกี่ยวกับเรา" };
|
|
|
|
export default function Page() {
|
|
return (
|
|
<>
|
|
<AboutView />
|
|
<PageRuntime page="about" /> </>
|
|
);
|
|
}
|