diff --git a/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/error.tsx b/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/error.tsx new file mode 100644 index 000000000..be9c458c9 --- /dev/null +++ b/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/error.tsx @@ -0,0 +1,14 @@ +"use client" + +import { useParams } from "next/navigation" + +import { baseUrls } from "@/constants/routes/baseUrls" + +import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher" + +import { LangParams } from "@/types/params" + +export default function Error() { + const params = useParams() + return +} diff --git a/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/page.tsx b/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/page.tsx new file mode 100644 index 000000000..e96bc295c --- /dev/null +++ b/app/[lang]/(live)/@header/[...paths]/@languageSwitcher/page.tsx @@ -0,0 +1,9 @@ +import { serverClient } from "@/lib/trpc/server" + +import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher" + +export default async function LanguageSwitcherRoute() { + const data = await serverClient().contentstack.languageSwitcher.get() + + return +} diff --git a/app/[lang]/(live)/@header/[...paths]/layout.tsx b/app/[lang]/(live)/@header/[...paths]/layout.tsx new file mode 100644 index 000000000..3601c3e2f --- /dev/null +++ b/app/[lang]/(live)/@header/[...paths]/layout.tsx @@ -0,0 +1,21 @@ +import { ReactNode } from "react" + +import Header from "@/components/Current/Header" + +import { LangParams, PageArgs } from "@/types/params" + +export default function HeaderLayout({ + params, + languageSwitcher, + children, +}: PageArgs & { + languageSwitcher: ReactNode + children: ReactNode +}) { + return ( + <> +
+ {children} + + ) +} diff --git a/app/[lang]/(live)/@header/[...paths]/page.tsx b/app/[lang]/(live)/@header/[...paths]/page.tsx new file mode 100644 index 000000000..c019f1170 --- /dev/null +++ b/app/[lang]/(live)/@header/[...paths]/page.tsx @@ -0,0 +1,3 @@ +export default function EmptyHeaderPage() { + return null +} diff --git a/app/[lang]/(live)/@header/error.tsx b/app/[lang]/(live)/@header/error.tsx new file mode 100644 index 000000000..2764280b4 --- /dev/null +++ b/app/[lang]/(live)/@header/error.tsx @@ -0,0 +1,5 @@ +"use client" + +export default function Error() { + return null +} diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx new file mode 100644 index 000000000..53bf8ae11 --- /dev/null +++ b/app/[lang]/(live)/@header/page.tsx @@ -0,0 +1,15 @@ +import { baseUrls } from "@/constants/routes/baseUrls" + +import Header from "@/components/Current/Header" +import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher" + +import { LangParams, PageArgs } from "@/types/params" + +export default async function HeaderPage({ params }: PageArgs) { + return ( +
} + /> + ) +} diff --git a/app/[lang]/(live)/@languageSwitcher/[...paths]/page.tsx b/app/[lang]/(live)/@languageSwitcher/[...paths]/page.tsx deleted file mode 100644 index 9f0deda43..000000000 --- a/app/[lang]/(live)/@languageSwitcher/[...paths]/page.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { serverClient } from "@/lib/trpc/server" - -import Desktop from "@/components/Current/Header/LanguageSwitcher/Desktop" -import Mobile from "@/components/Current/Header/LanguageSwitcher/Mobile" - -export default async function LanguageSwitcher() { - const data = await serverClient().contentstack.languageSwitcher.get() - return ( - <> - - - - ) -} diff --git a/app/[lang]/(live)/@languageSwitcher/default.tsx b/app/[lang]/(live)/@languageSwitcher/default.tsx deleted file mode 100644 index e8020af9c..000000000 --- a/app/[lang]/(live)/@languageSwitcher/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default async function DefaultLanguageSwitcher() { - return null -} diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 976b8ccbd..323ba1a41 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -7,7 +7,6 @@ import TrpcProvider from "@/lib/trpc/Provider" import AdobeScript from "@/components/Current/AdobeScript" import Footer from "@/components/Current/Footer" -import Header from "@/components/Current/Header" import VwoScript from "@/components/Current/VwoScript" import { getIntl } from "@/i18n" import ServerIntlProvider from "@/i18n/Provider" @@ -24,10 +23,10 @@ export const metadata: Metadata = { export default async function RootLayout({ children, params, - languageSwitcher, + header, }: React.PropsWithChildren< LayoutArgs & { - languageSwitcher: React.ReactNode + header: React.ReactNode } >) { const { defaultLocale, locale, messages } = await getIntl() @@ -55,12 +54,9 @@ export default async function RootLayout({ -
+ {header} {children} -