fix infinite redirect

This commit is contained in:
simon.franken
2026-02-16 15:41:59 +01:00
parent d3b8df3deb
commit d200254783
2 changed files with 40 additions and 43 deletions

View File

@@ -1,40 +1,40 @@
import { Routes, Route, Navigate } from 'react-router-dom';
import { AuthProvider } from './contexts/AuthContext';
import { TimerProvider } from './contexts/TimerContext';
import { Layout } from './components/Layout';
import { ProtectedRoute } from './components/ProtectedRoute';
import { LoginPage } from './pages/LoginPage';
import { AuthCallbackPage } from './pages/AuthCallbackPage';
import { DashboardPage } from './pages/DashboardPage';
import { TimeEntriesPage } from './pages/TimeEntriesPage';
import { ClientsPage } from './pages/ClientsPage';
import { ProjectsPage } from './pages/ProjectsPage';
import { Routes, Route, Navigate } from "react-router-dom";
import { AuthProvider } from "./contexts/AuthContext";
import { TimerProvider } from "./contexts/TimerContext";
import { Layout } from "./components/Layout";
import { ProtectedRoute } from "./components/ProtectedRoute";
import { LoginPage } from "./pages/LoginPage";
import { AuthCallbackPage } from "./pages/AuthCallbackPage";
import { DashboardPage } from "./pages/DashboardPage";
import { TimeEntriesPage } from "./pages/TimeEntriesPage";
import { ClientsPage } from "./pages/ClientsPage";
import { ProjectsPage } from "./pages/ProjectsPage";
function App() {
return (
<AuthProvider>
<TimerProvider>
<Routes>
<Route path="/login" element={<LoginPage />} />
<Route path="/auth/callback" element={<AuthCallbackPage />} />
<Route
path="/"
element={
<ProtectedRoute>
<Routes>
<Route path="/login" element={<LoginPage />} />
<Route path="/auth/callback" element={<AuthCallbackPage />} />
<Route
path="/"
element={
<ProtectedRoute>
<TimerProvider>
<Layout />
</ProtectedRoute>
}
>
<Route index element={<Navigate to="/dashboard" replace />} />
<Route path="dashboard" element={<DashboardPage />} />
<Route path="time-entries" element={<TimeEntriesPage />} />
<Route path="clients" element={<ClientsPage />} />
<Route path="projects" element={<ProjectsPage />} />
</Route>
</Routes>
</TimerProvider>
</TimerProvider>
</ProtectedRoute>
}
>
<Route index element={<Navigate to="/dashboard" replace />} />
<Route path="dashboard" element={<DashboardPage />} />
<Route path="time-entries" element={<TimeEntriesPage />} />
<Route path="clients" element={<ClientsPage />} />
<Route path="projects" element={<ProjectsPage />} />
</Route>
</Routes>
</AuthProvider>
);
}
export default App;
export default App;