Skip to content

Add Suspense around routes to prevent empty admin page #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tkalir wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add Suspense around routes to prevent empty admin page #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { lazy, useEffect } from 'react';
import React, { lazy, Suspense, useEffect } from 'react';
import { useDispatch } from 'react-redux';
import { BrowserRouter, Routes, Route, useLocation } from 'react-router-dom';
import { AppDispatch } from './stores/store';
Expand All @@ -11,6 +11,7 @@ import ModelPage from './pages/ModelPage';
import Header from './components/templates/Header/Header';
import Footer from './components/templates/footer/Footer';
import AdminRoute from './components/auth/AdminRoute';
import { Loader } from './components/common';

import './i18n';
import './App.css';
Expand Down Expand Up @@ -86,26 +87,28 @@ function App() {
<div style={{ height: '100%' }}>
<Header title='Safety Data' />
<div style={styles.app}>
<Routes>
<Route path='/' element={<HomePage />} />
<Route path='/city' element={<CityPage />} />
<Route path='/model' element={<ModelPage />} />
<Route path='/recommend' element={<RecommendationsPage />} />
{/* Map view removed: MapWithClusters component deleted */}
<Route path='/about' element={<AboutPage />} />
<Route path='/login' element={<Login />} />
<Route path='/register' element={<Register />} />
<Route path='/profile' element={<Profile />} />
<Route path='/login-popup-redirect' element={<LoginPopupRedirect />} />
<Route
path='/admin'
element={
<AdminRoute>
<AdminPage />
</AdminRoute>
}
/>
</Routes>
<Suspense fallback={<Loader />}>
<Routes>
<Route path='/' element={<HomePage />} />
<Route path='/city' element={<CityPage />} />
<Route path='/model' element={<ModelPage />} />
<Route path='/recommend' element={<RecommendationsPage />} />
{/* Map view removed: MapWithClusters component deleted */}
<Route path='/about' element={<AboutPage />} />
<Route path='/login' element={<Login />} />
<Route path='/register' element={<Register />} />
<Route path='/profile' element={<Profile />} />
<Route path='/login-popup-redirect' element={<LoginPopupRedirect />} />
<Route
path='/admin'
element={
<AdminRoute>
<AdminPage />
</AdminRoute>
}
/>
</Routes>
</Suspense>
</div>
<Footer />
</div>
Expand Down
Loading