Merged in fix/mypages-clientside-menu (pull request #1344)

Fix/mypages clientside menu

* feat: move mypages menu to client side

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu

* wip

* wip

* wip

* refactor: reorganize MyPages navigation logic and improve type definitions

* refactor: enhance MyPagesMobileDropdown with loading states and skeletons

* refactor: clean up header component and improve myPagesNavigation query structure

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu


Approved-by: Linus Flood
This commit is contained in:
Joakim Jäderberg
2025-02-17 07:47:33 +00:00
committed by Linus Flood
parent ef1d3ee065
commit 2791f07f67
18 changed files with 334 additions and 251 deletions

View File

@@ -6,10 +6,6 @@ import {
getName,
} from "@/lib/trpc/memoizedRequests"
import {
getPrimaryLinks,
getSecondaryLinks,
} from "@/components/MyPages/menuItems"
import { getLang } from "@/i18n/serverContext"
import LanguageSwitcher from "./LanguageSwitcher"
@@ -22,14 +18,11 @@ import styles from "./header.module.css"
export default async function Header() {
const lang = getLang()
const [data, user, languages, primaryLinks, secondaryLinks] =
await Promise.all([
getCurrentHeader(lang),
getName(),
getLanguageSwitcher(),
getPrimaryLinks({ lang }),
getSecondaryLinks({ lang }),
])
const [data, user, languages] = await Promise.all([
getCurrentHeader(lang),
getName(),
getLanguageSwitcher(),
])
if (!languages || !data?.header) {
return null
@@ -58,12 +51,7 @@ export default async function Header() {
logo={logo}
topMenuMobileLinks={topMenuMobileLinks}
languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
myPagesMobileDropdown={
<MyPagesMobileDropdown
primaryLinks={primaryLinks}
secondaryLinks={secondaryLinks}
/>
}
myPagesMobileDropdown={<MyPagesMobileDropdown />}
bookingHref={homeHref}
user={user}
/>