diff --git a/src/app/exhibits/page.tsx b/src/app/exhibits/page.tsx index bb7300ff..9ce51e54 100644 --- a/src/app/exhibits/page.tsx +++ b/src/app/exhibits/page.tsx @@ -8,6 +8,7 @@ import { fetchAllCategories } from '../../supabase/category/queries'; import Exhibit from '../../components/userComponents/Exhibit/Exhibit'; import BackButton from '../../components/userComponents/BackButton/page'; import { useWebDeviceDetection } from '../../context/WindowWidthContext/WindowWidthContext'; +import Footer from '../../components/userComponents/Footer/Footer'; /** * @returns exhibit page @@ -39,7 +40,7 @@ function App() { const y = element.getBoundingClientRect().top + window.scrollY + yOffset; // check on this offset later - window.scrollTo({ top: y, behavior: 'instant' }); + window.scrollTo({ top: y, behavior: 'smooth' }); } }, 1000); } @@ -80,11 +81,11 @@ function App() { image={exhibit.image || ''} key={exhibit.id} id={exhibit.id} - web={false} /> ))} + )} {isWebDevice && ( @@ -128,11 +129,11 @@ function App() { image={exhibit.image || ''} key={exhibit.id} id={exhibit.id} - web /> ))} + )} diff --git a/src/app/hours-and-location/page.tsx b/src/app/hours-and-location/page.tsx index 35e4ad07..2a64e5d8 100644 --- a/src/app/hours-and-location/page.tsx +++ b/src/app/hours-and-location/page.tsx @@ -5,6 +5,7 @@ import { FiCalendar, FiCompass } from 'react-icons/fi'; import Link from 'next/link'; import NavBar from '../../components/userComponents/NavBar/NavBar'; import { BackArrow } from '../../../public/icons'; +import Footer from '../../components/userComponents/Footer/Footer'; /** * @returns The hours and location page. @@ -89,6 +90,7 @@ export default function HoursLocationPage() { + ) : (
WELCOME TO
-WELCOME TO
+{tour.stop_count} stops
+{tour.stop_count} stops
++ {tourDisplay.display_order != null + ? tourDisplay.display_order + 1 + : ''} + .{' '} + { + displays.find( + display => display.id === tourDisplay.display_id, + )?.title + } +
+- {tourDisplay.display_order != null - ? tourDisplay.display_order + 1 - : ''} - .{' '} - { - displays.find( - display => display.id === tourDisplay.display_id, - )?.title - } -
-- Home / Virtual Tours -
-- Take a virtual sneak peek behind the scenes at our Wildlife Care - Center. Here you will find outside enclosures where sick, - injured, and orphaned wildlife recuperate and acclimate before - being released back into their natural habitat. Choose your - favorite animal to start the tour. -
- -+ Home / Virtual + Tours +
++ Take a virtual sneak peek behind the scenes at our Wildlife + Care Center. Here you will find outside enclosures where sick, + injured, and orphaned wildlife recuperate and acclimate before + being released back into their natural habitat. Choose your + favorite animal to start the tour. +
+ +- {tour.stop_count} stops -
-+ {tour.stop_count} stops +
+- Take a virtual sneak peek behind the scenes at our Wildlife Care - Center. Here you will find outside enclosures where sick, injured, - and orphaned wildlife recuperate and acclimate before being - released back into their natural habitat. Choose your favorite - animal to start the tour. -
++ Take a virtual sneak peek behind the scenes at our Wildlife Care + Center. Here you will find outside enclosures where sick, + injured, and orphaned wildlife recuperate and acclimate before + being released back into their natural habitat. Choose your + favorite animal to start the tour. +
-- {tour.stop_count} stops -
-+ {tour.stop_count} stops +
+- Wildlife Spotlights provide answers to many frequently asked - questions. You’ll find information on topics ranging from what - to do if you encounter a baby bird lost from its nest to how to - deal with nuisance animals in your yard. -
-+ Wildlife Spotlights provide answers to many frequently asked + questions. You’ll find information on topics ranging from what + to do if you encounter a baby bird lost from its nest to how + to deal with nuisance animals in your yard. +
+- {spotlight.preview_text} -
- -+ {spotlight.preview_text} +
+ +- Wildlife Spotlights provide answers to many frequently asked - questions. You’ll find information on topics ranging from what - to do if you encounter a baby bird lost from its nest to how to - deal with nuisance animals in your yard. -
-+ Wildlife Spotlights provide answers to many frequently asked + questions. You’ll find information on topics ranging from what + to do if you encounter a baby bird lost from its nest to how + to deal with nuisance animals in your yard. +
+- {spotlight.preview_text} -
- -+ {spotlight.preview_text} +
+ +SUBSCRIBE TO OUR NEWSLETTER - +
@@ -83,7 +83,7 @@ function Input({ required id="nameInput" onChange={handleNameChange} - className={`focus:border-ivory valid:border-asparagus font-Lato text-sm bg-hunterGreen border border-silver rounded-md pl-3 w-[20.125rem] h-[3.125rem] items-center ${ + className={`focus:border-ivory valid:border-asparagus font-Lato text-sm bg-hunter-green border border-silver rounded-md pl-3 w-[20.125rem] h-[3.125rem] items-center ${ inputValueName ? 'text-silver' : 'text-silver' }`} /> @@ -94,7 +94,7 @@ function Input({ id="emailInput" required onChange={handleEmailChange} - className={`focus:border-ivory valid:border-asparagus font-Lato text-sm bg-hunterGreen border border-silver rounded-md pl-3 w-[20.125rem] h-[3.125rem] items-center ${ + className={`focus:border-ivory valid:border-asparagus font-Lato text-sm bg-hunter-green border border-silver rounded-md pl-3 w-[20.125rem] h-[3.125rem] items-center ${ inputValueEmail ? 'text-silver' : 'text-silver' }`} /> @@ -106,7 +106,7 @@ function Input({ Subscribe {showError && ( -
Hours & Locations
{' '} - + {' '}Site Maps
{' '} - + {' '} -Featured Tours
{' '} +Virtual Tours
{' '}Exhibits
{' '} - + {' '}News
{' '} - + {' '}Wildlife Spotlights
{' '} @@ -182,7 +182,7 @@ function Input({VISIT
- + {' '}Hours & Location
- + {' '}Site Maps
- + {' '} -Featured Tours
{' '} +Virtual Tours
{' '}LEARN & EXPLORE
- + {' '}Exhibits
- + {' '}News
{' '} - + {' '}Wildlife Spotlights
{' '} @@ -305,8 +305,7 @@ function Input({ } /** - * @param root0 footer element thats at the bottom of every page. renders differentally based on whether its mobile or web. - * @returns an email pop up. + * @returns the footer component seen on bottom of every page * if no email is entered and the user clicks the submit button, an error message will pop up. * if an invalid email is entered and the user clicks the submit button, another error message will pop up. * otherwise, if a valid email is submitted and properly subscribed, another pop up will appear that will tell the user they are subscribed and direct them to another page. diff --git a/src/components/userComponents/emailPopup/page.tsx b/src/components/userComponents/emailPopup/page.tsx deleted file mode 100644 index af4b9353..00000000 --- a/src/components/userComponents/emailPopup/page.tsx +++ /dev/null @@ -1,211 +0,0 @@ -'use client'; - -import React, { ChangeEventHandler, Fragment, useState } from 'react'; -import { Dialog, Transition } from '@headlessui/react'; -import { PiPaperPlaneTiltBold, PiSealCheck } from 'react-icons/pi'; -import { VscClose } from 'react-icons/vsc'; -import { BiErrorCircle } from 'react-icons/bi'; -import Link from 'next/link'; -import supabase from '../../../supabase/client'; - -/** - * - * @param props - props - * @param props.backLink - the link to the page the user will be directed to after they subscribe - * @returns an email pop up. - */ -function EmailSuccess({ backLink }: { backLink: string }) { - return ( -- Your sign-up request was successful! Please check your email inbox to - confirm. -
-- Monthly updates on our work and involvement opportunities. -
-- {errorMsg} -
-