Skip to content

Commit

Permalink
Merge pull request #91 from ctc-uci/90_Kaitlin_Sindhuja
Browse files Browse the repository at this point in the history
90 kaitlin sindhuja
  • Loading branch information
theNatePi authored Feb 24, 2025
2 parents a7ea189 + bbef9ed commit 201349f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 24 deletions.
10 changes: 1 addition & 9 deletions client/src/components/bookings/EditBooking.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {
ModalCloseButton,
useDisclosure,
Checkbox,
// Lorem,
} from "@chakra-ui/react";

import {InfoIconPurple} from '../../assets/InfoIconPurple';
Expand Down Expand Up @@ -95,21 +94,14 @@ const {
useEffect(() => {
getInitialEventData();
getInitialLocations();
printData();
}, []);

const printData = () => {
console.log(eventName);
};

const exit = () => {
navigate('/programs/' + eventId);
};

const getInitialEventData = async () => {
const eventResponse = await backend.get(`/bookings/displayData/${id}`);
console.log(eventResponse.data);
console.log(eventResponse.data[0]);
setEventId(eventResponse.data[0].eventId);
setEventName(eventResponse.data[0].eventname);
setGeneralInformation(eventResponse.data[0].eventdescription);
Expand Down Expand Up @@ -186,7 +178,7 @@ console.log(eventResponse.data[0]);
};

const setArchived = async (boolean) => {
await backend.put(`/bookings/` + eventId, {archived: boolean});
await backend.put(`/bookings/` + id, {archived: boolean});
}

const handleConfirm = async () => {
Expand Down
30 changes: 15 additions & 15 deletions client/src/components/programs/ProgramComponents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ import {ArchiveIcon} from '../../assets/ArchiveIcon';
export const ProgramSummary = ({ program, bookingInfo, isArchived, setIsArchived, eventId }) => {
const { backend } = useBackendContext();
const navigate = useNavigate();
const {
isOpen: modalIsOpen,
onOpen: modalOnOpen,
onClose: modalOnClose
} = useDisclosure();

const {
isOpen: popoverIsOpen ,
onOpen: popoverOnOpen,
onClose: popoverOnClose
} = useDisclosure();
const {
isOpen: modalIsOpen,
onOpen: modalOnOpen,
onClose: modalOnClose
} = useDisclosure();

const {
isOpen: popoverIsOpen ,
onOpen: popoverOnOpen,
onClose: popoverOnClose
} = useDisclosure();

const exit = () => {
navigate('/home');
Expand Down Expand Up @@ -249,7 +249,7 @@ console.log("event response ", response.data.id)
if (selectedAction === "Archive") {
await handleArchive()
} else if (selectedAction === "Delete"){
await handleDelete();
await handleDelete();
}
}

Expand Down Expand Up @@ -631,7 +631,7 @@ console.log("event response ", response.data.id)
</Card>
</Flex>
</Container>
<Modal isOpen={isOpen} onClose={onClose}>
<Modal isOpen={modalIsOpen} onClose={modalOnClose}>
<ModalOverlay />
<ModalContent>
<ModalHeader>Deactivate Program?</ModalHeader>
Expand Down Expand Up @@ -664,7 +664,7 @@ console.log("event response ", response.data.id)
{selectedIcon} {selectedAction}
</MenuButton>
<MenuList>
<MenuItem
<MenuItem
icon={<Box display="inline-flex" alignItems="center">
<Icon as={ArchiveIcon} boxSize={4} />
</Box>}
Expand All @@ -685,7 +685,7 @@ console.log("event response ", response.data.id)
</Box>
</ModalBody>
<ModalFooter>
<Button bg ="transparent" onClick={onClose} color="#767778" borderRadius="30px" mr={3}>Exit</Button>
<Button bg ="transparent" onClick={modalOnClose} color="#767778" borderRadius="30px" mr={3}>Exit</Button>
<Button onClick={handleConfirm} style={{backgroundColor: "#90080F"}} colorScheme = "white" borderRadius="30px">Confirm</Button>
</ModalFooter>
</ModalContent>
Expand Down

0 comments on commit 201349f

Please sign in to comment.