diff --git a/src/views/Business/AddBusiness.js b/src/views/Business/AddBusiness.js index deebe93..a5a0510 100644 --- a/src/views/Business/AddBusiness.js +++ b/src/views/Business/AddBusiness.js @@ -32,7 +32,7 @@ const AddBusiness = () => { const [data, setData] = useState({ WebsiteURL: "https://bolo.ai.in/", - business: "", + userType: "", purpose: "", language: [], @@ -45,7 +45,7 @@ const AddBusiness = () => { //contacts image: "", imageURL: "", - business_name: "", + userName: "", email: "", short_url: "", @@ -65,7 +65,7 @@ const AddBusiness = () => { if ( data.address_Line_1.trim() === "" || data.address_Line_2.trim() === "" || - data.business === "" || + data.userType === "" || data.language === "" || data.country === "" || data.state === "" || @@ -74,13 +74,15 @@ const AddBusiness = () => { //Contacts // data.image === '' || // data.imageURL.trim() === '' || - (data.business_name.trim() === "" && - (data.contact_Person_Name.trim() === "" || - data.specialization === "")) || + (data.userName.trim() === "" + // && + // (data.contact_Person_Name.trim() === "" || + // data.specialization === "") + ) || data.email.trim() === "" || - data.short_url.trim() === "" || - data.contact_Number === "" || - data.contact_Person_Name.trim() === "" + // data.short_url.trim() === "" || + data.contact_Number === "" + // || data.contact_Person_Name.trim() === "" ) { swal({ title: "Warning", @@ -97,8 +99,8 @@ const AddBusiness = () => { formData.set("address_Line_2", data.address_Line_2); formData.set("purpose", data.purpose); - formData.set("business", data.business); - formData.set("language", data.language); + formData.set("userType", data.userType); + // formData.set("language", data.language); formData.set("country", data.country); formData.set("city", data.city); @@ -106,7 +108,7 @@ const AddBusiness = () => { formData.set("pincode", data.pincode); //contacts - formData.set("business_name", data.business_name); + formData.set("userName", data.userName); formData.set("email", data.email); formData.set("contact_Number", data.contact_Number); @@ -149,6 +151,7 @@ const AddBusiness = () => { }); }); }; + console.log(data); return ( @@ -181,19 +184,21 @@ const AddBusiness = () => { disabled={ data.address_Line_1.trim() === "" || data.address_Line_2.trim() === "" || - data.business === "" || + data.userType === "" || data.language === "" || data.country === "" || data.state === "" || data.city === "" || data.pincode.trim() === "" || - (data.business_name.trim() === "" && - (data.contact_Person_Name.trim() === "" || - data.specialization === "")) || + data.userName.trim() === "" || + // && + // (data.contact_Person_Name.trim() === "" || + // data.specialization === "") data.email.trim() === "" || - data.short_url.trim() === "" || - data.contact_Number === "" || - data.contact_Person_Name.trim() === "" + // data.short_url.trim() === "" || + data.contact_Number === "" + // || + // data.contact_Person_Name.trim() === "" } > {loading ? "Loading" : "Add Now"} @@ -250,7 +255,7 @@ const AddBusiness = () => { /> ))} - {viewState === 4 && ( + {/* {viewState === 4 && ( { // data={{ images, setImages }} loading={{ loading, setLoading }} /> - )} - {viewState === 5 && ( + )} */} + {viewState === 4 && ( { }); }; + const formatDate = (inputDate) => { + const options = { year: 'numeric', month: 'short', day: 'numeric' }; + const date = new Date(inputDate); + return date.toLocaleDateString('en-US', options); + } + return (
@@ -200,7 +206,7 @@ const Businesses = () => { User Name {/* Logo */} - User Type + User Type Created On {/* Status */} Actions @@ -225,27 +231,47 @@ const Businesses = () => { showData.map((i, idx) => { return ( - {i.business} + + {i.userName ? i.userName : i.business} + {/* {i.banner && i.banner ? No Image :

No image!

} */} - {i?.short_url} + + + + + + + + + - {new Date(i.createdAt).toLocaleString( - "en-IN", - { - month: "2-digit", - day: "numeric", - year: "numeric", - // hour: 'numeric', - // minute: 'numeric', - // hour12: true, - } - )} + {i.userType ? i.userType : i.short_url} + + + + + + + + + + + + + + {formatDate(i.createdAt) + } + + + + + {/* */} - + {/* */} + 0 ); }) diff --git a/src/views/Business/multiform/Contacts.js b/src/views/Business/multiform/Contacts.js index d964439..d7bbce0 100644 --- a/src/views/Business/multiform/Contacts.js +++ b/src/views/Business/multiform/Contacts.js @@ -4,6 +4,7 @@ import { Link, useNavigate } from "react-router-dom"; import swal from "sweetalert"; import axios from "axios"; import { isAutheticated } from "src/auth"; +import toast from "react-hot-toast"; // import { WebsiteURL } from '../WebsiteURL' const Contacts = (props) => { @@ -66,7 +67,7 @@ const Contacts = (props) => { }, [errors]); const handleChange = (e) => { - if (e.target.id === "business_name") { + if (e.target.id === "userName") { if (e.target.value.length < 0) return; setData((prev) => ({ @@ -167,7 +168,17 @@ const Contacts = (props) => { marginBottom: "1rem", textTransform: "capitalize", }} - onClick={() => props.handleView(4)} + onClick={() => { + if ( + data.business_name === "" || + data.email === "" || + data.contact_Number === "" + ) { + toast.error("Enter All Details"); + } else { + props.handleView(4); + } + }} > Next @@ -186,14 +197,14 @@ const Contacts = (props) => { handleChange(e)} /> - {data.business_name.length > 0 && ( + {data.userName.length > 0 && (

- Remaining characters : {50 - data.business_name.length} + Remaining characters : {50 - data.userName.length}

)}
diff --git a/src/views/Business/multiform/SelectBusiness.js b/src/views/Business/multiform/SelectBusiness.js index 32fd1cf..43a55f1 100644 --- a/src/views/Business/multiform/SelectBusiness.js +++ b/src/views/Business/multiform/SelectBusiness.js @@ -4,6 +4,7 @@ import { Link, useNavigate } from "react-router-dom"; import swal from "sweetalert"; import axios from "axios"; import { isAutheticated } from "src/auth"; +import toast from "react-hot-toast"; const SelectBusiness = (props) => { const token = isAutheticated(); @@ -88,7 +89,14 @@ const SelectBusiness = (props) => { textTransform: "capitalize", // marginRight: '5px', }} - onClick={() => props.handleView(3)} + onClick={() => { + if (data.userType !== "") { + props.handleView(3); + } else { + toast.error("Fill User Type"); + } + }} + // disabled={loading} // disabled={data.business === ''} > @@ -105,14 +113,13 @@ const SelectBusiness = (props) => {
-