Using feature flag

.env.local.example

@@ -48,3 +48,5 @@ GOOGLE_STATIC_MAP_KEY=""
 GOOGLE_STATIC_MAP_SIGNATURE_SECRET=""
 GOOGLE_STATIC_MAP_ID=""
 GOOGLE_DYNAMIC_MAP_ID=""
+
+HIDE_FOR_NEXT_RELEASE="true"

.env.test

@@ -41,3 +41,4 @@ GOOGLE_STATIC_MAP_KEY="test"
 GOOGLE_STATIC_MAP_SIGNATURE_SECRET="test"
 GOOGLE_STATIC_MAP_ID="test"
 GOOGLE_DYNAMIC_MAP_ID="test"
+HIDE_FOR_NEXT_RELEASE="test

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"
@@ -25,6 +27,9 @@ export default async function ContentTypePage({
     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)/@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 async function HeaderPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return <CurrentHeader />
+  }
+
   return <Header />
 }

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

@@ -3,10 +3,12 @@ import "@scandic-hotels/design-system/style.css"
 
 import Script from "next/script"
 
+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 { ToastHandler } from "@/components/TempDesignSystem/Toasts"
@@ -54,10 +56,10 @@ export default async function RootLayout({
         <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
           <TrpcProvider>
             {header}
-            {bookingwidget}
+            {!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>}
             {children}
             <ToastHandler />
-            <Footer />
+            {env.HIDE_FOR_NEXT_RELEASE ? <CurrentFooter /> : <Footer />}
             <TokenRefresher />
           </TrpcProvider>
         </ServerIntlProvider>

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

@@ -0,0 +1,10 @@
+import Header from "@/components/Current/Header"
+import { setLang } from "@/i18n/serverContext"
+
+import { LangParams, PageArgs } from "@/types/params"
+
+export default async function HeaderPage({ params }: PageArgs<LangParams>) {
+  setLang(params.lang)
+
+  return <Header />
+}

app/[lang]/(live-current)/@header/error.tsx

@@ -0,0 +1,5 @@
+"use client"
+
+export default function Error() {
+  return null
+}

app/[lang]/(live-current)/@languageSwitcher/current-content-page/page.tsx

@@ -1,18 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher"
-import { setLang } from "@/i18n/serverContext"
-
-import { LangParams, PageArgs } from "@/types/params"
-
-export default async function LanguageSwitcherRoute({
-  params,
-}: PageArgs<LangParams>) {
-  setLang(params.lang)
-
-  const data = await serverClient().contentstack.languageSwitcher.get()
-  if (!data) {
-    return null
-  }
-  return <LanguageSwitcher urls={data.urls} />
-}

app/[lang]/(live-current)/@languageSwitcher/error.tsx

@@ -1,9 +0,0 @@
-"use client"
-
-import { baseUrls } from "@/constants/routes/baseUrls"
-
-import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher"
-
-export default function Error() {
-  return <LanguageSwitcher urls={baseUrls} />
-}

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

@@ -27,12 +27,9 @@ export const metadata: Metadata = {
 export default async function RootLayout({
   children,
   params,
-  languageSwitcher,
+  header,
-  myPagesMobileDropdown,
 }: React.PropsWithChildren<
-  LayoutArgs<LangParams> & { languageSwitcher: React.ReactNode } & {
+  LayoutArgs<LangParams> & { header: React.ReactNode }
-    myPagesMobileDropdown: React.ReactNode
-  }
 >) {
   setLang(params.lang)
   const { defaultLocale, locale, messages } = await getIntl()
@@ -68,10 +65,7 @@ export default async function RootLayout({
         <LangPopup />
         <SkipToMainContent />
         <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
-          <Header
+          {header}
-            myPagesMobileDropdown={myPagesMobileDropdown}
-            languageSwitcher={languageSwitcher}
-          />
           <BookingWidget />
           {children}
           <Footer />

components/Current/Header/index.tsx

@@ -4,25 +4,25 @@ import { serverClient } from "@/lib/trpc/server"
 
 import { getLang } from "@/i18n/serverContext"
 
+import LanguageSwitcher from "./LanguageSwitcher"
 import { MainMenu } from "./MainMenu"
+import MyPagesMobileDropdown from "./MyPagesMobileDropdown"
 import OfflineBanner from "./OfflineBanner"
 import TopMenu from "./TopMenu"
 
 import styles from "./header.module.css"
 
-export default async function Header({
+export default async function Header() {
-  languageSwitcher,
+  const [data, user, languages, navigation] = await Promise.all([
-  myPagesMobileDropdown,
+    serverClient().contentstack.base.currentHeader({
-}: {
+      lang: getLang(),
-  languageSwitcher: React.ReactNode
+    }),
-  myPagesMobileDropdown: React.ReactNode
+    serverClient().user.name(),
-}) {
+    serverClient().contentstack.languageSwitcher.get(),
-  const data = await serverClient().contentstack.base.currentHeader({
+    serverClient().contentstack.myPages.navigation.get(),
-    lang: getLang(),
+  ])
-  })
-  const user = await serverClient().user.name()
 
-  if (!data) {
+  if (!navigation || !languages || !data) {
     return null
   }
 
@@ -40,7 +40,7 @@ export default async function Header({
         frontpageLinkText={frontpage_link_text}
         homeHref={homeHref}
         links={top_menu.links}
-        languageSwitcher={languageSwitcher}
+        languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
       />
       <MainMenu
         frontpageLinkText={frontpage_link_text}
@@ -48,8 +48,10 @@ export default async function Header({
         links={menu.links}
         logo={logo}
         topMenuMobileLinks={topMenuMobileLinks}
-        languageSwitcher={languageSwitcher}
+        languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
-        myPagesMobileDropdown={myPagesMobileDropdown}
+        myPagesMobileDropdown={
+          <MyPagesMobileDropdown navigation={navigation} />
+        }
         bookingHref={homeHref}
         user={user}
       />

env/server.ts

@@ -65,6 +65,7 @@ export const env = createEnv({
     GOOGLE_STATIC_MAP_SIGNATURE_SECRET: z.string(),
     GOOGLE_DYNAMIC_MAP_ID: z.string(),
     GOOGLE_STATIC_MAP_ID: z.string(),
+    HIDE_FOR_NEXT_RELEASE: z.string(),
   },
   emptyStringAsUndefined: true,
   runtimeEnv: {
@@ -117,5 +118,6 @@ export const env = createEnv({
       process.env.GOOGLE_STATIC_MAP_SIGNATURE_SECRET,
     GOOGLE_STATIC_MAP_ID: process.env.GOOGLE_STATIC_MAP_ID,
     GOOGLE_DYNAMIC_MAP_ID: process.env.GOOGLE_DYNAMIC_MAP_ID,
+    HIDE_FOR_NEXT_RELEASE: process.env.HIDE_FOR_NEXT_RELEASE,
   },
 })