Update main.jsx

DOodle25 · Oct 31, 2024 · d19e45e · d19e45e
1 parent 0df2645
commit d19e45e
Showing 1 changed file with 139 additions and 44 deletions.
diff --git a/DIDFrontend/src/main.jsx b/DIDFrontend/src/main.jsx
@@ -1,13 +1,111 @@
+// import React from "react";
+// import ReactDOM from "react-dom/client";
+// import App from "./App.jsx";
+// import "./index.css";
+// import {
+//   createBrowserRouter,
+//   createRoutesFromElements,
+//   RouterProvider,
+//   Route,
+// } from "react-router-dom";
+// import { NextUIProvider } from "@nextui-org/react";
+// import Home from "./components/Home/Home.jsx";
+// import Population from "./components/Population/Population.jsx";
+// import LoginPage from "./components/Auth/LoginPage.jsx";
+// import RegisterPage from "./components/Auth/RegisterPage.jsx";
+// import UserProfile from "./components/Auth/UserProfile.jsx";
+// import Demography from "./components/Demography/Demography.jsx";
+// import AddSchemes from "./components/Schemes/AddSchemes.jsx";
+// import VisnagarMap from "./components/Demography/Maps/VisnagarMap.jsx";
+// import SatlasanaMap from "./components/Demography/Maps/SatlasanaMap.jsx";
+// import KheraluMap from "./components/Demography/Maps/KheraluMap.jsx";
+// import KadiMap from "./components/Demography/Maps/KadiMap.jsx";
+// import MahesanaMap from "./components/Demography/Maps/MahesanaMap.jsx";
+// import BechrajiMap from "./components/Demography/Maps/BechrajiMap.jsx";
+// import JotanaMap from "./components/Demography/Maps/JotanaMap.jsx";
+// import VadnagarMap from "./components/Demography/Maps/VadnagarMap.jsx";
+// import VijapurMap from "./components/Demography/Maps/VijapurMap.jsx";
+// import UnjhaMap from "./components/Demography/Maps/UnjhaMap.jsx";
+// import { Provider } from "react-redux";
+// import store from "./store/store.js";
+// import { AuthProvider } from './auth-context/auth-context';
+// import ProtectedRoute from "./components/Auth/ProtectedRoute"; // Import the ProtectedRoute
+// import SchemeDetails from "./components/Schemes/SchemeID.jsx";
+// const routes = createRoutesFromElements(
+//   <>
+//     {/* Public Routes */}
+//     <Route path="/register" element={<RegisterPage />} />
+//     <Route path="/login" element={<LoginPage />} />
+
+//     {/* Protected Routes */}
+//     <Route
+//       path="/"
+//       element={
+//         <ProtectedRoute>
+//           <App />
+//         </ProtectedRoute>
+//       }
+//     >
+//       <Route path="/scheme/:id" element={<SchemeDetails />} />
+//       <Route path="/" element={<Home />} />
+//       <Route path="/population" element={<Population />} />
+//       <Route path="/demography" element={<Demography />} />
+//       <Route path="/addscheme" element={<AddSchemes />} />
+//       <Route path="/profile" element={<UserProfile />} />
+//       <Route path="/visnagar" element={<VisnagarMap />} />
+//       <Route path="/kheralu" element={<KheraluMap />} />
+//       <Route path="/satlasana" element={<SatlasanaMap />} />
+//       <Route path="/kadi" element={<KadiMap />} />
+//       <Route path="/bechraji" element={<BechrajiMap />} />
+//       <Route path="/mahesana" element={<MahesanaMap />} />
+//       <Route path="/jotana" element={<JotanaMap />} />
+//       <Route path="/unjha" element={<UnjhaMap />} />
+//       <Route path="/vadnagar" element={<VadnagarMap />} />
+//       <Route path="/vijapur" element={<VijapurMap />} />
+//     </Route>
+//   </>
+// );
+
+// const router = createBrowserRouter(routes);
+
+// ReactDOM.createRoot(document.getElementById("root")).render(
+//   <React.StrictMode>
+//     <AuthProvider>
+//       <Provider store={store}>
+//         <NextUIProvider>
+//           <RouterProvider router={router} />
+//         </NextUIProvider>
+//       </Provider>
+//     </AuthProvider>
+//   </React.StrictMode>
+// );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.jsx";
 import "./index.css";
