diff --git a/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx b/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx
index 92e3a69b4..4f412f82f 100644
--- a/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx
+++ b/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx
@@ -5,6 +5,9 @@ import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDrop
export default async function MyPagesMobileDropdownPage() {
// TODO: Figure out how to pass down props at the paralell route level.
- // - POssibly by parsing [...paths]
- return
+ // - Possibly by parsing [...paths]
+
+ const navigation = await serverClient().contentstack.myPages.navigation.get()
+ if (!navigation) return null
+ return
}
diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx
index 1e4be86af..9e5e41636 100644
--- a/app/[lang]/(live)/@header/page.tsx
+++ b/app/[lang]/(live)/@header/page.tsx
@@ -1,4 +1,5 @@
import { baseUrls } from "@/constants/routes/baseUrls"
+import { serverClient } from "@/lib/trpc/server"
import Header from "@/components/Current/Header"
import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher"
@@ -7,10 +8,13 @@ import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDrop
import { LangParams, PageArgs } from "@/types/params"
export default async function HeaderPage({ params }: PageArgs) {
+ const navigation = await serverClient().contentstack.myPages.navigation.get()
return (
}
+ myPagesMobileDropdown={
+
+ }
languageSwitcher={}
/>
)
diff --git a/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx b/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx
index bbcb00595..cc0f9d69e 100644
--- a/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx
+++ b/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx
@@ -3,10 +3,13 @@ import { serverClient } from "@/lib/trpc/server"
import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDropdown"
export default async function MyPagesMobileDropdownPage() {
- // TODO: Dirty way to get lang value. Figure out a proper way.
- const data = await serverClient().contentstack.languageSwitcher.get()
- if (!data) {
+ // TODO: Remove data call and pass down props at the paralell route level.
+ const [data, navigation] = await Promise.all([
+ serverClient().contentstack.languageSwitcher.get(),
+ serverClient().contentstack.myPages.navigation.get(),
+ ])
+ if (!data || !navigation) {
return null
}
- return
+ return
}
diff --git a/components/Current/Header/MyPagesMobileDropdown/index.tsx b/components/Current/Header/MyPagesMobileDropdown/index.tsx
index 28db26551..432ad6558 100644
--- a/components/Current/Header/MyPagesMobileDropdown/index.tsx
+++ b/components/Current/Header/MyPagesMobileDropdown/index.tsx
@@ -1,8 +1,10 @@
+"use client"
import { Fragment } from "react"
import { Lang } from "@/constants/languages"
import { logout } from "@/constants/routes/handleAuth"
-import { serverClient } from "@/lib/trpc/server"
+import { navigationQueryRouter } from "@/server/routers/contentstack/myPages/navigation/query"
+import useDropdownStore from "@/stores/main-menu"
import Divider from "@/components/TempDesignSystem/Divider"
import Link from "@/components/TempDesignSystem/Link"
@@ -10,26 +12,30 @@ import Title from "@/components/TempDesignSystem/Text/Title"
import styles from "./my-pages-mobile-dropdown.module.css"
-export default async function MyPagesMobileDropdown({
+type Navigation = Awaited>
+
+export default function MyPagesMobileDropdown({
+ navigation,
lang,
}: {
+ navigation: Navigation
lang: Lang | null
}) {
- const navigation = await serverClient().contentstack.myPages.navigation.get()
+ const { toggleMyPagesMobileMenu, isMyPagesMobileMenuOpen } =
+ useDropdownStore()
if (!navigation) {
return null
}
return (