Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 56 additions & 31 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,46 +1,71 @@
import { lazy, Suspense } from 'react';
import { Routes, Route, Navigate } from 'react-router-dom';
import { AuthProvider } from './components/features/auth/AuthProvider';
import { ProtectedRoute } from './components/layout/ProtectedRoute';
import { Header } from './components/layout/Header';
import { Footer } from './components/layout/Footer';
import { LoginPage } from './pages/LoginPage';
import { DashboardPage } from './pages/DashboardPage';
import { WalletsPage } from './pages/WalletsPage';
import { RequestsPage } from './pages/RequestsPage';
import { HistoryPage } from './pages/HistoryPage';
import { OperatingPage } from './pages/OperatingPage';
import { ChangePasswordPage } from './pages/ChangePasswordPage';
import { Spinner } from './components/ui/Spinner';
import { ErrorBoundary } from './components/ErrorBoundary';

const LoginPage = lazy(() => import('./pages/LoginPage').then((m) => ({ default: m.LoginPage })));
const DashboardPage = lazy(() =>
import('./pages/DashboardPage').then((m) => ({ default: m.DashboardPage })),
);
const WalletsPage = lazy(() =>
import('./pages/WalletsPage').then((m) => ({ default: m.WalletsPage })),
);
const RequestsPage = lazy(() =>
import('./pages/RequestsPage').then((m) => ({ default: m.RequestsPage })),
);
const HistoryPage = lazy(() =>
import('./pages/HistoryPage').then((m) => ({ default: m.HistoryPage })),
);
const OperatingPage = lazy(() =>
import('./pages/OperatingPage').then((m) => ({ default: m.OperatingPage })),
);
const ChangePasswordPage = lazy(() =>
import('./pages/ChangePasswordPage').then((m) => ({ default: m.ChangePasswordPage })),
);

const PageFallback = () => (
<div className="flex justify-center items-center py-20">
<Spinner size="lg" />
</div>
);

export const App = () => {
return (
<ErrorBoundary>
<AuthProvider>
<div className="min-h-screen flex flex-col bg-gray-50">
<Routes>
<Route path="/login" element={<LoginPage />} />
<Route
path="/*"
element={
<ProtectedRoute>
<Header />
<main className="flex-1 container mx-auto px-4 py-8">
<Routes>
<Route path="/dashboard" element={<DashboardPage />} />
<Route path="/wallets" element={<WalletsPage />} />
<Route path="/requests" element={<RequestsPage />} />
<Route path="/history" element={<HistoryPage />} />
<Route path="/operational" element={<OperatingPage />} />
<Route path="/change-password" element={<ChangePasswordPage />} />
<Route path="/" element={<Navigate to="/dashboard" replace />} />
<Route path="*" element={<Navigate to="/dashboard" replace />} />
</Routes>
</main>
<Footer />
</ProtectedRoute>
}
/>
</Routes>
<Suspense fallback={<PageFallback />}>
<Routes>
<Route path="/login" element={<LoginPage />} />
<Route
path="/*"
element={
<ProtectedRoute>
<Header />
<main className="flex-1 container mx-auto px-4 py-8">
<Suspense fallback={<PageFallback />}>
<Routes>
<Route path="/dashboard" element={<DashboardPage />} />
<Route path="/wallets" element={<WalletsPage />} />
<Route path="/requests" element={<RequestsPage />} />
<Route path="/history" element={<HistoryPage />} />
<Route path="/operational" element={<OperatingPage />} />
<Route path="/change-password" element={<ChangePasswordPage />} />
<Route path="/" element={<Navigate to="/dashboard" replace />} />
<Route path="*" element={<Navigate to="/dashboard" replace />} />
</Routes>
</Suspense>
</main>
<Footer />
</ProtectedRoute>
}
/>
</Routes>
</Suspense>
</div>
</AuthProvider>
</ErrorBoundary>
Expand Down
8 changes: 4 additions & 4 deletions src/App.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ vi.mock('./pages/RequestsPage', () => ({
}));

describe('App', () => {
it('renders login route', () => {
it('renders login route', async () => {
render(
<MemoryRouter initialEntries={['/login']}>
<App />
</MemoryRouter>,
);
expect(screen.getByText('Login')).toBeInTheDocument();
expect(await screen.findByText('Login')).toBeInTheDocument();
});

it('renders protected layout for dashboard route', () => {
it('renders protected layout for dashboard route', async () => {
render(
<MemoryRouter initialEntries={['/dashboard']}>
<App />
</MemoryRouter>,
);
expect(screen.getByText('Header')).toBeInTheDocument();
expect(screen.getByText('Dashboard')).toBeInTheDocument();
expect(await screen.findByText('Dashboard')).toBeInTheDocument();
expect(screen.getByText('Footer')).toBeInTheDocument();
});
});