Merge branch 'justinxue/phs-49-exhibit-page' of github.com:calbluepri…

…nt/phs into justinxue/phs-49-exhibit-page
calblueprint · May 22, 2024 · 5cd000c · 5cd000c
2 parents 4e4acf5 + 6a30121
commit 5cd000c
Show file tree

Hide file tree

Showing 6 changed files with 375 additions and 358 deletions.
diff --git a/src/components/userComponents/BackButton/page.tsx b/src/components/userComponents/BackButton/page.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { BackArrow } from '../../../../public/icons';
 
 /**
  * @param evt on click of button
@@ -16,9 +15,23 @@ function goBack(evt: React.SyntheticEvent) {
  */
 export default function BackButton() {
   return (
-    <button type="button" onClick={goBack} className="text-scary-forest">
+    <button type="button" onClick={goBack}>
       {' '}
-      <BackArrow />
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="20"
+        height="20"
+        viewBox="0 0 20 20"
+        fill="none"
+      >
+        <path
+          className="stroke-scary-forest active:stroke-[#223a1d]"
+          d="M17.5 10H2.5M2.5 10L6.66667 14.1667M2.5 10L6.66667 5.83337"
+          strokeWidth="1.65"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </svg>
     </button>
   );
 }
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
@@ -90,10 +90,22 @@ export default function NavBar() {
             >
               Wildlife Spotlights
             </Link>
-            <Link
-              href="/newsFeedPage"
-              className="text-night font-lato text-lg font-bold block relative left-4 mt-[1.25rem]"
-            >
+            <Link href="/exhibitsPage" className="block mb-2 text-black">
+              Exhibits
+            </Link>
+            <Link href="/qrCodeTourPage" className="block text-black">
+              QR Code Tour
+            </Link>
+            <Link href="/qrCodeScanner" className="block text-black">
+              QR Scanner
+            </Link>
+          </ul>
+          <h1 className="text-xl text-black font-bold p-4">LEARN & EXPLORE</h1>
+          <ul className="p-4">
+            <Link href="/collectionsPage" className="block mb-2 text-black">
+              Collections
+            </Link>
+            <Link href="/newsFeedPage" className="block mb-2 text-black">
               News Feed
             </Link>
           </div>

diff --git a/src/supabase/exhibits/queries.tsx b/src/supabase/exhibits/queries.tsx
@@ -40,7 +40,7 @@ export async function fetchExhibitImage(
   exhibitId: string,
 ): Promise<{ image: string }> {
   const { data, error } = await supabase
-    .from('exhibits')
+    .from('categories')
     .select('image')
     .eq('id', exhibitId)
     .single();