sync with origin

calblueprint · Sep 16, 2024 · 1b58914 · 1b58914
1 parent 2209d91
commit 1b58914
Showing 1 changed file with 0 additions and 86 deletions.
diff --git a/src/components/userComponents/navBar/navBar.tsx b/src/components/userComponents/navBar/navBar.tsx
@@ -1,22 +1,14 @@
-<<<<<<< HEAD
 import Link from 'next/link';
 import React, { useState, useEffect } from 'react';
 
-=======
-import React, { useState, useEffect } from 'react';
-import Link from 'next/link';
->>>>>>> e2ff808 (merge resolved)
 import { HamburgerMenu, CloseMenu } from '../../../../public/icons';
 
 /**
  * @returns The navigation bar for the web app
  */
 export default function NavBar() {
   const [showMenu, setShowMenu] = useState(false);
-<<<<<<< HEAD
   const [isWide, setIsWide] = useState(false);
-=======
->>>>>>> e2ff808 (merge resolved)
 
   useEffect(() => {
     if (showMenu) {
@@ -26,7 +18,6 @@ export default function NavBar() {
     }
   }, [showMenu]);
 
-<<<<<<< HEAD
   useEffect(() => {
     if (window) {
       setIsWide(window.innerWidth >= 1024);
@@ -39,29 +30,20 @@ export default function NavBar() {
     };
   }, []);
 
-=======
->>>>>>> e2ff808 (merge resolved)
   /**
    * Toggles the side menu
    */
   function handleClick() {
     setShowMenu(!showMenu);
   }
 
-<<<<<<< HEAD
   return isWide ? (
     <nav className="bg-scary-forest w-full h-[4.625rem] flex flex-col justify-between sticky top-0 left-0 z-[9999]">
       <div className="flex flex-row pl-[3.88rem] pr-[4.75rem] pt-5 justify-between items-center">
-=======
-  return (
-    <nav className="bg-scary-forest w-full h-[4.25rem] flex flex-col relative z-[9999]">
-      <div className="flex flex-row justify-between relative top-2">
->>>>>>> e2ff808 (merge resolved)
         <Link href="/">
           <img
             src="https://qkkuacqtcsfjbnzmxmhk.supabase.co/storage/v1/object/public/images/PHSLogo.jpg"
             alt="PHSLogo"
-<<<<<<< HEAD
             className="w-[6.5rem] h-[2.25rem]"
           />
         </Link>
@@ -136,74 +118,6 @@ export default function NavBar() {
                 </h4>
               </div>
             </div>
-=======
-            className="object-contain w-[6.5rem] h-[2.25rem] relative left-[1.13rem]"
-          />
-        </Link>
-        <button
-          type="button"
-          className="w-10 h-10 relative right-[0.81rem]"
-          onClick={handleClick}
-          aria-label="Toggle Menu"
-        >
-          <div className="flex justify-center items-center w-full h-full">
-            {showMenu ? <CloseMenu /> : <HamburgerMenu />}
-          </div>
-        </button>
-      </div>
-      <div className="bg-hunterGreen w-full h-[0.375rem] absolute bottom-0" />
-
-      {showMenu && (
-        <div className="bg-[#000000B2] w-full h-full flex justify-end fixed top-[4.25rem]">
-          <div className="bg-ivory w-[14.9375rem] h-full relative p-[1.31rem]">
-            <h1 className="text-scary-forest font-lato text-sm font-normal uppercase mt-[1.5rem]">
-              WELCOME
-            </h1>
-            <Link
-              href="/"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              Home
-            </Link>
-
-            <h1 className="text-scary-forest font-lato text-sm font-normal uppercase mt-[2.12rem]">
-              VISIT
-            </h1>
-            <Link
-              href="/hoursAdmissionPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              Hours & Location
-            </Link>
-            <Link
-              href="/siteMapPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              Site Maps
-            </Link>
-
-            <h1 className="text-scary-forest font-lato text-sm font-normal uppercase mt-[2.13rem]">
-              LEARN & EXPLORE
-            </h1>
-            <Link
-              href="/featuredToursPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              Virtual Tours
-            </Link>
-            <Link
-              href="/spotlightPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              Wildlife Spotlights
-            </Link>
-            <Link
-              href="/newsFeedPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
-              News Feed
-            </Link>
->>>>>>> e2ff808 (merge resolved)
           </div>
         </div>
       )}