From 98b48b8290941a9da444ffeacdefa4d05f2049e9 Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Wed, 18 Sep 2024 15:31:15 +0200
Subject: [PATCH] More PR fixes

---
 components/Header/MainMenu/MobileMenuWrapper/index.tsx |  2 +-
 .../Header/MainMenu/MyPagesMenuWrapper/index.tsx       |  2 +-
 .../NavigationMenu/NavigationMenuList/index.tsx        | 10 +++-------
 components/Header/MainMenu/index.tsx                   |  8 ++++----
 components/Header/index.tsx                            |  2 +-
 components/MyPages/Sidebar/index.tsx                   |  2 +-
 types/components/header/navigationMenuList.ts          |  6 ++++++
 types/header.ts                                        |  1 +
 8 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 types/components/header/navigationMenuList.ts

diff --git a/components/Header/MainMenu/MobileMenuWrapper/index.tsx b/components/Header/MainMenu/MobileMenuWrapper/index.tsx
index b61b086fd..fb851248c 100644
--- a/components/Header/MainMenu/MobileMenuWrapper/index.tsx
+++ b/components/Header/MainMenu/MobileMenuWrapper/index.tsx
@@ -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(),
diff --git a/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx b/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
index da941389a..4108b807a 100644
--- a/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
+++ b/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
@@ -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(),
diff --git a/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx b/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx
index c59797c6c..bdc957582 100644
--- a/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx
+++ b/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx
@@ -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}`}
diff --git a/components/Header/MainMenu/index.tsx b/components/Header/MainMenu/index.tsx
index f923a00af..f897f8a84 100644
--- a/components/Header/MainMenu/index.tsx
+++ b/components/Header/MainMenu/index.tsx
@@ -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>
diff --git a/components/Header/index.tsx b/components/Header/index.tsx
index 026cc72f0..cb24d890e 100644
--- a/components/Header/index.tsx
+++ b/components/Header/index.tsx
@@ -5,7 +5,7 @@ import TopMenu from "./TopMenu"
 
 import styles from "./header.module.css"
 
-export default function Header({}) {
+export default function Header() {
   return (
     <header className={styles.header}>
       <Suspense fallback="Loading top menu">
diff --git a/components/MyPages/Sidebar/index.tsx b/components/MyPages/Sidebar/index.tsx
index d91782b83..b6169639e 100644
--- a/components/MyPages/Sidebar/index.tsx
+++ b/components/MyPages/Sidebar/index.tsx
@@ -1,4 +1,4 @@
-import { Fragment, Suspense } from "react"
+import { Fragment } from "react"
 
 import { logout } from "@/constants/routes/handleAuth"
 import { serverClient } from "@/lib/trpc/server"
diff --git a/types/components/header/navigationMenuList.ts b/types/components/header/navigationMenuList.ts
new file mode 100644
index 000000000..1b43d9a42
--- /dev/null
+++ b/types/components/header/navigationMenuList.ts
@@ -0,0 +1,6 @@
+import { MenuItems } from "@/types/header"
+
+export interface NavigationMenuListProps {
+  isMobile: boolean
+  items: MenuItems
+}
diff --git a/types/header.ts b/types/header.ts
index cc425f618..b9d5863c4 100644
--- a/types/header.ts
+++ b/types/header.ts
@@ -10,3 +10,4 @@ export type HeaderRefResponse = z.input<typeof getHeaderRefSchema>
 export type HeaderResponse = z.input<typeof getHeaderSchema>
 export type Header = z.output<typeof getHeaderSchema>
 export type MenuItem = z.output<typeof menuItemSchema>
+export type MenuItems = z.infer<typeof getHeaderSchema>["menuItems"]