app routs fixes

Victoria-Fedkova · Sep 25, 2023 · 2104b4a · 2104b4a
1 parent b9d6051
commit 2104b4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,4 +1,4 @@
-import { Route, Routes } from 'react-router-dom';
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
 import { HelmetProvider } from 'react-helmet-async';
 import { lazy } from 'react';
 
@@ -8,10 +8,13 @@ const CarsPage = lazy(() => import('./pages/CarsPage/CarsPage'));
 const NotFound = lazy(() => import('./pages/NotFound/NotFound'));
 import './App.css';
 import { SharedLayout } from './components/SharedLayout/SharedLayout';
+import GlobalStyle from './styles/globalStyles';
 
 function App() {
   return (
-    <HelmetProvider>
+    // <HelmetProvider>
+    <BrowserRouter basename={import.meta.env.DEV ? '/' : '/wheels4rent/'}>
+      <GlobalStyle />
       <Routes>
         <Route path="/" element={<SharedLayout />}>
           <Route index element={<MainPage />} />
@@ -20,7 +23,8 @@ function App() {
           <Route path="*" element={<NotFound />} />
         </Route>
       </Routes>
-    </HelmetProvider>
+    </BrowserRouter>
+    // </HelmetProvider>
   );
 }
 

diff --git a/src/main.jsx b/src/main.jsx
@@ -13,10 +13,7 @@ ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
     <Provider store={store}>
       <PersistGate loading={null} persistor={persistor}>
-        <BrowserRouter basename={import.meta.env.DEV ? '/' : '/wheels4rent/'}>
-          <GlobalStyle />
-          <App />
-        </BrowserRouter>
+        <App />
       </PersistGate>
     </Provider>
   </React.StrictMode>