Merge branch 'justin-exhibit-redo' of github.com:calblueprint/phs int…

…o justin-exhibit-redo
calblueprint · May 22, 2024 · bbe6f7f · bbe6f7f
2 parents 3158aa8 + dfc350e
commit bbe6f7f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 45 deletions.
diff --git a/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx b/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx
@@ -5,8 +5,6 @@ import Link from 'next/link';
 import Image from 'next/image';
 import { ExhibitWithCategoryRow, TourRow } from '../../../types/types';
 import { fetchImagesForTour } from '../../../supabase/media/queries';
-import { fetchExhibitImage } from '../../../supabase/exhibits/queries';
-import { CloseIcon } from '../../../../public/icons';
 
 interface DisplayCardProps {
   tour: TourRow | ExhibitWithCategoryRow;
@@ -64,7 +62,6 @@ function DisplayPreviewCard({
         // const imageObj = await fetchExhibitImage(tour.id);
         // if (imageObj) {
         imageUrl = tour.image;
-        console.log(tour);
         // }
         displayName = tour.category;
       }

diff --git a/src/components/userComponents/SiteMap/SiteMap.tsx b/src/components/userComponents/SiteMap/SiteMap.tsx
@@ -7,8 +7,8 @@ import { renderToStaticMarkup } from 'react-dom/server';
 
 import { fetchAllSpotlights } from '../../../supabase/tours/queries';
 import { ExhibitWithCategoryRow, TourRow } from '../../../types/types';
-
 import Control from './Control';
+import DisplayPreviewCard from './DisplayPreviewCard';
 import { fetchAllExhibits } from '../../../supabase/exhibits/queries';
 import { getCategoryColor1 } from '../../../supabase/category/queries';
 import RecenterMap from './MapInteractionHandler';

diff --git a/src/components/userComponents/navBar/navBar.tsx b/src/components/userComponents/navBar/navBar.tsx
@@ -1,13 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import React, { useState, useEffect } from 'react';
 import Link from 'next/link';
 import { HamburgerMenu, CloseMenu } from '../../../../public/icons';
-import { HamburgerMenu, CloseMenu } from '../../../../public/icons';
 
 /**
  * @returns The navigation bar for the web app
  */
-export default function NavBar() {
 export default function NavBar() {
   const [showMenu, setShowMenu] = useState(false);
 
@@ -19,14 +16,6 @@ export default function NavBar() {
     }
   }, [showMenu]);
 
-  useEffect(() => {
-    if (showMenu) {
-      document.body.style.overflow = 'hidden';
-    } else {
-      document.body.style.overflow = '';
-    }
-  }, [showMenu]);
-
   /**
    * Toggles the side menu
    */
@@ -35,20 +24,6 @@ export default function NavBar() {
   }
 
   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">
-        <Link href="/">
-          <img
-            src="https://qkkuacqtcsfjbnzmxmhk.supabase.co/storage/v1/object/public/images/PHSLogo.jpg"
-            alt="PHSLogo"
-            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"
     <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">
         <Link href="/">
@@ -69,24 +44,9 @@ export default function NavBar() {
           </div>
         </button>
       </div>
-      <div className="bg-hunterGreen w-full h-[0.375rem] absolute bottom-0" />
-          <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]"
-            >
         <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]">
@@ -143,7 +103,6 @@ export default function NavBar() {
               News Feed
             </Link>
           </div>
-          </div>
         </div>
       )}
     </nav>