From 7b6d380d3a1f5ee2e13d125bdcd373740b48dd55 Mon Sep 17 00:00:00 2001
From: aelassas <akram.elassas@gmail.com>
Date: Sun, 29 Dec 2024 14:59:59 +0100
Subject: [PATCH] Replace SuspenseRouter with BrowserRouter for routing in App
 components

---
 backend/src/App.tsx  | 11 +++++------
 frontend/src/App.tsx | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/backend/src/App.tsx b/backend/src/App.tsx
index f34e89de9..ee112a311 100644
--- a/backend/src/App.tsx
+++ b/backend/src/App.tsx
@@ -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'))
@@ -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">
@@ -83,8 +82,8 @@ const App = () => (
           </Routes>
         </Suspense>
       </div>
-    </SuspenseRouter>
-  </GlobalProvider>
+    </GlobalProvider>
+  </BrowserRouter>
 )
 
 export default App
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8f68dc821..581f292af 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -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'
@@ -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">
@@ -69,9 +68,9 @@ const App = () => (
             </Routes>
           </Suspense>
         </div>
-      </SuspenseRouter>
-    </RecaptchaProvider>
-  </GlobalProvider>
+      </RecaptchaProvider>
+    </GlobalProvider>
+  </BrowserRouter>
 )
 
 export default App