feat: restore navbar

LeadcodeDev · LeadcodeDev · commit 303bee6e9017 · 2025-11-19T22:46:53.000+01:00
diff --git a/.astro/collections/deepDocDefaults.schema.json b/.astro/collections/deepDocDefaults.schema.json
@@ -22,16 +22,6 @@
         "collection": {
           "type": "array"
         },
-        "visibility": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": [
-              "navbar"
-            ]
-          },
-          "default": []
-        },
         "$schema": {
           "type": "string"
         }
diff --git a/.astro/collections/docDefaults.schema.json b/.astro/collections/docDefaults.schema.json
@@ -22,16 +22,6 @@
         "collection": {
           "type": "array"
         },
-        "visibility": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": [
-              "navbar"
-            ]
-          },
-          "default": []
-        },
         "$schema": {
           "type": "string"
         }
diff --git a/.astro/collections/docs.schema.json b/.astro/collections/docs.schema.json
@@ -16,6 +16,16 @@
         "icon": {
           "type": "string"
         },
+        "visibility": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "navbar"
+            ]
+          },
+          "default": []
+        },
         "$schema": {
           "type": "string"
         }
diff --git a/.astro/collections/documentation.schema.json b/.astro/collections/documentation.schema.json
@@ -16,6 +16,16 @@
         "icon": {
           "type": "string"
         },
+        "visibility": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "navbar"
+            ]
+          },
+          "default": []
+        },
         "$schema": {
           "type": "string"
         }
diff --git a/.astro/data-store.json b/.astro/data-store.json
diff --git a/content/docs/documentation/_default.mdx b/content/docs/documentation/_default.mdx
@@ -4,8 +4,6 @@ directory: documentation
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: framework
 icon: lucide:cuboid
-visibility:
-  - navbar
 collection:
   - getting-started
   - foundamentals
diff --git a/content/docs/documentation/components/_default.mdx b/content/docs/documentation/components/_default.mdx
@@ -4,8 +4,6 @@ directory: components
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: components
 icon: lucide:cuboid
-visibility:
-  - navbar
 collection:
   - alert: false
   - code-block: true
diff --git a/content/docs/documentation/components/components2/_default.mdx b/content/docs/documentation/components/components2/_default.mdx
@@ -4,8 +4,6 @@ directory: components
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: components
 icon: lucide:cuboid
-visibility:
-  - navbar
 collection:
   - alert: false
   - code-block: true
diff --git a/content/docs/documentation/foundamentals/_default.mdx b/content/docs/documentation/foundamentals/_default.mdx
@@ -4,8 +4,6 @@ directory: foundamentals
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: foundamentals
 icon: lucide:cuboid
-visibility:
-  - navbar
 collection:
   - routing: false
   - docs: true
diff --git a/content/docs/documentation/getting-started/_default.mdx b/content/docs/documentation/getting-started/_default.mdx
@@ -4,8 +4,6 @@ directory: getting-started
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: getting-started
 icon: lucide:cuboid
-visibility:
-  - navbar
 collection:
   - getting-started: false
   - installation: true
diff --git a/content/docs/documentation/getting-started/installation.mdx b/content/docs/documentation/getting-started/installation.mdx
@@ -3,6 +3,8 @@ title: Installation
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 permalink: installation
 icon: lucide:play
+visibility:
+  - navbar
 ---
 
 # Installation
