Skip to content

Commit c929c87

Browse files
removing react-hook-form and using index.css
1 parent 2984b3a commit c929c87

36 files changed

+1030
-1064
lines changed

web/package-lock.json

Lines changed: 270 additions & 318 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
},
1212
"dependencies": {
1313
"@fontsource/sen": "^5.2.8",
14-
"@hookform/error-message": "^2.0.1",
15-
"@hookform/resolvers": "^5.2.2",
1614
"firebase": "^12.9.0",
1715
"react": "^19.2.0",
1816
"react-dom": "^19.2.0",

web/src/App.tsx

Lines changed: 61 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,64 @@
1-
import React from 'react'
2-
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'
3-
import { ThemeProvider } from 'styled-components'
4-
import { AuthProvider } from './context/AuthContext'
5-
import { ProtectedRoute, PublicRoute } from './guards/RouteGuards'
6-
import { AuthPage } from './pages/AuthPage'
7-
import { DashboardPage } from './pages/DashboardPage'
8-
import { GlobalStyles, theme } from './styles/theme'
1+
import React from 'react';
2+
import {
3+
createBrowserRouter,
4+
RouterProvider,
5+
Navigate,
6+
} from 'react-router-dom';
7+
import { AuthProvider } from './context/AuthContext';
8+
import { ProtectedRoute, PublicRoute } from './guards/RouteGuards';
9+
import { AuthPage } from './components/pages/AuthPage';
10+
import { DashboardPage } from './components/pages/DashboardPage';
11+
import { LandingCard } from './components/organisms/LandingCard';
12+
import { LoginCard } from './components/organisms/LoginCard';
13+
import { RegisterCard } from './components/organisms/RegisterCard';
14+
import { AUTH_ROUTES, AUTH_ROUTE_SEGMENTS } from './routes/authRoutes';
915

10-
const App: React.FC = () => {
11-
return (
12-
<ThemeProvider theme={theme}>
13-
<GlobalStyles />
14-
<BrowserRouter>
15-
<AuthProvider>
16-
<Routes>
17-
{/* Public: redirect to dashboard if already logged in */}
18-
<Route
19-
path="/auth"
20-
element={
21-
<PublicRoute>
22-
<AuthPage />
23-
</PublicRoute>
24-
}
25-
/>
26-
27-
{/* Protected: redirect to /auth if not logged in */}
28-
<Route
29-
path="/dashboard"
30-
element={
31-
<ProtectedRoute>
32-
<DashboardPage />
33-
</ProtectedRoute>
34-
}
35-
/>
16+
const router = createBrowserRouter([
17+
{
18+
path: AUTH_ROUTES.base,
19+
element: <PublicRoute />,
20+
children: [
21+
{
22+
element: <AuthPage />,
23+
children: [
24+
{
25+
index: true,
26+
element: <LandingCard />,
27+
},
28+
{
29+
path: AUTH_ROUTE_SEGMENTS.login,
30+
element: <LoginCard />,
31+
},
32+
{
33+
path: AUTH_ROUTE_SEGMENTS.register,
34+
element: <RegisterCard />,
35+
},
36+
],
37+
},
38+
],
39+
},
40+
{
41+
path: '/dashboard',
42+
element: <ProtectedRoute />,
43+
children: [
44+
{
45+
index: true,
46+
element: <DashboardPage />,
47+
},
48+
],
49+
},
50+
{
51+
path: '*',
52+
element: <Navigate to={AUTH_ROUTES.base} replace />,
53+
},
54+
]);
3655

37-
{/* Default redirect */}
38-
<Route path="*" element={<Navigate to="/auth" replace />} />
39-
</Routes>
40-
</AuthProvider>
41-
</BrowserRouter>
42-
</ThemeProvider>
43-
)
44-
}
56+
const App: React.FC = () => {
57+
return (
58+
<AuthProvider>
59+
<RouterProvider router={router} />
60+
</AuthProvider>
61+
);
62+
};
4563

46-
export default App
64+
export default App;

web/src/atoms/Button.tsx

Lines changed: 0 additions & 136 deletions
This file was deleted.

web/src/atoms/Divider.tsx

Lines changed: 0 additions & 34 deletions
This file was deleted.

web/src/atoms/ErrorMessage.tsx

Lines changed: 0 additions & 18 deletions
This file was deleted.

web/src/atoms/Input.tsx

Lines changed: 0 additions & 50 deletions
This file was deleted.

web/src/atoms/LoadingScreen.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)