From 98321b83c70bc0680a0c84e299d05c8a31d35671 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sun, 12 Apr 2026 19:53:59 -0400
Subject: [PATCH 01/14] final commit

---
 .claude/settings.local.json                   |   8 +
 apps/frontend/src/app.tsx                     |  45 ---
 apps/frontend/src/components/Navbar.tsx       | 369 ++++++++++++++++++
 apps/frontend/src/containers/homepage.tsx     |  22 --
 apps/frontend/src/containers/orders.tsx       |   5 -
 .../src/containers/pantryPastOrders.tsx       |   5 -
 apps/frontend/src/containers/root.tsx         |  13 +-
 7 files changed, 385 insertions(+), 82 deletions(-)
 create mode 100644 .claude/settings.local.json
 create mode 100644 apps/frontend/src/components/Navbar.tsx
 delete mode 100644 apps/frontend/src/containers/orders.tsx
 delete mode 100644 apps/frontend/src/containers/pantryPastOrders.tsx

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 000000000..d5276fad5
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "mcp__plugin_figma_figma__get_design_context",
+      "mcp__plugin_figma_figma__get_screenshot"
+    ]
+  }
+}
diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index b4cc95a41..2afc4abb4 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -1,10 +1,7 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import Root from '@containers/root';
 import NotFound from '@containers/404';
-import PantryPastOrders from '@containers/pantryPastOrders';
 import Pantries from '@containers/pantries';
-import Orders from '@containers/orders';
-import PantryDashboard from '@containers/pantryDashboard';
 import FormRequests from '@containers/formRequests';
 import PantryApplication from '@containers/pantryApplication';
 import ApplicationSubmitted from '@containers/applicationSubmitted';
@@ -12,7 +9,6 @@ import { submitPantryApplicationForm } from '@components/forms/pantryApplication
 import ApprovePantries from '@containers/approvePantries';
 import PantryApplicationDetails from '@containers/pantryApplicationDetails';
 import VolunteerManagement from '@containers/volunteerManagement';
-import FoodManufacturerOrderDashboard from '@containers/foodManufacturerOrderDashboard';
 import AdminDonation from '@containers/adminDonation';
 import Homepage from '@containers/homepage';
 import AdminOrderManagement from '@containers/adminOrderManagement';
