diff --git a/src/components/Checkin/VolunteerEventsTable.jsx b/src/components/Checkin/VolunteerEventsTable.jsx index 532f591..e07e01a 100644 --- a/src/components/Checkin/VolunteerEventsTable.jsx +++ b/src/components/Checkin/VolunteerEventsTable.jsx @@ -101,7 +101,7 @@ const RenderVolunteerRow = ({ volunteer, changeIsCheckedIn, isCheckinPage, isVie justifyContent={'center'} > - + {status} diff --git a/src/components/Events/EventFilteredGrid.jsx b/src/components/Events/EventFilteredGrid.jsx index cb6cdf4..dbdaf00 100644 --- a/src/components/Events/EventFilteredGrid.jsx +++ b/src/components/Events/EventFilteredGrid.jsx @@ -10,7 +10,7 @@ import { Heading, HStack, } from '@chakra-ui/react'; -import { useEffect, useState, useContext } from 'react'; +import { useEffect, useState, useContext, useCallback } from 'react'; import { SearchIcon } from '@chakra-ui/icons'; import PropTypes from 'prop-types'; @@ -32,9 +32,11 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt const [date, setDate] = useState(''); const [fuse, setFuse] = useState(); + const { user } = useContext(UserContext); + + const getEvents = useCallback(async () => { - const getEvents = async () => { try { let eventsData; if (onlyUnregistered) { @@ -52,7 +54,7 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt } catch (err) { console.log(`Error getting events: `, err.message); } - }; + }, []); const getLocation = data => { let location = []; @@ -85,7 +87,7 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt useEffect(() => { getEvents(); - }, []); + }, [getEvents]); const handleLocationChange = event => { const selectedLocation = event.target.value; @@ -130,16 +132,16 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt result = fuseResult.map(item => item.item); } else result = events; setDisplayEvents(result); - }, [name, location, date, fuse]); + }, [name, location, date, fuse, events]); return ( <> - {/* Flag: Navbar responsive (Use 15%) */} + {/* Flag: Navbar responsive (Use 15%) */} { const [featuredEvents, setFeaturedEvents] = useState([]); @@ -29,6 +30,15 @@ const FeaturedDashboard = ({ }; useEffect(() => { + const getEvents = async () => { + try { + const eventsData = await Backend.get('/events'); + setFeaturedEvents(eventsData.data.slice(0, numEvents)); + } catch (err) { + console.log(`Error getting events: `, err.message); + } + }; + getEvents(); }, [numEvents]); @@ -38,7 +48,7 @@ const FeaturedDashboard = ({ flexDir={'column'} alignItems={'center'} bg="#E6EAEF" - ml={{ base: '3vw', xl: '15rem' }} + ml={{ base: '3vw', xl: isSideBarOpen ? '22%' : '15%' }} mr={{ base: '3vw' }} pt={4} > @@ -132,6 +142,7 @@ FeaturedDashboard.propTypes = { setCurrentEventId: PropTypes.func.isRequired, setIsOpen: PropTypes.func.isRequired, setShowOpenDrawerButton: PropTypes.func.isRequired, + isSideBarOpen: PropTypes.bool }; export default FeaturedDashboard; diff --git a/src/components/Events/ImpactSummary.jsx b/src/components/Events/ImpactSummary.jsx index 47d9bf9..54bb27f 100644 --- a/src/components/Events/ImpactSummary.jsx +++ b/src/components/Events/ImpactSummary.jsx @@ -137,7 +137,7 @@ const ImpactSummary = () => { filename="./data.csv" headers={header} > - Export Data + Export All Data {/* {eventIdData.map((eventData) => { filename="./data.csv" headers={header} > - Export Data + Export Past Events Data diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx index c043d81..c214363 100644 --- a/src/components/Navbar/Navbar.jsx +++ b/src/components/Navbar/Navbar.jsx @@ -76,7 +76,7 @@ const Navbar = () => { useEffect(() => { updateUser(); - }, []); + }, [updateUser]); // Change the paths for each button since these might change const homePath = '/'; @@ -102,7 +102,7 @@ const Navbar = () => { <> {/* Box for entire navbar */} {/* Flag: Navbar responsive (Use 15%) */} - + {/* Box for entire nabar with coloring */} { alignItems: 'center', gap: '10px', padding: '12px', - marginLeft: '14px', - marginRight: '13px', - marginBottom: '18px', - borderRadius: '12px', + // marginLeft: '14px', + // marginRight: '13px', + // marginBottom: '18px', + // borderRadius: '12px', backgroundColor: '#FFF', border: '1px', + width: 'full' }} onClick={e => { e.preventDefault(); @@ -261,29 +262,30 @@ const Navbar = () => { href="#" > {/* User image */} - + {/* */} - + {/* */} {/* User name */} { setEventData(data)); getEventDataVolunteerId(user?.id, eventId).then(data => setEventDataVolunteer(data)); // setDateObj(new Date(Date.parse(eventData.date))) - }, [eventId]); + }, [eventId, user?.id]); function formatDate(dateString) { const months = [ @@ -87,12 +86,11 @@ const VolunteerSideViewDrawer = ({ eventId, isOpen, onClose, setShowOpenDrawerBu - diff --git a/src/pages/AdminPage.jsx b/src/pages/AdminPage.jsx index be2149a..cf33061 100644 --- a/src/pages/AdminPage.jsx +++ b/src/pages/AdminPage.jsx @@ -94,7 +94,7 @@ export default function AdminPage() { )); return ( - + Administrators diff --git a/src/pages/ArchivedEvents.jsx b/src/pages/ArchivedEvents.jsx index ee8f9a7..2249cba 100644 --- a/src/pages/ArchivedEvents.jsx +++ b/src/pages/ArchivedEvents.jsx @@ -80,7 +80,7 @@ const ArchivedEvents = () => { }, []); return ( - + {/* Overall Imapct Card */} Overall Impact diff --git a/src/pages/CheckinPage.jsx b/src/pages/CheckinPage.jsx index a894bf7..d0110b2 100644 --- a/src/pages/CheckinPage.jsx +++ b/src/pages/CheckinPage.jsx @@ -185,7 +185,7 @@ const CheckinPage = () => { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} > diff --git a/src/pages/DummyVolunteerProfilePage.jsx b/src/pages/DummyVolunteerProfilePage.jsx index 9847f96..dcdcee5 100644 --- a/src/pages/DummyVolunteerProfilePage.jsx +++ b/src/pages/DummyVolunteerProfilePage.jsx @@ -18,7 +18,7 @@ import SettingsField from '../components/DummyVolunteerProfile/SettingsField'; export const DummyVolunteerProfilePage = () => { return ( - + {/* Profile Card and Account Information */} diff --git a/src/pages/EventPage.jsx b/src/pages/EventPage.jsx index a3fa6d6..5b19c9f 100644 --- a/src/pages/EventPage.jsx +++ b/src/pages/EventPage.jsx @@ -257,7 +257,7 @@ const Events = () => { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} py={10} > { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} py={10} > diff --git a/src/pages/InputDataPage.jsx b/src/pages/InputDataPage.jsx index 0262b5f..0bfbd66 100644 --- a/src/pages/InputDataPage.jsx +++ b/src/pages/InputDataPage.jsx @@ -146,7 +146,7 @@ const InputDataPage = () => { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} px={5} > diff --git a/src/pages/PastEvents.jsx b/src/pages/PastEvents.jsx index 24f0c19..32ec5e2 100644 --- a/src/pages/PastEvents.jsx +++ b/src/pages/PastEvents.jsx @@ -86,7 +86,7 @@ const PastEvents = () => { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} py={10} > diff --git a/src/pages/ProfilePage.jsx b/src/pages/ProfilePage.jsx index 9962157..40e7c9e 100644 --- a/src/pages/ProfilePage.jsx +++ b/src/pages/ProfilePage.jsx @@ -135,7 +135,7 @@ export const ProfilePage = () => { { alignItems={'center'} bg="#E6EAEF" minH="100vh" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} > diff --git a/src/pages/VolunteerEventPage.jsx b/src/pages/VolunteerEventPage.jsx index efb35d5..1482634 100644 --- a/src/pages/VolunteerEventPage.jsx +++ b/src/pages/VolunteerEventPage.jsx @@ -35,7 +35,7 @@ const VolunteerEventPage = () => { flexDir={'row'} alignItems={'center'} bg="#E6EAEF" - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} pt={6} px={6} justifyContent={'space-between'} @@ -90,7 +90,7 @@ const VolunteerEventPage = () => { /> {/* Drawer Component */} - {breakpoint == 'base' ? ( + {breakpoint != 'xl' ? ( { const { user } = useContext(UserContext); - const getEvents = async () => { + const getEvents = useCallback(async () => { try { const eventsData = await Backend.get(`data/registered/${user.id}`); setEvents(eventsData.data); @@ -51,7 +51,7 @@ const VolunteerHomePage = () => { } catch (err) { console.log(`Error getting events: `, err.message); } - }; + }, [user]); const eventCards = displayEvents.map(element => ( { if (user) { getEvents(); } - }, [user]); + }, [getEvents, user]); useEffect(() => { if (!fuse) { @@ -111,7 +111,7 @@ const VolunteerHomePage = () => { bg="#E6EAEF" minH="100vh" width={'100%'} - ml={{ base: '0', xl: '15rem' }} + ml={{ base: '0', xl: '15%' }} py={10} > @@ -229,7 +229,7 @@ const VolunteerHomePage = () => { - {breakpoint == 'base' ? ( + {breakpoint != 'xl' ? ( { return ( <> {/* Registered + Checked-In */} - + { justifyContent={{ base: 'center', lg: 'start' }} alignItems={'end'} > - */} +