From 04e077cb26a94f9c5efad1f92acfdabd7fbee3ba Mon Sep 17 00:00:00 2001
From: Gauravtb2253 <gtbomble225@gmail.com>
Date: Tue, 15 Oct 2024 22:29:14 +0530
Subject: [PATCH] solved issue of registerpage

---
 frontend/package-lock.json | 28 ++-------------------
 frontend/src/App.tsx       | 51 +++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 78e0227..fb6ec28 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3944,32 +3944,8 @@
       }
     },
     "node_modules/dypcetclubs": {
-      "version": "0.0.0",
-      "resolved": "file:",
-      "dependencies": {
-        "@fortawesome/free-solid-svg-icons": "^6.6.0",
-        "@fortawesome/react-fontawesome": "^0.2.2",
-        "@prisma/client": "^5.19.0",
-        "@radix-ui/react-accordion": "^1.2.1",
-        "@radix-ui/react-slot": "^1.1.0",
-        "@tabler/icons-react": "^3.13.0",
-        "@tanstack/react-form": "^0.29.2",
-        "@tanstack/react-query": "^5.52.2",
-        "axios": "^1.7.5",
-        "canvas-confetti": "^1.9.3",
-        "class-variance-authority": "^0.7.0",
-        "clsx": "^2.1.1",
-        "dypcetclubs": "file:",
-        "framer-motion": "^11.11.7",
-        "lucide-react": "^0.419.0",
-        "radix-ui": "^1.0.1",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-router-dom": "^6.27.0",
-        "react-spinners": "^0.14.1",
-        "tailwind-merge": "^2.5.2",
-        "tailwindcss-animate": "^1.0.7"
-      }
+      "resolved": "",
+      "link": true
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index f89c420..d6c137f 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,5 +1,10 @@
 import { useState } from "react";
-import { Route, Routes, BrowserRouter as Router} from "react-router-dom";
+import {
+  Route,
+  Routes,
+  BrowserRouter as Router,
+  Outlet,
+} from "react-router-dom";
 import Hero from "./appComponents/Herosection";
 import Clubs from "./appComponents/Clubs";
 import Particles from "@/components/magicui/particles";
@@ -11,12 +16,11 @@ import ClubLogin from "./appComponents/ClubLogin";
 import { ClubAdmin } from "./appComponents/ClubAdmin";
 import "./App.css";
 import QuizPage from "./appComponents/QuizPage";
-import Footer from "./appComponents/Footer"; // Import the Footer component
+import Footer from "./appComponents/Footer"; 
 
 import { Navbar } from "./appComponents/Navbar";
 import About from "./appComponents/About";
 
-
 function App() {
   const [showPopup, setShowPopup] = useState(true);
   const [showLoginPage, setShowLoginPage] = useState(false);
@@ -29,11 +33,12 @@ function App() {
 
   return (
     <Router>
-      <div className="bg-black font-popins">
-        <Routes>
-          <Route
-            path="/"
-            element={
+      <Routes>
+        <Route
+          path="/"
+          element={
+            <div className="bg-black font-popins">
+              <Outlet />
               <div className="relative overflow-hidden">
                 <Meteors number={numberOfMeteors} />
                 <Particles
@@ -46,22 +51,22 @@ function App() {
                 <Navbar setShowLoginPage={setShowLoginPage} />
                 <Hero />
               </div>
-            }
-          >
-            <Route path="registerClub" element={<ClubRegistration />} />
-          </Route>
-          <Route path="/clubAdmin/*" element={<ClubAdmin />} />
-          <Route path="/quiz/:id" element={<QuizPage />} />
-          <Route path="/about" element={<About />} />
-        </Routes>
-        <Clubs />
-        <Events />
-        {showPopup && <Popup onClose={handleClose} />}
-        {showLoginPage && <ClubLogin onClose={setShowLoginPage} />}
-      </div>
-      <Footer /> {/* Render the Footer component on all routes */}
+              <Clubs />
+              <Events />
+              {showPopup && <Popup onClose={handleClose} />}
+              {showLoginPage && <ClubLogin onClose={setShowLoginPage} />}
+            </div>
+          }
+        >
+          <Route path="registerClub" element={<ClubRegistration />} />
+        </Route>
+        <Route path="/clubAdmin/*" element={<ClubAdmin />} />
+        <Route path="/quiz/:id" element={<QuizPage />} />
+        <Route path="/about" element={<About />} />
+      </Routes>
+      <Footer /> 
     </Router>
   );
 }
 
-export default App;
\ No newline at end of file
+export default App;