feat: separate current and "new" web in route groups

2024-02-20 09:14:42 +01:00
parent 10b52112af
commit 4e4b6f1bd6
14 changed files with 268 additions and 66 deletions
--- a/app/[lang]/(live-current)/current-content-page/page.tsx
+++ b/app/[lang]/(live-current)/current-content-page/page.tsx
@@ -0,0 +1,57 @@
+import { notFound } from "next/navigation"
+
+import { request } from "@/lib/request"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
+
+import ContentPage from "@/components/Current/ContentPage"
+import Tracking from "../../Tracking"
+
+import type { PageArgs, LangParams, UriParams } from "@/types/params"
+import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
+
+export default async function CurrentContentPage({
+  params,
+  searchParams,
+}: PageArgs<LangParams, UriParams>) {
+  try {
+    if (!searchParams.uri) {
+      throw new Error("Bad URI")
+    }
+
+    const response = await request<GetCurrentBlockPageData>(
+      GetCurrentBlockPage,
+      {
+        locale: params.lang,
+        url: searchParams.uri,
+      }
+    )
+
+    if (!response.data?.all_current_blocks_page?.total) {
+      console.log("#### DATA ####")
+      console.log(response.data)
+      console.log("SearchParams URI: ", searchParams.uri)
+      throw new Error("Not found")
+    }
+    const pageData = response.data.all_current_blocks_page.items[0]
+    const trackingData = {
+      pageName: pageData.title,
+      pageType: pageData.__typename,
+      publishedDate: pageData.system.updated_at,
+      createdDate: pageData.system.created_at,
+      pageId: pageData.system.uid,
+    }
+
+    return (
+      <>
+        <ContentPage
+          data={response.data}
+          uri={searchParams.uri}
+          lang={params.lang}
+        />
+        <Tracking pageData={trackingData} />
+      </>
+    )
+  } catch (err) {
+    return notFound()
+  }
+}
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -0,0 +1,79 @@
+/* eslint-disable @next/next/no-css-tags */
+
+import Footer from "@/components/Current/Footer"
+import LangPopup from "@/components/Current/LangPopup"
+import Script from "next/script"
+import SkipToMainContent from "@/components/SkipToMainContent"
+import AdobeScript from "../AdobeScript"
+
+import type { Metadata } from "next"
+import type { LangParams, LayoutArgs } from "@/types/params"
+
+export const metadata: Metadata = {
+  description: "New web",
+  title: "Scandic Hotels New Web",
+}
+
+export default function RootLayout({
+  children,
+  params,
+}: React.PropsWithChildren<LayoutArgs<LangParams>>) {
+  return (
+    <html lang={params.lang}>
+      <head>
+        <link rel="stylesheet" href="/Static/css/core.css"/>
+        <link rel="stylesheet" href="/Static/css/scandic.css"/>
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/cookie-bot.js?1705409331007"
+        />
+        <Script
+          data-blockingmode="auto"
+          data-cbid="6d539de8-3e67-4f0f-a0df-8cef9070f712"
+          data-culture="@cultureCode"
+          id="Cookiebot"
+          src="https://consent.cookiebot.com/uc.js"
+        />
+        {/* <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/head.js?85c84c9e24ae8da3e7af"
+        /> */}
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/inline.js?00133e5a37de35c51a5d"
+        />
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/main.js?89d0030e1a04b3b46d0b"
+        />
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/ng/polyfills.js?1705409330990"
+        />
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/ng/runtime.js?1705409330990"
+        />
+        <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/ng/main.js?1705409330990"
+        />
+        {/* <Script
+          data-cookieconsent="ignore"
+          src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
+          strategy="lazyOnload"
+        /> */}
+        <AdobeScript />
+      </head>
+      <body>
+        <LangPopup lang={params.lang} />
+        <SkipToMainContent lang={params.lang} />
+        {children}
+        <Footer lang={params.lang} />
+        <Script id="page-tracking">{`
+          typeof _satellite !== "undefined" && _satellite.pageBottom();
+        `}</Script>
+      </body>
+    </html>
+  )
+}
--- a/app/[lang]/(live-current)/not-found.tsx
+++ b/app/[lang]/(live-current)/not-found.tsx
@@ -0,0 +1,8 @@
+export default function NotFound() {
+  return (
+    <main>
+      <h2>Not Found</h2>
+      <p>Could not find requested resource</p>
+    </main>
+  )
+}