admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor Layout (#322)

Browse Source 
* Refactor Layout

* Fix storybook

* Fixing tests by forcing msw version before regression
This commit is contained in:
Charles Bochet
2023-06-17 21:24:15 +02:00
committed by GitHub
parent 5ae5f28dcb
commit 49462c69a2
38 changed files with 325 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
front/src/App.tsx
View File

@ -1,5 +1,7 @@
import { Navigate, Route, Routes } from 'react-router-dom';
import { DefaultLayout } from '@/ui/layout/DefaultLayout';
import { RequireAuth } from './modules/auth/components/RequireAuth';
import { AuthCallback } from './pages/auth/AuthCallback';
import { Login } from './pages/auth/Login';
@ -10,37 +12,39 @@ import { SettingsProfile } from './pages/settings/SettingsProfile';
export function App() {
return (
<Routes>
<Route
path="*"
element={
<RequireAuth>
<DefaultLayout>
<Routes>
<Route
path="*"
element={
<RequireAuth>
<Routes>
<Route path="" element={<Navigate to="/people" replace />} />
<Route path="people" element={<People />} />
<Route path="companies" element={<Companies />} />
<Route path="opportunities" element={<Opportunities />} />
</Routes>
</RequireAuth>
}
/>
<Route
path="auth/*"
element={
<Routes>
<Route path="" element={<Navigate to="/people" replace />} />
<Route path="people" element={<People />} />
<Route path="companies" element={<Companies />} />
<Route path="opportunities" element={<Opportunities />} />
<Route path="callback" element={<AuthCallback />} />
<Route path="login" element={<Login />} />
</Routes>
</RequireAuth>
}
/>
<Route
path="auth/*"
element={
<Routes>
<Route path="callback" element={<AuthCallback />} />
<Route path="login" element={<Login />} />
</Routes>
}
/>
<Route
path="settings/*"
element={
<Routes>
<Route path="profile" element={<SettingsProfile />} />
</Routes>
}
/>
</Routes>
}
/>
<Route
path="settings/*"
element={
<Routes>
<Route path="profile" element={<SettingsProfile />} />
</Routes>
}
/>
</Routes>
</DefaultLayout>
);
}