From a6222255d40d236ee988a250a689cb6b33ced5a9 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Tue, 17 Sep 2024 08:09:29 +0200 Subject: [PATCH] PR fixes --- app/[lang]/(live)/@header/page.tsx | 2 +- app/[lang]/(live)/layout.tsx | 1 - .../{MobileMenuServer => MobileMenuWrapper}/index.tsx | 3 +-- .../{MyPagesMenuServer => MyPagesMenuWrapper}/index.tsx | 3 +-- .../MainMenu/NavigationMenu/NavigationMenuList/index.tsx | 8 ++++++-- components/Header/MainMenu/index.tsx | 8 +++----- components/Header/TopMenu/index.tsx | 6 +----- components/Header/index.tsx | 2 +- types/components/header/mainMenu.ts | 1 - types/components/header/topMenu.ts | 1 - 10 files changed, 14 insertions(+), 21 deletions(-) rename components/Header/MainMenu/{MobileMenuServer => MobileMenuWrapper}/index.tsx (85%) rename components/Header/MainMenu/{MyPagesMenuServer => MyPagesMenuWrapper}/index.tsx (95%) delete mode 100644 types/components/header/mainMenu.ts delete mode 100644 types/components/header/topMenu.ts diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx index adccd9484..7f01d8eb5 100644 --- a/app/[lang]/(live)/@header/page.tsx +++ b/app/[lang]/(live)/@header/page.tsx @@ -3,7 +3,7 @@ import { setLang } from "@/i18n/serverContext" import { LangParams, PageArgs } from "@/types/params" -export default async function HeaderPage({ params }: PageArgs) { +export default function HeaderPage({ params }: PageArgs) { setLang(params.lang) return
diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index a1d7e0408..33ba651d4 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -10,7 +10,6 @@ import TokenRefresher from "@/components/Auth/TokenRefresher" import AdobeSDKScript from "@/components/Current/AdobeSDKScript" import VwoScript from "@/components/Current/VwoScript" import Footer from "@/components/Footer" -import Header from "@/components/Header" import LoadingSpinner from "@/components/LoadingSpinner" import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import { preloadUserTracking } from "@/components/TrackingSDK" diff --git a/components/Header/MainMenu/MobileMenuServer/index.tsx b/components/Header/MainMenu/MobileMenuWrapper/index.tsx similarity index 85% rename from components/Header/MainMenu/MobileMenuServer/index.tsx rename to components/Header/MainMenu/MobileMenuWrapper/index.tsx index 1932603f2..b61b086fd 100644 --- a/components/Header/MainMenu/MobileMenuServer/index.tsx +++ b/components/Header/MainMenu/MobileMenuWrapper/index.tsx @@ -1,9 +1,8 @@ -"use server" import { serverClient } from "@/lib/trpc/server" import MobileMenu from "../MobileMenu" -export default async function MobileMenuServer({}) { +export default async function MobileMenuServer() { const [languages, headerData] = await Promise.all([ serverClient().contentstack.languageSwitcher.get(), serverClient().contentstack.base.header(), diff --git a/components/Header/MainMenu/MyPagesMenuServer/index.tsx b/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx similarity index 95% rename from components/Header/MainMenu/MyPagesMenuServer/index.tsx rename to components/Header/MainMenu/MyPagesMenuWrapper/index.tsx index eaf5440c8..da941389a 100644 --- a/components/Header/MainMenu/MyPagesMenuServer/index.tsx +++ b/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx @@ -1,4 +1,3 @@ -"use server" import { Link } from "react-feather" import { myPages } from "@/constants/routes/myPages" @@ -13,7 +12,7 @@ import MyPagesMobileMenu from "../MyPagesMobileMenu" import styles from "../mainMenu.module.css" -export default async function MyPagesMenuServer({}) { +export default async function MyPagesMenuServer() { 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 60e4a5c7e..c59797c6c 100644 --- a/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx +++ b/components/Header/MainMenu/NavigationMenu/NavigationMenuList/index.tsx @@ -1,4 +1,8 @@ "use client" +import { z } from "zod" + +import { getHeaderSchema } from "@/server/routers/contentstack/base/output" + import NavigationMenuItem from "../NavigationMenuItem" import styles from "../navigationMenu.module.css" @@ -8,13 +12,13 @@ export default function NavigationMenuList({ items, }: { isMobile: boolean - items: any + items: z.infer["menuItems"] }) { return (
    - {items.map((item: any) => ( + {items.map((item) => (
    • diff --git a/components/Header/MainMenu/index.tsx b/components/Header/MainMenu/index.tsx index 2727fd16d..f923a00af 100644 --- a/components/Header/MainMenu/index.tsx +++ b/components/Header/MainMenu/index.tsx @@ -5,15 +5,13 @@ import Image from "@/components/Image" import { getIntl } from "@/i18n" import { getLang } from "@/i18n/serverContext" -import MobileMenuServer from "./MobileMenuServer" -import MyPagesMenuServer from "./MyPagesMenuServer" +import MobileMenuServer from "./MobileMenuWrapper" +import MyPagesMenuServer from "./MyPagesMenuWrapper" import NavigationMenu from "./NavigationMenu" import styles from "./mainMenu.module.css" -import type { MainMenuProps } from "@/types/components/header/mainMenu" - -export default async function MainMenu({}: MainMenuProps) { +export default async function MainMenu() { const lang = getLang() const intl = await getIntl() diff --git a/components/Header/TopMenu/index.tsx b/components/Header/TopMenu/index.tsx index adf8ca96d..ee676bbf0 100644 --- a/components/Header/TopMenu/index.tsx +++ b/components/Header/TopMenu/index.tsx @@ -1,5 +1,3 @@ -import { Suspense } from "react" - import { serverClient } from "@/lib/trpc/server" import { GiftIcon, SearchIcon } from "@/components/Icons" @@ -10,9 +8,7 @@ import HeaderLink from "../HeaderLink" import styles from "./topMenu.module.css" -import type { TopMenuProps } from "@/types/components/header/topMenu" - -export default async function TopMenu({}: TopMenuProps) { +export default async function TopMenu() { const [intl, languages, headerData] = await Promise.all([ getIntl(), serverClient().contentstack.languageSwitcher.get(), diff --git a/components/Header/index.tsx b/components/Header/index.tsx index 2bb580c2b..026cc72f0 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 async function Header({}) { +export default function Header({}) { return (
    diff --git a/types/components/header/mainMenu.ts b/types/components/header/mainMenu.ts deleted file mode 100644 index 8053fc40f..000000000 --- a/types/components/header/mainMenu.ts +++ /dev/null @@ -1 +0,0 @@ -export interface MainMenuProps {} diff --git a/types/components/header/topMenu.ts b/types/components/header/topMenu.ts deleted file mode 100644 index f5ef829e6..000000000 --- a/types/components/header/topMenu.ts +++ /dev/null @@ -1 +0,0 @@ -export interface TopMenuProps {}