-
+ {stationsData.map((station) => {
+ if (station.selected) {
+ return (
+
+ );
+ }
+ return null;
+ })}{' '}
diff --git a/src/components/UserForm.jsx b/src/components/UserForm.jsx
index 57e41f4..0d4399c 100644
--- a/src/components/UserForm.jsx
+++ b/src/components/UserForm.jsx
@@ -14,7 +14,7 @@ import hsyLogo from '../assets/hsy_logo_dark.png';
import { useStepper } from '../hooks/useStepper';
import { useTranslation } from 'react-i18next';
import useApi from '../hooks/useApi';
-const UserForm = ({ onSubmit, onPrevStep }) => {
+const UserForm = ({ onSubmit, onPrevStep, randomUUID }) => {
const [validated, setValidated] = useState(false);
const [showInfoModal, setShowInfoModal] = useState(false);
const [showWarningModal, setShowWarningModal] = useState(false);
@@ -31,7 +31,6 @@ const UserForm = ({ onSubmit, onPrevStep }) => {
setUserData,
acceptTerms,
setAcceptTerms,
- randomUUID,
} = useStepper();
const { postRequest } = useApi();
@@ -202,7 +201,7 @@ const UserForm = ({ onSubmit, onPrevStep }) => {
idPrepaid: false,
uuid: randomUUID,
};
-
+ console.log(bodyData);
const responce = await postRequest('add-reservation', bodyData);
console.log('UserForm.jsx 209', responce);
} catch (error) {
diff --git a/src/hooks/useApi.js b/src/hooks/useApi.js
index 9dc52e1..8af56d4 100644
--- a/src/hooks/useApi.js
+++ b/src/hooks/useApi.js
@@ -1,7 +1,11 @@
import API from '../utils/axios';
import { useState } from 'react';
import { errorHandling } from '../utils/errorHandling';
-import { postRequest, deleteRequest } from '../services/ApiServices';
+import {
+ postRequest,
+ deleteRequest,
+ getRequest,
+} from '../services/ApiServices';
import { useNavigate } from 'react-router-dom';
const useApi = () => {
const [error, setError] = useState(null);
@@ -58,9 +62,21 @@ const useApi = () => {
}
};
+ const getApiRequest = async (endpoint, queryParams) => {
+ try {
+ const response = await getRequest(endpoint, queryParams);
+ handleApiSuccess(response);
+ return response; // Return the response if needed in the calling code
+ } catch (error) {
+ handleApiError(error);
+ throw error; // Re-throw the error to propagate it to the calling code
+ }
+ };
+
return {
postRequest: postApiRequest,
deleteRequest: deleteApiRequest,
+ getRequest: getApiRequest,
getRentById,
updateRent,
deleteRent,
diff --git a/src/services/ApiServices.js b/src/services/ApiServices.js
index 927c865..fad0579 100644
--- a/src/services/ApiServices.js
+++ b/src/services/ApiServices.js
@@ -29,3 +29,25 @@ export const deleteRequest = async (endpoint, uuid) => {
return response.json();
};
+
+export const getRequest = async (endpoint, queryParams = {}) => {
+ const url = new URL(`${API_BASE_URL}${endpoint}`);
+
+ // Append query parameters to the URL
+ Object.keys(queryParams).forEach((key) =>
+ url.searchParams.append(key, queryParams[key]),
+ );
+
+ const response = await fetch(url, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+
+ if (!response.ok) {
+ throw new Error(`HTTP error! Status: ${response.status}`);
+ }
+
+ return response.json();
+};
From ffe058725e6db9dab7d280a2e1d2178c53ad953a Mon Sep 17 00:00:00 2001
From: Lor3wp <61760289+Lor3wp@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:23:57 +0200
Subject: [PATCH 2/2] fixed timezone issues with calendar date selection
---
src/components/Calendar.jsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/Calendar.jsx b/src/components/Calendar.jsx
index 4ff5054..ce69a8e 100644
--- a/src/components/Calendar.jsx
+++ b/src/components/Calendar.jsx
@@ -28,7 +28,9 @@ const RentCalendar = ({ futureDates, setSelectedDate }) => {
};
const handleChange = (date) => {
- setSelectedDate(date);
+ date.setHours(date.getHours() + 12);
+ setSelectedDate(date);
+ console.log(date.getHours());
};
const tileDisabled = ({ date }) => {