diff --git a/src/pages/bookings/bookings.js b/src/pages/bookings/bookings.js index b48c8cea550ba2419395f3db5730c9161ad59769..9e6da97b37f84b5a402fdefc72aa97af932f3e2d 100644 --- a/src/pages/bookings/bookings.js +++ b/src/pages/bookings/bookings.js @@ -23,7 +23,7 @@ const BookingsPage = () => { const [error, setError] = useState(null); const [selectedBooking, setSelectedBooking] = useState(null); const [isOpen, setIsOpen] = useState(false); - const [extendTime, setExtendTime] = useState(null); + const [extendTime, setExtendTime] = useState(1); const bookingServiceBaseUrl = process.env.REACT_APP_BOOKING_SERVICE_ENDPOINT; @@ -41,6 +41,7 @@ const BookingsPage = () => { }, }); const data = await response.json(); + console.log(data); // const data = [ // { id: 1, location: "Test Location 1", address: "123 Test Address", startTime: "12:00PM - 25/7/2023", endTime: "14:00PM - 25/7/2023", }, // { id: 2, location: "Test Location 2", address: "1224 Test Street", startTime: "12:00PM - 25/7/2023", endTime: "14:00PM - 25/7/2023", }, @@ -72,7 +73,7 @@ const BookingsPage = () => { if (response.ok) { setBookings(bookings.filter((booking) => booking._id !== selectedBooking._id)); } else { - setError("Booking extension failed"); + setError("Booking delete failed"); } } catch (error) { setError(error.message); @@ -83,7 +84,7 @@ const BookingsPage = () => { setIsOpen(false); setExtendTime(null); try { - const response = await fetch(`${bookingServiceBaseUrl}/bookings/extend/${selectedBooking.id}`, { + const response = await fetch(`${bookingServiceBaseUrl}/bookings/extend/${selectedBooking._id}`, { method: "PUT", headers: { Authorization: `Bearer ${localStorage.getItem("token")}`, @@ -93,12 +94,13 @@ const BookingsPage = () => { }); if (response.ok) { const data = await response.json(); + console.log(data); setBookings( bookings.map((booking) => - booking.id === selectedBooking.id ? data.booking : booking + booking._id === selectedBooking._id ? data : booking ) ); - setExtendTime(null); + setExtendTime(1); setError(null); } else { setError("Booking extension failed"); @@ -124,6 +126,7 @@ const BookingsPage = () => { {!isLoading && !error && bookings.length > 0 && ( <Stack spacing={4} minW={"50vw"}> {bookings.map((booking) => ( + <Box key={booking._id} p={4} borderWidth={1} borderRadius={4} > <Text fontSize={20}> <strong>Street Address:</strong> {booking.street_address} diff --git a/src/pages/notifications/notifications.js b/src/pages/notifications/notifications.js index bfa666a3be930dcbdff6ebb522304d03d091d04f..a82353109f0cf4b0093ad7c2f59faa2125f2cf2a 100644 --- a/src/pages/notifications/notifications.js +++ b/src/pages/notifications/notifications.js @@ -35,7 +35,7 @@ const NotificationsPage = () => { const data = await response.json(); - setNotifications(data); + setNotifications(data.reverse()); setLoading(false); } catch (error) { setError("Failed to fetch notifications"); diff --git a/src/pages/parking_areas/parking_areas.js b/src/pages/parking_areas/parking_areas.js index 8ba7ac22b11d49683a8a80425a1d1098965ed840..4e519ca27c79189f3d3d5a0f490fb80052cf6aa1 100644 --- a/src/pages/parking_areas/parking_areas.js +++ b/src/pages/parking_areas/parking_areas.js @@ -38,7 +38,7 @@ const ParkingAreasPage = () => { const [parkingAreas, setParkingAreas] = useState([]); const [selectedParkingArea, setSelectedParkingArea] = useState(null); const [startTime, setStartTime] = useState(""); - const [expiryTime, setExpiryTime] = useState(""); + const [expiryTime, setExpiryTime] = useState(0); const [isBookingLoading, setIsBookingLoading] = useState(false); const [bookingError, setBookingError] = useState(null); const { isOpen, onOpen, onClose } = useDisclosure(); @@ -92,6 +92,8 @@ const ParkingAreasPage = () => { console.log(selectedParkingArea); console.log(startTime); + const expiryHours = parseInt(expiryTime); + try { const response = await fetch( `${bookingServiceBaseUrl}/bookings/create`, @@ -104,7 +106,7 @@ const ParkingAreasPage = () => { body: JSON.stringify({ location_id: selectedParkingArea, start_time: startTime, - expires_hours: expiryTime, + expires_hours: expiryHours, }), } ); @@ -112,7 +114,7 @@ const ParkingAreasPage = () => { if (response.ok) { setStartTime(""); - setExpiryTime(""); + setExpiryTime(0); onClose(); alert("Booking Confirmed"); } else { @@ -225,7 +227,7 @@ const ParkingAreasPage = () => { <FormControl mb={4}> <FormLabel>Expiry Time</FormLabel> <Select value={expiryTime} onChange={handleExpiryTimeChange}> - <option value="" disabled> + <option value="0" disabled> Choose an expiry time </option> <option value="1">1 hour</option>