fixed issue #80 - nav links not working (#93)

* fixed issue #80 - nav links not working * fixed conflicts in commit 0923b0c * final resolve in fix-bug-80 * added footer in about * Update App.tsx --------- Co-authored-by: yash ainapure <[email protected]>
Yash-Ainapure · Oct 18, 2024 · b82b9e7 · b82b9e7
1 parent f195ec8
commit b82b9e7
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 47 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
-import { Route, Routes, BrowserRouter as Router, Outlet } from "react-router-dom";
-import { Navbar } from "./appComponents/Navbar"; // Clean import
+import { Route, Routes, BrowserRouter as Router } from "react-router-dom";
+import { Navbar } from "./appComponents/Navbar"; 
 import Hero from "./appComponents/Herosection";
 import Clubs from "./appComponents/Clubs";
 import Particles from "@/components/magicui/particles";
@@ -33,46 +33,47 @@ function App() {
 
   return (
     <Router>
-      <Routes>
-        <Route
-          path="/"
-          element={
-            <div className="bg-black font-popins">
-              <Outlet />
-              <div className="relative overflow-hidden">
-                <Meteors number={numberOfMeteors} />
-                <Particles
-                  className="absolute inset-0"
-                  quantity={400}
-                  ease={40}
-                  color={"#ffffff"}
-                  refresh
-                />
-                <Navbar setShowLoginPage={setShowLoginPage} />
-                <Hero />
+      <div className="bg-black font-popins">
+        <Navbar setShowLoginPage={setShowLoginPage} />
+        <Routes>
+          <Route
+            path="/"
+            element={
+              <div className="bg-black font-popins">
+                <div className="relative overflow-hidden">
+                  <Meteors number={numberOfMeteors} />
+                  <Particles
+                    className="absolute inset-0"
+                    quantity={400}
+                    ease={40}
+                    color={"#ffffff"}
+                    refresh
+                  />
+                  <Hero />
+                  <Features />
+                  <Clubs />
+                  <Events />
+                  <Footer />
+                  {showPopup && <Popup onClose={handleClose} />}
+                  {showLoginPage && <ClubLogin onClose={setShowLoginPage} />}
+                </div>
               </div>
-              <Features />
-              <Clubs />
-              <Events />
-              <Footer />
-              {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 />} />
-        <Route path="/clubboard" element={<ClubsPage />} />
-        <Route path="/events" element={<EventsPage />} />
-        <Route path="/hirimaineng" element={<HiringPage />} />
-        <Route path="/privacy-policy" element={<PrivacyPolicy />} />
-        <Route path="/terms" element={<Terms />} />
-      </Routes>
+            }
+          >
+            <Route path="registerClub" element={<ClubRegistration />} />
+          </Route>
+          <Route path="/clubAdmin/*" element={<ClubAdmin />} />
+          <Route path="/quiz/:id" element={<QuizPage />} />
+          <Route path="/about" element={<About />} />
+          <Route path="/clubboard" element={<ClubsPage />} />
+          <Route path="/events" element={<EventsPage />} />
+          <Route path="/hiring" element={<HiringPage />} />
+          <Route path="/privacy-policy" element={<PrivacyPolicy />} />
+          <Route path="/terms" element={<Terms />} />
+        </Routes>
+      </div>
     </Router>
   );
 }
 
-export default App;
+export default App;
diff --git a/frontend/src/appComponents/About.tsx b/frontend/src/appComponents/About.tsx
@@ -6,8 +6,8 @@ import { Accordion,AccordionContent,AccordionItem, AccordionTrigger } from "@/co
 import { Input } from "@/components/magicui/input"
 import { useState } from "react"
 import { useNavigate } from "react-router-dom"
-import { Navigation } from "./Navbar"
 import Footer from "./Footer"
+// import { Navigation } from "./Navbar"
 //import { Navigation } from "./Navdar"
 
 
@@ -35,11 +35,11 @@ const About =()=>{
                 </div>
             </div>
 
-            <Navigation/>
+            {/* <Navigation /> */}
+
+
+
 
-
-
-
 
             <div className="max-w-6xl mx-auto py-16 px-4 sm:px-6 lg:px-8">