-import {
-  createBrowserRouter,
-  createRoutesFromElements,
-  RouterProvider,
-  Route,
-} from "react-router-dom";
+import { HashRouter, Routes, Route } from "react-router-dom";
 import { NextUIProvider } from "@nextui-org/react";
 import Home from "./components/Home/Home.jsx";
 import Population from "./components/Population/Population.jsx";
@@ -29,51 +127,48 @@ import UnjhaMap from "./components/Demography/Maps/UnjhaMap.jsx";
 import { Provider } from "react-redux";
 import store from "./store/store.js";
 import { AuthProvider } from './auth-context/auth-context';
-import ProtectedRoute from "./components/Auth/ProtectedRoute"; // Import the ProtectedRoute
+import ProtectedRoute from "./components/Auth/ProtectedRoute"; 
 import SchemeDetails from "./components/Schemes/SchemeID.jsx";
-const routes = createRoutesFromElements(
-  <>
-    {/* Public Routes */}
-    <Route path="/register" element={<RegisterPage />} />
-    <Route path="/login" element={<LoginPage />} />
-
-    {/* Protected Routes */}
-    <Route
-      path="/"
-      element={
-        <ProtectedRoute>
-          <App />
-        </ProtectedRoute>
-      }
-    >
-      <Route path="/scheme/:id" element={<SchemeDetails />} />
-      <Route path="/" element={<Home />} />
-      <Route path="/population" element={<Population />} />
-      <Route path="/demography" element={<Demography />} />
-      <Route path="/addscheme" element={<AddSchemes />} />
-      <Route path="/profile" element={<UserProfile />} />
-      <Route path="/visnagar" element={<VisnagarMap />} />
-      <Route path="/kheralu" element={<KheraluMap />} />
-      <Route path="/satlasana" element={<SatlasanaMap />} />
-      <Route path="/kadi" element={<KadiMap />} />
-      <Route path="/bechraji" element={<BechrajiMap />} />
-      <Route path="/mahesana" element={<MahesanaMap />} />
-      <Route path="/jotana" element={<JotanaMap />} />
-      <Route path="/unjha" element={<UnjhaMap />} />
-      <Route path="/vadnagar" element={<VadnagarMap />} />
-      <Route path="/vijapur" element={<VijapurMap />} />
-    </Route>
-  </>
-);
-
-const router = createBrowserRouter(routes);
 
 ReactDOM.createRoot(document.getElementById("root")).render(
   <React.StrictMode>
     <AuthProvider>
       <Provider store={store}>
         <NextUIProvider>
-          <RouterProvider router={router} />
+          <HashRouter>
+            <Routes>
+              {/* Public Routes */}
+              <Route path="/register" element={<RegisterPage />} />
+              <Route path="/login" element={<LoginPage />} />
+
+              {/* Protected Routes */}
+              <Route
+                path="/"
+                element={
+                  <ProtectedRoute>
+                    <App />
+                  </ProtectedRoute>
+                }
+              >
+                <Route path="/scheme/:id" element={<SchemeDetails />} />
+                <Route path="/" element={<Home />} />
+                <Route path="/population" element={<Population />} />
+                <Route path="/demography" element={<Demography />} />
+                <Route path="/addscheme" element={<AddSchemes />} />
+                <Route path="/profile" element={<UserProfile />} />
+                <Route path="/visnagar" element={<VisnagarMap />} />
+                <Route path="/kheralu" element={<KheraluMap />} />
+                <Route path="/satlasana" element={<SatlasanaMap />} />
+                <Route path="/kadi" element={<KadiMap />} />
+                <Route path="/bechraji" element={<BechrajiMap />} />
+                <Route path="/mahesana" element={<MahesanaMap />} />
+                <Route path="/jotana" element={<JotanaMap />} />
+                <Route path="/unjha" element={<UnjhaMap />} />
+                <Route path="/vadnagar" element={<VadnagarMap />} />
+                <Route path="/vijapur" element={<VijapurMap />} />
+              </Route>
+            </Routes>
+          </HashRouter>
         </NextUIProvider>
       </Provider>
     </AuthProvider>