Merged in feat/refactor-header-footer-sitewidealert (pull request #1374)

Refactor: removed parallel routes for header, footer and sidewidealert. Langswitcher and sidewidealert now client components

* feat - removed parallel routes and made sidepeek and sitewidealerts as client components

* Langswitcher as client component

* Fixed lang switcher for current header

* Passing lang when fetching siteconfig

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Refactor

* Removed dead code

* Show only languages that has translation

* Refetch sitewidealert every 60 seconds

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Removed sidepeek parallel route from my-stay

* Added missing env.var to env.test

* Removed console.log


Approved-by: Joakim Jäderberg
This commit is contained in:
Linus Flood
2025-02-19 08:59:24 +00:00
parent c2b7d97ddd
commit 7c0f9084b6
45 changed files with 664 additions and 697 deletions

View File

@@ -21,7 +21,6 @@ import { IconName } from "@/types/components/icon"
export default function MobileMenu({
children,
languageUrls,
topLink,
isLoggedIn,
}: React.PropsWithChildren<MobileMenuProps>) {
@@ -91,7 +90,7 @@ export default function MobileMenu({
<HeaderLink href="#" iconName={IconName.Service}>
{intl.formatMessage({ id: "Customer service" })}
</HeaderLink>
<LanguageSwitcher type="mobileHeader" urls={languageUrls} />
<LanguageSwitcher type="mobileHeader" />
</footer>
</Dialog>
</Modal>

View File

@@ -1,4 +1,4 @@
import { getHeader, getLanguageSwitcher } from "@/lib/trpc/memoizedRequests"
import { getHeader } from "@/lib/trpc/memoizedRequests"
import { auth } from "@/auth"
import { isValidSession } from "@/utils/session"
@@ -9,17 +9,15 @@ export default async function MobileMenuWrapper({
children,
}: React.PropsWithChildren) {
// preloaded
const languages = await getLanguageSwitcher()
const header = await getHeader()
const session = await auth()
if (!languages || !header) {
if (!header) {
return null
}
return (
<MobileMenu
languageUrls={languages.urls}
topLink={header.data.topLink}
isLoggedIn={isValidSession(session)}
>

View File

@@ -1,4 +1,4 @@
import { getHeader, getLanguageSwitcher } from "@/lib/trpc/memoizedRequests"
import { getHeader } from "@/lib/trpc/memoizedRequests"
import { auth } from "@/auth"
import LanguageSwitcher from "@/components/LanguageSwitcher"
@@ -18,12 +18,11 @@ export default async function TopMenu() {
// cached
const intl = await getIntl()
// both preloaded
const languages = await getLanguageSwitcher()
const header = await getHeader()
const session = await auth()
const isLoggedIn = isValidSession(session)
if (!languages || !header) {
if (!header) {
return null
}
@@ -32,7 +31,7 @@ export default async function TopMenu() {
<div className={styles.content}>
<TopLink isLoggedIn={isLoggedIn} topLink={header.data.topLink} />
<div className={styles.options}>
<LanguageSwitcher type="desktopHeader" urls={languages.urls} />
<LanguageSwitcher type="desktopHeader" />
<Caption type="regular" color="textMediumContrast" asChild>
<HeaderLink href="#" iconName={IconName.Search}>

View File

@@ -1,20 +1,29 @@
import { Suspense } from "react"
import {
getHeader,
getLanguageSwitcher,
getName,
} from "@/lib/trpc/memoizedRequests"
import { env } from "@/env/server"
import { getHeader, getName } from "@/lib/trpc/memoizedRequests"
import CurrentHeader from "@/components/Current/Header"
import HeaderFallback from "../Current/Header/HeaderFallback"
import MainMenu from "./MainMenu"
import TopMenu, { TopMenuSkeleton } from "./TopMenu"
import styles from "./header.module.css"
export default function Header() {
void getHeader()
void getLanguageSwitcher()
void getName()
if (env.HIDE_FOR_NEXT_RELEASE) {
return (
<Suspense fallback={<HeaderFallback />}>
<CurrentHeader />
</Suspense>
)
}
void getHeader()
return (
<header className={styles.header}>
<Suspense fallback={<TopMenuSkeleton />}>