diff --git a/src/components/root/common/Forms/CPanelBooking.js b/src/components/root/common/Forms/CPanelBooking.js index 427ae49..c73c3d1 100644 --- a/src/components/root/common/Forms/CPanelBooking.js +++ b/src/components/root/common/Forms/CPanelBooking.js @@ -23,16 +23,8 @@ const InputValidation = Yup.object().shape({ .required("Please enter a domain"), username: Yup.string().min(2, "Too Short!").required("Required"), original_server: Yup.string() - .matches( - /^((([1-9]?\d|1\d\d|2[0-5][0-5]|2[0-4]\d)\.){3}([1-9]?\d|1\d\d|2[0-5][0-5]|2[0-4]\d))|(((https?):\/\/)?(www.)?[a-z0-9]+(\.[a-z]{2,}){1,3}(#?\/?[a-zA-Z0-9#]+)*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?)|([a-z0-9]{0,4}-[a-z0-9]{0,2}-[a-z0-9]{0,3})$/i, - "Please enter a valid IPv4 Address or domain" - ) .required("Please enter a valid IPv4 or domain"), new_server: Yup.string() - .matches( - /^((([1-9]?\d|1\d\d|2[0-5][0-5]|2[0-4]\d)\.){3}([1-9]?\d|1\d\d|2[0-5][0-5]|2[0-4]\d))|(((https?):\/\/)?(www.)?[a-z0-9]+(\.[a-z]{2,}){1,3}(#?\/?[a-zA-Z0-9#]+)*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?)|([a-z0-9]{0,4}-[a-z0-9]{0,2}-[a-z0-9]{0,3})$/i, - "Please enter a valid IPv4 Address or domain" - ) .required("Please enter a valid IPv4 or domain"), agent_booked: Yup.string() .min(2, "Too short!") @@ -44,7 +36,7 @@ const InputValidation = Yup.object().shape({ booked_date: Yup.date().required("Please enter a date!"), }); -export const CPanelBooking = () => { +export const CPanelBooking = (timeslots) => { const [respID, setRespID] = useState(0); const [error, setError] = useState(0); @@ -70,6 +62,7 @@ export const CPanelBooking = () => { }); setSubmitting(false); }; + return ( { className="has-success" > - - - - - - + {timeslots.timeslots.map((slot) => )} diff --git a/src/components/root/common/Forms/FormPage.js b/src/components/root/common/Forms/FormPage.js index 7c58803..2262e09 100644 --- a/src/components/root/common/Forms/FormPage.js +++ b/src/components/root/common/Forms/FormPage.js @@ -13,7 +13,7 @@ import classnames from "classnames"; import { CPanelBooking } from "./CPanelBooking"; import EmailBooking from "./EmailBooking"; -const FormPage = ({ item }) => { +const FormPage = ({ timeslots, item }) => { const [activeTab, setActiveTab] = useState("1"); const toggle = (tab) => { @@ -23,7 +23,6 @@ const FormPage = ({ item }) => { // Parent page from the Book section, // Can be expanded to offer email migration bookings, // elements below do the POST requests. - return (