Merge develop

app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx

@@ -1,5 +1,7 @@
 import { notFound } from "next/navigation"
 
+import { env } from "@/env/server"
+
 import ContentPage from "@/components/ContentType/ContentPage"
 import HotelPage from "@/components/ContentType/HotelPage"
 import LoyaltyPage from "@/components/ContentType/LoyaltyPage"
@@ -21,10 +23,16 @@ export default async function ContentTypePage({
 
   switch (params.contentType) {
     case "content-page":
+      if (env.HIDE_FOR_NEXT_RELEASE) {
+        return notFound()
+      }
       return <ContentPage />
     case "loyalty-page":
       return <LoyaltyPage />
     case "hotel-page":
+      if (env.HIDE_FOR_NEXT_RELEASE) {
+        return notFound()
+      }
       return <HotelPage />
     default:
       const type: never = params.contentType

app/[lang]/(live)/(public)/hotelreservation/layout.tsx

@@ -1,3 +1,7 @@
+import { notFound } from "next/navigation"
+
+import { env } from "@/env/server"
+
 import styles from "./layout.module.css"
 
 import { LangParams, LayoutArgs } from "@/types/params"
@@ -5,5 +9,8 @@ import { LangParams, LayoutArgs } from "@/types/params"
 export default function HotelReservationLayout({
   children,
 }: React.PropsWithChildren<LayoutArgs<LangParams>>) {
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return notFound()
+  }
   return <div className={styles.layout}>{children}</div>
 }

app/[lang]/(live)/@header/page.tsx

@@ -1,3 +1,6 @@
+import { env } from "@/env/server"
+
+import CurrentHeader from "@/components/Current/Header"
 import Header from "@/components/Header"
 import { setLang } from "@/i18n/serverContext"
 
@@ -6,5 +9,9 @@ import { LangParams, PageArgs } from "@/types/params"
 export default function HeaderPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return <CurrentHeader />
+  }
+
   return <Header />
 }

app/[lang]/(live)/layout.tsx

@@ -4,10 +4,12 @@ import "@scandic-hotels/design-system/style.css"
 import Script from "next/script"
 import { Suspense } from "react"
 
+import { env } from "@/env/server"
 import TrpcProvider from "@/lib/trpc/Provider"
 
 import TokenRefresher from "@/components/Auth/TokenRefresher"
 import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
+import CurrentFooter from "@/components/Current/Footer"
 import VwoScript from "@/components/Current/VwoScript"
 import Footer from "@/components/Footer"
 import LoadingSpinner from "@/components/LoadingSpinner"
@@ -56,11 +58,11 @@ export default async function RootLayout({
         <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
           <TrpcProvider>
             {header}
-            {bookingwidget}
+            {!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>}
             {children}
             <ToastHandler />
             <Suspense fallback={<LoadingSpinner />}>
-              <Footer />
+              {env.HIDE_FOR_NEXT_RELEASE ? <CurrentFooter /> : <Footer />}
             </Suspense>
             <TokenRefresher />
           </TrpcProvider>