Skip to content

Commit a966671

Browse files
Merge branch 'main' into feature/Navbar
2 parents fed0e7d + ed21542 commit a966671

File tree

25 files changed

+1144
-66
lines changed

25 files changed

+1144
-66
lines changed

package-lock.json

Lines changed: 63 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
}
1818
},
1919
"dependencies": {
20+
"@fontsource/sacramento": "^5.2.6",
21+
"embla-carousel-react": "^8.6.0",
2022
"lottie-react": "^2.4.1",
2123
"react": "^19.1.0",
2224
"react-dom": "^19.1.0",
23-
"react-router-dom": "^7.6.0"
25+
"react-router-dom": "^7.6.0",
26+
"react-toastify": "^11.0.5"
2427
},
2528
"lint-staged": {
2629
"src/**/*.{ts,html}": [

src/App.jsx

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,37 @@ import Login from "./pages/Login/Login";
44
import { Routes, Route, Navigate } from "react-router-dom";
55
import Home from "./pages/Home/Home.jsx";
66
import Callback from "./pages/Callback/Callback";
7+
import NotFound from "./pages/404/404";
8+
import MainLayout from "./layouts/MainLayout.jsx";
79
import Preloader from "./pages/Preloader/Preloader";
8-
import NotFound from './pages/404/404'
910
import ProfilePage from "./pages/Profile/ProfilePage.jsx";
11+
import PrivateRoutesWrapper from "./components/ProtectedRoutes/PrivateRoutesWrapper.jsx";
12+
import { ToastContainer } from "react-toastify";
13+
import 'react-toastify/dist/ReactToastify.css'
1014

1115
function App() {
1216
return (
13-
<Routes>
14-
<Route path="/" element={<Landingpage />} />
15-
<Route path="/home" element={<Home />} />
16-
<Route path="/login" element={<Login />} />
17-
<Route path="/callback" element={<Callback />} />
18-
<Route path="/preloader" element={<Preloader />} />
19-
<Route path="/profile" element={<ProfilePage />} />
20-
<Route path="*" element={<NotFound />} />
21-
</Routes>
22-
)
17+
<>
18+
<ToastContainer />
19+
20+
<Routes>
21+
<Route element={<MainLayout />}>
22+
<Route path="/" element={<Landingpage />} />
23+
<Route path="/login" element={<Login />} />
24+
<Route element={<PrivateRoutesWrapper />}>
25+
<Route path="/home" element={<Home />} />
26+
<Route path="/profile" element={<ProfilePage />} />
27+
<Route path="/preloader" element={<Preloader />} />
28+
{/* Add more protected routes here */}
29+
</Route>
30+
<Route path="/callback" element={<Callback />} />
31+
</Route>
32+
33+
34+
<Route path="*" element={<NotFound />} />
35+
</Routes>
36+
</>
37+
);
2338
}
2439

2540
export default App;

src/assets/Home/BG.png

967 KB
Loading

src/assets/Home/heartIcon.png

2.84 KB
Loading

src/assets/Home/pass.png

2.59 KB
Loading

src/assets/Home/refreshIcon.png

4.1 KB
Loading
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Loading

src/assets/carousel/nextArrow.svg

Lines changed: 9 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)