diff --git a/client/src/assets/SettingsIcon.jsx b/client/src/assets/SettingsIcon.jsx
index d0e9fde..6005864 100644
--- a/client/src/assets/SettingsIcon.jsx
+++ b/client/src/assets/SettingsIcon.jsx
@@ -3,7 +3,7 @@ import React from 'react';
export const SettingsIcon = () => {
return (
);
};
diff --git a/client/src/components/navbar/Navbar.css b/client/src/components/navbar/Navbar.css
index 646180c..52f00af 100644
--- a/client/src/components/navbar/Navbar.css
+++ b/client/src/components/navbar/Navbar.css
@@ -1,5 +1,4 @@
#navbarBody {
- height: 100vh;
display: flex;
flex-direction: row;
justify-content: space-between;
@@ -16,6 +15,7 @@
.navText {
margin-left: 3%;
width: 90%;
+ font-weight: 500;
font-size: 150%;
color: #474849;
}
diff --git a/client/src/components/programs/EditProgram.css b/client/src/components/programs/EditProgram.css
index f95b944..52c9cdf 100644
--- a/client/src/components/programs/EditProgram.css
+++ b/client/src/components/programs/EditProgram.css
@@ -80,15 +80,13 @@ input[type="date"]::-webkit-calendar-picker-indicator {
display: flex;
flex-direction: row;
justify-content: space-between;
- align-items: center;
+ width: 90%;
+ /* align-items: center; */
font-size: 170%;
margin-bottom: 5%;
}
-#saveCancel {
- height: 100%;
-}
#save {
background-color: var(--indigo, #4E4AE7);
@@ -98,13 +96,6 @@ input[type="date"]::-webkit-calendar-picker-indicator {
border-radius: 30px;
}
-#popTrigger {
- justify-content: center;
- align-items: center;
- height: 100%;
- width: 100%;
- margin-right: 1%;
-}
#select {
display: none;
@@ -117,16 +108,6 @@ input[type="date"]::-webkit-calendar-picker-indicator {
appearance: auto; /* Restores the dropdown behavior */
}
-/* #instructorTags {
- display: none;
- appearance: none;
-}
-
-#instructorTags:focus {
- background-color: white;
- appearance: auto;
-} */
-
#dateTimeDiv, #instructorContainer, #payeeContainer {
width: 100%;
height: 100%;
@@ -157,7 +138,7 @@ input[type="date"]::-webkit-calendar-picker-indicator {
width: 80%;
margin-right: auto;
margin-left: 2%;
-flex: 1;
+ flex: 1;
}
#date1, #date2 {
@@ -270,9 +251,6 @@ flex: 1;
overflow-y: auto;
}
-
-
-
#location, #locationRate {
display: flex;
flex-direction: row;
diff --git a/client/src/components/programs/EditProgram.jsx b/client/src/components/programs/EditProgram.jsx
index f34901d..7054456 100644
--- a/client/src/components/programs/EditProgram.jsx
+++ b/client/src/components/programs/EditProgram.jsx
@@ -4,33 +4,15 @@ import './EditProgram.css';
import {
Box,
Button,
- Link as ChakraLink,
Flex,
FormControl,
FormLabel,
- Heading,
- HStack,
Icon,
IconButton,
Input,
- InputGroup,
- InputLeftElement,
- Link,
Select,
- Table,
- TableCaption,
- TableContainer,
- Tbody,
- Td,
- Text,
Textarea,
- Th,
- Thead,
Tag,
- Tr,
- VStack,
- Kbd,
- Portal,
Popover,
PopoverTrigger,
PopoverContent,
@@ -47,13 +29,8 @@ import {CloseFilledIcon} from '../../assets/CloseFilledIcon';
import {EmailIcon} from '../../assets/EmailIcon';
import {LocationIcon} from '../../assets/LocationIcon';
import {DollarIcon} from '../../assets/DollarIcon';
-
-// import { useAuthContext } from "../../contexts/hooks/useAuthContext";
import { useBackendContext } from "../../contexts/hooks/useBackendContext";
import { useNavigate } from 'react-router-dom';
-// import { useRoleContext } from "../../contexts/hooks/useRoleContext";
-// import { User } from "../../types/user";
-// import { RoleSelect } from "./RoleSelect";
import { IoCloseOutline } from "react-icons/io5";
import { CiCircleMore } from "react-icons/ci";
import { useParams } from "react-router";
@@ -85,16 +62,6 @@ export const EditProgram = () => {
const [bookingIds, setBookingIds] = useState([]);
const [instructorSearchTerm, setInstructorSearchTerm] = useState("");
const [payeeSearchTerm, setPayeeSearchTerm] = useState("");
-<<<<<<< HEAD
- const [instructorFocused, setInstructorFocused] = useState(false);
- const [payeeFocused, setPayeeFocused] = useState(false);
- const [dropInstructorFocused, setDropInstructorFocused] = useState(false);
- const [dropPayeeFocused, setDropPayeeFocused] = useState(false);
-
- // const [instructorDropdownVisible, setInstructorDropdownVisible] = useState(false);
- // const [payeeDropdownVisible, setPayeeDropdownVisible] = useState(false);
-=======
->>>>>>> 4fe8d86bdf4dfaea25b6560b19eafeb05566318a
useEffect(() => {
@@ -250,7 +217,7 @@ const payees = eventClientResponse.data
try {
await Promise.all(bookingIds.map(async (bookingId) => {
try {
- const deletedCommentResponse = await backend.delete('/comments/booking/' + bookingId);
+ await backend.delete('/comments/booking/' + bookingId);
} catch (err) {
if (err.response?.status === 404) {
console.log(`No comments found for booking ${bookingId}`);
@@ -267,7 +234,7 @@ const payees = eventClientResponse.data
const deleteAllEventBookings = async () => {
try {
- const deletedBookingResponse = await backend.delete('/bookings/event/' + id);
+ await backend.delete('/bookings/event/' + id);
} catch (error) {
if (error.response?.status === 404) {
console.log(`No bookings found for event ${id}`);
@@ -281,7 +248,7 @@ const payees = eventClientResponse.data
const deleteAllAssignments = async () => {
try {
- const deletedAssignmentResponse = await backend.delete('/assignments/event/' + id);
+ await backend.delete('/assignments/event/' + id);
} catch (error) {
if (error.response?.status === 404) {
console.log(`No assignments found for event ${id}`);
@@ -295,7 +262,7 @@ const payees = eventClientResponse.data
const saveEvent = async () => {
try {
- const eventsResponse = await backend.put('/events/' + id, {
+ await backend.put('/events/' + id, {
name: eventName,
description: generalInformation,
archived: eventArchived
@@ -316,7 +283,7 @@ const payees = eventClientResponse.data
archived: eventArchived,
};
- const bookingsResponse = await backend.post('/bookings', bookingsData);
+ await backend.post('/bookings', bookingsData);
}
for (const instructor of selectedInstructors) {
@@ -334,11 +301,7 @@ const payees = eventClientResponse.data
role: "payee"
});
}
-<<<<<<< HEAD
- navigate('/programs/' + id);
-=======
exit();
->>>>>>> 4fe8d86bdf4dfaea25b6560b19eafeb05566318a
} catch (error) {
console.error("Error getting instructors:", error);
@@ -358,12 +321,12 @@ const payees = eventClientResponse.data
-
+