PR fixes
This commit is contained in:
@@ -3,7 +3,7 @@ import { setLang } from "@/i18n/serverContext"
|
|||||||
|
|
||||||
import { LangParams, PageArgs } from "@/types/params"
|
import { LangParams, PageArgs } from "@/types/params"
|
||||||
|
|
||||||
export default async function HeaderPage({ params }: PageArgs<LangParams>) {
|
export default function HeaderPage({ params }: PageArgs<LangParams>) {
|
||||||
setLang(params.lang)
|
setLang(params.lang)
|
||||||
|
|
||||||
return <Header />
|
return <Header />
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import TokenRefresher from "@/components/Auth/TokenRefresher"
|
|||||||
import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
|
import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
|
||||||
import VwoScript from "@/components/Current/VwoScript"
|
import VwoScript from "@/components/Current/VwoScript"
|
||||||
import Footer from "@/components/Footer"
|
import Footer from "@/components/Footer"
|
||||||
import Header from "@/components/Header"
|
|
||||||
import LoadingSpinner from "@/components/LoadingSpinner"
|
import LoadingSpinner from "@/components/LoadingSpinner"
|
||||||
import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
|
import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
|
||||||
import { preloadUserTracking } from "@/components/TrackingSDK"
|
import { preloadUserTracking } from "@/components/TrackingSDK"
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
"use server"
|
|
||||||
import { serverClient } from "@/lib/trpc/server"
|
import { serverClient } from "@/lib/trpc/server"
|
||||||
|
|
||||||
import MobileMenu from "../MobileMenu"
|
import MobileMenu from "../MobileMenu"
|
||||||
|
|
||||||
export default async function MobileMenuServer({}) {
|
export default async function MobileMenuServer() {
|
||||||
const [languages, headerData] = await Promise.all([
|
const [languages, headerData] = await Promise.all([
|
||||||
serverClient().contentstack.languageSwitcher.get(),
|
serverClient().contentstack.languageSwitcher.get(),
|
||||||
serverClient().contentstack.base.header(),
|
serverClient().contentstack.base.header(),
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
"use server"
|
|
||||||
import { Link } from "react-feather"
|
import { Link } from "react-feather"
|
||||||
|
|
||||||
import { myPages } from "@/constants/routes/myPages"
|
import { myPages } from "@/constants/routes/myPages"
|
||||||
@@ -13,7 +12,7 @@ import MyPagesMobileMenu from "../MyPagesMobileMenu"
|
|||||||
|
|
||||||
import styles from "../mainMenu.module.css"
|
import styles from "../mainMenu.module.css"
|
||||||
|
|
||||||
export default async function MyPagesMenuServer({}) {
|
export default async function MyPagesMenuServer() {
|
||||||
const lang = getLang()
|
const lang = getLang()
|
||||||
const [intl, myPagesNavigation, user, membership] = await Promise.all([
|
const [intl, myPagesNavigation, user, membership] = await Promise.all([
|
||||||
getIntl(),
|
getIntl(),
|
||||||
@@ -1,4 +1,8 @@
|
|||||||
"use client"
|
"use client"
|
||||||
|
import { z } from "zod"
|
||||||
|
|
||||||
|
import { getHeaderSchema } from "@/server/routers/contentstack/base/output"
|
||||||
|
|
||||||
import NavigationMenuItem from "../NavigationMenuItem"
|
import NavigationMenuItem from "../NavigationMenuItem"
|
||||||
|
|
||||||
import styles from "../navigationMenu.module.css"
|
import styles from "../navigationMenu.module.css"
|
||||||
@@ -8,13 +12,13 @@ export default function NavigationMenuList({
|
|||||||
items,
|
items,
|
||||||
}: {
|
}: {
|
||||||
isMobile: boolean
|
isMobile: boolean
|
||||||
items: any
|
items: z.infer<typeof getHeaderSchema>["menuItems"]
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<ul
|
<ul
|
||||||
className={`${styles.navigationMenu} ${isMobile ? styles.mobile : styles.desktop}`}
|
className={`${styles.navigationMenu} ${isMobile ? styles.mobile : styles.desktop}`}
|
||||||
>
|
>
|
||||||
{items.map((item: any) => (
|
{items.map((item) => (
|
||||||
<li key={item.title} className={styles.item}>
|
<li key={item.title} className={styles.item}>
|
||||||
<NavigationMenuItem isMobile={isMobile} item={item} />
|
<NavigationMenuItem isMobile={isMobile} item={item} />
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -5,15 +5,13 @@ import Image from "@/components/Image"
|
|||||||
import { getIntl } from "@/i18n"
|
import { getIntl } from "@/i18n"
|
||||||
import { getLang } from "@/i18n/serverContext"
|
import { getLang } from "@/i18n/serverContext"
|
||||||
|
|
||||||
import MobileMenuServer from "./MobileMenuServer"
|
import MobileMenuServer from "./MobileMenuWrapper"
|
||||||
import MyPagesMenuServer from "./MyPagesMenuServer"
|
import MyPagesMenuServer from "./MyPagesMenuWrapper"
|
||||||
import NavigationMenu from "./NavigationMenu"
|
import NavigationMenu from "./NavigationMenu"
|
||||||
|
|
||||||
import styles from "./mainMenu.module.css"
|
import styles from "./mainMenu.module.css"
|
||||||
|
|
||||||
import type { MainMenuProps } from "@/types/components/header/mainMenu"
|
export default async function MainMenu() {
|
||||||
|
|
||||||
export default async function MainMenu({}: MainMenuProps) {
|
|
||||||
const lang = getLang()
|
const lang = getLang()
|
||||||
|
|
||||||
const intl = await getIntl()
|
const intl = await getIntl()
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import { Suspense } from "react"
|
|
||||||
|
|
||||||
import { serverClient } from "@/lib/trpc/server"
|
import { serverClient } from "@/lib/trpc/server"
|
||||||
|
|
||||||
import { GiftIcon, SearchIcon } from "@/components/Icons"
|
import { GiftIcon, SearchIcon } from "@/components/Icons"
|
||||||
@@ -10,9 +8,7 @@ import HeaderLink from "../HeaderLink"
|
|||||||
|
|
||||||
import styles from "./topMenu.module.css"
|
import styles from "./topMenu.module.css"
|
||||||
|
|
||||||
import type { TopMenuProps } from "@/types/components/header/topMenu"
|
export default async function TopMenu() {
|
||||||
|
|
||||||
export default async function TopMenu({}: TopMenuProps) {
|
|
||||||
const [intl, languages, headerData] = await Promise.all([
|
const [intl, languages, headerData] = await Promise.all([
|
||||||
getIntl(),
|
getIntl(),
|
||||||
serverClient().contentstack.languageSwitcher.get(),
|
serverClient().contentstack.languageSwitcher.get(),
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import TopMenu from "./TopMenu"
|
|||||||
|
|
||||||
import styles from "./header.module.css"
|
import styles from "./header.module.css"
|
||||||
|
|
||||||
export default async function Header({}) {
|
export default function Header({}) {
|
||||||
return (
|
return (
|
||||||
<header className={styles.header}>
|
<header className={styles.header}>
|
||||||
<Suspense fallback="Loading top menu">
|
<Suspense fallback="Loading top menu">
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export interface MainMenuProps {}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export interface TopMenuProps {}
|
|
||||||
Reference in New Issue
Block a user