Refactor navigation configuration

mikepsinn · mikepsinn · commit 5ae4dedc5394 · 2024-11-20T16:09:35.000-06:00
Removed `config/links.ts` and updated paths to use new modular navigation structure under `config/navigation`. This change enhances organization and scalability by separating domain-specific and general navigation configurations.

Took 45 minutes
diff --git a/app/articles/layout.tsx b/app/articles/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalNavigation } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
@@ -26,7 +26,7 @@ export default async function DashboardLayout({
       />
       <div className="container grid flex-1 gap-12 md:grid-cols-[200px_1fr]">
         <aside className="hidden w-[200px] flex-col md:flex">
-          <SidebarNav items={generalSidebarNav.data} />
+          <SidebarNav items={generalNavigation.sidebarNav.data} />
         </aside>
         <main
           className="flex w-full flex-1 flex-col"
diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/dfda/components/dfda-logo-nav.tsx b/app/dfda/components/dfda-logo-nav.tsx
@@ -1,11 +1,11 @@
 "use client"
 
 import { Key } from "react"
+import Image from "next/image"
 import Link from "next/link"
 import { NavItem } from "@/types"
-import Image from "next/image"
 
-import { dfdaSidebarNav } from "@/config/links"
+import { dfdaNavigation } from "@/config/navigation/domains/dfda"
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -21,7 +21,7 @@ interface LogoNavMenuProps {
 
 export function DfdaLogoNavMenu({ navItems }: LogoNavMenuProps) {
   if (!navItems) {
-    navItems = dfdaSidebarNav.data
+    navItems = dfdaNavigation.sidebarNav
   }
   return (
     <DropdownMenu>
diff --git a/app/globalProblemSolutions/layout.tsx b/app/globalProblemSolutions/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/globalProblems/layout.tsx b/app/globalProblems/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalNavigation } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
@@ -24,7 +24,7 @@ export default async function DashboardLayout({
       />
       <div className="container grid flex-1 gap-12 md:grid-cols-[200px_1fr]">
         <aside className="hidden w-[200px] flex-col md:flex">
-          <SidebarNav items={generalSidebarNav.data} />
+          <SidebarNav items={generalNavigation.sidebarNav.data} />
         </aside>
         <main
           className="flex w-full flex-1 flex-col"
diff --git a/app/globalSolutions/layout.tsx b/app/globalSolutions/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/md/layout.tsx b/app/md/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalNavigation } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
@@ -26,7 +26,7 @@ export default async function DashboardLayout({
       />
       <div className="container grid flex-1 gap-12 md:grid-cols-[200px_1fr]">
         <aside className="hidden w-[200px] flex-col md:flex">
-          <SidebarNav items={generalSidebarNav.data} />
+          <SidebarNav items={generalNavigation.sidebarNav.data} />
         </aside>
         <main
           className="flex w-full flex-1 flex-col"
diff --git a/app/petitions/layout.tsx b/app/petitions/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/profile/layout.tsx b/app/profile/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/researcher/layout.tsx b/app/researcher/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/voters/layout.tsx b/app/voters/layout.tsx
@@ -1,4 +1,4 @@
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/wish/layout.tsx b/app/wish/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/app/wishingWells/layout.tsx b/app/wishingWells/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { getCurrentUser } from "@/lib/session"
 import Footer from "@/components/layout/footer"
 import TopNavbar from "@/components/layout/topNavbar"
diff --git a/components/UserBadge.tsx b/components/UserBadge.tsx
@@ -3,31 +3,27 @@
 import React from "react"
 import Image from "next/image"
 import Link from "next/link"
-import { useRouter } from "next/navigation"
 import { Gear, SignOut } from "@phosphor-icons/react"
 import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu"
 import { signIn, signOut, useSession } from "next-auth/react"
 
-import { avatarNav } from "@/config/links"
+import { avatarNav } from "@/config/navigation/general"
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuLabel,
   DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
 import { Icons } from "@/components/icons"
 
-import LoadingSpinner from "./LoadingSpinner"
 import { Button } from "./ui/button"
 import { Skeleton } from "./ui/skeleton"
 
 function UserBadge() {
   const [position, setPosition] = React.useState("bottom")
   const { data: session, status } = useSession()
-  const router = useRouter()
 
   if (status === "loading") {
     return (
diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx
@@ -2,16 +2,16 @@ import { Key } from "react"
 import Link from "next/link"
 import { NavItem } from "@/types"
 
-import { generalFooterNav } from "@/config/links"
-import { Icons } from "@/components/icons"
+import { generalFooterNav } from "@/config/navigation/general"
 import { siteConfig } from "@/config/site"
+import { Icons } from "@/components/icons"
 
 interface FooterProps {
   footerNavItems?: NavItem[]
 }
 
 export default function Footer({ footerNavItems }: FooterProps) {
-  const footerLinks = footerNavItems || generalFooterNav.data
+  const footerLinks = footerNavItems || generalFooterNav
 
   return (
     <footer className="mx-auto  mt-auto">
diff --git a/components/layout/logo-nav.tsx b/components/layout/logo-nav.tsx
@@ -5,7 +5,7 @@ import Link from "next/link"
 import { NavItem } from "@/types"
 import { WandIcon } from "lucide-react"
 
-import { generalSidebarNav } from "@/config/links"
+import { generalSidebarNav } from "@/config/navigation/general"
 import { siteConfig } from "@/config/site"
 import {
   DropdownMenu,
diff --git a/components/layout/topNavbar.tsx b/components/layout/topNavbar.tsx
@@ -5,7 +5,7 @@ import Link from "next/link"
 import { NavItem } from "@/types"
 import { User } from "next-auth"
 
-import { generalDashboardTopNav } from "@/config/links"
+import { generalDashboardTopNav } from "@/config/navigation/general"
 import { LogoNavMenu } from "@/components/layout/logo-nav"
 import { UserNavDisplay } from "@/components/user/user-nav-display"
 
diff --git a/components/pages/dashboard/dashboard-cards.tsx b/components/pages/dashboard/dashboard-cards.tsx
@@ -2,14 +2,8 @@
 
 import { SearchParams } from "@/types"
 
-import {
-  globalProblemsResultsLink,
-  globalProblemsVoteLink,
-  globalSolutionsResultsLink,
-  globalSolutionsVoteLink,
-  wishingWellsLink,
-  wishingWellsResultsLink,
-} from "@/config/links"
+import { globalProblemsResultsLink } from "@/config/navigation/domains/wishonia"
+import { globalProblemsVoteLink } from "@/config/navigation/general"
 import { LinkCard } from "@/components/link-card"
 
 interface DashboardCardsProps {
diff --git a/components/user/user-account-nav.tsx b/components/user/user-account-nav.tsx
@@ -6,7 +6,7 @@ import { NavItem } from "@/types"
 import { User } from "next-auth"
 import { signOut } from "next-auth/react"
 
-import { avatarNav } from "@/config/links"
+import { avatarNav } from "@/config/navigation/general"
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -67,11 +67,11 @@ export function UserAccountNav({ user, avatarNavItems }: UserAccountNavProps) {
           className="cursor-pointer"
           onSelect={(event) => {
             event.preventDefault()
-            let callbackUrl = '/signin'
+            let callbackUrl = "/signin"
             if (typeof window !== "undefined") {
-                callbackUrl = `${window.location.origin}/signin`
+              callbackUrl = `${window.location.origin}/signin`
             } else {
-                console.error("window is not defined in UserAccountNav");
+              console.error("window is not defined in UserAccountNav")
             }
             signOut({
               callbackUrl: callbackUrl,
diff --git a/config/links.ts b/config/links.ts
diff --git a/config/navigation/domains/dfda.ts b/config/navigation/domains/dfda.ts
diff --git a/config/navigation/domains/wishonia.ts b/config/navigation/domains/wishonia.ts
diff --git a/config/navigation/general.ts b/config/navigation/general.ts
diff --git a/config/navigation/shared-links.ts b/config/navigation/shared-links.ts
diff --git a/env.d.ts b/env.d.ts
diff --git a/env.mjs b/env.mjs
diff --git a/lib/utils/domain-config.ts b/lib/utils/domain-config.ts
diff --git a/middleware.ts b/middleware.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { generalSidebarNav } from "@/config/links"`
	`1`	`+import { generalSidebarNav } from "@/config/navigation/general"`
`2`	`2`	`import { getCurrentUser } from "@/lib/session"`
`3`	`3`	`import Footer from "@/components/layout/footer"`
`4`	`4`	`import TopNavbar from "@/components/layout/topNavbar"`