many fixes of backeend and fronteend
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { Suspense, lazy, useEffect } from "react";
|
||||
import { BrowserRouter as Router, Routes, Route, Navigate } from "react-router-dom";
|
||||
import { Routes, Route, Navigate } from "react-router-dom";
|
||||
import { HelmetProvider } from "react-helmet-async";
|
||||
import AppLayout from "./layout/AppLayout";
|
||||
import { ScrollToTop } from "./components/common/ScrollToTop";
|
||||
@@ -176,10 +176,9 @@ export default function App() {
|
||||
<>
|
||||
<GlobalErrorDisplay />
|
||||
<LoadingStateMonitor />
|
||||
<Router>
|
||||
<HelmetProvider>
|
||||
<ScrollToTop />
|
||||
<Routes>
|
||||
<HelmetProvider>
|
||||
<ScrollToTop />
|
||||
<Routes>
|
||||
{/* Auth Routes - Public */}
|
||||
<Route path="/signin" element={<SignIn />} />
|
||||
<Route path="/signup" element={<SignUp />} />
|
||||
@@ -832,8 +831,7 @@ export default function App() {
|
||||
{/* Fallback Route */}
|
||||
<Route path="*" element={<NotFound />} />
|
||||
</Routes>
|
||||
</HelmetProvider>
|
||||
</Router>
|
||||
</HelmetProvider>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import { ThemeProvider } from "./context/ThemeContext";
|
||||
import { ToastProvider } from "./components/ui/toast/ToastContainer";
|
||||
import { HeaderMetricsProvider } from "./context/HeaderMetricsContext";
|
||||
import { ErrorBoundary } from "./components/common/ErrorBoundary";
|
||||
import { BrowserRouter } from "react-router-dom";
|
||||
|
||||
createRoot(document.getElementById("root")!).render(
|
||||
<StrictMode>
|
||||
@@ -16,7 +17,9 @@ createRoot(document.getElementById("root")!).render(
|
||||
<ThemeProvider>
|
||||
<HeaderMetricsProvider>
|
||||
<ToastProvider>
|
||||
<App />
|
||||
<BrowserRouter>
|
||||
<App />
|
||||
</BrowserRouter>
|
||||
</ToastProvider>
|
||||
</HeaderMetricsProvider>
|
||||
</ThemeProvider>
|
||||
|
||||
Reference in New Issue
Block a user