diff --git a/src/content.config.ts b/src/content.config.ts
@@ -8,6 +8,7 @@ export const docSchema = z.object({
   description: z.string(),
   permalink: z.string().optional(),
   icon: z.string().optional(),
+  visibility: z.array(z.enum(["navbar"])).default([]),
 });
 
 export const docDefaultSchema = z.object({
@@ -17,7 +18,6 @@ export const docDefaultSchema = z.object({
   icon: z.string().optional(),
   directory: z.string(),
   collection: z.array(z.any()),
-  visibility: z.array(z.enum(["navbar"])).default([]),
 });
 
 export const docDefaults = defineCollection({
diff --git a/src/lib/components/elements/collapsible.tsx b/src/lib/components/elements/collapsible.tsx
@@ -11,7 +11,9 @@ type Props = {
 };
 
 export default function Collapsible(props: PropsWithChildren<Props>) {
-  const [isOpen, setIsOpen] = useState(props.defaultOpen ?? true);
+  const [isOpen, setIsOpen] = useState(
+    props.defaultOpen ?? (props.isNestedElement && false) ?? true,
+  );
 
   return (
     <CollapsiblePrimitives.Collapsible
diff --git a/src/lib/components/elements/navbar.tsx b/src/lib/components/elements/navbar.tsx
@@ -63,11 +63,7 @@ type NavbarProps = {
 };
 
 export default function Navbar(props: NavbarProps) {
-  const docs = props.docs.flatMap((element) => {
-    let children = element.children.flatMap((element: any) => element.children);
-    return { ...element, collection: children };
-  });
-
+  console.log(props.docs[0]);
   return (
     <div className="sticky top-0 z-50 w-full p-2 py-3 border-b bg-background/70 backdrop-blur-sm">
       <div className="max-w-[var(--container-width)] mx-auto flex items-center justify-between">
@@ -86,11 +82,11 @@ export default function Navbar(props: NavbarProps) {
           <div className="flex gap-3">
             <NavigationMenu>
               <NavigationMenuList>
-                {docs.map((element, index) => (
+                {props.docs.map((element, index) => (
                   <NavigationMenuItem key={index}>
                     <NavigationMenuTrigger className="flex items-center">
                       <Icon icon={element.icon} className="size-4 mr-2" />
-                      {element.label}
+                      {element.data.label}
                     </NavigationMenuTrigger>
                     <NavigationMenuContent>
                       <ul className="grid w-[400px] gap-3 p-1 md:w-[500px] md:grid-cols-2 lg:w-[600px]">
@@ -101,7 +97,7 @@ export default function Navbar(props: NavbarProps) {
                               key={item.id}
                               title={item.data.title}
                               icon={item.data.icon}
-                              href={item.href}
+                              href={`/docs/${item.id}`}
                             >
                               {item.data.description}
                             </ListItem>
@@ -194,7 +190,7 @@ export default function Navbar(props: NavbarProps) {
                   })}
 
                   <div className="flex flex-col gap-6 pt-5">
-                    {docs.map((element, index) => (
+                    {props.docs.map((element, index) => (
                       <div key={index}>
                         <div className="flex items-center font-medium">
                           <Icon icon={element.icon} className="size-4 mr-2" />
diff --git a/src/lib/layouts/BaseLayout.astro b/src/lib/layouts/BaseLayout.astro
@@ -9,8 +9,16 @@ import * as astroContent from "astro:content";
 
 const { title = config.seo.title } = Astro.props;
 
-const { load } = useDocumentation(astroContent);
-const documentations = await load();
+const { load, flattenDocs } = useDocumentation(astroContent);
+const loaded = await load();
+const docs = loaded.map((element) => {
+  return {
+    ...element,
+    children: flattenDocs(element.children).filter((child) =>
+      child.data.visibility.includes("navbar"),
+    ),
+  };
+});
 ---
 
 <!doctype html>
@@ -56,7 +64,7 @@ const documentations = await load();
   <body class="relative min-h-screen">
     <div class="min-h-screen flex flex-col">
       <Navbar
-        docs={documentations.filter((entry) => {
+        docs={docs.filter((entry) => {
           // return entry.visibility.includes("navbar");
           return true;
         })}
diff --git a/src/lib/layouts/DocsLayout.astro b/src/lib/layouts/DocsLayout.astro
@@ -19,6 +19,11 @@ const currentCollection = documentations.find((element) => {
     return Astro.url.pathname.startsWith(a);
   });
 });
+
+function findFlattenCollection(id: string) {
+  const doc = documentations.find((element) => element.id === id);
+  return flattenDocs(doc.children);
+}
 ---
 
 <BaseLayout>
@@ -30,13 +35,13 @@ const currentCollection = documentations.find((element) => {
             class="fixed left-5 md:left-auto top-14 px-4 sm:px-0 py-8 overflow-y-auto h-[calc(100vh-4rem)] w-[225px]"
           >
             {
-              documentations.length > 0 && (
+              documentations.length > 1 && (
                 <Fragment>
                   <nav class="flex flex-col gap-2 px-2.5">
                     {documentations.map((element) => (
                       <a
                         class="flex items-center gap-2 group text-primary font-medium"
-                        href={element.children[0].href}
+                        href={`/docs/${findFlattenCollection(element.id)[0].id}`}
                       >
                         <div
                           class={clsx(
