Updated: Router
This commit is contained in:
18
src/App.js
18
src/App.js
@@ -1,9 +1,9 @@
|
|||||||
import { Routes, Route, useLocation, Navigate } from 'react-router-dom';
|
import { Routes, Route, useLocation, Navigate } from 'react-router-dom';
|
||||||
|
|
||||||
import Test from './components/Test';
|
|
||||||
import AuthProvider, { useAuth } from './config/authProvider';
|
import AuthProvider, { useAuth } from './config/authProvider';
|
||||||
import localizationInit from './config/localization';
|
import localizationInit from './config/localization';
|
||||||
import Dashboard from './layouts/dashboard';
|
import Dashboard from './layouts/dashboard';
|
||||||
|
import Login from './pages/login';
|
||||||
|
|
||||||
localizationInit();
|
localizationInit();
|
||||||
|
|
||||||
@@ -26,9 +26,19 @@ function App() {
|
|||||||
return (
|
return (
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Dashboard />} />
|
<Route path="/login" element={<Login />} />
|
||||||
<Route path="/login" element={<Test />} />
|
{/* <Route path="/signup" element={<Test />} /> */}
|
||||||
<Route path="/dashboard" element={<RequireAuth>This is secret</RequireAuth>} />
|
<Route
|
||||||
|
path="/"
|
||||||
|
element={
|
||||||
|
<RequireAuth>
|
||||||
|
<Dashboard />
|
||||||
|
</RequireAuth>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Route path="/" element={<div>This is content</div>} />
|
||||||
|
</Route>
|
||||||
|
<Route path="*" element={<p>This page does not exist</p>} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
|
import { Outlet } from 'react-router-dom';
|
||||||
import styles from './dashboard.module.css';
|
import styles from './dashboard.module.css';
|
||||||
import Sidebar from './Sidebar';
|
import Sidebar from './Sidebar';
|
||||||
|
|
||||||
export default function Dashboard({ children }) {
|
export default function Dashboard() {
|
||||||
return (
|
return (
|
||||||
<div className={styles.dashboardGrid}>
|
<div className={styles.dashboardGrid}>
|
||||||
<Sidebar />
|
<Sidebar />
|
||||||
@@ -10,7 +11,9 @@ export default function Dashboard({ children }) {
|
|||||||
<div className={styles.breadcrumbs}>
|
<div className={styles.breadcrumbs}>
|
||||||
breadcrumbs {'>'} are {'>'} here
|
breadcrumbs {'>'} are {'>'} here
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.content}>rest content comes here</div>
|
<div className={styles.content}>
|
||||||
|
<Outlet />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user