From 31282d5407e0a0076fb4033c70d5529c230f64e6 Mon Sep 17 00:00:00 2001
From: Sarim-Sheikh-2003 <sheikh.sarim@ucalgary.ca>
Date: Sat, 4 Nov 2023 15:06:48 -0600
Subject: [PATCH] Simplified code

---
 src/Header/DropdownMenu.js | 10 ++--------
 src/Header/Header.js       | 19 ++++++-------------
 src/Header/OpenPage.js     |  9 ---------
 3 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 src/Header/OpenPage.js

diff --git a/src/Header/DropdownMenu.js b/src/Header/DropdownMenu.js
index f4c94bb..26b0be0 100644
--- a/src/Header/DropdownMenu.js
+++ b/src/Header/DropdownMenu.js
@@ -1,18 +1,12 @@
-// import OpenPage from "./OpenPage";
 import { useNavigate } from "react-router-dom";
 
 const DropdownMenu = () => {
   const navigate = useNavigate();
 
-  const OpenPage = (arg) => {    
-      navigate(arg);
-      console.log(arg);
-  };
-
   return (
     <div>
-      <button type = "button" onClick = {() => OpenPage('/JoinTheClub')}>Join the Club</button>
-      <button type = "button" onClick = {() => OpenPage('/UpcomingEvents')}>Upcoming Events</button>
+      <button type = "button" onClick = {() => navigate('/JoinTheClub')}>Join the Club</button>
+      <button type = "button" onClick = {() => navigate('/UpcomingEvents')}>Upcoming Events</button>
     </div>
   );
 };
diff --git a/src/Header/Header.js b/src/Header/Header.js
index 9d53f58..c5bf283 100644
--- a/src/Header/Header.js
+++ b/src/Header/Header.js
@@ -1,6 +1,5 @@
 import logo from './logo.png';
 import DropdownMenu from "./DropdownMenu";
-// import OpenPage from "./OpenPage";
 import { useNavigate } from "react-router-dom";
 import { useState } from "react";
 import { Outlet } from "react-router-dom";
@@ -10,11 +9,6 @@ export default function Header() {
     const [isDropdownVisible, setDropdownVisible] = useState(false);
     const navigate = useNavigate();
 
-    const OpenPage = (arg) => {    
-        navigate(arg);
-        console.log(arg);
-    };
-
     const handleMouseEnter = () => {
         setDropdownVisible(true);
     };
@@ -27,23 +21,22 @@ export default function Header() {
         <>
             <header>
                 <div>
-                    <img style={{background: "gray"}} onClick = {() => OpenPage('/')} src={logo} alt="logo" />
+                    <img onClick = {() => navigate('/')} src={logo} alt="logo" />
                     <p>Schulich Offroad</p>
                 </div>
                 <div>
-                    <button type = "button" onClick = {() => OpenPage('/')}>About Us</button>
-                    <button type = "button" onClick = {() => OpenPage('/Teams')}>Teams</button>
-                    <button type = "button" onClick = {() => OpenPage('/OurSponsors')}>Our Sponsors</button>
-                    <button type = "button" onClick = {() => OpenPage('/BecomeASponsor')}>Become a Sponsor</button>
+                    <button type = "button" onClick = {() => navigate('/')}>About Us</button>
+                    <button type = "button" onClick = {() => navigate('/Teams')}>Teams</button>
+                    <button type = "button" onClick = {() => navigate('/OurSponsors')}>Our Sponsors</button>
+                    <button type = "button" onClick = {() => navigate('/BecomeASponsor')}>Become a Sponsor</button>
                     <div
                     onMouseEnter={handleMouseEnter}
                     onMouseLeave={handleMouseLeave}
-                    style={{background: "red"}}
                     >
                         <button type = "button">Club Membership & Upcoming Events</button>
                         {isDropdownVisible && <DropdownMenu />}
                     </div>
-                    <button type = "button" onClick = {() => OpenPage('/Gallery')}>Gallery</button>
+                    <button type = "button" onClick = {() => navigate('/Gallery')}>Gallery</button>
                 </div>
             </header>
             <Outlet />
diff --git a/src/Header/OpenPage.js b/src/Header/OpenPage.js
deleted file mode 100644
index dcd4ae1..0000000
--- a/src/Header/OpenPage.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useNavigate } from "react-router-dom";
-
-const OpenPage = (arg) => {    
-    const navigate = useNavigate();
-    navigate(arg);
-    console.log(arg);
-};
-
-export default OpenPage;
\ No newline at end of file