diff --git a/src/Logo.svg b/public/Logo.svg similarity index 100% rename from src/Logo.svg rename to public/Logo.svg diff --git a/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx b/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx index 0657248..056018b 100644 --- a/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx +++ b/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx @@ -26,12 +26,12 @@ const DeleteEventModal = ({ isOpen, onClose, deleteItemId, setDataShouldRevalida - Confirm Delete + Remove Event? - Are you sure you want to delete this row? + Are you sure you want to delete this event? You cannot undo this action afterward. - - + + diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx index 8ab3a2c..d53032a 100644 --- a/src/components/Navbar/Navbar.jsx +++ b/src/components/Navbar/Navbar.jsx @@ -47,7 +47,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => { position={'sticky'} as={'nav'} > - + {makeNavTabs('Schedule', '/publishedSchedule')} {makeNavTabs('Catalog', '/catalog')} {makeNavTabs('Accounts', '/accounts')} @@ -68,7 +68,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => { position={'sticky'} as={'nav'} > - + {makeNavTabs('Schedule', '/publishedSchedule')} diff --git a/src/components/Planner/PlannerEvents/PlannerEvents.jsx b/src/components/Planner/PlannerEvents/PlannerEvents.jsx index 48fc1a4..83e5210 100644 --- a/src/components/Planner/PlannerEvents/PlannerEvents.jsx +++ b/src/components/Planner/PlannerEvents/PlannerEvents.jsx @@ -128,9 +128,8 @@ const PlannerEvents = ({ onClose }) => { isDisabled={!plannedEvents.length} onClick={closeModal} > - Finish Day + Save and Exit - diff --git a/src/pages/PublishedSchedule/PublishedSchedule.jsx b/src/pages/PublishedSchedule/PublishedSchedule.jsx index e825ffe..9dd35a8 100644 --- a/src/pages/PublishedSchedule/PublishedSchedule.jsx +++ b/src/pages/PublishedSchedule/PublishedSchedule.jsx @@ -4,7 +4,7 @@ import AUTH_ROLES from '../../utils/auth_config.js'; import { useAuthContext } from '../../common/AuthContext.jsx'; import { useEffect, useState } from 'react'; -const { ADMIN_ROLE, USER_ROLE } = AUTH_ROLES.AUTH_ROLES; +const { ADMIN_ROLE } = AUTH_ROLES.AUTH_ROLES; import { Box, Select, Text } from '@chakra-ui/react'; const PublishedSchedule = () => { @@ -38,7 +38,7 @@ const PublishedSchedule = () => { data.unshift(curSeason); } - setSelectedSeason(currentUser.type === USER_ROLE ? curSeason : data[0]); // We assume the current season is the first one in the list + setSelectedSeason(curSeason); const seasonOrder = ['Fall', 'Summer', 'Spring']; data.sort((a, b) => { @@ -54,7 +54,7 @@ const PublishedSchedule = () => { }; renderTable(); - }, [currentUser]); + }, [currentUser, curSeason]); //update chakra table container accordingly return (