Reformating route and renaming firm and correcting login redirections
This commit is contained in:
@@ -23,8 +23,8 @@ import { ForgotPassword } from "./components/auth/ForgotPassword";
|
||||
import { UpdatePassword } from "./components/auth/UpdatePassword";
|
||||
|
||||
import { Header } from "./components";
|
||||
import { Hub } from "./pages/hub";
|
||||
import { CreateFirm } from "./pages/hub/CreateFirm";
|
||||
import { HubRoutes } from "./pages/hub";
|
||||
import { FirmRoutes } from "./pages/firm";
|
||||
|
||||
function App() {
|
||||
return (
|
||||
@@ -43,26 +43,42 @@ function App() {
|
||||
syncWithLocation: true,
|
||||
warnWhenUnsavedChanges: true,
|
||||
useNewQueryKeys: true,
|
||||
disableTelemetry: true
|
||||
disableTelemetry: true,
|
||||
reactQuery: {
|
||||
clientConfig: {
|
||||
defaultOptions: {
|
||||
queries: {
|
||||
retry: (failureCount, error) => {
|
||||
// @ts-ignore
|
||||
if (error.status >= 400 && error.status <= 499) {
|
||||
return false
|
||||
}
|
||||
return failureCount < 4
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Header />
|
||||
<Routes>
|
||||
<Route
|
||||
element={(
|
||||
<Authenticated key="authenticated-routes" redirectOnFail="/login" fallback={<CatchAllNavigate to="/login"/>}>
|
||||
<Outlet />
|
||||
</Authenticated>
|
||||
)}
|
||||
element={(
|
||||
<Authenticated key="authenticated-routes" redirectOnFail="/auth/login" fallback={<CatchAllNavigate to="/auth/login"/>}>
|
||||
<Outlet />
|
||||
</Authenticated>
|
||||
)}
|
||||
>
|
||||
<Route path="/hub" element={ <Hub /> } />
|
||||
<Route path="/hub/create-firm" element={ <CreateFirm /> } />
|
||||
<Route path="hub/*" element={<HubRoutes />} />
|
||||
<Route path="firm/*" element={<FirmRoutes />} />
|
||||
</Route>
|
||||
<Route index element={<h1>HOME <Link to={"/login"}>Login</Link></h1>} />
|
||||
<Route path="/login" element={<Login />} />
|
||||
<Route path="/register" element={<Register />} />
|
||||
<Route path="/forgot-password" element={<ForgotPassword />} />
|
||||
<Route path="/update-password" element={<UpdatePassword />} />
|
||||
<Route path="auth/*" element={<><Header /><Outlet /></>}>
|
||||
<Route path="login" element={<Login />} />
|
||||
<Route path="register" element={<Register />} />
|
||||
<Route path="forgot-password" element={<ForgotPassword />} />
|
||||
<Route path="update-password" element={<UpdatePassword />} />
|
||||
</Route>
|
||||
<Route index element={<><Header /><h1>HOME <Link to={"/auth/login"}>Login</Link></h1></>} />
|
||||
</Routes>
|
||||
<UnsavedChangesNotifier />
|
||||
<DocumentTitleHandler />
|
||||
|
||||
Reference in New Issue
Block a user