From 9ea59b0f74601579fe110607e5e5c76c95cc6b32 Mon Sep 17 00:00:00 2001
From: ctc-devops <90984711+ctc-devops@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:58:06 -0700
Subject: [PATCH 1/4] Create a pull trequest for branch 73-Bug-Batch-3


From 8eb5464d5502ae387834542f7361420d695c4ff6 Mon Sep 17 00:00:00 2001
From: Lana Ramadan <lanamramadan@gmail.com>
Date: Tue, 9 Apr 2024 12:23:03 -0700
Subject: [PATCH 2/4] Bug fixes

---
 {src => public}/Logo.svg                                     | 0
 src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx | 4 ++--
 src/components/Navbar/Navbar.jsx                             | 4 ++--
 src/components/Planner/PlannerEvents/PlannerEvents.jsx       | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename {src => public}/Logo.svg (100%)

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..a0a059a 100644
--- a/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
+++ b/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
@@ -30,8 +30,8 @@ const DeleteEventModal = ({ isOpen, onClose, deleteItemId, setDataShouldRevalida
         <ModalCloseButton />
         <ModalBody>Are you sure you want to delete this row?</ModalBody>
         <ModalFooter>
-          <Button onClick={() => handleConfirmDelete(deleteItemId)}>Delete</Button>
-          <Button onClick={onClose}>Cancel</Button>
+          <Button onClick={onClose} mr={2}>Cancel</Button>
+          <Button onClick={() => handleConfirmDelete(deleteItemId)} colorScheme='red'>Delete</Button>
         </ModalFooter>
       </ModalContent>
     </Modal>
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'}
       >
-        <Image src="src/Logo.svg" marginRight={'48px'}></Image>
+        <Image src="/Logo.svg" marginRight={'48px'}></Image>
         {makeNavTabs('Schedule', '/publishedSchedule')}
         {makeNavTabs('Catalog', '/catalog')}
         {makeNavTabs('Accounts', '/accounts')}
@@ -68,7 +68,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => {
       position={'sticky'}
       as={'nav'}
     >
-      <Image src="src/Logo.svg" marginRight={'48px'}></Image>
+      <Image src="/Logo.svg" marginRight={'48px'}></Image>
       {makeNavTabs('Schedule', '/publishedSchedule')}
 
       <Spacer />
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
             </Button>
-            <Button onClick={closeModal} mr="1rem">Cancel</Button>
           </Flex>
         </Box>
       </div>

From ef455252b0338b8133b48ac54d85ad999d52bb64 Mon Sep 17 00:00:00 2001
From: Lana Ramadan <lanamramadan@gmail.com>
Date: Tue, 9 Apr 2024 12:32:33 -0700
Subject: [PATCH 3/4] Fixed bug in published schedule where season selected was
 incorrect

---
 src/pages/PublishedSchedule/PublishedSchedule.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/PublishedSchedule/PublishedSchedule.jsx b/src/pages/PublishedSchedule/PublishedSchedule.jsx
index 839c550..b076778 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 (

From 77d942081b59dee8fa85b18d0e04c87ee176857e Mon Sep 17 00:00:00 2001
From: ThatMegamind <udongenius@hotmail.com>
Date: Tue, 16 Apr 2024 13:05:15 -0700
Subject: [PATCH 4/4] modal message changes

---
 src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx b/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
index a0a059a..056018b 100644
--- a/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
+++ b/src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
@@ -26,9 +26,9 @@ const DeleteEventModal = ({ isOpen, onClose, deleteItemId, setDataShouldRevalida
     <Modal isOpen={isOpen} onClose={onClose}>
       <ModalOverlay />
       <ModalContent>
-        <ModalHeader>Confirm Delete</ModalHeader>
+        <ModalHeader>Remove Event?</ModalHeader>
         <ModalCloseButton />
-        <ModalBody>Are you sure you want to delete this row?</ModalBody>
+        <ModalBody>Are you sure you want to delete this event? You cannot undo this action afterward.</ModalBody>
         <ModalFooter>
           <Button onClick={onClose} mr={2}>Cancel</Button>
           <Button onClick={() => handleConfirmDelete(deleteItemId)} colorScheme='red'>Delete</Button>