Remove comments

ctc-uci · May 12, 2024 · 6bbb37a · 6bbb37a
1 parent c858d05
commit 6bbb37a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/src/components/Events/EventFilteredGrid.jsx b/src/components/Events/EventFilteredGrid.jsx
@@ -20,7 +20,7 @@ import Fuse from 'fuse.js';
 
 import UserContext from '../../utils/UserContext';
 
-const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButton, isOpen, onlyRegistered=false }) => {
+const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButton, isOpen, onlyUnregistered=false }) => {
   const [events, setEvents] = useState([]);
   const [displayEvents, setDisplayEvents] = useState([]);
 
@@ -37,15 +37,14 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt
   const getEvents = async () => {
     try {
       let eventsData;
-      if (onlyRegistered) {
+      if (onlyUnregistered) {
         // Will show only registered events
-        eventsData = await Backend.get('/events/currentEvents');
+        eventsData = await Backend.get(`data/unregistered/${user.id}`);
       } else {
         // Will show all events, default / previous behavior
-        eventsData = await Backend.get(`data/unregistered/${user.id}`);
+        eventsData = await Backend.get('/events/currentEvents');
       }
       setEvents(eventsData.data);
-      // setDates();
       setLocations(getLocation(eventsData.data));
       setDates(getDate(eventsData.data));
       const options = { keys: ['name', 'date', 'location'], includeScore: true }; //use date and locaiton selected
@@ -130,7 +129,6 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt
       // result = fuseResult.filter(item => item.score <= 0.5).map(item => item.item);
       result = fuseResult.map(item => item.item);
     } else result = events;
-    // result.map((e) -> e.)
     setDisplayEvents(result);
   }, [name, location, date, fuse]);
 
@@ -208,7 +206,6 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt
                     </Select>
                     <Select
                       bg={'white'}
-                      //   icon={<Icon as={CalendarIcon}/>}
                       onChange={handleDateChange}
                       placeholder="Select Date"
                       border={'2px solid var(--Secondary-Button-Color, #EFEFEF)'}
@@ -248,7 +245,6 @@ const EventFilteredGrid = ({ setCurrentEventId, setIsOpen, setShowOpenDrawerButt
                   <EventCard
                     {...element}
                     isSelected={selectedEvents.includes(element.id)}
-                    // showSelect={showSelect}
                     handleCheckboxChange={handleCheckboxChange}
                     getEvents={getEvents}
                     hasBorder={true}
@@ -268,7 +264,7 @@ EventFilteredGrid.propTypes = {
   setIsOpen: PropTypes.func.isRequired,
   setShowOpenDrawerButton: PropTypes.func.isRequired,
   isOpen: PropTypes.bool.isRequired,
-  onlyRegistered: PropTypes.bool
+  onlyUnregistered: PropTypes.bool
 };
 
 export default EventFilteredGrid;
diff --git a/src/components/VolunteerSideView.jsx b/src/components/VolunteerSideView.jsx
@@ -29,7 +29,6 @@ import { getEventDataVolunteerId } from '../utils/eventsUtils';
 const VolunteerSideView = ({ eventId, onClose, setShowOpenDrawerButton }) => {
   const [eventData, setEventData] = useState();
   const [isReadMore, setIsReadMore] = useState(false);
-  // const [calendarSelected, setCalendarSelected] = useState(false);
   const [mapSelected, setMapSelected] = useState(false);
   const [dateObj, setDateObj] = useState(new Date());
 
@@ -43,12 +42,6 @@ const VolunteerSideView = ({ eventId, onClose, setShowOpenDrawerButton }) => {
   }, [eventData]);
   const [eventDataVolunteer, setEventDataVolunteer] = useState([]);
   const { user } = useContext(UserContext);
-  // console.log('users', user);
-  // console.log('eventid', eventDataVolunteer[0]);
-
-  // const [dateObj, setDateObj] = useState(new Date());
-  // const dateObj = new Date(Date.parse(eventData.date));
-  // console.log(eventData);
 
   const {
     isOpen: isRegistrationFlowOpen,

diff --git a/src/pages/VolunteerEventPage.jsx b/src/pages/VolunteerEventPage.jsx
@@ -7,7 +7,6 @@ import NavbarContext from '../utils/NavbarContext';
 import VolunteerSideView from '../components/VolunteerSideView.jsx';
 import { useBreakpoint, useDisclosure } from '@chakra-ui/react';
 import VolunteerSideViewDrawer from '../components/VolunteerSideViewDrawer.jsx';
-// import RegistrationFlowController from '../components/EventRegistration/RegistrationFlowController.jsx';
 
 const VolunteerEventPage = () => {
   const { isOpen: isDrawerOpen, onOpen: onDrawerOpen, onClose: onDrawerClose } = useDisclosure();
@@ -25,27 +24,11 @@ const VolunteerEventPage = () => {
     onDrawerOpen();
   };
 
-  // const handleClose = () => {
-  //   onDrawerClose();
-  // };
+
   console.log('test' + currentEventId);
-  // const {
-  //   isOpen: isRegistrationFlowOpen,
-  //   onOpen: onRegistrationFlowOpen,
-  //   onClose: onRegistrationFlowClose,
-  // } = useDisclosure({ defaultIsOpen: false });
 
   return (
     <Flex dir="column">
-      {/* controller */}
-      {/* <Button onClick={onRegistrationFlowOpen}>Open!</Button>
-      {isRegistrationFlowOpen && (
-        <RegistrationFlowController
-          isOpen={isRegistrationFlowOpen}
-          onClose={onRegistrationFlowClose}
-          eventId={currentEventId}
-        />
-      )} */}
       {/* <RegistrationModal /> */}
       <Box bg="#E6EAEF" flexGrow={1} minW="1px" minH={'100vh'}>
         <Flex