mirror of
https://github.com/tiennm99/ccs.git
synced 2026-09-10 06:20:13 +00:00
fix(ui): keep home route at root without last-route redirect
This commit is contained in:
+2
-12
@@ -1,5 +1,5 @@
|
|||||||
import { lazy, Suspense } from 'react';
|
import { lazy, Suspense } from 'react';
|
||||||
import { BrowserRouter, Navigate, Routes, Route } from 'react-router-dom';
|
import { BrowserRouter, Routes, Route } from 'react-router-dom';
|
||||||
import { QueryClientProvider } from '@tanstack/react-query';
|
import { QueryClientProvider } from '@tanstack/react-query';
|
||||||
import { Toaster } from 'sonner';
|
import { Toaster } from 'sonner';
|
||||||
import { queryClient } from '@/lib/query-client';
|
import { queryClient } from '@/lib/query-client';
|
||||||
@@ -8,7 +8,6 @@ import { PrivacyProvider } from '@/contexts/privacy-context';
|
|||||||
import { AuthProvider } from '@/contexts/auth-context';
|
import { AuthProvider } from '@/contexts/auth-context';
|
||||||
import { RequireAuth } from '@/components/auth/require-auth';
|
import { RequireAuth } from '@/components/auth/require-auth';
|
||||||
import { Layout } from '@/components/layout/layout';
|
import { Layout } from '@/components/layout/layout';
|
||||||
import { getStoredLastRoute, shouldRestoreRoute } from '@/lib/last-route';
|
|
||||||
import { Loader2 } from 'lucide-react';
|
import { Loader2 } from 'lucide-react';
|
||||||
|
|
||||||
// Eager load: HomePage (initial route) + LoginPage (auth flow)
|
// Eager load: HomePage (initial route) + LoginPage (auth flow)
|
||||||
@@ -48,15 +47,6 @@ function PageLoader() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function HomeEntryRoute() {
|
|
||||||
const lastRoute = getStoredLastRoute();
|
|
||||||
if (shouldRestoreRoute(lastRoute)) {
|
|
||||||
return <Navigate to={lastRoute} replace />;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <HomePage />;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
@@ -71,7 +61,7 @@ export default function App() {
|
|||||||
{/* Protected routes: wrapped with RequireAuth */}
|
{/* Protected routes: wrapped with RequireAuth */}
|
||||||
<Route element={<RequireAuth />}>
|
<Route element={<RequireAuth />}>
|
||||||
<Route element={<Layout />}>
|
<Route element={<Layout />}>
|
||||||
<Route path="/" element={<HomeEntryRoute />} />
|
<Route path="/" element={<HomePage />} />
|
||||||
<Route
|
<Route
|
||||||
path="/analytics"
|
path="/analytics"
|
||||||
element={
|
element={
|
||||||
|
|||||||
Reference in New Issue
Block a user