More PR fixes

This commit is contained in:
Linus Flood
2024-09-18 15:31:15 +02:00
parent b8f37c810d
commit 98b48b8290
8 changed files with 18 additions and 15 deletions

View File

@@ -2,7 +2,7 @@ import { serverClient } from "@/lib/trpc/server"
import MobileMenu from "../MobileMenu"
export default async function MobileMenuServer() {
export default async function MobileMenuWrapper() {
const [languages, headerData] = await Promise.all([
serverClient().contentstack.languageSwitcher.get(),
serverClient().contentstack.base.header(),

View File

@@ -12,7 +12,7 @@ import MyPagesMobileMenu from "../MyPagesMobileMenu"
import styles from "../mainMenu.module.css"
export default async function MyPagesMenuServer() {
export default async function MyPagesMenuWrapper() {
const lang = getLang()
const [intl, myPagesNavigation, user, membership] = await Promise.all([
getIntl(),

View File

@@ -1,19 +1,15 @@
"use client"
import { z } from "zod"
import { getHeaderSchema } from "@/server/routers/contentstack/base/output"
import NavigationMenuItem from "../NavigationMenuItem"
import styles from "../navigationMenu.module.css"
import { NavigationMenuListProps } from "@/types/components/header/navigationMenuList"
export default function NavigationMenuList({
isMobile,
items,
}: {
isMobile: boolean
items: z.infer<typeof getHeaderSchema>["menuItems"]
}) {
}: NavigationMenuListProps) {
return (
<ul
className={`${styles.navigationMenu} ${isMobile ? styles.mobile : styles.desktop}`}

View File

@@ -5,8 +5,8 @@ import Image from "@/components/Image"
import { getIntl } from "@/i18n"
import { getLang } from "@/i18n/serverContext"
import MobileMenuServer from "./MobileMenuWrapper"
import MyPagesMenuServer from "./MyPagesMenuWrapper"
import MobileMenuWrapper from "./MobileMenuWrapper"
import MyPagesMenuWrapper from "./MyPagesMenuWrapper"
import NavigationMenu from "./NavigationMenu"
import styles from "./mainMenu.module.css"
@@ -38,10 +38,10 @@ export default async function MainMenu() {
<NavigationMenu isMobile={false} />
</Suspense>
<Suspense fallback={"Loading profile"}>
<MyPagesMenuServer />
<MyPagesMenuWrapper />
</Suspense>
<Suspense fallback={"Loading menu"}>
<MobileMenuServer />
<MobileMenuWrapper />
</Suspense>
</div>
</nav>