Skip to content
Snippets Groups Projects
Commit 99ccd1eb authored by MrJoshE's avatar MrJoshE
Browse files

Fixed minor bugs

parent 01823f28
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ const BookingsPage = () => { ...@@ -23,7 +23,7 @@ const BookingsPage = () => {
const [error, setError] = useState(null); const [error, setError] = useState(null);
const [selectedBooking, setSelectedBooking] = useState(null); const [selectedBooking, setSelectedBooking] = useState(null);
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [extendTime, setExtendTime] = useState(null); const [extendTime, setExtendTime] = useState(1);
const bookingServiceBaseUrl = process.env.REACT_APP_BOOKING_SERVICE_ENDPOINT; const bookingServiceBaseUrl = process.env.REACT_APP_BOOKING_SERVICE_ENDPOINT;
...@@ -41,6 +41,7 @@ const BookingsPage = () => { ...@@ -41,6 +41,7 @@ const BookingsPage = () => {
}, },
}); });
const data = await response.json(); const data = await response.json();
console.log(data);
// const 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: 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", }, // { 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 = () => { ...@@ -72,7 +73,7 @@ const BookingsPage = () => {
if (response.ok) { if (response.ok) {
setBookings(bookings.filter((booking) => booking._id !== selectedBooking._id)); setBookings(bookings.filter((booking) => booking._id !== selectedBooking._id));
} else { } else {
setError("Booking extension failed"); setError("Booking delete failed");
} }
} catch (error) { } catch (error) {
setError(error.message); setError(error.message);
...@@ -83,7 +84,7 @@ const BookingsPage = () => { ...@@ -83,7 +84,7 @@ const BookingsPage = () => {
setIsOpen(false); setIsOpen(false);
setExtendTime(null); setExtendTime(null);
try { try {
const response = await fetch(`${bookingServiceBaseUrl}/bookings/extend/${selectedBooking.id}`, { const response = await fetch(`${bookingServiceBaseUrl}/bookings/extend/${selectedBooking._id}`, {
method: "PUT", method: "PUT",
headers: { headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`, Authorization: `Bearer ${localStorage.getItem("token")}`,
...@@ -93,12 +94,13 @@ const BookingsPage = () => { ...@@ -93,12 +94,13 @@ const BookingsPage = () => {
}); });
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json();
console.log(data);
setBookings( setBookings(
bookings.map((booking) => bookings.map((booking) =>
booking.id === selectedBooking.id ? data.booking : booking booking._id === selectedBooking._id ? data : booking
) )
); );
setExtendTime(null); setExtendTime(1);
setError(null); setError(null);
} else { } else {
setError("Booking extension failed"); setError("Booking extension failed");
...@@ -124,6 +126,7 @@ const BookingsPage = () => { ...@@ -124,6 +126,7 @@ const BookingsPage = () => {
{!isLoading && !error && bookings.length > 0 && ( {!isLoading && !error && bookings.length > 0 && (
<Stack spacing={4} minW={"50vw"}> <Stack spacing={4} minW={"50vw"}>
{bookings.map((booking) => ( {bookings.map((booking) => (
<Box key={booking._id} p={4} borderWidth={1} borderRadius={4} > <Box key={booking._id} p={4} borderWidth={1} borderRadius={4} >
<Text fontSize={20}> <Text fontSize={20}>
<strong>Street Address:</strong> {booking.street_address} <strong>Street Address:</strong> {booking.street_address}
......
...@@ -35,7 +35,7 @@ const NotificationsPage = () => { ...@@ -35,7 +35,7 @@ const NotificationsPage = () => {
const data = await response.json(); const data = await response.json();
setNotifications(data); setNotifications(data.reverse());
setLoading(false); setLoading(false);
} catch (error) { } catch (error) {
setError("Failed to fetch notifications"); setError("Failed to fetch notifications");
......
...@@ -38,7 +38,7 @@ const ParkingAreasPage = () => { ...@@ -38,7 +38,7 @@ const ParkingAreasPage = () => {
const [parkingAreas, setParkingAreas] = useState([]); const [parkingAreas, setParkingAreas] = useState([]);
const [selectedParkingArea, setSelectedParkingArea] = useState(null); const [selectedParkingArea, setSelectedParkingArea] = useState(null);
const [startTime, setStartTime] = useState(""); const [startTime, setStartTime] = useState("");
const [expiryTime, setExpiryTime] = useState(""); const [expiryTime, setExpiryTime] = useState(0);
const [isBookingLoading, setIsBookingLoading] = useState(false); const [isBookingLoading, setIsBookingLoading] = useState(false);
const [bookingError, setBookingError] = useState(null); const [bookingError, setBookingError] = useState(null);
const { isOpen, onOpen, onClose } = useDisclosure(); const { isOpen, onOpen, onClose } = useDisclosure();
...@@ -92,6 +92,8 @@ const ParkingAreasPage = () => { ...@@ -92,6 +92,8 @@ const ParkingAreasPage = () => {
console.log(selectedParkingArea); console.log(selectedParkingArea);
console.log(startTime); console.log(startTime);
const expiryHours = parseInt(expiryTime);
try { try {
const response = await fetch( const response = await fetch(
`${bookingServiceBaseUrl}/bookings/create`, `${bookingServiceBaseUrl}/bookings/create`,
...@@ -104,7 +106,7 @@ const ParkingAreasPage = () => { ...@@ -104,7 +106,7 @@ const ParkingAreasPage = () => {
body: JSON.stringify({ body: JSON.stringify({
location_id: selectedParkingArea, location_id: selectedParkingArea,
start_time: startTime, start_time: startTime,
expires_hours: expiryTime, expires_hours: expiryHours,
}), }),
} }
); );
...@@ -112,7 +114,7 @@ const ParkingAreasPage = () => { ...@@ -112,7 +114,7 @@ const ParkingAreasPage = () => {
if (response.ok) { if (response.ok) {
setStartTime(""); setStartTime("");
setExpiryTime(""); setExpiryTime(0);
onClose(); onClose();
alert("Booking Confirmed"); alert("Booking Confirmed");
} else { } else {
...@@ -225,7 +227,7 @@ const ParkingAreasPage = () => { ...@@ -225,7 +227,7 @@ const ParkingAreasPage = () => {
<FormControl mb={4}> <FormControl mb={4}>
<FormLabel>Expiry Time</FormLabel> <FormLabel>Expiry Time</FormLabel>
<Select value={expiryTime} onChange={handleExpiryTimeChange}> <Select value={expiryTime} onChange={handleExpiryTimeChange}>
<option value="" disabled> <option value="0" disabled>
Choose an expiry time Choose an expiry time
</option> </option>
<option value="1">1 hour</option> <option value="1">1 hour</option>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment