Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue #80 - nav links not working #93

Merged
merged 8 commits into from
Oct 18, 2024
Merged

fixed issue #80 - nav links not working #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0143c56
fixed issue #80 - nav links not working
Dhruv-pahuja Oct 14, 2024
0923b0c
Merge branch 'main' into fix-bug-80
Dhruv-pahuja Oct 17, 2024
5bccbb1
fixed conflicts in commit 0923b0ca85c58aeeeeb4aab1748e32c45e5374f8
Dhruv-pahuja Oct 17, 2024
567e1b3
Merge remote-tracking branch 'fork/fix-bug-80' into fix-bug-80
Dhruv-pahuja Oct 17, 2024
e15b3fd
final resolve in fix-bug-80
Dhruv-pahuja Oct 17, 2024
cf015e3
added footer in about
Dhruv-pahuja Oct 17, 2024
4b732f7
Merge branch 'fix-bug-80' of github.com:Dhruv-pahuja/dypcetclubs.live…
Dhruv-pahuja Oct 17, 2024
de4f8c9
Update App.tsx
Yash-Ainapure Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 132 additions & 2 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 41 additions & 40 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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;
10 changes: 5 additions & 5 deletions frontend/src/appComponents/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down Expand Up @@ -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">

Expand Down
Loading