56 bug batch 1 (#63)

* added logo to navbar, changed website title (potentially fix low-res) * better quality aiss svg * clicking confirm confirms the event in the pub-sched database * updated toast description upon catalog event success --------- Co-authored-by: Alyssia Tan <[email protected]> Co-authored-by: Kristen Yee <[email protected]>
ctc-uci · Mar 21, 2024 · db42b46 · db42b46
1 parent 9ce3bb0
commit db42b46
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 15 deletions.
diff --git a/index.html b/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/src/Logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>AISS Schedule Planner</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.45.4",
     "react-html-email": "^3.0.0",
+    "react-icons": "^5.0.1",
     "react-router-dom": "^6.20.0",
     "react-script": "^2.0.5",
     "yup": "^1.3.2"

diff --git a/src/Logo.png b/src/Logo.png
diff --git a/src/Logo.svg b/src/Logo.svg
diff --git a/src/components/Catalog/CreateEventForm/CreateEventForm.jsx b/src/components/Catalog/CreateEventForm/CreateEventForm.jsx
@@ -46,33 +46,33 @@ const CreateEventForm = ({ eventData, setDataShouldRevalidate, closeModal }) =>
 
     // make post request to catalog backend route
     try {
-      let response;
-      let id;
+      // let response;
+      // let id;
       if (eventData) {
-        response = await NPOBackend.put(`/catalog/${eventData.id}`, {
+        await NPOBackend.put(`/catalog/${eventData.id}`, {
           host: host,
           title: title,
           eventType: eventType,
           subject: subject,
           description: description,
           year: year,
         });
-        id = response.data[0].id;
+        // id = response.data[0].id;
       } else {
-        response = await NPOBackend.post(`/catalog`, {
+        await NPOBackend.post(`/catalog`, {
           host: host,
           title: title,
           eventType: eventType,
           subject: subject,
           description: description,
           year: year,
         });
-        id = response.data.id;
+        // id = response.data.id;
       }
       reset();
       toast({
-        title: 'Event submitted!',
-        description: `Event has been submitted. ID: ${id}`,
+        title: 'Event has been added',
+        // description: `Event has been submitted. ID: ${id}`,
         status: 'success',
         variant: 'subtle',
         position: 'bottom',

diff --git a/src/components/Events/DailyEvent.jsx b/src/components/Events/DailyEvent.jsx
@@ -1,15 +1,36 @@
 import PropTypes from 'prop-types';
 import { Box, Flex, Text, Grid, Button } from '@chakra-ui/react';
+import { useState } from 'react';
+import { NPOBackend } from '../../utils/auth_utils.js';
 
-const DailyEvent = ({ startTime, endTime, eventTitle, location, confirmed }) => {
+const DailyEvent = ({ id, startTime, endTime, eventTitle, location, confirmed }) => {
   // console.log("CONFIRMED:" + confirmed);
+
+  const [confirmEvent, setConfirmEvent] = useState(confirmed);
+
   let border_color = '#2B93D1';
   let background_color = '#F7FAFC';
-  if (!confirmed) {
+  if (!confirmEvent) {
     border_color = '#F69052';
     background_color = '#FEF1DC';
   }
 
+  const handleConfirm = async () => {
+    const date = new Date();
+    try {
+      let response;
+      response = await NPOBackend.put(`/published-schedule/${id}`, {
+          confirmed: true,
+          confirmedOn: date,
+        }
+      );
+      console.log(response);
+      setConfirmEvent(true);
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    }
+  }
+
   return (
     <Box
       bg={background_color}
@@ -34,12 +55,12 @@ const DailyEvent = ({ startTime, endTime, eventTitle, location, confirmed }) =>
           </Grid>
         </Box>
 
-        {!confirmed ? (
+        {!confirmEvent ? (
           <Box w="15vh" alignItems="top">
             <Grid gap={2}>
               <div></div>
               <div></div>
-              <Button bg="#FBD38D" textColor="#2D3748" size="sm">
+              <Button bg="#FBD38D" textColor="#2D3748" size="sm" onClick={handleConfirm}>
                 Confirm
               </Button>
             </Grid>
@@ -53,6 +74,7 @@ const DailyEvent = ({ startTime, endTime, eventTitle, location, confirmed }) =>
 };
 
 DailyEvent.propTypes = {
+  id: PropTypes.number.isRequired,
   startTime: PropTypes.string.isRequired,
   endTime: PropTypes.string.isRequired,
   eventTitle: PropTypes.string.isRequired,

diff --git a/src/components/Events/Events.jsx b/src/components/Events/Events.jsx
@@ -23,6 +23,7 @@ const Events = ( {eventData, location} ) => {
             {eventData.map(item => (
                 <DailyEvent
                     key={item.id}
+                    id={item.id}
                     startTime={formatDate(item.startTime)}
                     endTime={formatDate(item.endTime)}
                     eventTitle={item.title}

diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
@@ -48,7 +48,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => {
       >
         <HStack>
           <Flex align={'center'}>
-            <Image src="../../../aiss-logo.png" marginRight={'48px'}></Image>
+            <Image src="src/Logo.svg" marginRight={'48px'}></Image>
             {makeNavTabs('Schedule', '/publishedSchedule')}
             {makeNavTabs('Catalog', '/catalog')}
           </Flex>