83 final day planner adjustments (#91)

* finished? * fixed one day off bug? --------- Co-authored-by: chloecheng8 <[email protected]> Co-authored-by: ThatMegamind <[email protected]> Co-authored-by: Cheryl Chen <[email protected]> Co-authored-by: michellelin1 <[email protected]>
ctc-uci · Apr 29, 2024 · 54542b4 · 54542b4
1 parent d15e24c
commit 54542b4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/components/AddEventToPublishedScheduleForm/AddEventToPublishedScheduleForm.jsx b/src/components/AddEventToPublishedScheduleForm/AddEventToPublishedScheduleForm.jsx
@@ -169,7 +169,8 @@ const AddEventToPublishedScheduleForm = ({ closeForm }) => {
       variant: 'subtle',
       position: 'top-right',
       containerStyle: {
-        mt: '6rem',
+        mt: '3rem',
+        mr: '2rem'
       },
       duration: 3000,
       isClosable: true,

diff --git a/src/components/Catalog/CatalogTable.jsx b/src/components/Catalog/CatalogTable.jsx
@@ -130,7 +130,8 @@ const CatalogTable = ({ tableData, handleActionClick, onDayPlanner, setCurrEvent
             :
               <Td>
                 <IconButton
-                  color="gray.400"
+                  fontSize='24px'
+                  color="gray.500"
                   backgroundColor="transparent"
                   p="0.5rem"
                   h="fit-content"

diff --git a/src/components/Planner/PlannerEvents/PlannerEvents.jsx b/src/components/Planner/PlannerEvents/PlannerEvents.jsx
@@ -24,13 +24,18 @@ const PlannerEvents = ({ onClose }) => {
   const [dataShouldRevalidate, setShouldDataRevalidate] = useState(false);
   const plannedEvents = plannedEventsContext[0];
 
+  const getUTCDate = (eventDate) => {
+    const utcDate = new Date(eventDate);
+    return new Date(utcDate.getTime() + utcDate.getTimezoneOffset() * 60000);
+  }
+
   const getDayData = async () => {
     try {
       // console.log('getDayData');
       const response = await NPOBackend.get(`/day/${dayId}`);
       const responseData = response.data[0];
       const [datePart] = responseData.eventDate.split('T');
-      const dateObj = new Date(responseData.eventDate);
+      const dateObj = getUTCDate(responseData.eventDate);
       // console.log(dateObj);
       setDateHeader(dateObj.toLocaleDateString({ year: 'numeric', month: 'short', day: '2-digit' }));
       setDayData({id: responseData.id, eventDate: datePart, location: responseData.location, details: responseData.notes});

diff --git a/src/pages/PublishedSchedule/PublishedSchedule.jsx b/src/pages/PublishedSchedule/PublishedSchedule.jsx
@@ -38,7 +38,9 @@ const PublishedSchedule = () => {
         data.unshift(curSeason);
       }
 
-      setSelectedSeason(curSeason);
+      if (selectedSeason === '') {
+        setSelectedSeason(curSeason);
+      }
 
       const seasonOrder = ['Fall', 'Summer', 'Spring'];
       data.sort((a, b) => {
@@ -54,7 +56,7 @@ const PublishedSchedule = () => {
 
     };
     renderTable();
-  }, [currentUser, curSeason]);
+  }, [currentUser, curSeason, allSeasons]);
 
   //update chakra table container accordingly
   return (