Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3c9e8d2c by jaymehta
Options

Merge branch 'master' of https://git.logicloop.io/jaymehta/zango-frontend

2 parents e52fe9dd e121ed40
Inline Side-by-side
Showing 4 changed files with 53 additions and 15 deletions
components/home/GiftAnExperience.js
...@@ -15,16 +15,16 @@ const GiftAnExperience = () => { ...@@ -15,16 +15,16 @@ const GiftAnExperience = () => {
<div className="gift-an-experience-inner"> <div className="gift-an-experience-inner">
<div className="row align-items-center"> <div className="row align-items-center">
<div className="col-md-6"> <div className="col-md-6">
<motion.div variants={zoomIn(0.4)} initial={"hidden"} whileInView={"show"} viewport={{ once: false, amount: 0.2 }}> <motion.div variants={zoomIn(0.4)} initial={"hidden"} whileInView={"show"} viewport={{ once: false, amount: 0.2 }}>
<div className="content"> <div className="content">
<div className="title">Gift An Experience For Any Occasion</div> <div className="title">Share the Joy of Discovery </div>
<div className="disc">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.</div> <div className="disc">Treat your loved ones to extraordinary experiences with our gift cards. Perfect for any occasion, they can choose from a variety of adventures, cultural explorations, wellness retreats, and more.</div>
<div> <div>
<Button variant="primary" onClick={()=> { <Button variant="primary" onClick={() => {
router.push("/gift-card") router.push("/gift-card")
}}>Gift An Experience</Button> }}>Gift An Experience</Button>
</div>
</div> </div>
</div>
</motion.div> </motion.div>
</div> </div>
<div className="col-md-6"> <div className="col-md-6">
......
components/layout/Header.js
...@@ -14,6 +14,7 @@ import ActiveLink from "../common/ActiveLink"; ...@@ -14,6 +14,7 @@ import ActiveLink from "../common/ActiveLink";
import { Skeleton } from "antd"; import { Skeleton } from "antd";
const Header = () => { const Header = () => {
const [isopen, setisopen] = useState(false);
const [isGridViewOpen, setIsGridViewOpen] = useState(false); const [isGridViewOpen, setIsGridViewOpen] = useState(false);
const { loadedUser } = useSelector(state => state.loadedUser); const { loadedUser } = useSelector(state => state.loadedUser);
const { endUser, loading } = useSelector(state => state.endUser); const { endUser, loading } = useSelector(state => state.endUser);
...@@ -60,7 +61,15 @@ const Header = () => { ...@@ -60,7 +61,15 @@ const Header = () => {
// Function to toggle the dropdown visibility // Function to toggle the dropdown visibility
const toggleGridViewDropdown = () => { const toggleGridViewDropdown = () => {
setIsGridViewOpen(!isGridViewOpen); // Toggle the state if (isopen) {
setIsGridViewOpen(false);
setisopen(false);
}
if (!isopen) {
setisopen(true);
setIsGridViewOpen(true);
}
// Toggle the state
}; };
// Function to handle click outside // Function to handle click outside
...@@ -100,7 +109,7 @@ const Header = () => { ...@@ -100,7 +109,7 @@ const Header = () => {
</span> </span>
</a> </a>
{/* <p>{loadedUser.phone}</p> */} {/* <p>{loadedUser.phone}</p> */}
<div className={`inner-box ${isGridViewOpen ? "open" : ""}`}> <div ref={logoutBkRef} className={`inner-box ${isGridViewOpen ? "open" : ""}`}>
{endUser && ( {endUser && (
<div className="user-info"> <div className="user-info">
<div className="pic"> <div className="pic">
......
components/vendor/BusinessDetails.js
...@@ -49,7 +49,9 @@ const BusinessDetails = () => { ...@@ -49,7 +49,9 @@ const BusinessDetails = () => {
// gstNumber: Yup.string().required("GST Number is Required"), // gstNumber: Yup.string().required("GST Number is Required"),
// gstCertificateFile: Yup.mixed(), // gstCertificateFile: Yup.mixed(),
businessName: Yup.string().required("Business Name is Required"), businessName: Yup.string().required("Business Name is Required"),
einNumber: Yup.string().required("EIN Number is Required"), einNumber: Yup.string()
.matches(/^\d{9}$/, 'EIN Number must be exactly 9 digits')
.required('EIN Number is Required'),
// brandLogoFile: Yup.mixed(), // brandLogoFile: Yup.mixed(),
pincode: Yup.string().required("Pincode is Required"), pincode: Yup.string().required("Pincode is Required"),
country: Yup.string().required("Country is Required"), country: Yup.string().required("Country is Required"),
...@@ -206,13 +208,38 @@ const BusinessDetails = () => { ...@@ -206,13 +208,38 @@ const BusinessDetails = () => {
</div> </div>
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group"> <div className="input-group">
<label>EIN Number</label> <label>Employer Identification Number</label>
<input disabled={disableFields} type="text" name="einNumber" onChange={handleChange} onBlur={handleBlur} value={values.einNumber} /> <input disabled={disableFields} type="text"
pattern="[0-9]"
maxLength="9" name="einNumber" onChange={handleChange} onBlur={handleBlur} value={values.einNumber} />
{errors.einNumber && touched.einNumber && <span className="form-error">{errors.einNumber}</span>} {errors.einNumber && touched.einNumber && <span className="form-error">{errors.einNumber}</span>}
</div> </div>
</div> </div>
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group align-items-center"> <div className="input-group align-items-center">
<label>EIN Document Upload</label>
{/* <div className="custom-file">
<input
disabled={disableFields}
type="file"
className="custom-file-input"
id="brandLogoFile"
name="brandLogoFile"
onChange={handleChange}
onBlur={handleBlur}
value={values.brandLogoFile}
/>
<label className="custom-file-label" htmlFor="brandLogoFile">
Upload
</label>
</div> */}
<UploadImageCustom disabled={disableFields} setImage={setbrandLogo} isPdf={false} populatedImages={vendorDetails?.attributes.brandLogo} />
<p className="textS pe-5 pt-2">File size to be less than 2MB</p>
{errors.brandLogoFile && touched.brandLogoFile && <span className="form-error">{errors.brandLogoFile}</span>}
</div>
</div>
<div className="col-12 col-lg-5">
<div className="input-group align-items-center">
<label>Brand Logo</label> <label>Brand Logo</label>
{/* <div className="custom-file"> {/* <div className="custom-file">
<input <input
......
styles/globals.css
...@@ -722,7 +722,9 @@ span.form-error, ...@@ -722,7 +722,9 @@ span.form-error,
top: 35px; top: 35px;
cursor: pointer; cursor: pointer;
} }
.form-container .input-group button.ant-btn.ant-btn-icon-only.ant-upload-list-item-action {
width: 30px !important;
}
.form-container .password-field .eye-slash { .form-container .password-field .eye-slash {
background: url(/images/icons/eye-slash-icon.png) no-repeat 50%; background: url(/images/icons/eye-slash-icon.png) no-repeat 50%;
display: block; display: block;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!