.

Author: faikit

components/app-sidebar.tsx

@@ -32,14 +32,18 @@ import { FadeIn } from "@/components/animation/fade-in"
 
 
 function PageSidebar() {
-    const { content } = useSidebar()
-    if (content != null) {
+    const { content_projecct, content_page } = useSidebar()
+    if (content_projecct != null) {
         return (
                 <SidebarMenu className="mb-12 px-8 text-xs overflow-y-scroll no-scrollbar">
-                    <span className="font-bold p-2 select-none text-foreground/50">
-                        This Page
-                    </span>
-                    {content.map((item) => (
+                    {
+                        content_page != null && (
+                            <span className="font-bold p-2 select-none text-foreground/50">
+                                This Page
+                            </span>
+                        )
+                    }
+                    {content_projecct.map((item) => (
                         <Link key={item.text} href={"#" + item.id}  className="p-2 rounded-sm hover:bg-o-blue/3 select-none">
                             {item.text}
                         </Link>
@@ -56,7 +60,7 @@ function PageSidebar() {
 
 export function AppSidebar() {
 
-    const { content } = useSidebar()
+    const { content_page } = useSidebar()
 
     return (
         <FadeIn>
@@ -80,7 +84,7 @@ export function AppSidebar() {
 
 
                     {
-                        content == null && (
+                        content_page != null && (
 
                             <SidebarMenu className="mb-12 px-8 text-xs overflow-y-scroll no-scrollbar">
 

components/ui/sidebar.tsx

@@ -1,7 +1,8 @@
 "use client"
 
 import { usePathname } from 'next/navigation'
-import { pageNavigator } from '@/data/pagenavigator'
+import { NavigatorProject } from '@/data/navigator-project'
+import { NavigatorPage } from '@/data/navigator-page'
 
 import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
@@ -43,7 +44,8 @@ type SidebarContextProps = {
   setOpenMobile: (open: boolean) => void
   isMobile: boolean
   toggleSidebar: () => void
-  content: { text: string; id: string }[] | null
+  content_projecct: { text: string; id: string }[] | null
+  content_page: { text: string; id: string }[] | null
 }
 
 const SidebarContext = React.createContext<SidebarContextProps | null>(null)
@@ -118,7 +120,9 @@ function SidebarProvider({
   const state = open ? "expanded" : "collapsed"
 
   const pathname = usePathname()
-  const content = pathname.toLowerCase() in pageNavigator ? pageNavigator[pathname.toLowerCase()] : null
+  const content_projecct = pathname.toLowerCase() in NavigatorProject ? NavigatorProject[pathname.toLowerCase()] : null
+  const content_page = pathname.toLowerCase() in NavigatorPage ? NavigatorPage[pathname.toLowerCase()] : null
+
 
   const contextValue = React.useMemo<SidebarContextProps>(
     () => ({
@@ -129,7 +133,8 @@ function SidebarProvider({
       openMobile,
       setOpenMobile,
       toggleSidebar,
-      content,
+      content_projecct,
+      content_page,
     }),
     [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]
   )

data/navigator-page.tsx

@@ -0,0 +1,25 @@
+export const NavigatorPage: {
+    [page: string]: {
+        text: string;
+        id: string;
+    }[]
+} = {
+    "/team": [
+        {
+            text: "Scholar",
+            id: "scholar",
+        },
+        {
+            text: "Ph.D.",
+            id: "phd",
+        },
+        {
+            text: "Intern",
+            id: "intern",
+        },
+        {
+            text: "Alumni",
+            id: "alumni",
+        },
+    ],
+};

data/pagenavigator.tsx data/navigator-project.tsxdata/pagenavigator.tsx renamed to data/navigator-project.tsx

@@ -1,4 +1,4 @@
-export const pageNavigator: {
+export const NavigatorProject: {
     [page: string]: {
         text: string;
         id: string;