diff --git a/src/components/navigation/MobileNavbar.tsx b/src/components/navigation/MobileNavbar.tsx index d6358fe..25ffc32 100644 --- a/src/components/navigation/MobileNavbar.tsx +++ b/src/components/navigation/MobileNavbar.tsx @@ -1,9 +1,13 @@ import { HamburgerMenuIcon } from "@radix-ui/react-icons"; import { ScrollArea } from "../ui/scroll-area"; import { Sheet, SheetContent, SheetTrigger } from "../ui/sheet"; -import { NavContents, type NavContentsProps } from "./NavContents.tsx"; +import React from "react"; -export default function MobileNavbar(props: NavContentsProps) { +export default function MobileNavbar({ + children, +}: { + children: React.ReactNode; +}) { return ( -
- -
+
{children}
diff --git a/src/components/navigation/NavContents.tsx b/src/components/navigation/NavContents.tsx index c55aa47..3d594b9 100644 --- a/src/components/navigation/NavContents.tsx +++ b/src/components/navigation/NavContents.tsx @@ -4,7 +4,7 @@ import { cn } from "@/lib/utils.ts"; import type { groupedNavbarParents, navbarParents, - posts, + pages, } from "./navigationConfig"; // We have to access these navbar configs via astro props because they are not available on the client side @@ -12,14 +12,14 @@ export interface NavContentsProps { mobile?: boolean; groupedNavbarParents: typeof groupedNavbarParents; navbarParents: typeof navbarParents; - posts: typeof posts; + pages: typeof pages; } export function NavContents({ mobile = false, groupedNavbarParents, navbarParents, - posts, + pages, }: NavContentsProps) { const [expanded, setExpanded] = useState(); @@ -37,8 +37,8 @@ export function NavContents({ return { navbarItem: i, title: - posts.find((p) => p.params.slug === i.title.toLowerCase())?.props - .entry.data.title ?? i.title, + pages.find((page) => page.slug === i.title.toLowerCase()) + ?.title ?? i.title, }; }) .map(({ navbarItem, title }) => ( @@ -76,10 +76,10 @@ export function NavContents({ {groupedNavbarParents[c]?.map((post) => ( - {post.props.entry.data.title} + {post.title} ))} @@ -88,17 +88,17 @@ export function NavContents({ )} - {groupedNavbarParents[navbarItem.title]?.map((post) => ( + {groupedNavbarParents[navbarItem.title]?.map((page) => ( - {post.props.entry.data.title} + {page.title} ))} diff --git a/src/components/navigation/Navbar.astro b/src/components/navigation/Navbar.astro index 0ff64bd..784dbd5 100644 --- a/src/components/navigation/Navbar.astro +++ b/src/components/navigation/Navbar.astro @@ -1,7 +1,7 @@ --- import { ScrollArea } from "../ui/scroll-area"; import { NavContents } from "./NavContents.tsx"; -import { groupedNavbarParents, navbarParents, posts } from "./navigationConfig"; +import { groupedNavbarParents, navbarParents, pages } from "./navigationConfig"; --- @@ -9,9 +9,9 @@ import { groupedNavbarParents, navbarParents, posts } from "./navigationConfig"; diff --git a/src/components/navigation/Navigation.astro b/src/components/navigation/Navigation.astro index c5f8c3a..3316d69 100644 --- a/src/components/navigation/Navigation.astro +++ b/src/components/navigation/Navigation.astro @@ -4,7 +4,8 @@ import MobileNavbar from "./MobileNavbar"; import Search from "./Search.astro"; import ThemeToggle from "./ThemeToggle.astro"; import { headerNavItems } from "./navigationConfig"; -import { groupedNavbarParents, navbarParents, posts } from "./navigationConfig"; +import { groupedNavbarParents, navbarParents, pages } from "./navigationConfig"; +import { NavContents } from "./NavContents"; ---
- + + +