From 80684486258fb5d873dadccc6fcd029d0532b168 Mon Sep 17 00:00:00 2001 From: pepper Date: Mon, 18 Jan 2021 00:38:15 -0500 Subject: [PATCH] Added some more form validation --- .../root/common/Forms/CPanelBooking.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/root/common/Forms/CPanelBooking.js b/src/components/root/common/Forms/CPanelBooking.js index 2887bc9..a0ff5b4 100644 --- a/src/components/root/common/Forms/CPanelBooking.js +++ b/src/components/root/common/Forms/CPanelBooking.js @@ -36,16 +36,22 @@ const InputValidation = Yup.object().shape({ 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)$/, - "Please enter a valid IPv4 Address" + /^((([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-%]+&?)?)$/, + "Please enter a valid IPv4 Address or domain" ) - .required("Please enter a valid IP"), + .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)$/, - "Please enter a valid IPv4 Address" + /^((([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-%]+&?)?)$/, + "Please enter a valid IPv4 Address or domain" ) - .required("Please enter a valid IP"), + .required("Please enter a valid IPv4 or domain"), + agent_booked: Yup.string().min(2, "Too short!").required("Requried"), + booked_time: Yup.string().required("Requried"), + ticket_id: Yup.string().required("Requried"), + brand: Yup.string().required("Requried"), + migration_type: Yup.string().required("Requried"), + booked_date: Yup.date().required("Required") }); export const CPanelBooking = () => {