Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 202 additions & 5 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
},
"dependencies": {
"@fontsource/sen": "^5.2.8",
"@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^5.2.2",
"firebase": "^12.9.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-router": "^7.13.1"
"react-router": "^7.13.1",
"react-router-dom": "^7.13.1",
"styled-components": "^6.3.11"
},
"devDependencies": {
"@eslint/js": "^9.39.1",
Expand Down
48 changes: 42 additions & 6 deletions web/src/App.tsx
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change the routing? Use createBrowserRouter. It's the newer and recommended way to do routing using react-router.

Original file line number Diff line number Diff line change
@@ -1,10 +1,46 @@
import { createBrowserRouter, RouterProvider } from "react-router";
import React from 'react'
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'
import { ThemeProvider } from 'styled-components'
import { AuthProvider } from './context/AuthContext'
import { ProtectedRoute, PublicRoute } from './guards/RouteGuards'
import { AuthPage } from './pages/AuthPage'
import { DashboardPage } from './pages/DashboardPage'
import { GlobalStyles, theme } from './styles/theme'

const router = createBrowserRouter([{path: "/", element: <div>Hello World</div>}]);
const App: React.FC = () => {
return (
<ThemeProvider theme={theme}>
<GlobalStyles />
<BrowserRouter>
<AuthProvider>
<Routes>
{/* Public: redirect to dashboard if already logged in */}
<Route
path="/auth"
element={
<PublicRoute>
<AuthPage />
</PublicRoute>
}
/>

{/* Protected: redirect to /auth if not logged in */}
<Route
path="/dashboard"
element={
<ProtectedRoute>
<DashboardPage />
</ProtectedRoute>
}
/>

export default function App() {

{/* Default redirect */}
<Route path="*" element={<Navigate to="/auth" replace />} />
</Routes>
</AuthProvider>
</BrowserRouter>
</ThemeProvider>
)
}

return <RouterProvider router={router}></RouterProvider>;
}
export default App
Loading
Loading