From 56f26c1d4b4a5b2ab5eb53f4b528e59c9d5700a9 Mon Sep 17 00:00:00 2001
From: KaranMegha <karanmegha99@gmail.com>
Date: Wed, 15 Feb 2023 10:42:39 +0530
Subject: [PATCH] React-router-dom

---
 package-lock.json                  | 50 +++++++++++++++---------------
 package.json                       |  2 +-
 src/App.jsx                        | 39 +++++++++++++++--------
 src/components/Events/Event.jsx    |  2 +-
 src/components/Home/Home.jsx       |  4 ++-
 src/components/HomePage.jsx        | 26 ++++++++++++++++
 src/components/Nav/NavBar.jsx      | 32 +++++++++----------
 src/components/Sponsor/Sponsor.jsx | 17 ++++------
 8 files changed, 104 insertions(+), 68 deletions(-)
 create mode 100644 src/components/HomePage.jsx

diff --git a/package-lock.json b/package-lock.json
index 778962a..25f0566 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "react-icons": "^4.7.1",
         "react-lazy-load": "^4.0.1",
         "react-on-screen": "^2.1.1",
-        "react-router-dom": "^6.8.0",
+        "react-router-dom": "^6.8.1",
         "react-router-hash-link": "^2.4.3",
         "react-scripts": "5.0.1",
         "react-slick": "^0.29.0",
@@ -3145,9 +3145,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.1.tgz",
-      "integrity": "sha512-+eun1Wtf72RNRSqgU7qM2AMX/oHp+dnx7BHk1qhK5ZHzdHTUU4LA1mGG1vT+jMc8sbhG3orvsfOmryjzx2PzQw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz",
+      "integrity": "sha512-t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA==",
       "engines": {
         "node": ">=14"
       }
@@ -14731,11 +14731,11 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.0.tgz",
-      "integrity": "sha512-760bk7y3QwabduExtudhWbd88IBbuD1YfwzpuDUAlJUJ7laIIcqhMvdhSVh1Fur1PE8cGl84L0dxhR3/gvHF7A==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz",
+      "integrity": "sha512-Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==",
       "dependencies": {
-        "@remix-run/router": "1.3.1"
+        "@remix-run/router": "1.3.2"
       },
       "engines": {
         "node": ">=14"
@@ -14745,12 +14745,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.0.tgz",
-      "integrity": "sha512-hQouduSTywGJndE86CXJ2h7YEy4HYC6C/uh19etM+79FfQ6cFFFHnHyDlzO4Pq0eBUI96E4qVE5yUjA00yJZGQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz",
+      "integrity": "sha512-67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==",
       "dependencies": {
-        "@remix-run/router": "1.3.1",
-        "react-router": "6.8.0"
+        "@remix-run/router": "1.3.2",
+        "react-router": "6.8.1"
       },
       "engines": {
         "node": ">=14"
@@ -19851,9 +19851,9 @@
       }
     },
     "@remix-run/router": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.1.tgz",
-      "integrity": "sha512-+eun1Wtf72RNRSqgU7qM2AMX/oHp+dnx7BHk1qhK5ZHzdHTUU4LA1mGG1vT+jMc8sbhG3orvsfOmryjzx2PzQw=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz",
+      "integrity": "sha512-t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="
     },
     "@restart/hooks": {
       "version": "0.4.8",
@@ -28162,20 +28162,20 @@
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
     },
     "react-router": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.0.tgz",
-      "integrity": "sha512-760bk7y3QwabduExtudhWbd88IBbuD1YfwzpuDUAlJUJ7laIIcqhMvdhSVh1Fur1PE8cGl84L0dxhR3/gvHF7A==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz",
+      "integrity": "sha512-Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==",
       "requires": {
-        "@remix-run/router": "1.3.1"
+        "@remix-run/router": "1.3.2"
       }
     },
     "react-router-dom": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.0.tgz",
