From 12178279d339cd1b81f377af46054cb73650541d Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Wed, 11 Sep 2024 08:11:47 +0200 Subject: [PATCH] SW-386 Using header component in layout instead of parallel route. Added suspense --- app/[lang]/(live)/@header/[...paths]/page.tsx | 1 - .../(live)/@header/[contentType]/[uid]/page.tsx | 1 - app/[lang]/(live)/@header/error.tsx | 5 ----- .../(live)/@header/my-pages/[...path]/page.tsx | 1 - app/[lang]/(live)/@header/page.tsx | 10 ---------- app/[lang]/(live)/layout.tsx | 5 ++--- components/Header/index.tsx | 17 +++++++++++------ 7 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 app/[lang]/(live)/@header/[...paths]/page.tsx delete mode 100644 app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx delete mode 100644 app/[lang]/(live)/@header/error.tsx delete mode 100644 app/[lang]/(live)/@header/my-pages/[...path]/page.tsx delete mode 100644 app/[lang]/(live)/@header/page.tsx diff --git a/app/[lang]/(live)/@header/[...paths]/page.tsx b/app/[lang]/(live)/@header/[...paths]/page.tsx deleted file mode 100644 index 03a82e5f5..000000000 --- a/app/[lang]/(live)/@header/[...paths]/page.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from "../page" diff --git a/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx deleted file mode 100644 index 2ebaca014..000000000 --- a/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from "../../page" diff --git a/app/[lang]/(live)/@header/error.tsx b/app/[lang]/(live)/@header/error.tsx deleted file mode 100644 index 2764280b4..000000000 --- a/app/[lang]/(live)/@header/error.tsx +++ /dev/null @@ -1,5 +0,0 @@ -"use client" - -export default function Error() { - return null -} diff --git a/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx b/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx deleted file mode 100644 index 2ebaca014..000000000 --- a/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from "../../page" diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx deleted file mode 100644 index adccd9484..000000000 --- a/app/[lang]/(live)/@header/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import Header from "@/components/Header" -import { setLang } from "@/i18n/serverContext" - -import { LangParams, PageArgs } from "@/types/params" - -export default async function HeaderPage({ params }: PageArgs) { - setLang(params.lang) - - return
-} diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 3ee99194c..15312b9b4 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -9,6 +9,7 @@ import TokenRefresher from "@/components/Auth/TokenRefresher" import AdobeSDKScript from "@/components/Current/AdobeSDKScript" import VwoScript from "@/components/Current/VwoScript" import Footer from "@/components/Footer" +import Header from "@/components/Header" import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import { preloadUserTracking } from "@/components/TrackingSDK" import { getIntl } from "@/i18n" @@ -20,11 +21,9 @@ import type { LangParams, LayoutArgs } from "@/types/params" export default async function RootLayout({ children, params, - header, bookingwidget, }: React.PropsWithChildren< LayoutArgs & { - header: React.ReactNode bookingwidget: React.ReactNode } >) { @@ -53,7 +52,7 @@ export default async function RootLayout({ - {header} +
{bookingwidget} {children} diff --git a/components/Header/index.tsx b/components/Header/index.tsx index effc8aadb..6be9a911b 100644 --- a/components/Header/index.tsx +++ b/components/Header/index.tsx @@ -1,5 +1,8 @@ +import { Suspense } from "react" + import { serverClient } from "@/lib/trpc/server" +import LoadingSpinner from "../LoadingSpinner" import MainMenu from "./MainMenu" import TopMenu from "./TopMenu" @@ -15,12 +18,14 @@ export default async function Header() { return (
- - + }> + + +
) }