@@ -77,15 +73,6 @@ const router = createBrowserRouter([
         path: '/unauthorized',
         element: <Unauthorized />,
       },
-      // Private routes (protected by auth)
-      {
-        path: '/pantry-past-orders',
-        element: (
-          <ProtectedRoute>
-            <PantryPastOrders />
-          </ProtectedRoute>
-        ),
-      },
       {
         path: '/pantries',
         element: (
@@ -94,22 +81,6 @@ const router = createBrowserRouter([
           </ProtectedRoute>
         ),
       },
-      {
-        path: '/pantry-dashboard',
-        element: (
-          <ProtectedRoute>
-            <PantryDashboard />
-          </ProtectedRoute>
-        ),
-      },
-      {
-        path: '/pantry-past-orders',
-        element: (
-          <ProtectedRoute>
-            <PantryPastOrders />
-          </ProtectedRoute>
-        ),
-      },
       {
         path: '/pantries',
         element: (
@@ -118,22 +89,6 @@ const router = createBrowserRouter([
           </ProtectedRoute>
         ),
       },
-      {
-        path: '/food-manufacturer-order-dashboard',
-        element: (
-          <ProtectedRoute>
-            <FoodManufacturerOrderDashboard />
-          </ProtectedRoute>
-        ),
-      },
-      {
-        path: '/orders',
-        element: (
-          <ProtectedRoute>
-            <Orders />
-          </ProtectedRoute>
-        ),
-      },
       {
         path: '/request-form',
         element: (
diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
new file mode 100644
index 000000000..eb34e62a9
--- /dev/null
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -0,0 +1,369 @@
+import React, { useEffect, useState } from 'react';
+import { Link as RouterLink, useLocation, useNavigate } from 'react-router-dom';
+import { Box, Flex, Text, VStack } from '@chakra-ui/react';
+import { useAuthenticator } from '@aws-amplify/ui-react';
+import { signOut } from 'aws-amplify/auth';
+import { ChevronDown, ChevronRight, LogOut } from 'lucide-react';
+import ApiClient from '@api/apiClient';
+import { Role, User } from '../types/types';
+
+const ROLE_MAP: Record<Role, { label: string }> = {
+  [Role.ADMIN]: { label: 'Admin' },
+  [Role.VOLUNTEER]: { label: 'Volunteer' },
+  [Role.PANTRY]: { label: 'Pantry' },
+  [Role.FOODMANUFACTURER]: { label: 'Food Manufacturer' },
+};
+
+// Nav Structure Types
+type FlatNav = { type: 'flat'; label: string; to: string };
+type GroupNav = {
+  type: 'group';
+  label: string;
+  children: Array<{ label: string; to: string }>;
+};
+type NavSection = FlatNav | GroupNav;
+
+// Role Nav Definitions
+const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
+  [Role.ADMIN]: [
+    {
+      type: 'group',
+      label: 'Volunteers',
+      children: [
+        { label: 'Volunteer Management', to: '/volunteer-management' },
+      ],
+    },
+    {
+      type: 'group',
+      label: 'Pantries',
+      children: [
+        { label: 'Pantry Management', to: '/pantries' },
+        { label: 'Application Review', to: '/approve-pantries' },
+      ],
+    },
+    {
+      type: 'group',
+      label: 'Orders',
+      children: [{ label: 'Order Management', to: '/admin-order-management' }],
+    },
+    {
+      type: 'group',
+      label: 'Manufacturers',
+      children: [
+        { label: 'Donation Management', to: '/admin-donation' },
+        { label: 'Application Review', to: '/approve-food-manufacturers' },
+      ],
+    },
+  ],
+  [Role.VOLUNTEER]: [
+    {
+      type: 'flat',
+      label: 'Assigned Pantries',
+      to: '/volunteer-assigned-pantries',
+    },
+    {
+      type: 'group',
+      label: 'Orders',
+      children: [
+        {
+          label: 'Food Request Management',
+          to: '/volunteer-request-management',
+        },
+      ],
+    },
+  ],
+  [Role.FOODMANUFACTURER]: [
+    {
+      type: 'group',
+      label: 'Donations',
+      children: [
+        { label: 'Donation Management', to: '/fm-donation-management' },
+      ],
+    },
+  ],
+  [Role.PANTRY]: [
+    {
+      type: 'group',
+      label: 'Orders',
+      children: [
+        { label: 'Order Management', to: '/pantry-order-management' },
+        { label: 'Food Requests', to: '/request-form' },
+      ],
+    },
+  ],
+};
+
+// Subcomponents
+const NavLink: React.FC<{
+  to: string;
+  label: string;
+  isActive: boolean;
+  fontWeight?: string | number;
+}> = ({ to, label, isActive, fontWeight }) => (
+  <RouterLink to={to} style={{ width: '100%' }}>
+    <Box
+      h="32px"
+      px={3}
+      borderRadius="5px"
+      display="flex"
+      alignItems="center"
+      bg={isActive ? 'neutral.100' : 'transparent'}
+      _hover={{ bg: 'neutral.100' }}
+      cursor="pointer"
+    >
+      <Text fontSize="14px" color="neutral.800" fontWeight={fontWeight}>
+        {label}
+      </Text>
+    </Box>
+  </RouterLink>
+);
+
+interface NavGroupProps {
+  label: string;
+  children: Array<{ label: string; to: string }>;
+  isOpen: boolean;
+  onToggle: () => void;
+  activePath: string;
+}
+
+const NavGroup: React.FC<NavGroupProps> = ({
+  label,
+  children,
+  isOpen,
+  onToggle,
+  activePath,
+}) => (
+  <Box w="full">
+    <Box
+      h="32px"
+      px={3}
+      borderRadius="5px"
+      display="flex"
+      alignItems="center"
+      justifyContent="space-between"
+      cursor="pointer"
+      _hover={{ bg: 'neutral.100' }}
+      onClick={onToggle}
+      w="full"
+    >
+      <Text fontSize="14px" color="neutral.800" fontWeight="600">
+        {label}
+      </Text>
+      {isOpen ? (
+        <ChevronDown size={10} color="var(--chakra-colors-neutral-800)" />
+      ) : (
+        <ChevronRight size={10} color="var(--chakra-colors-neutral-800)" />
+      )}
+    </Box>
+
+    {isOpen &&
+      children.map((child) => {
+        const isActive = activePath === child.to;
+        return (
+          <Box
+            key={child.to}
+            display="flex"
+            alignItems="center"
+            h="32px"
+            pl="8px"
+            pr="8px"
+            w="full"
+          >
+            <Box position="relative" w="15px" h="20px" flexShrink={0}>
+              <Box
+                position="absolute"
+                left="calc(50% + 3px)"
+                top="-6px"
+                h="32px"
+                w="1px"
+                bg="neutral.300"
+                transform="translateX(-50%)"
+              />
+            </Box>
+
+            <RouterLink to={child.to} style={{ flex: 1, paddingLeft: '10px' }}>
+              <Box
+                px={1}
+                py={1}
+                borderRadius="5px"
+                bg={isActive ? 'neutral.100' : 'transparent'}
+                _hover={{ bg: 'neutral.100' }}
+                cursor="pointer"
+              >
+                <Text fontSize="14px" color="neutral.800">
+                  {child.label}
+                </Text>
+              </Box>
+            </RouterLink>
+          </Box>
+        );
+      })}
+  </Box>
+);
+
+const Navbar: React.FC = () => {
+  const { user: cognitoUser } = useAuthenticator((context) => [context.user]);
+  const [currentUser, setCurrentUser] = useState<User | null>(null);
+  const [openGroups, setOpenGroups] = useState<Set<string>>(new Set());
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    // Only fetch the current user if they are logged in
+    if (cognitoUser) {
+      ApiClient.getMe()
+        .then(setCurrentUser)
+        .catch(() => setCurrentUser(null));
+    } else {
+      setCurrentUser(null);
+    }
+  }, [cognitoUser]);
+
+  // On reload or navigation, make sure the currently opened groups stays open
+  useEffect(() => {
+    if (!currentUser) return;
+    const sections = ROLE_NAV_SECTIONS[currentUser.role];
+    setOpenGroups((prev) => {
+      const next = new Set(prev);
+      sections.forEach((s) => {
+        if (
+          s.type === 'group' &&
+          s.children.some((c) => c.to === location.pathname)
+        ) {
+          next.add(s.label);
+        }
+      });
+      return next;
+    });
+  }, [location.pathname, currentUser]);
+
+  if (!cognitoUser) return null;
+
+  const roleLabel = currentUser ? ROLE_MAP[currentUser.role].label : null;
+  const sections: NavSection[] = currentUser
+    ? ROLE_NAV_SECTIONS[currentUser.role]
+    : [];
+  const email = currentUser?.email ?? '';
+
+  const toggleGroup = (label: string) => {
+    setOpenGroups((prev) => {
+      const next = new Set(prev);
+      if (next.has(label)) next.delete(label);
+      else next.add(label);
+      return next;
+    });
+  };
+
+  const handleSignOut = async () => {
+    await signOut();
+    navigate('/');
+  };
+
+  return (
+    <Flex
+      direction="column"
+      w="240px"
+      minH="100vh"
+      bg="neutral.50"
+      borderRightWidth="1px"
+      borderRightColor="neutral.200"
+      px={4}
+      pt="29px"
+      pb={4}
+      flexShrink={0}
+    >
+      <RouterLink to="/profile" style={{ width: '100%', marginBottom: '24px' }}>
+        <Box
+          bg="white.core"
+          borderWidth="1px"
+          borderColor="neutral.200"
+          borderRadius="6px"
+          p={3}
+          display="flex"
+          alignItems="center"
+          gap={3}
+          cursor="pointer"
+          _hover={{ borderColor: 'neutral.300' }}
+        >
+          <Box w="29px" h="29px" flexShrink={0}>
+            <img
+              src="/favicon.ico"
+              alt="SSF logo"
+              style={{ width: '100%', height: '100%', objectFit: 'contain' }}
+            />
+          </Box>
+          <Box overflow="hidden">
+            <Text
+              fontSize="14px"
+              color="neutral.800"
+              fontWeight="normal"
+              lineHeight="1.5"
+              overflow="hidden"
+              style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
+            >
+              {`${roleLabel} Dashboard`}
+            </Text>
+            <Text
+              fontSize="10px"
+              color="neutral.700"
+              lineHeight="1.5"
+              overflow="hidden"
+              style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
+            >
+              {email}
+            </Text>
+          </Box>
+        </Box>
+      </RouterLink>
+
+      <VStack align="stretch" gap={0} flex={1}>
+        <NavLink
+          fontWeight="600"
+          to="/"
+          label="Dashboard"
+          isActive={location.pathname === '/'}
+        />
+
+        {sections.map((section) =>
+          section.type === 'flat' ? (
+            <NavLink
+              key={section.to}
+              to={section.to}
+              label={section.label}
+              isActive={location.pathname === section.to}
+            />
+          ) : (
+            <NavGroup
+              key={section.label}
+              label={section.label}
+              children={section.children}
+              isOpen={openGroups.has(section.label)}
+              onToggle={() => toggleGroup(section.label)}
+              activePath={location.pathname}
+            />
+          ),
+        )}
+      </VStack>
+
+      <Box
+        h="32px"
+        px={3}
+        borderRadius="5px"
+        display="flex"
+        alignItems="center"
+        gap={2}
+        cursor="pointer"
+        _hover={{ bg: 'neutral.100' }}
+        onClick={handleSignOut}
+        mt={4}
+      >
+        <LogOut size={14} color="var(--chakra-colors-neutral-700)" />
+        <Text fontSize="14px" color="neutral.700">
+          Sign Out
+        </Text>
+      </Box>
+    </Flex>
+  );
+};
+
+export default Navbar;
diff --git a/apps/frontend/src/containers/homepage.tsx b/apps/frontend/src/containers/homepage.tsx
index 580a3a743..b7ce34d55 100644
--- a/apps/frontend/src/containers/homepage.tsx
+++ b/apps/frontend/src/containers/homepage.tsx
@@ -33,16 +33,6 @@ const Homepage: React.FC = () => {
             Pantry View
           </Heading>
           <List.Root unstyled gap={2}>
-            <ListItem textAlign="center">
-              <Link asChild color="teal.500">
-                <RouterLink to="/pantry-dashboard">Pantry Dashboard</RouterLink>
-              </Link>
-            </ListItem>
-            <ListItem textAlign="center">
-              <Link asChild color="teal.500">
-                <RouterLink to="/pantry-past-orders">Past Orders</RouterLink>
-              </Link>
-            </ListItem>
             <ListItem textAlign="center">
               <Link asChild color="teal.500">
                 <RouterLink to="/request-form">Request Form</RouterLink>
@@ -70,18 +60,6 @@ const Homepage: React.FC = () => {
             Food Manufacturer View
           </Heading>
           <List.Root unstyled gap={2}>
-            <ListItem textAlign="center">
-              <Link asChild color="teal.500">
-                <RouterLink to="/food-manufacturer-order-dashboard">
-                  Order Dashboard
-                </RouterLink>
-              </Link>
-            </ListItem>
-            <ListItem textAlign="center">
-              <Link asChild color="teal.500">
-                <RouterLink to="/orders">Orders</RouterLink>
-              </Link>
-            </ListItem>
             <ListItem textAlign="center">
               <Link asChild color="teal.500">
                 <RouterLink to="/fm-donation-management">
diff --git a/apps/frontend/src/containers/orders.tsx b/apps/frontend/src/containers/orders.tsx
deleted file mode 100644
index b4aa4db9b..000000000
--- a/apps/frontend/src/containers/orders.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const Orders: React.FC = () => {
-  return <>Orders</>;
-};
-
-export default Orders;
diff --git a/apps/frontend/src/containers/pantryPastOrders.tsx b/apps/frontend/src/containers/pantryPastOrders.tsx
deleted file mode 100644
index 260a492f9..000000000
--- a/apps/frontend/src/containers/pantryPastOrders.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const PantryPastOrders: React.FC = () => {
-  return <>Pantry past orders</>;
-};
-
-export default PantryPastOrders;
diff --git a/apps/frontend/src/containers/root.tsx b/apps/frontend/src/containers/root.tsx
index 214d09b74..9e216caaf 100644
--- a/apps/frontend/src/containers/root.tsx
+++ b/apps/frontend/src/containers/root.tsx
@@ -1,7 +1,8 @@
 import { Outlet, useNavigate } from 'react-router-dom';
-import Header from '../components/Header';
+import { Box, Flex } from '@chakra-ui/react';
 import { useEffect } from 'react';
 import apiClient from '@api/apiClient';
+import Navbar from '../components/Navbar';
 
 const Root: React.FC = () => {
   const navigate = useNavigate();
@@ -11,10 +12,12 @@ const Root: React.FC = () => {
   }, [navigate]);
 
   return (
-    <div>
-      <Header />
-      <Outlet />
-    </div>
+    <Flex minH="100vh">
+      <Navbar />
+      <Box flex={1} overflow="auto">
+        <Outlet />
+      </Box>
+    </Flex>
   );
 };
 

From 02a741406f80234c0403eed4268c593144f1d626 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sun, 12 Apr 2026 20:02:28 -0400
Subject: [PATCH 02/14] added icon in login page

---
 .claude/settings.local.json                   |   8 -
 apps/frontend/src/components/AuthHeader.tsx   |  25 ++
 .../src/containers/forgotPasswordPage.tsx     |  25 +-
 apps/frontend/src/containers/loginPage.tsx    | 346 +++++++++---------
 apps/frontend/src/containers/signupPage.tsx   | 121 +++---
 5 files changed, 279 insertions(+), 246 deletions(-)
 delete mode 100644 .claude/settings.local.json
 create mode 100644 apps/frontend/src/components/AuthHeader.tsx

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
deleted file mode 100644
index d5276fad5..000000000
--- a/.claude/settings.local.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "mcp__plugin_figma_figma__get_design_context",
-      "mcp__plugin_figma_figma__get_screenshot"
-    ]
-  }
-}
diff --git a/apps/frontend/src/components/AuthHeader.tsx b/apps/frontend/src/components/AuthHeader.tsx
new file mode 100644
index 000000000..7e3d94437
--- /dev/null
+++ b/apps/frontend/src/components/AuthHeader.tsx
@@ -0,0 +1,25 @@
+import { Box } from '@chakra-ui/react';
+
+const AuthHeader: React.FC = () => (
+  <Box
+    h="74px"
+    w="full"
+    bg="white.core"
+    borderBottomWidth="1px"
+    borderBottomColor="neutral.100"
+    display="flex"
+    alignItems="center"
+    pl="26px"
+    flexShrink={0}
+  >
+    <Box w="40px" h="40px">
+      <img
+        src="/favicon.ico"
+        alt="SSF"
+        style={{ width: '100%', height: '100%', objectFit: 'contain' }}
+      />
+    </Box>
+  </Box>
+);
+
+export default AuthHeader;
diff --git a/apps/frontend/src/containers/forgotPasswordPage.tsx b/apps/frontend/src/containers/forgotPasswordPage.tsx
index e2d4405fb..7e9c0d5f6 100644
--- a/apps/frontend/src/containers/forgotPasswordPage.tsx
+++ b/apps/frontend/src/containers/forgotPasswordPage.tsx
@@ -1,20 +1,23 @@
 import { Box } from '@chakra-ui/react';
 import loginBackground from '../assets/login_background.png';
 import ResetPasswordModal from '@components/forms/resetPasswordModal';
+import AuthHeader from '@components/AuthHeader';
 
 const ForgotPasswordPage: React.FC = () => {
   return (
-    <Box
-      minH="100vh"
-      w="full"
-      bgImage={`url(${loginBackground})`}
-      bgSize="cover"
-      bgPos="center"
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-    >
-      <ResetPasswordModal></ResetPasswordModal>
+    <Box minH="100vh" w="full" display="flex" flexDirection="column">
+      <AuthHeader />
+      <Box
+        flex={1}
+        bgImage={`url(${loginBackground})`}
+        bgSize="cover"
+        bgPos="center"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
+      >
+        <ResetPasswordModal />
+      </Box>
     </Box>
   );
 };
diff --git a/apps/frontend/src/containers/loginPage.tsx b/apps/frontend/src/containers/loginPage.tsx
index e3fc46909..48f8ce6ba 100644
--- a/apps/frontend/src/containers/loginPage.tsx
+++ b/apps/frontend/src/containers/loginPage.tsx
@@ -16,6 +16,7 @@ import loginBackground from '../assets/login_background.png';
 import { Eye, EyeOff } from 'lucide-react';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
+import AuthHeader from '@components/AuthHeader';
 
 type Step = 'login' | 'new-password';
 
@@ -87,192 +88,201 @@ const LoginPage: React.FC = () => {
   };
 
   return (
-    <Box
-      minH="100vh"
-      w="full"
-      bgImage={`url(${loginBackground})`}
-      bgSize="cover"
-      bgPos="center"
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-    >
-      {alertState && (
-        <FloatingAlert
-          key={alertState.id}
-          message={alertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
+    <Box minH="100vh" w="full" display="flex" flexDirection="column">
+      <AuthHeader />
       <Box
-        maxW="500px"
-        w="full"
-        bg="white"
-        p={8}
-        borderRadius="xl"
-        boxShadow="xl"
+        flex={1}
+        bgImage={`url(${loginBackground})`}
+        bgSize="cover"
+        bgPos="center"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
       >
-        {step === 'login' ? (
-          <VStack gap={10} align="stretch">
-            <Box>
-              <Text textStyle="h1">Log In</Text>
-              <Text color="#52525B" textStyle="p2" mt={2}>
-                Welcome to the Securing Safe Food (SSF) Portal. Please log in
-                with your account credentials.
-              </Text>
-            </Box>
-
-            <Field.Root required>
-              <Field.Label {...fieldHeaderStyles}>Email</Field.Label>
-              <Input
-                name="email"
-                type="text"
-                borderColor="neutral.100"
-                placeholder="Enter email"
-                textStyle="p2"
-                color="neutral.700"
-                _placeholder={{ ...placeholderStyles }}
-                onChange={(e) => setEmail(e.target.value)}
-              />
-            </Field.Root>
+        {alertState && (
+          <FloatingAlert
+            key={alertState.id}
+            message={alertState.message}
+            status="error"
+            timeout={6000}
+          />
+        )}
+        <Box
+          maxW="500px"
+          w="full"
+          bg="white"
+          p={8}
+          borderRadius="xl"
+          boxShadow="xl"
+        >
+          {step === 'login' ? (
+            <VStack gap={10} align="stretch">
+              <Box>
+                <Text textStyle="h1">Log In</Text>
+                <Text color="#52525B" textStyle="p2" mt={2}>
+                  Welcome to the Securing Safe Food (SSF) Portal. Please log in
+                  with your account credentials.
+                </Text>
+              </Box>
 
-            <Field.Root required>
-              <Field.Label {...fieldHeaderStyles}>Password</Field.Label>
-              <Group attached w="full">
+              <Field.Root required>
+                <Field.Label {...fieldHeaderStyles}>Email</Field.Label>
                 <Input
-                  name="password"
-                  type={showPassword ? 'text' : 'password'}
+                  name="email"
+                  type="text"
                   borderColor="neutral.100"
-                  placeholder="Enter password"
+                  placeholder="Enter email"
                   textStyle="p2"
                   color="neutral.700"
                   _placeholder={{ ...placeholderStyles }}
-                  onChange={(e) => setPassword(e.target.value)}
+                  onChange={(e) => setEmail(e.target.value)}
                 />
-                <IconButton
-                  variant="outline"
-                  onClick={() => setShowPassword((prev) => !prev)}
-                >
-                  <Box color="neutral.200">
-                    {showPassword && <EyeOff />}
-                    {!showPassword && <Eye />}
-                  </Box>
-                </IconButton>
-              </Group>
-            </Field.Root>
+              </Field.Root>
 
-            <Button
-              bgColor="neutral.800"
-              w="full"
-              onClick={handleLogin}
-              borderRadius={4}
-              color="white"
-              textStyle="p2"
-              fontWeight={600}
-              disabled={!password || !email}
-            >
-              Log In
-            </Button>
-          </VStack>
-        ) : (
-          <VStack gap={10} align="stretch">
-            <Box>
-              <Text textStyle="h1">Set New Password</Text>
-              <Text color="#52525B" textStyle="p2" mt={2}>
-                Your account requires a new password before continuing. Your
-                password should be at least 8 characters.
-              </Text>
-            </Box>
+              <Field.Root required>
+                <Field.Label {...fieldHeaderStyles}>Password</Field.Label>
+                <Group attached w="full">
+                  <Input
+                    name="password"
+                    type={showPassword ? 'text' : 'password'}
+                    borderColor="neutral.100"
+                    placeholder="Enter password"
+                    textStyle="p2"
+                    color="neutral.700"
+                    _placeholder={{ ...placeholderStyles }}
+                    onChange={(e) => setPassword(e.target.value)}
+                  />
+                  <IconButton
+                    variant="outline"
+                    onClick={() => setShowPassword((prev) => !prev)}
+                  >
+                    <Box color="neutral.200">
+                      {showPassword && <EyeOff />}
+                      {!showPassword && <Eye />}
+                    </Box>
+                  </IconButton>
+                </Group>
+              </Field.Root>
 
-            <Field.Root required>
-              <Field.Label {...fieldHeaderStyles}>New Password</Field.Label>
-              <Group attached w="full">
-                <Input
-                  name="newPassword"
-                  type={showNewPassword ? 'text' : 'password'}
-                  borderColor="neutral.100"
-                  placeholder="Enter new password"
-                  textStyle="p2"
-                  color="neutral.700"
-                  _placeholder={{ ...placeholderStyles }}
-                  onChange={(e) => setNewPassword(e.target.value)}
-                />
-                <IconButton
-                  variant="outline"
-                  onClick={() => setShowNewPassword((prev) => !prev)}
-                >
-                  <Box color="neutral.200">
-                    {showNewPassword && <EyeOff />}
-                    {!showNewPassword && <Eye />}
-                  </Box>
-                </IconButton>
-              </Group>
-            </Field.Root>
+              <Button
+                bgColor="neutral.800"
+                w="full"
+                onClick={handleLogin}
+                borderRadius={4}
+                color="white"
+                textStyle="p2"
+                fontWeight={600}
+                disabled={!password || !email}
+              >
+                Log In
+              </Button>
+            </VStack>
+          ) : (
+            <VStack gap={10} align="stretch">
+              <Box>
+                <Text textStyle="h1">Set New Password</Text>
+                <Text color="#52525B" textStyle="p2" mt={2}>
+                  Your account requires a new password before continuing. Your
+                  password should be at least 8 characters.
+                </Text>
+              </Box>
 
-            <Field.Root required>
-              <Field.Label {...fieldHeaderStyles}>Confirm Password</Field.Label>
-              <Group attached w="full">
-                <Input
-                  key="confirmNewPassword"
-                  name="confirmNewPassword"
-                  type={showConfirmNewPassword ? 'text' : 'password'}
-                  borderColor="neutral.100"
-                  placeholder="Confirm new password"
-                  textStyle="p2"
-                  color="neutral.700"
-                  _placeholder={{ ...placeholderStyles }}
-                  onChange={(e) => setConfirmNewPassword(e.target.value)}
-                />
-                <IconButton
-                  variant="outline"
-                  onClick={() => setShowConfirmNewPassword((prev) => !prev)}
-                >
-                  <Box color="neutral.200">
-                    {showConfirmNewPassword && <EyeOff />}
-                    {!showConfirmNewPassword && <Eye />}
-                  </Box>
-                </IconButton>
-              </Group>
-            </Field.Root>
+              <Field.Root required>
+                <Field.Label {...fieldHeaderStyles}>New Password</Field.Label>
+                <Group attached w="full">
+                  <Input
+                    name="newPassword"
+                    type={showNewPassword ? 'text' : 'password'}
+                    borderColor="neutral.100"
+                    placeholder="Enter new password"
+                    textStyle="p2"
+                    color="neutral.700"
+                    _placeholder={{ ...placeholderStyles }}
+                    onChange={(e) => setNewPassword(e.target.value)}
+                  />
+                  <IconButton
+                    variant="outline"
+                    onClick={() => setShowNewPassword((prev) => !prev)}
+                  >
+                    <Box color="neutral.200">
+                      {showNewPassword && <EyeOff />}
+                      {!showNewPassword && <Eye />}
+                    </Box>
+                  </IconButton>
+                </Group>
+              </Field.Root>
 
-            <Button
-              bgColor="neutral.800"
-              w="full"
-              onClick={handleSetNewPassword}
-              borderRadius={4}
-              color="white"
-              textStyle="p2"
-              fontWeight={600}
-              disabled={!newPassword || !confirmNewPassword}
-            >
-              Set Password
-            </Button>
-          </VStack>
-        )}
+              <Field.Root required>
+                <Field.Label {...fieldHeaderStyles}>
+                  Confirm Password
+                </Field.Label>
+                <Group attached w="full">
+                  <Input
+                    key="confirmNewPassword"
+                    name="confirmNewPassword"
+                    type={showConfirmNewPassword ? 'text' : 'password'}
+                    borderColor="neutral.100"
+                    placeholder="Confirm new password"
+                    textStyle="p2"
+                    color="neutral.700"
+                    _placeholder={{ ...placeholderStyles }}
+                    onChange={(e) => setConfirmNewPassword(e.target.value)}
+                  />
+                  <IconButton
+                    variant="outline"
+                    onClick={() => setShowConfirmNewPassword((prev) => !prev)}
+                  >
+                    <Box color="neutral.200">
+                      {showConfirmNewPassword && <EyeOff />}
+                      {!showConfirmNewPassword && <Eye />}
+                    </Box>
+                  </IconButton>
+                </Group>
+              </Field.Root>
 
-        {step === 'login' && (
-          <>
-            <Text textStyle="p2" color="neutral.600" textAlign="center" mt={6}>
-              Don't have an account?{' '}
-              <Link
+              <Button
+                bgColor="neutral.800"
+                w="full"
+                onClick={handleSetNewPassword}
+                borderRadius={4}
+                color="white"
+                textStyle="p2"
+                fontWeight={600}
+                disabled={!newPassword || !confirmNewPassword}
+              >
+                Set Password
+              </Button>
+            </VStack>
+          )}
+
+          {step === 'login' && (
+            <>
+              <Text
                 textStyle="p2"
                 color="neutral.600"
-                onClick={() => navigate('/signup')}
-                variant="underline"
-                textDecorationColor="neutral.300"
+                textAlign="center"
+                mt={6}
               >
-                Sign up
-              </Link>
-            </Text>
+                Don't have an account?{' '}
+                <Link
+                  textStyle="p2"
+                  color="neutral.600"
+                  onClick={() => navigate('/signup')}
+                  variant="underline"
+                  textDecorationColor="neutral.300"
+                >
+                  Sign up
+                </Link>
+              </Text>
 
-            <Text fontSize="sm" textAlign="center" mt={12} fontWeight={400}>
-              <Link color="red" onClick={() => navigate('/forgot-password')}>
-                Reset Password
-              </Link>
-            </Text>
-          </>
-        )}
+              <Text fontSize="sm" textAlign="center" mt={12} fontWeight={400}>
+                <Link color="red" onClick={() => navigate('/forgot-password')}>
+                  Reset Password
+                </Link>
+              </Text>
+            </>
+          )}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/apps/frontend/src/containers/signupPage.tsx b/apps/frontend/src/containers/signupPage.tsx
index ca831b9a1..ad6b6f1a8 100644
--- a/apps/frontend/src/containers/signupPage.tsx
+++ b/apps/frontend/src/containers/signupPage.tsx
@@ -1,74 +1,77 @@
 import { useNavigate } from 'react-router-dom';
 import { Box, Text, VStack, Button, Link } from '@chakra-ui/react';
 import loginBackground from '../assets/login_background.png';
+import AuthHeader from '@components/AuthHeader';
 
 const SignupPage: React.FC = () => {
   const navigate = useNavigate();
 
   return (
-    <Box
-      minH="100vh"
-      w="full"
-      bgImage={`url(${loginBackground})`}
-      bgSize="cover"
-      bgPos="center"
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-    >
+    <Box minH="100vh" w="full" display="flex" flexDirection="column">
+      <AuthHeader />
       <Box
-        maxW="500px"
-        w="full"
-        bg="white"
-        p={8}
-        borderRadius="xl"
-        boxShadow="xl"
+        flex={1}
+        bgImage={`url(${loginBackground})`}
+        bgSize="cover"
+        bgPos="center"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
       >
-        <VStack gap={12} align="stretch">
-          <Box>
-            <Text textStyle="h1">Sign Up</Text>
-            <Text color="#52525B" textStyle="p2" mt={2}>
-              Please select your specified user type to begin your account
-              creation.
-            </Text>
-          </Box>
+        <Box
+          maxW="500px"
+          w="full"
+          bg="white"
+          p={8}
+          borderRadius="xl"
+          boxShadow="xl"
+        >
+          <VStack gap={12} align="stretch">
+            <Box>
+              <Text textStyle="h1">Sign Up</Text>
+              <Text color="#52525B" textStyle="p2" mt={2}>
+                Please select your specified user type to begin your account
+                creation.
+              </Text>
+            </Box>
 
-          <Button
-            bgColor="yellow.ssf"
-            w="full"
-            borderRadius={5}
-            color="white"
-            textStyle="p2"
-            fontWeight={600}
-            onClick={() => navigate('/pantry-application')}
-          >
-            Food Pantry Partner
-          </Button>
+            <Button
+              bgColor="yellow.ssf"
+              w="full"
+              borderRadius={5}
+              color="white"
+              textStyle="p2"
+              fontWeight={600}
+              onClick={() => navigate('/pantry-application')}
+            >
+              Food Pantry Partner
+            </Button>
 
-          <Button
-            bgColor="blue.ssf"
-            w="full"
-            borderRadius={5}
-            color="white"
-            textStyle="p2"
-            fontWeight={600}
-            onClick={() => navigate('/food-manufacturer-application')}
-          >
-            Food Manufacturer (Donor) Partner
-          </Button>
-        </VStack>
-        <Text textStyle="p2" color="neutral.600" textAlign="center" mt={24}>
-          Already have an account?{' '}
-          <Link
-            textStyle="p2"
-            color="neutral.600"
-            onClick={() => navigate('/login')}
-            variant="underline"
-            textDecorationColor="neutral.300"
-          >
-            Log in
-          </Link>
-        </Text>
+            <Button
+              bgColor="blue.ssf"
+              w="full"
+              borderRadius={5}
+              color="white"
+              textStyle="p2"
+              fontWeight={600}
+              onClick={() => navigate('/food-manufacturer-application')}
+            >
+              Food Manufacturer (Donor) Partner
+            </Button>
+          </VStack>
+          <Text textStyle="p2" color="neutral.600" textAlign="center" mt={24}>
+            Already have an account?{' '}
+            <Link
+              textStyle="p2"
+              color="neutral.600"
+              onClick={() => navigate('/login')}
+              variant="underline"
+              textDecorationColor="neutral.300"
+            >
+              Log in
+            </Link>
+          </Text>
+        </Box>
       </Box>
     </Box>
   );

From 4bc3615fa0e9544de34e47b4af591467d7443509 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sun, 12 Apr 2026 20:07:09 -0400
Subject: [PATCH 03/14] final commit

---
 apps/frontend/src/app.tsx                     |  16 --
 apps/frontend/src/components/Navbar.tsx       |   5 +-
 .../foodManufacturerOrderDashboard.tsx        | 113 --------------
 .../src/containers/pantryDashboard.tsx        | 147 ------------------
 4 files changed, 1 insertion(+), 280 deletions(-)
 delete mode 100644 apps/frontend/src/containers/foodManufacturerOrderDashboard.tsx
 delete mode 100644 apps/frontend/src/containers/pantryDashboard.tsx

diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index 2afc4abb4..e5aafd54a 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -73,22 +73,6 @@ const router = createBrowserRouter([
         path: '/unauthorized',
         element: <Unauthorized />,
       },
-      {
-        path: '/pantries',
-        element: (
-          <ProtectedRoute>
-            <Pantries />
-          </ProtectedRoute>
-        ),
-      },
-      {
-        path: '/pantries',
-        element: (
-          <ProtectedRoute>
-            <Pantries />
-          </ProtectedRoute>
-        ),
-      },
       {
         path: '/request-form',
         element: (
diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index eb34e62a9..7ca421951 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -36,10 +36,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
     {
       type: 'group',
       label: 'Pantries',
-      children: [
-        { label: 'Pantry Management', to: '/pantries' },
-        { label: 'Application Review', to: '/approve-pantries' },
-      ],
+      children: [{ label: 'Application Review', to: '/approve-pantries' }],
     },
     {
       type: 'group',
diff --git a/apps/frontend/src/containers/foodManufacturerOrderDashboard.tsx b/apps/frontend/src/containers/foodManufacturerOrderDashboard.tsx
deleted file mode 100644
index b118f0a78..000000000
--- a/apps/frontend/src/containers/foodManufacturerOrderDashboard.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Center, Table, Button, ButtonGroup, VStack } from '@chakra-ui/react';
-import ApiClient from '@api/apiClient';
-import { Order } from 'types/types';
-import OrderInformationModal from '@components/forms/orderInformationModal';
-import { formatDate } from '@utils/utils';
-
-const FoodManufacturerOrderDashboard: React.FC = () => {
-  const [orders, setOrders] = useState<Order[]>([]);
-  const [orderType, setOrderType] = useState<'current' | 'past'>('current');
-  const [openOrderId, setOpenOrderId] = useState<number | null>(null);
-
-  useEffect(() => {
-    fetchOrders();
-  }, [orderType]);
-
-  const fetchOrders = async () => {
-    try {
-      const data =
-        orderType === 'current'
-          ? await ApiClient.getCurrentOrders()
-          : await ApiClient.getPastOrders();
-      setOrders(data);
-    } catch (error) {
-      alert('Error fetching orders: ' + error);
-    }
-  };
-
-  const updateOrderStatus = async (
-    orderId: number,
-    newStatus: 'shipped' | 'delivered',
-  ) => {
-    try {
-      await ApiClient.updateOrderStatus(orderId, newStatus);
-      fetchOrders();
-    } catch (error) {
-      alert(`Error updating order status: ` + error);
-    }
-  };
-
-  return (
-    <Center flexDirection="column" p={4}>
-      <VStack gap={4} width="80%">
-        <ButtonGroup>
-          <Button
-            bg={orderType === 'current' ? 'blue' : 'gray'}
-            onClick={() => setOrderType('current')}
-          >
-            Current Orders
-          </Button>
-          <Button
-            bg={orderType === 'past' ? 'blue' : 'gray'}
-            onClick={() => setOrderType('past')}
-          >
-            Past Orders
-          </Button>
-        </ButtonGroup>
-
-        <Table.Root mt={6} width="100%">
-          <Table.Header>
-            <Table.Row>
-              <Table.ColumnHeader>Order ID</Table.ColumnHeader>
-              <Table.ColumnHeader>Date Placed</Table.ColumnHeader>
-              <Table.ColumnHeader>Status</Table.ColumnHeader>
-              <Table.ColumnHeader>Actions</Table.ColumnHeader>
-            </Table.Row>
-          </Table.Header>
-          <Table.Body>
-            {orders.map((order) => (
-              <Table.Row key={order.orderId}>
-                <Table.Cell>
-                  <Button
-                    onClick={() => setOpenOrderId(order.orderId)}
-                    bg="neutral.100"
-                    color="black"
-                  >
-                    {order.orderId}
-                  </Button>
-                </Table.Cell>
-                <Table.Cell>{formatDate(order.createdAt)}</Table.Cell>
-                <Table.Cell>{order.status}</Table.Cell>
-                <Table.Cell>
-                  <ButtonGroup>
-                    {order.status === 'pending' && (
-                      <Button
-                        bg="blue"
-                        size="sm"
-                        onClick={() =>
-                          updateOrderStatus(order.orderId, 'shipped')
-                        }
-                      >
-                        Mark as Shipped
-                      </Button>
-                    )}
-                  </ButtonGroup>
-                </Table.Cell>
-              </Table.Row>
-            ))}
-            {openOrderId && (
-              <OrderInformationModal
-                orderId={openOrderId}
-                isOpen={openOrderId !== null}
-                onClose={() => setOpenOrderId(null)}
-              />
-            )}
-          </Table.Body>
-        </Table.Root>
-      </VStack>
-    </Center>
-  );
-};
-
-export default FoodManufacturerOrderDashboard;
diff --git a/apps/frontend/src/containers/pantryDashboard.tsx b/apps/frontend/src/containers/pantryDashboard.tsx
deleted file mode 100644
index 37aa458dc..000000000
--- a/apps/frontend/src/containers/pantryDashboard.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import {
-  Menu,
-  Portal,
-  Button,
-  HStack,
-  Text,
-  VStack,
-  Card,
-  CardBody,
-  Box,
-  Link,
-} from '@chakra-ui/react';
-import { MenuIcon } from 'lucide-react';
-import React, { useEffect, useState } from 'react';
-import { PantryWithUser } from 'types/types';
-import ApiClient from '@api/apiClient';
-
-const PantryDashboard: React.FC = () => {
-  const [pantryId, setPantryId] = useState<number | null>(null);
-  const [pantry, setPantry] = useState<PantryWithUser | null>(null);
-
-  useEffect(() => {
-    const fetchPantryId = async () => {
-      try {
-        const pantryId = await ApiClient.getCurrentUserPantryId();
-        setPantryId(pantryId);
-      } catch (error) {
-        console.error('Error fetching pantry ID', error);
-      }
-    };
-
-    fetchPantryId();
-  }, []);
-
-  useEffect(() => {
-    const fetchPantryData = async () => {
-      if (!pantryId) return;
-
-      try {
-        const pantryData = await ApiClient.getPantry(pantryId);
-        setPantry(pantryData);
-      } catch (error) {
-        console.error('Error fetching pantry data/SSFRep data', error);
-      }
-    };
-
-    fetchPantryData();
-  }, [pantryId]);
-
-  return (
-    <VStack width="100%" padding="2" gap={10}>
-      <HStack
-        width="100%"
-        justify="center"
-        position="relative"
-        borderBottom="2px solid #e2e8f0"
-        paddingBottom="8px"
-      >
-        <Text textAlign="center" fontSize="2xl">
-          Welcome {pantry?.pantryName}!
-        </Text>
-        <Box
-          position="absolute"
-          right="2px"
-          top="50%"
-          transform="translateY(-50%)"
-        >
-          <Menu.Root>
-            <Menu.Trigger asChild>
-              <Button
-                bg="transparent"
-                size="lg"
-                _hover={{ bg: 'transparent' }}
-                _active={{ bg: 'transparent' }}
-              >
-                <MenuIcon color="black" size={6} />
-              </Button>
-            </Menu.Trigger>
-            <Portal>
-              <Menu.Positioner>
-                <Menu.Content>
-                  <Menu.Item
-                    as={Link}
-                    href="/"
-                    _hover={{ textDecoration: 'none', cursor: 'pointer' }}
-                    textDecoration="none"
-                  >
-                    Profile
-                  </Menu.Item>
-                  <Menu.Item
-                    as={Link}
-                    href="/request-form"
-                    _hover={{ textDecoration: 'none', cursor: 'pointer' }}
-                    textDecoration="none"
-                  >
-                    Request Form
-                  </Menu.Item>
-                  <Menu.Item
-                    as={Link}
-                    href="/"
-                    _hover={{ textDecoration: 'none', cursor: 'pointer' }}
-                    textDecoration="none"
-                  >
-                    Sign out
-                  </Menu.Item>
-                </Menu.Content>
-              </Menu.Positioner>
-            </Portal>
-          </Menu.Root>
-        </Box>
-      </HStack>
-
-      <Card.Root>
-        <CardBody>
-          <Text
-            textAlign="center"
-            fontSize={'2xl'}
-            mb="6"
-            borderBottom="2px solid #e2e8f0"
-            paddingBottom="8px"
-          >
-            Need help? Contact your SSF representative
-          </Text>
-          <Text>
-            Name: {pantry?.pantryUser?.firstName} {pantry?.pantryUser?.lastName}
-          </Text>
-          <Text>Email: {pantry?.pantryUser?.email}</Text>
-          <Text>Phone: {pantry?.pantryUser?.phone}</Text>
-        </CardBody>
-      </Card.Root>
-
-      <Button
-        asChild
-        mt="6"
-        _hover={{ textDecoration: 'none' }}
-        _focus={{ textDecoration: 'none' }}
-        textDecoration="none"
-      >
-        <Link href={`/request-form`}>
-          Request new shipment or check shipment status
-        </Link>
-      </Button>
-    </VStack>
-  );
-};
-
-export default PantryDashboard;

From 50ead8bfcc59701043d309e4702e56ed134db0b5 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 18 Apr 2026 04:07:27 -0400
Subject: [PATCH 04/14] fixed navigation bugs and comments

---
 apps/frontend/src/app.tsx                     | 44 ++++++++--------
 apps/frontend/src/components/Navbar.tsx       | 51 ++++++++++---------
 .../forms/manufacturerApplicationForm.tsx     |  5 +-
 .../forms/pantryApplicationForm.tsx           |  5 +-
 .../frontend/src/components/signOutButton.tsx |  3 +-
 .../foodManufacturerApplicationDetails.tsx    |  9 ++--
 apps/frontend/src/containers/loginPage.tsx    |  8 ++-
 apps/frontend/src/containers/pantries.tsx     |  5 --
 .../containers/pantryApplicationDetails.tsx   | 11 ++--
 apps/frontend/src/containers/signupPage.tsx   |  7 +--
 .../containers/volunteerAssignedPantries.tsx  |  5 +-
 apps/frontend/src/routes.ts                   | 32 ++++++++++++
 12 files changed, 117 insertions(+), 68 deletions(-)
 delete mode 100644 apps/frontend/src/containers/pantries.tsx
 create mode 100644 apps/frontend/src/routes.ts

diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index e5aafd54a..36148615b 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -1,7 +1,6 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import Root from '@containers/root';
 import NotFound from '@containers/404';
-import Pantries from '@containers/pantries';
 import FormRequests from '@containers/formRequests';
 import PantryApplication from '@containers/pantryApplication';
 import ApplicationSubmitted from '@containers/applicationSubmitted';
@@ -14,6 +13,7 @@ import Homepage from '@containers/homepage';
 import AdminOrderManagement from '@containers/adminOrderManagement';
 import { Amplify } from 'aws-amplify';
 import CognitoAuthConfig from './aws-exports';
+import { ROUTES } from './routes';
 import FoodManufacturerDonationManagement from '@containers/foodManufacturerDonationManagement';
 import LoginPage from '@containers/loginPage';
 import SignupPage from '@containers/signupPage';
@@ -34,7 +34,7 @@ Amplify.configure(CognitoAuthConfig);
 
 const router = createBrowserRouter([
   {
-    path: '/',
+    path: ROUTES.HOME,
     element: <Root />,
     errorElement: <NotFound />,
     children: [
@@ -44,37 +44,37 @@ const router = createBrowserRouter([
         element: <Homepage />,
       },
       {
-        path: '/login',
+        path: ROUTES.LOGIN,
         element: <LoginPage />,
       },
       {
-        path: '/signup',
+        path: ROUTES.SIGNUP,
         element: <SignupPage />,
       },
       {
-        path: '/forgot-password',
+        path: ROUTES.FORGOT_PASSWORD,
         element: <ForgotPasswordPage />,
       },
       {
-        path: '/pantry-application',
+        path: ROUTES.PANTRY_APPLICATION,
         element: <PantryApplication />,
         action: submitPantryApplicationForm,
       },
       {
-        path: '/food-manufacturer-application',
+        path: ROUTES.FOOD_MANUFACTURER_APPLICATION,
         element: <FoodManufacturerApplication />,
         action: submitManufacturerApplicationForm,
       },
       {
-        path: '/application-submitted',
+        path: ROUTES.APPLICATION_SUBMITTED,
         element: <ApplicationSubmitted />,
       },
       {
-        path: '/unauthorized',
+        path: ROUTES.UNAUTHORIZED,
         element: <Unauthorized />,
       },
       {
-        path: '/request-form',
+        path: ROUTES.REQUEST_FORM,
         element: (
           <ProtectedRoute>
             <FormRequests />
@@ -82,7 +82,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/fm-donation-management',
+        path: ROUTES.FM_DONATION_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <FoodManufacturerDonationManagement />
@@ -90,7 +90,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/approve-pantries',
+        path: ROUTES.APPROVE_PANTRIES,
         element: (
           <ProtectedRoute>
             <ApprovePantries />
@@ -98,7 +98,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/approve-food-manufacturers',
+        path: ROUTES.APPROVE_FOOD_MANUFACTURERS,
         element: (
           <ProtectedRoute>
             <ApproveFoodManufacturers />
@@ -106,7 +106,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/pantry-application-details/:applicationId',
+        path: ROUTES.PANTRY_APPLICATION_DETAILS,
         element: (
           <ProtectedRoute>
             <PantryApplicationDetails />
@@ -114,7 +114,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/food-manufacturer-application-details/:applicationId',
+        path: ROUTES.FOOD_MANUFACTURER_APPLICATION_DETAILS,
         element: (
           <ProtectedRoute>
             <FoodManufacturerApplicationDetails />
@@ -122,7 +122,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/admin-donation',
+        path: ROUTES.ADMIN_DONATION,
         element: (
           <ProtectedRoute>
             <AdminDonation />
@@ -130,7 +130,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/volunteer-management',
+        path: ROUTES.VOLUNTEER_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <VolunteerManagement />
@@ -138,7 +138,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/admin-order-management',
+        path: ROUTES.ADMIN_ORDER_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <AdminOrderManagement />
@@ -146,7 +146,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/pantry-order-management',
+        path: ROUTES.PANTRY_ORDER_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <PantryOrderManagement />
@@ -154,7 +154,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/profile',
+        path: ROUTES.PROFILE,
         element: (
           <ProtectedRoute>
             <ProfilePage />
@@ -162,7 +162,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/volunteer-assigned-pantries',
+        path: ROUTES.VOLUNTEER_ASSIGNED_PANTRIES,
         element: (
           <ProtectedRoute>
             <AssignedPantries />
@@ -170,7 +170,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/volunteer-request-management',
+        path: ROUTES.VOLUNTEER_REQUEST_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <VolunteerRequestManagement />
diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index 7ca421951..3553eca1e 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -6,6 +6,7 @@ import { signOut } from 'aws-amplify/auth';
 import { ChevronDown, ChevronRight, LogOut } from 'lucide-react';
 import ApiClient from '@api/apiClient';
 import { Role, User } from '../types/types';
+import { ROUTES } from '../routes';
 
 const ROLE_MAP: Record<Role, { label: string }> = {
   [Role.ADMIN]: { label: 'Admin' },
@@ -30,25 +31,27 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       type: 'group',
       label: 'Volunteers',
       children: [
-        { label: 'Volunteer Management', to: '/volunteer-management' },
+        { label: 'Volunteer Management', to: ROUTES.VOLUNTEER_MANAGEMENT },
       ],
     },
     {
       type: 'group',
       label: 'Pantries',
-      children: [{ label: 'Application Review', to: '/approve-pantries' }],
+      children: [{ label: 'Application Review', to: ROUTES.APPROVE_PANTRIES }],
     },
     {
       type: 'group',
       label: 'Orders',
-      children: [{ label: 'Order Management', to: '/admin-order-management' }],
+      children: [
+        { label: 'Order Management', to: ROUTES.ADMIN_ORDER_MANAGEMENT },
+      ],
     },
     {
       type: 'group',
       label: 'Manufacturers',
       children: [
-        { label: 'Donation Management', to: '/admin-donation' },
-        { label: 'Application Review', to: '/approve-food-manufacturers' },
+        { label: 'Donation Management', to: ROUTES.ADMIN_DONATION },
+        { label: 'Application Review', to: ROUTES.APPROVE_FOOD_MANUFACTURERS },
       ],
     },
   ],
@@ -56,7 +59,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
     {
       type: 'flat',
       label: 'Assigned Pantries',
-      to: '/volunteer-assigned-pantries',
+      to: ROUTES.VOLUNTEER_ASSIGNED_PANTRIES,
     },
     {
       type: 'group',
@@ -64,7 +67,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       children: [
         {
           label: 'Food Request Management',
-          to: '/volunteer-request-management',
+          to: ROUTES.VOLUNTEER_REQUEST_MANAGEMENT,
         },
       ],
     },
@@ -74,7 +77,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       type: 'group',
       label: 'Donations',
       children: [
-        { label: 'Donation Management', to: '/fm-donation-management' },
+        { label: 'Donation Management', to: ROUTES.FM_DONATION_MANAGEMENT },
       ],
     },
   ],
@@ -83,8 +86,8 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       type: 'group',
       label: 'Orders',
       children: [
-        { label: 'Order Management', to: '/pantry-order-management' },
-        { label: 'Food Requests', to: '/request-form' },
+        { label: 'Order Management', to: ROUTES.PANTRY_ORDER_MANAGEMENT },
+        { label: 'Food Requests', to: ROUTES.REQUEST_FORM },
       ],
     },
   ],
@@ -199,22 +202,21 @@ const NavGroup: React.FC<NavGroupProps> = ({
 );
 
 const Navbar: React.FC = () => {
-  const { user: cognitoUser } = useAuthenticator((context) => [context.user]);
+  const { authStatus } = useAuthenticator((context) => [context.authStatus]);
   const [currentUser, setCurrentUser] = useState<User | null>(null);
   const [openGroups, setOpenGroups] = useState<Set<string>>(new Set());
   const location = useLocation();
   const navigate = useNavigate();
 
   useEffect(() => {
-    // Only fetch the current user if they are logged in
-    if (cognitoUser) {
+    if (authStatus === 'authenticated') {
       ApiClient.getMe()
         .then(setCurrentUser)
         .catch(() => setCurrentUser(null));
     } else {
       setCurrentUser(null);
     }
-  }, [cognitoUser]);
+  }, [authStatus]);
 
   // On reload or navigation, make sure the currently opened groups stays open
   useEffect(() => {
@@ -234,13 +236,11 @@ const Navbar: React.FC = () => {
     });
   }, [location.pathname, currentUser]);
 
-  if (!cognitoUser) return null;
+  if (authStatus !== 'authenticated' || !currentUser) return null;
 
-  const roleLabel = currentUser ? ROLE_MAP[currentUser.role].label : null;
-  const sections: NavSection[] = currentUser
-    ? ROLE_NAV_SECTIONS[currentUser.role]
-    : [];
-  const email = currentUser?.email ?? '';
+  const roleLabel = ROLE_MAP[currentUser.role].label;
+  const sections: NavSection[] = ROLE_NAV_SECTIONS[currentUser.role];
+  const email = currentUser.email;
 
   const toggleGroup = (label: string) => {
     setOpenGroups((prev) => {
@@ -253,7 +253,7 @@ const Navbar: React.FC = () => {
 
   const handleSignOut = async () => {
     await signOut();
-    navigate('/');
+    navigate(ROUTES.LOGIN, { replace: true });
   };
 
   return (
@@ -269,7 +269,10 @@ const Navbar: React.FC = () => {
       pb={4}
       flexShrink={0}
     >
-      <RouterLink to="/profile" style={{ width: '100%', marginBottom: '24px' }}>
+      <RouterLink
+        to={ROUTES.PROFILE}
+        style={{ width: '100%', marginBottom: '24px' }}
+      >
         <Box
           bg="white.core"
           borderWidth="1px"
@@ -316,9 +319,9 @@ const Navbar: React.FC = () => {
       <VStack align="stretch" gap={0} flex={1}>
         <NavLink
           fontWeight="600"
-          to="/"
+          to={ROUTES.HOME}
           label="Dashboard"
-          isActive={location.pathname === '/'}
+          isActive={location.pathname === ROUTES.HOME}
         />
 
         {sections.map((section) =>
diff --git a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
index 3350edfb7..a029e9dd0 100644
--- a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
@@ -36,6 +36,7 @@ import {
 } from '../../types/manufacturerEnums';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
+import { ROUTES } from '../../routes';
 
 const ManufacturerApplicationForm: React.FC = () => {
   const [contactPhone, setContactPhone] = useState<string>('');
@@ -107,7 +108,7 @@ const ManufacturerApplicationForm: React.FC = () => {
         borderColor="neutral.200"
         rounded="sm"
       >
-        <Form method="post" action="/food-manufacturer-application">
+        <Form method="post" action={ROUTES.FOOD_MANUFACTURER_APPLICATION}>
           <Heading textStyle="h3" mb="1em" color="gray.dark">
             Food Manufacturer Application Form
           </Heading>
@@ -721,7 +722,7 @@ export const submitManufacturerApplicationForm: ActionFunction = async ({
 
   try {
     await ApiClient.postManufacturer(data as ManufacturerApplicationDto);
-    return redirect('/application-submitted');
+    return redirect(ROUTES.APPLICATION_SUBMITTED);
   } catch (error) {
     if (axios.isAxiosError(error) && error.response?.status === 400) {
       return {
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index bf133a87b..601bfc266 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -32,6 +32,7 @@ import { ChevronDownIcon } from 'lucide-react';
 import { TagGroup } from './tagGroup';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
+import { ROUTES } from '../../routes';
 
 const otherRestrictionsOptions: string[] = [
   'Other allergy (e.g., yeast, sunflower, etc.)',
@@ -142,7 +143,7 @@ const PantryApplicationForm: React.FC = () => {
         borderColor="neutral.200"
         rounded="sm"
       >
-        <Form method="post" action="/pantry-application">
+        <Form method="post" action={ROUTES.PANTRY_APPLICATION}>
           <Heading textStyle="h3" mb="1em" color="gray.dark">
             Pantry Application Form
           </Heading>
@@ -1210,7 +1211,7 @@ export const submitPantryApplicationForm: ActionFunction = async ({
 
   try {
     await ApiClient.postPantry(data as PantryApplicationDto);
-    return redirect('/application-submitted');
+    return redirect(ROUTES.APPLICATION_SUBMITTED);
   } catch (error) {
     if (axios.isAxiosError(error) && error.response?.status === 400) {
       return {
diff --git a/apps/frontend/src/components/signOutButton.tsx b/apps/frontend/src/components/signOutButton.tsx
index 5b7abec01..2de170fe2 100644
--- a/apps/frontend/src/components/signOutButton.tsx
+++ b/apps/frontend/src/components/signOutButton.tsx
@@ -2,6 +2,7 @@ import apiClient from '@api/apiClient';
 import { Button, ButtonProps } from '@chakra-ui/react';
 import { signOut } from 'aws-amplify/auth';
 import { useNavigate } from 'react-router-dom';
+import { ROUTES } from '../routes';
 
 type SignOutButtonProps = ButtonProps;
 
@@ -10,7 +11,7 @@ const SignOutButton: React.FC<SignOutButtonProps> = (props) => {
 
   const handleSignOut = async () => {
     await signOut();
-    navigate('/');
+    navigate(ROUTES.LOGIN, { replace: true });
   };
 
   return (
diff --git a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
index 5147e3e35..bcae561bb 100644
--- a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
+++ b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
@@ -20,6 +20,7 @@ import { AxiosError } from 'axios';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
 import ConfirmFoodManufacturerDecisionModal from '@components/forms/confirmFoodManufacturerDecisionModal';
+import { ROUTES } from '../routes';
 
 interface EmptyStateProps {
   icon: React.ReactNode;
@@ -73,7 +74,7 @@ const EmptyState: React.FC<EmptyStateProps> = ({
               textStyle="p2"
               fontWeight={600}
             >
-              <Link to="/approve-food-manufacturers">
+              <Link to={ROUTES.APPROVE_FOOD_MANUFACTURERS}>
                 Return to applications
               </Link>
             </Button>
@@ -170,7 +171,8 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
           'approve',
         );
         navigate(
-          '/approve-food-manufacturers?action=approved&name=' +
+          ROUTES.APPROVE_FOOD_MANUFACTURERS +
+            '?action=approved&name=' +
             application.foodManufacturerName,
         );
       } catch {
@@ -187,7 +189,8 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
           'deny',
         );
         navigate(
-          '/approve-food-manufacturers?action=denied&name=' +
+          ROUTES.APPROVE_FOOD_MANUFACTURERS +
+            '?action=denied&name=' +
             application.foodManufacturerName,
         );
       } catch {
diff --git a/apps/frontend/src/containers/loginPage.tsx b/apps/frontend/src/containers/loginPage.tsx
index 48f8ce6ba..16a18150e 100644
--- a/apps/frontend/src/containers/loginPage.tsx
+++ b/apps/frontend/src/containers/loginPage.tsx
@@ -17,6 +17,7 @@ import { Eye, EyeOff } from 'lucide-react';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
 import AuthHeader from '@components/AuthHeader';
+import { ROUTES } from '../routes';
 
 type Step = 'login' | 'new-password';
 
@@ -267,7 +268,7 @@ const LoginPage: React.FC = () => {
                 <Link
                   textStyle="p2"
                   color="neutral.600"
-                  onClick={() => navigate('/signup')}
+                  onClick={() => navigate(ROUTES.SIGNUP)}
                   variant="underline"
                   textDecorationColor="neutral.300"
                 >
@@ -276,7 +277,10 @@ const LoginPage: React.FC = () => {
               </Text>
 
               <Text fontSize="sm" textAlign="center" mt={12} fontWeight={400}>
-                <Link color="red" onClick={() => navigate('/forgot-password')}>
+                <Link
+                  color="red"
+                  onClick={() => navigate(ROUTES.FORGOT_PASSWORD)}
+                >
                   Reset Password
                 </Link>
               </Text>
diff --git a/apps/frontend/src/containers/pantries.tsx b/apps/frontend/src/containers/pantries.tsx
deleted file mode 100644
index 91e9e22df..000000000
--- a/apps/frontend/src/containers/pantries.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const Pantries: React.FC = () => {
-  return <>Pantries</>;
-};
-
-export default Pantries;
diff --git a/apps/frontend/src/containers/pantryApplicationDetails.tsx b/apps/frontend/src/containers/pantryApplicationDetails.tsx
index 978140065..06f0f0c7a 100644
--- a/apps/frontend/src/containers/pantryApplicationDetails.tsx
+++ b/apps/frontend/src/containers/pantryApplicationDetails.tsx
@@ -20,6 +20,7 @@ import { AxiosError } from 'axios';
 import { FloatingAlert } from '@components/floatingAlert';
 import ConfirmPantryDecisionModal from '@components/forms/confirmPantryDecisionModal';
 import { useAlert } from '../hooks/alert';
+import { ROUTES } from '../routes';
 
 interface EmptyStateProps {
   icon: React.ReactNode;
@@ -73,7 +74,7 @@ const EmptyState: React.FC<EmptyStateProps> = ({
               textStyle="p2"
               fontWeight={600}
             >
-              <Link to="/approve-pantries">Return to applications</Link>
+              <Link to={ROUTES.APPROVE_PANTRIES}>Return to applications</Link>
             </Button>
           )}
         </Box>
@@ -163,7 +164,9 @@ const PantryApplicationDetails: React.FC = () => {
       try {
         await ApiClient.updatePantry(application.pantryId, 'approve');
         navigate(
-          '/approve-pantries?action=approved&name=' + application.pantryName,
+          ROUTES.APPROVE_PANTRIES +
+            '?action=approved&name=' +
+            application.pantryName,
         );
       } catch {
         setAlertMessage('Error approving application');
@@ -176,7 +179,9 @@ const PantryApplicationDetails: React.FC = () => {
       try {
         await ApiClient.updatePantry(application.pantryId, 'deny');
         navigate(
-          '/approve-pantries?action=denied&name=' + application.pantryName,
+          ROUTES.APPROVE_PANTRIES +
+            '?action=denied&name=' +
+            application.pantryName,
         );
       } catch {
         setAlertMessage('Error denying application');
diff --git a/apps/frontend/src/containers/signupPage.tsx b/apps/frontend/src/containers/signupPage.tsx
index ad6b6f1a8..7793ba528 100644
--- a/apps/frontend/src/containers/signupPage.tsx
+++ b/apps/frontend/src/containers/signupPage.tsx
@@ -2,6 +2,7 @@ import { useNavigate } from 'react-router-dom';
 import { Box, Text, VStack, Button, Link } from '@chakra-ui/react';
 import loginBackground from '../assets/login_background.png';
 import AuthHeader from '@components/AuthHeader';
+import { ROUTES } from '../routes';
 
 const SignupPage: React.FC = () => {
   const navigate = useNavigate();
@@ -42,7 +43,7 @@ const SignupPage: React.FC = () => {
               color="white"
               textStyle="p2"
               fontWeight={600}
-              onClick={() => navigate('/pantry-application')}
+              onClick={() => navigate(ROUTES.PANTRY_APPLICATION)}
             >
               Food Pantry Partner
             </Button>
@@ -54,7 +55,7 @@ const SignupPage: React.FC = () => {
               color="white"
               textStyle="p2"
               fontWeight={600}
-              onClick={() => navigate('/food-manufacturer-application')}
+              onClick={() => navigate(ROUTES.FOOD_MANUFACTURER_APPLICATION)}
             >
               Food Manufacturer (Donor) Partner
             </Button>
@@ -64,7 +65,7 @@ const SignupPage: React.FC = () => {
             <Link
               textStyle="p2"
               color="neutral.600"
-              onClick={() => navigate('/login')}
+              onClick={() => navigate(ROUTES.LOGIN)}
               variant="underline"
               textDecorationColor="neutral.300"
             >
diff --git a/apps/frontend/src/containers/volunteerAssignedPantries.tsx b/apps/frontend/src/containers/volunteerAssignedPantries.tsx
index 433fc838b..a89164a04 100644
--- a/apps/frontend/src/containers/volunteerAssignedPantries.tsx
+++ b/apps/frontend/src/containers/volunteerAssignedPantries.tsx
@@ -17,6 +17,7 @@ import { RefrigeratedDonation } from '../types/pantryEnums';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useNavigate } from 'react-router-dom';
 import { useAlert } from '../hooks/alert';
+import { ROUTES } from '../routes';
 
 const AssignedPantries: React.FC = () => {
   const navigate = useNavigate();
@@ -379,7 +380,9 @@ const AssignedPantries: React.FC = () => {
                         textDecoration="underline"
                         color="neutral.700"
                         textStyle="p2"
-                        onClick={() => navigate('/landing-page')}
+                        onClick={() =>
+                          navigate(ROUTES.VOLUNTEER_REQUEST_MANAGEMENT)
+                        }
                         p={0}
                         height="auto"
                         minW="auto"
diff --git a/apps/frontend/src/routes.ts b/apps/frontend/src/routes.ts
new file mode 100644
index 000000000..020b32a1e
--- /dev/null
+++ b/apps/frontend/src/routes.ts
@@ -0,0 +1,32 @@
+export const ROUTES = {
+  HOME: '/',
+
+  LOGIN: '/login',
+  SIGNUP: '/signup',
+  FORGOT_PASSWORD: '/forgot-password',
+  UNAUTHORIZED: '/unauthorized',
+
+  PROFILE: '/profile',
+
+  PANTRY_APPLICATION: '/pantry-application',
+  FOOD_MANUFACTURER_APPLICATION: '/food-manufacturer-application',
+  APPLICATION_SUBMITTED: '/application-submitted',
+
+  PANTRY_APPLICATION_DETAILS: '/pantry-application-details/:applicationId',
+  FOOD_MANUFACTURER_APPLICATION_DETAILS:
+    '/food-manufacturer-application-details/:applicationId',
+
+  APPROVE_PANTRIES: '/approve-pantries',
+  APPROVE_FOOD_MANUFACTURERS: '/approve-food-manufacturers',
+  VOLUNTEER_MANAGEMENT: '/volunteer-management',
+  ADMIN_ORDER_MANAGEMENT: '/admin-order-management',
+  ADMIN_DONATION: '/admin-donation',
+
+  VOLUNTEER_ASSIGNED_PANTRIES: '/volunteer-assigned-pantries',
+  VOLUNTEER_REQUEST_MANAGEMENT: '/volunteer-request-management',
+
+  PANTRY_ORDER_MANAGEMENT: '/pantry-order-management',
+  REQUEST_FORM: '/request-form',
+
+  FM_DONATION_MANAGEMENT: '/fm-donation-management',
+};

From 7cc5aa08e078eab1596fb42af406974a2a136fc7 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 18 Apr 2026 04:09:47 -0400
Subject: [PATCH 05/14] fixed null dashboard bug

---
 apps/frontend/src/components/Navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index 3553eca1e..037b52051 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -301,7 +301,7 @@ const Navbar: React.FC = () => {
               overflow="hidden"
               style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
             >
-              {`${roleLabel} Dashboard`}
+              {roleLabel ? `${roleLabel} Dashboard` : 'Dashboard'}
             </Text>
             <Text
               fontSize="10px"

From 426d1b5110dd161c90404ab70dde70b320641709 Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sat, 18 Apr 2026 11:16:36 -0400
Subject: [PATCH 06/14] Use route constants

---
 apps/frontend/src/app.tsx   | 4 ++--
 apps/frontend/src/routes.ts | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index 638995a18..740e049c2 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -132,7 +132,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/admin-donation-stats',
+        path: ROUTES.ADMIN_DONATION_STATS,
         element: (
           <ProtectedRoute>
             <AdminDonationStats />
@@ -188,7 +188,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/volunteer-order-management',
+        path: ROUTES.VOLUNTEER_ORDER_MANAGEMENT,
         element: (
           <ProtectedRoute>
             <VolunteerOrderManagement />
diff --git a/apps/frontend/src/routes.ts b/apps/frontend/src/routes.ts
index 020b32a1e..81a59bc0f 100644
--- a/apps/frontend/src/routes.ts
+++ b/apps/frontend/src/routes.ts
@@ -21,9 +21,11 @@ export const ROUTES = {
   VOLUNTEER_MANAGEMENT: '/volunteer-management',
   ADMIN_ORDER_MANAGEMENT: '/admin-order-management',
   ADMIN_DONATION: '/admin-donation',
+  ADMIN_DONATION_STATS: '/admin-donation-stats',
 
   VOLUNTEER_ASSIGNED_PANTRIES: '/volunteer-assigned-pantries',
   VOLUNTEER_REQUEST_MANAGEMENT: '/volunteer-request-management',
+  VOLUNTEER_ORDER_MANAGEMENT: '/volunteer-order-management',
 
   PANTRY_ORDER_MANAGEMENT: '/pantry-order-management',
   REQUEST_FORM: '/request-form',

From 695f72cb51ac94022d165491361ff3ea06a71e43 Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sat, 18 Apr 2026 11:22:37 -0400
Subject: [PATCH 07/14] Add new pages to navbar

---
 apps/frontend/src/components/Navbar.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index 037b52051..1e825a88b 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -52,6 +52,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       children: [
         { label: 'Donation Management', to: ROUTES.ADMIN_DONATION },
         { label: 'Application Review', to: ROUTES.APPROVE_FOOD_MANUFACTURERS },
+        { label: 'Donation Statistics', to: ROUTES.ADMIN_DONATION_STATS },
       ],
     },
   ],
@@ -65,6 +66,10 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
       type: 'group',
       label: 'Orders',
       children: [
+        {
+          label: 'Order Management',
+          to: ROUTES.VOLUNTEER_ORDER_MANAGEMENT,
+        },
         {
           label: 'Food Request Management',
           to: ROUTES.VOLUNTEER_REQUEST_MANAGEMENT,

From 6f60068fda809aa14405fdcf46c9ba1560ac537c Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Tue, 21 Apr 2026 02:12:57 -0400
Subject: [PATCH 08/14] comments

---
 apps/frontend/src/components/Navbar.tsx    | 41 ++++++++++++++--------
 apps/frontend/src/containers/loginPage.tsx |  2 +-
 apps/frontend/src/routes.ts                |  2 ++
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index 1e825a88b..a27ee3d3e 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -12,7 +12,7 @@ const ROLE_MAP: Record<Role, { label: string }> = {
   [Role.ADMIN]: { label: 'Admin' },
   [Role.VOLUNTEER]: { label: 'Volunteer' },
   [Role.PANTRY]: { label: 'Pantry' },
-  [Role.FOODMANUFACTURER]: { label: 'Food Manufacturer' },
+  [Role.FOODMANUFACTURER]: { label: 'Manufacturer' },
 };
 
 // Nav Structure Types
@@ -37,13 +37,17 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
     {
       type: 'group',
       label: 'Pantries',
-      children: [{ label: 'Application Review', to: ROUTES.APPROVE_PANTRIES }],
+      children: [
+        { label: 'Pantry Management', to: ROUTES.PANTRY_MANAGEMENT },
+        { label: 'Application Review', to: ROUTES.APPROVE_PANTRIES },
+      ],
     },
     {
       type: 'group',
       label: 'Orders',
       children: [
         { label: 'Order Management', to: ROUTES.ADMIN_ORDER_MANAGEMENT },
+        { label: 'Food Requests', to: ROUTES.FOOD_REQUESTS },
       ],
     },
     {
@@ -71,7 +75,7 @@ const ROLE_NAV_SECTIONS: Record<Role, NavSection[]> = {
           to: ROUTES.VOLUNTEER_ORDER_MANAGEMENT,
         },
         {
-          label: 'Food Request Management',
+          label: 'Food Requests',
           to: ROUTES.VOLUNTEER_REQUEST_MANAGEMENT,
         },
       ],
@@ -150,14 +154,21 @@ const NavGroup: React.FC<NavGroupProps> = ({
       _hover={{ bg: 'neutral.100' }}
       onClick={onToggle}
       w="full"
+      mb="4px"
+      mt="4px"
     >
-      <Text fontSize="14px" color="neutral.800" fontWeight="600">
+      <Text
+        fontSize="14px"
+        color="neutral.800"
+        fontWeight="600"
+        fontFamily="ibm"
+      >
         {label}
       </Text>
       {isOpen ? (
-        <ChevronDown size={10} color="var(--chakra-colors-neutral-800)" />
+        <ChevronDown size={14} color="var(--chakra-colors-neutral-800)" />
       ) : (
-        <ChevronRight size={10} color="var(--chakra-colors-neutral-800)" />
+        <ChevronRight size={14} color="var(--chakra-colors-neutral-800)" />
       )}
     </Box>
 
@@ -174,7 +185,7 @@ const NavGroup: React.FC<NavGroupProps> = ({
             pr="8px"
             w="full"
           >
-            <Box position="relative" w="15px" h="20px" flexShrink={0}>
+            <Box position="relative" w="15px" h="20px">
               <Box
                 position="absolute"
                 left="calc(50% + 3px)"
@@ -297,12 +308,11 @@ const Navbar: React.FC = () => {
               style={{ width: '100%', height: '100%', objectFit: 'contain' }}
             />
           </Box>
-          <Box overflow="hidden">
+          <Box overflow="hidden" lineHeight="1.2" fontFamily="ibm">
             <Text
               fontSize="14px"
               color="neutral.800"
               fontWeight="normal"
-              lineHeight="1.5"
               overflow="hidden"
               style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
             >
@@ -310,8 +320,7 @@ const Navbar: React.FC = () => {
             </Text>
             <Text
               fontSize="10px"
-              color="neutral.700"
-              lineHeight="1.5"
+              color="neutral.800"
               overflow="hidden"
               style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
             >
@@ -360,10 +369,14 @@ const Navbar: React.FC = () => {
         cursor="pointer"
         _hover={{ bg: 'neutral.100' }}
         onClick={handleSignOut}
-        mt={4}
+        mb={8}
       >
-        <LogOut size={14} color="var(--chakra-colors-neutral-700)" />
-        <Text fontSize="14px" color="neutral.700">
+        <LogOut
+          size={14}
+          color="var(--chakra-colors-neutral-700)"
+          style={{ transform: 'scaleX(-1)' }}
+        />
+        <Text fontSize="14px" color="neutral.700" fontFamily="ibm">
           Sign Out
         </Text>
       </Box>
diff --git a/apps/frontend/src/containers/loginPage.tsx b/apps/frontend/src/containers/loginPage.tsx
index 16a18150e..1cc951dfd 100644
--- a/apps/frontend/src/containers/loginPage.tsx
+++ b/apps/frontend/src/containers/loginPage.tsx
@@ -281,7 +281,7 @@ const LoginPage: React.FC = () => {
                   color="red"
                   onClick={() => navigate(ROUTES.FORGOT_PASSWORD)}
                 >
-                  Reset Password
+                  Forgot Password?
                 </Link>
               </Text>
             </>
diff --git a/apps/frontend/src/routes.ts b/apps/frontend/src/routes.ts
index 81a59bc0f..cf6ae021c 100644
--- a/apps/frontend/src/routes.ts
+++ b/apps/frontend/src/routes.ts
@@ -19,6 +19,8 @@ export const ROUTES = {
   APPROVE_PANTRIES: '/approve-pantries',
   APPROVE_FOOD_MANUFACTURERS: '/approve-food-manufacturers',
   VOLUNTEER_MANAGEMENT: '/volunteer-management',
+  PANTRY_MANAGEMENT: '/pantry-management',
+  FOOD_REQUESTS: '/food-reqeusts',
   ADMIN_ORDER_MANAGEMENT: '/admin-order-management',
   ADMIN_DONATION: '/admin-donation',
   ADMIN_DONATION_STATS: '/admin-donation-stats',

From d949fc6682b884f1aa4ee8f585352457d35152b0 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Tue, 21 Apr 2026 10:28:50 -0400
Subject: [PATCH 09/14] fixed enum usage

---
 .../containers/foodManufacturerApplicationDetails.tsx  | 10 +++++++---
 .../src/containers/pantryApplicationDetails.tsx        | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
index bcae561bb..7c2e96475 100644
--- a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
+++ b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
@@ -12,7 +12,7 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { FoodManufacturer } from 'types/types';
+import { ApplicationStatus, FoodManufacturer } from 'types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
 import { FileX, TriangleAlert, WifiOff } from 'lucide-react';
@@ -172,7 +172,9 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
         );
         navigate(
           ROUTES.APPROVE_FOOD_MANUFACTURERS +
-            '?action=approved&name=' +
+            '?action=' +
+            ApplicationStatus.APPROVED +
+            '&name=' +
             application.foodManufacturerName,
         );
       } catch {
@@ -190,7 +192,9 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
         );
         navigate(
           ROUTES.APPROVE_FOOD_MANUFACTURERS +
-            '?action=denied&name=' +
+            '?action=' +
+            ApplicationStatus.DENIED +
+            '&name=' +
             application.foodManufacturerName,
         );
       } catch {
diff --git a/apps/frontend/src/containers/pantryApplicationDetails.tsx b/apps/frontend/src/containers/pantryApplicationDetails.tsx
index 06f0f0c7a..65fa68f67 100644
--- a/apps/frontend/src/containers/pantryApplicationDetails.tsx
+++ b/apps/frontend/src/containers/pantryApplicationDetails.tsx
@@ -12,7 +12,7 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { PantryWithUser } from 'types/types';
+import { ApplicationStatus, PantryWithUser } from 'types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
 import { FileX, TriangleAlert, WifiOff } from 'lucide-react';
@@ -165,7 +165,9 @@ const PantryApplicationDetails: React.FC = () => {
         await ApiClient.updatePantry(application.pantryId, 'approve');
         navigate(
           ROUTES.APPROVE_PANTRIES +
-            '?action=approved&name=' +
+            '?action=' +
+            ApplicationStatus.APPROVED +
+            '&name=' +
             application.pantryName,
         );
       } catch {
@@ -180,7 +182,9 @@ const PantryApplicationDetails: React.FC = () => {
         await ApiClient.updatePantry(application.pantryId, 'deny');
         navigate(
           ROUTES.APPROVE_PANTRIES +
-            '?action=denied&name=' +
+            '?action=' +
+            ApplicationStatus.DENIED +
+            '&name=' +
             application.pantryName,
         );
       } catch {

From f38ad06958fd594afc0fd0f91e130b4f12b3d586 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Tue, 21 Apr 2026 10:31:37 -0400
Subject: [PATCH 10/14] fixed enum usage

---
 .../src/containers/foodManufacturerApplicationDetails.tsx       | 2 +-
 apps/frontend/src/containers/pantryApplicationDetails.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
index 7c2e96475..f60646c8b 100644
--- a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
+++ b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
@@ -12,7 +12,7 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { ApplicationStatus, FoodManufacturer } from 'types/types';
+import { ApplicationStatus, FoodManufacturer } from '../types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
 import { FileX, TriangleAlert, WifiOff } from 'lucide-react';
diff --git a/apps/frontend/src/containers/pantryApplicationDetails.tsx b/apps/frontend/src/containers/pantryApplicationDetails.tsx
index 65fa68f67..e9766eeba 100644
--- a/apps/frontend/src/containers/pantryApplicationDetails.tsx
+++ b/apps/frontend/src/containers/pantryApplicationDetails.tsx
@@ -12,7 +12,7 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { ApplicationStatus, PantryWithUser } from 'types/types';
+import { ApplicationStatus, PantryWithUser } from '../types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
 import { FileX, TriangleAlert, WifiOff } from 'lucide-react';

From 3f16b7a8b5a70a27454d68a42d74e6bc0009b0ec Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 22 Apr 2026 18:22:41 -0400
Subject: [PATCH 11/14] surely amy approves now!!

---
 apps/frontend/src/components/Navbar.tsx | 34 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index a27ee3d3e..a518f7cf8 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -107,8 +107,7 @@ const NavLink: React.FC<{
   to: string;
   label: string;
   isActive: boolean;
-  fontWeight?: string | number;
-}> = ({ to, label, isActive, fontWeight }) => (
+}> = ({ to, label, isActive }) => (
   <RouterLink to={to} style={{ width: '100%' }}>
     <Box
       h="32px"
@@ -120,7 +119,7 @@ const NavLink: React.FC<{
       _hover={{ bg: 'neutral.100' }}
       cursor="pointer"
     >
-      <Text fontSize="14px" color="neutral.800" fontWeight={fontWeight}>
+      <Text fontSize="14px" color="neutral.700" fontWeight="600">
         {label}
       </Text>
     </Box>
@@ -159,8 +158,8 @@ const NavGroup: React.FC<NavGroupProps> = ({
     >
       <Text
         fontSize="14px"
-        color="neutral.800"
-        fontWeight="600"
+        color="neutral.700"
+        fontWeight="semibold"
         fontFamily="ibm"
       >
         {label}
@@ -206,7 +205,7 @@ const NavGroup: React.FC<NavGroupProps> = ({
                 _hover={{ bg: 'neutral.100' }}
                 cursor="pointer"
               >
-                <Text fontSize="14px" color="neutral.800">
+                <Text fontSize="14px" color="neutral.700">
                   {child.label}
                 </Text>
               </Box>
@@ -276,7 +275,9 @@ const Navbar: React.FC = () => {
     <Flex
       direction="column"
       w="240px"
-      minH="100vh"
+      h="100vh"
+      position="sticky"
+      top={0}
       bg="neutral.50"
       borderRightWidth="1px"
       borderRightColor="neutral.200"
@@ -308,13 +309,18 @@ const Navbar: React.FC = () => {
               style={{ width: '100%', height: '100%', objectFit: 'contain' }}
             />
           </Box>
-          <Box overflow="hidden" lineHeight="1.2" fontFamily="ibm">
+          <Box
+            overflow="hidden"
+            lineHeight="1.2"
+            fontFamily="ibm"
+            fontWeight="semibold"
+          >
             <Text
               fontSize="14px"
               color="neutral.800"
               fontWeight="normal"
               overflow="hidden"
-              style={{ whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}
+              style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}
             >
               {roleLabel ? `${roleLabel} Dashboard` : 'Dashboard'}
             </Text>
@@ -330,9 +336,8 @@ const Navbar: React.FC = () => {
         </Box>
       </RouterLink>
 
-      <VStack align="stretch" gap={0} flex={1}>
+      <VStack align="stretch" gap={0} flex={1} overflowY="auto">
         <NavLink
-          fontWeight="600"
           to={ROUTES.HOME}
           label="Dashboard"
           isActive={location.pathname === ROUTES.HOME}
@@ -376,7 +381,12 @@ const Navbar: React.FC = () => {
           color="var(--chakra-colors-neutral-700)"
           style={{ transform: 'scaleX(-1)' }}
         />
-        <Text fontSize="14px" color="neutral.700" fontFamily="ibm">
+        <Text
+          fontSize="14px"
+          color="neutral.700"
+          fontFamily="ibm"
+          fontWeight="semibold"
+        >
           Sign Out
         </Text>
       </Box>

From 008f2f16a7b11503e3796c055c0f55e63426f48b Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 22 Apr 2026 20:54:41 -0400
Subject: [PATCH 12/14] added gap from dashboard

---
 apps/frontend/src/components/Navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index a518f7cf8..cd3f0f916 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -336,7 +336,7 @@ const Navbar: React.FC = () => {
         </Box>
       </RouterLink>
 
-      <VStack align="stretch" gap={0} flex={1} overflowY="auto">
+      <VStack align="stretch" gap={1} flex={1} overflowY="auto">
         <NavLink
           to={ROUTES.HOME}
           label="Dashboard"

From 744c5a2254020c7d4c3ba7a6b2b16ffe1c4f6923 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 22 Apr 2026 21:44:19 -0400
Subject: [PATCH 13/14] amy's frontend pr reviews scare me

---
 apps/frontend/src/components/Navbar.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
index cd3f0f916..8875fa34a 100644
--- a/apps/frontend/src/components/Navbar.tsx
+++ b/apps/frontend/src/components/Navbar.tsx
@@ -153,8 +153,6 @@ const NavGroup: React.FC<NavGroupProps> = ({
       _hover={{ bg: 'neutral.100' }}
       onClick={onToggle}
       w="full"
-      mb="4px"
-      mt="4px"
     >
       <Text
         fontSize="14px"
@@ -336,7 +334,7 @@ const Navbar: React.FC = () => {
         </Box>
       </RouterLink>
 
-      <VStack align="stretch" gap={1} flex={1} overflowY="auto">
+      <VStack align="stretch" gap={2} flex={1} overflowY="auto">
         <NavLink
           to={ROUTES.HOME}
           label="Dashboard"

From ceca3bf00b1fc4fcf86294527921e7643aab7922 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Fri, 24 Apr 2026 16:51:18 -0400
Subject: [PATCH 14/14] removed fuzzy navbar

---
 apps/frontend/src/components/AuthHeader.tsx | 2 --
 apps/frontend/src/containers/homepage.tsx   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/frontend/src/components/AuthHeader.tsx b/apps/frontend/src/components/AuthHeader.tsx
index 7e3d94437..bb76e46c1 100644
--- a/apps/frontend/src/components/AuthHeader.tsx
+++ b/apps/frontend/src/components/AuthHeader.tsx
@@ -5,8 +5,6 @@ const AuthHeader: React.FC = () => (
     h="74px"
     w="full"
     bg="white.core"
-    borderBottomWidth="1px"
-    borderBottomColor="neutral.100"
     display="flex"
     alignItems="center"
     pl="26px"
diff --git a/apps/frontend/src/containers/homepage.tsx b/apps/frontend/src/containers/homepage.tsx
index 6915952d2..26750cb02 100644
--- a/apps/frontend/src/containers/homepage.tsx
+++ b/apps/frontend/src/containers/homepage.tsx
@@ -24,7 +24,7 @@ const Homepage: React.FC = () => {
         </Heading>
 
         <Box w="full" textAlign="center">
-          <Link color="teal.500">
+          <Link asChild color="teal.500">
             <RouterLink to="/profile">Profile View</RouterLink>
           </Link>
         </Box>