-      "integrity": "sha512-hQouduSTywGJndE86CXJ2h7YEy4HYC6C/uh19etM+79FfQ6cFFFHnHyDlzO4Pq0eBUI96E4qVE5yUjA00yJZGQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz",
+      "integrity": "sha512-67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==",
       "requires": {
-        "@remix-run/router": "1.3.1",
-        "react-router": "6.8.0"
+        "@remix-run/router": "1.3.2",
+        "react-router": "6.8.1"
       }
     },
     "react-router-hash-link": {
diff --git a/package.json b/package.json
index 2cf7b9c..6bd1bfd 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "react-icons": "^4.7.1",
     "react-lazy-load": "^4.0.1",
     "react-on-screen": "^2.1.1",
-    "react-router-dom": "^6.8.0",
+    "react-router-dom": "^6.8.1",
     "react-router-hash-link": "^2.4.3",
     "react-scripts": "5.0.1",
     "react-slick": "^0.29.0",
diff --git a/src/App.jsx b/src/App.jsx
index 09034cd..6089954 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -11,23 +11,36 @@ import Glimpse from "./components/Glimpse/Glimpse";
 import Signup from "./components/Signup/Signup";
 import Registration from "./components/registration/registration";
 import { render } from "@testing-library/react";
+import { BrowserRouter, Routes, Route } from "react-router-dom";
+import HomePage from "./components/HomePage";
+
 const App = () => {
 
   return (
-    <div >
-        {/* <div className="loader" ref={divRef}>
-        </div> */}
-        <NavBar/>
-        <Home/>
-        <About />
-        <Event />
-        {/* <Team /> */}
-        {/* <Sponsor /> */}
-        <Glimpse />
-      <Signup/>
-      <Registration/>
-        <Footer />
+    <div>
+      <NavBar/>
+    <BrowserRouter>
+    
+    <Routes>
+      <Route path="/" element={<HomePage/>}/>
+      <Route path="/signup" element={<Signup/>}/>
+      <Route path="/registration" element={<Registration/>}/>
+      </Routes>
+      </BrowserRouter>
+        
     </div>
   );
 };
 export default App;
+
+
+      //   <NavBar/>
+      //   <Home/>
+      //   <About />
+      //   <Event />
+      //   <Team /> 
+      //   <Sponsor /> 
+      //   <Glimpse />
+      // <Signup/>
+      // <Registration/>
+      // <Footer />
\ No newline at end of file
diff --git a/src/components/Events/Event.jsx b/src/components/Events/Event.jsx
index 144e627..ebec557 100644
--- a/src/components/Events/Event.jsx
+++ b/src/components/Events/Event.jsx
@@ -63,7 +63,7 @@ function Event() {
   ];
   return(
     
-    <section className="container" id="event">
+    <section className="container" id="Events">
 
       <div className="heading head mx-auto d-flex align-items-center justify-content-center">
           <h2
diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
index 7b626fa..e1c0781 100644
--- a/src/components/Home/Home.jsx
+++ b/src/components/Home/Home.jsx
@@ -2,6 +2,7 @@ import React,{useEffect,useRef} from "react";
 import "./Home.css";
 import IMG from "../../assets/logo.svg";
 import Title from "../../assets/title.png";
+import { NavBar } from "../Nav/NavBar";
 const Home = () => {
 
   const vidRef = useRef(null);
@@ -15,8 +16,9 @@ const Home = () => {
 
 
   return (
+    
     <section id="home">
-      
+      {/* <NavBar/> */}
       <div className="container home__container">
         <div className="home__content">
           <div className="home__title">
diff --git a/src/components/HomePage.jsx b/src/components/HomePage.jsx
new file mode 100644
index 0000000..498a985
--- /dev/null
+++ b/src/components/HomePage.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { NavBar } from './Nav/NavBar';
+import Home from './Home/Home';
+import About from './About/About';
+import Event from './Events/Event';
+import Glimpse from './Glimpse/Glimpse';
+import Sponsor from './Sponsor/Sponsor';
+import Team from './Team/Team';
+import Footer from './Footer/Footer';
+
+const HomePage = () => {
+  return (
+    <div>
+      {/* <NavBar/> */}
+      <Home/>
+      <About/>
+      <Event/>
+      <Sponsor/>
+      <Team/>
+      <Glimpse/>
+      <Footer/>
+    </div>
+  )
+}
+
+export default HomePage
diff --git a/src/components/Nav/NavBar.jsx b/src/components/Nav/NavBar.jsx
index 31e6ba2..c56e449 100644
--- a/src/components/Nav/NavBar.jsx
+++ b/src/components/Nav/NavBar.jsx
@@ -41,7 +41,7 @@ export const NavBar = () => {
           </Navbar.Toggle>
           <Navbar.Collapse id="basic-navbar-nav">
             <Nav className="ms-auto">
-              <Nav.Link
+              {/* <Nav.Link
                 href="#home"
                 className={
                   activeLink === "home" ? "active navbar-link" : "navbar-link"
@@ -49,9 +49,9 @@ export const NavBar = () => {
                 onClick={() => onUpdateActiveLink("home")}
               >
                 Home
-              </Nav.Link>
+              </Nav.Link> */}
               <Nav.Link
-                href="#About"
+                href="/#About"
                 className={
                   activeLink === "About" ? "active navbar-link" : "navbar-link"
                 }
@@ -59,17 +59,17 @@ export const NavBar = () => {
               >
                 About
               </Nav.Link>
-              {/* <Nav.Link
-                href="#"
+              <Nav.Link
+                href="/#Events"
                 className={
                   activeLink === "Events" ? "active navbar-link" : "navbar-link"
                 }
                 onClick={() => onUpdateActiveLink("Events")}
               >
                 Events
-              </Nav.Link> */}
+              </Nav.Link>
               <Nav.Link
-                href="#Glimpse"
+                href="/#Glimpse"
                 className={
                   activeLink === "Glimpse"
                     ? "active navbar-link"
@@ -79,8 +79,8 @@ export const NavBar = () => {
               >
                 Glimpse
               </Nav.Link>
-              {/* <Nav.Link
-                href="#sponser"
+              <Nav.Link
+                href="/#sponser"
                 className={
                   activeLink === "Sponser"
                     ? "active navbar-link"
@@ -91,23 +91,23 @@ export const NavBar = () => {
                 Sponser
               </Nav.Link>
               <Nav.Link
-                href="#"
+                href="/signup"
                 className={
-                  activeLink === "Signup" ? "active navbar-link" : "navbar-link"
+                  activeLink === "signup" ? "active navbar-link" : "navbar-link"
                 }
-                onClick={() => onUpdateActiveLink("signup")}
+                onClick={() => onUpdateActiveLink("/signup")}
               >
                 SignUp
               </Nav.Link>
               <Nav.Link
-                href="#"
+                href="/signup"
                 className={
-                  activeLink === "Signup" ? "active navbar-link" : "navbar-link"
+                  activeLink === "signup" ? "active navbar-link" : "navbar-link"
                 }
-                onClick={() => onUpdateActiveLink("signup")}
+                onClick={() => onUpdateActiveLink("/signup")}
               >
                 <FiShoppingCart />
-              </Nav.Link> */}
+              </Nav.Link>
             </Nav>
           </Navbar.Collapse>
         </Container>
diff --git a/src/components/Sponsor/Sponsor.jsx b/src/components/Sponsor/Sponsor.jsx
index bd9388e..8ed37e7 100644
--- a/src/components/Sponsor/Sponsor.jsx
+++ b/src/components/Sponsor/Sponsor.jsx
@@ -3,7 +3,7 @@ import "./Sponsor.css";
 
 function Sponsor() {
   return (
-    <Carousel id="sponser">
+    <section id="sponser">
       <div className="heading">
         <h2
           className="abouthead"
@@ -16,6 +16,7 @@ function Sponsor() {
         </h2>
         <h2 className="front-text"> Sponsor</h2>
       </div>
+      <Carousel>
       <Carousel.Item interval={2000}>
         <img
           className="mx-auto c-block"
@@ -43,29 +44,23 @@ function Sponsor() {
           src="assests/Sponsor/GOLD-SPONSOR.png"
           alt="Fourth slide"
         />
-        <Carousel.Item interval={2000}>
-          <img
-            className="mx-auto d-block"
-            src="assests/Sponsor/SILVER-SPONSOR.png"
-            alt="Fifth slide"
-          />
-        </Carousel.Item>
       </Carousel.Item>
       <Carousel.Item interval={2000}>
         <img
           className="mx-auto d-block"
           src="assests/Sponsor/SILVER-SPONSOR.png"
-          alt="sixth slide"
+          alt="Fifth slide"
         />
       </Carousel.Item>
       <Carousel.Item interval={2000}>
         <img
           className="mx-auto d-block"
           src="assests/Sponsor/BRONZE-SPONSOR.png"
-          alt="Seventh slide"
+          alt="Sixth slide"
         />
       </Carousel.Item>
-    </Carousel>
+      </Carousel>
+    </section>
   );
 }