scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle case with no lang/uid for langswitcher and footer

Browse Source
This commit is contained in:
Christel Westerberg
2024-06-05 11:24:27 +02:00
parent 512738428e
commit b8982dacf4
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/[lang]/(live)/layout.tsx
View File

@@ -60,7 +60,7 @@ export default async function RootLayout({
languageSwitcher={languageSwitcher} languageSwitcher={languageSwitcher}
/> />
{children} {children}
<Footer /> <Footer lang={params.lang} />
</TrpcProvider> </TrpcProvider>
</ServerIntlProvider> </ServerIntlProvider>
<Script id="page-tracking">{` <Script id="page-tracking">{`

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

@@ -80,12 +80,12 @@ export default async function RootLayout({
</head> </head>
<body className="theme-00Corecolours theme-X0Oldcorecolours"> <body className="theme-00Corecolours theme-X0Oldcorecolours">
<LangPopup lang={params.lang} /> <LangPopup lang={params.lang} />
<SkipToMainContent /> <SkipToMainContent lang={params.lang} />
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}> <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<Header lang={params.lang} languageSwitcher={languageSwitcher} /> <Header lang={params.lang} languageSwitcher={languageSwitcher} />
{children} {children}
<Footer lang={params.lang} />
</ServerIntlProvider> </ServerIntlProvider>
<Footer />
<Script id="page-tracking">{` <Script id="page-tracking">{`
typeof _satellite !== "undefined" && _satellite.pageBottom(); typeof _satellite !== "undefined" && _satellite.pageBottom();
`}</Script> `}</Script>

2
app/[lang]/(preview-current)/layout.tsx
View File

@@ -53,7 +53,7 @@ export default function RootLayout({
<LangPopup lang={params.lang} /> <LangPopup lang={params.lang} />
<SkipToMainContent /> <SkipToMainContent />
{children} {children}
<Footer /> <Footer lang={params.lang} />
</body> </body>
</html> </html>
) )

6
components/Current/Footer/index.tsx
View File

@@ -6,8 +6,10 @@ import Navigation from "./Navigation"
import styles from "./footer.module.css" import styles from "./footer.module.css"
export default async function Footer() { import { LangParams } from "@/types/params"
const footerData = await serverClient().contentstack.base.footer()
export default async function Footer({ lang }: LangParams) {
const footerData = await serverClient().contentstack.base.footer({ lang })
return ( return (
<footer className={styles.container}> <footer className={styles.container}>
<div className={styles.content}> <div className={styles.content}>

2
server/routers/contentstack/base/input.ts
View File

@@ -2,4 +2,4 @@ import { z } from "zod"
import { Lang } from "@/constants/languages" import { Lang } from "@/constants/languages"
export const headerInput = z.object({ lang: z.nativeEnum(Lang) }) export const langInput = z.object({ lang: z.nativeEnum(Lang) })