Skip to content

Commit

Permalink
Replace SuspenseRouter with BrowserRouter for routing in App components
Browse files Browse the repository at this point in the history
  • Loading branch information
aelassas committed Dec 29, 2024
1 parent e1b8103 commit 7b6d380
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
11 changes: 5 additions & 6 deletions backend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { lazy, Suspense } from 'react'
import { Route, Routes } from 'react-router-dom'
import { BrowserRouter, Route, Routes } from 'react-router-dom'
import { GlobalProvider } from '@/context/GlobalContext'
import SuspenseRouter from '@/components/SuspenseRouter'
import ScrollToTop from '@/components/ScrollToTop'

const SignIn = lazy(() => import('@/pages/SignIn'))
Expand Down Expand Up @@ -39,8 +38,8 @@ const CreateCountry = lazy(() => import('@/pages/CreateCountry'))
const UpdateCountry = lazy(() => import('@/pages/UpdateCountry'))

const App = () => (
<GlobalProvider>
<SuspenseRouter window={window}>
<BrowserRouter>
<GlobalProvider>
<ScrollToTop />

<div className="app">
Expand Down Expand Up @@ -83,8 +82,8 @@ const App = () => (
</Routes>
</Suspense>
</div>
</SuspenseRouter>
</GlobalProvider>
</GlobalProvider>
</BrowserRouter>
)

export default App
15 changes: 7 additions & 8 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { lazy, Suspense } from 'react'
import { Route, Routes } from 'react-router-dom'
import SuspenseRouter from '@/components/SuspenseRouter'
import { BrowserRouter, Route, Routes } from 'react-router-dom'
import env from '@/config/env.config'
import { GlobalProvider } from '@/context/GlobalContext'
import { RecaptchaProvider } from '@/context/RecaptchaContext'
Expand Down Expand Up @@ -35,9 +34,9 @@ const Suppliers = lazy(() => import('@/pages/Suppliers'))
const Faq = lazy(() => import('@/pages/Faq'))

const App = () => (
<GlobalProvider>
<RecaptchaProvider>
<SuspenseRouter window={window}>
<BrowserRouter>
<GlobalProvider>
<RecaptchaProvider>
<ScrollToTop />

<div className="app">
Expand Down Expand Up @@ -69,9 +68,9 @@ const App = () => (
</Routes>
</Suspense>
</div>
</SuspenseRouter>
</RecaptchaProvider>
</GlobalProvider>
</RecaptchaProvider>
</GlobalProvider>
</BrowserRouter>
)

export default App

0 comments on commit 7b6d380

Please sign in to comment.