diff --git a/.env b/.env new file mode 100644 index 0000000..ae69d5d --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VITE_MSW=true \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index a3f4e21..6ae4904 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,6 +9,7 @@ import RegisterPage from "./pages/RegisterPage"; import ForgetPasswordPage from "./pages/forgetPasswordPage"; import InterestPage from "./pages/interestPage"; import NotificationPage from "./pages/notificationPage"; +import NotificationPreferencesPage from "./pages/NotificationPreferencesPage"; import ResetPasswordPage from "./pages/resetPasswordPage"; import { AdoptionCompletionDemo } from "./pages/AdoptionCompletionDemo"; import PetListingDetailsPage from "./pages/PetlistingdetailsPage"; @@ -19,10 +20,9 @@ import AdoptionTimelinePage from "./pages/AdoptionTimelinePage"; import ModalPreview from "./pages/ModalPreview"; import StatusPollingDemo from "./pages/StatusPollingDemo"; import CustodyTimelinePage from "./pages/CustodyTimelinePage"; -import AdminDisputeListPage from "./pages/AdminDisputeListPage"; +import AdminApprovalQueuePage from "./pages/AdminApprovalQueuePage"; function App() { - return ( {/* Auth Routes - No Navbar/Footer */} @@ -32,6 +32,7 @@ function App() { } /> } /> + {/* Main App Routes - With Navbar/Footer */} }> } /> } /> @@ -42,22 +43,37 @@ function App() { } /> } /> } /> - } /> - } /> - - } /> - - {/* Admin Routes */} - } /> + } + /> + } + /> + } + /> + } + /> + } + /> {/* Preview Routes */} } /> - } /> + } + /> } /> ); - } -export default App; \ No newline at end of file +export default App; diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index 2428f36..0fd9be2 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -1,9 +1,9 @@ -import { Outlet } from "react-router-dom"; +import { type PropsWithChildren } from "react"; import { Navbar } from "./Navbar"; import { Footer } from "./Footer"; import ApprovalBanner from "./ApprovalBanner"; -export function MainLayout() { +export function MainLayout({ children }: PropsWithChildren) { return (
@@ -13,7 +13,7 @@ export function MainLayout() {
- + {children}