Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b0e551bd by jaymehta
Options

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

2 parents e483780f 564e5ed2
Inline Side-by-side
Showing 5 changed files with 87 additions and 28 deletions
components/detail/DetailInfo.js
......@@ -47,6 +47,7 @@ const DetailInfo = ({ activityById }) => {
const [showshareWidget, setshowshareWidget] = useState(false);
const { loadedUser } = useSelector(state => state.loadedUser);
const { endUser } = useSelector(state => state.endUser);
console.log("endUser", endUser)
useEffect(() => {
const fetchSession = async () => {
setSession(await getSession());
......@@ -190,21 +191,29 @@ const DetailInfo = ({ activityById }) => {
<h2>Send Enquiry</h2>
</Modal.Header>
<Modal.Body>
<div>Experience Name:</div>
<div className="text01">
{activityById.data.attributes.name}
</div>
<div className="mt-3">Full Name:</div>
<div className="text01">
{endUser?.attributes.name}
</div>
<div className="mt-3">Mobile:</div>
<div className="text01">
{endUser?.attributes.phone}
</div>
<div className="mt-3">Email ID:</div>
<div className="text01">
{endUser?.attributes.email}
</div>
<div className="row d-flex justify-content-center">
<div className="mt-3">Experience Name:</div>
<div className="text01">
{activityById.data.attributes.name}
</div>
<div className="row d-flex justify-content-center mt-2">
<div className="col-6">
<div className="mt-2">Quantity:</div>
<div className="my-2">Quantity:</div>
<Input
type="number"
onChange={e => {
......@@ -214,7 +223,7 @@ const DetailInfo = ({ activityById }) => {
></Input>
</div>
<div className="col-6">
<div className="mt-2">Date:</div>
<div className="my-2">Date:</div>
<div className="">
<DatePicker
......@@ -234,7 +243,7 @@ const DetailInfo = ({ activityById }) => {
</div>
<Button
disabled={loading || !quantity}
className="mt-2 col-12"
className="mt-4 col-12"
onClick={async () => {
setloading(true);
console.log("hello");
......
components/gift-card/GiftCard.js
......@@ -11,14 +11,17 @@ import { finishVendorOtpVerification } from "../../redux/actions/vendorActions";
import { useRouter } from "next/router";
import { Button } from "react-bootstrap";
import { postGiftCard } from "../../redux/actions/giftCardAction";
import TermsAndConditionModel from "../signup/TermsAndConditionModel";
// import { getCurrentEndUser } from "../../redux/actions/userActions";
const validationSchema = Yup.object().shape({
customAmt: Yup.string().required("Full name is required"),
code: Yup.string().required("Please Enter 4-Digit Code"),
email: Yup.string().email("Invalid email").required("Email is required"),
receiverEmail: Yup.string().email("Invalid email").required("Email is required"),
message: Yup.string().required("Message is required")
receiverEmail: Yup.string().email("Invalid email").required("Reciver's Email is required"),
message: Yup.string().required("Message is required"),
amt: Yup.string().required("Please select an amount"),
termsConditions: Yup.bool().oneOf([true], "Please Accept Terms & Conditions"),
});
let formik1;
......@@ -42,6 +45,7 @@ const GiftCard = () => {
// const {loadedUser} = useSelector(state => state.loadedUser)
const { endUser } = useSelector(state => state.endUser);
console.log("endUser", endUser);
const [isOpenEis, setIsOpenEis] = useState(false);
const [isStep1, setIsStep1] = useState(true);
const [amount, setAmount] = useState(0);
const [custom, setcustom] = useState();
......@@ -59,6 +63,7 @@ const GiftCard = () => {
};
return (
<>
<section className="gift-card-session">
<div className="container">
<div className="row justify-content-center">
......@@ -101,10 +106,12 @@ const GiftCard = () => {
customAmt: "",
email: "",
receiverEmail: "",
message: ""
message: "",
amt: "",
termsConditions: false
}}
enableReinitialize={true}
// validationSchema={validationSchema}
validationSchema={validationSchema}
onSubmit={(values, { setSubmitting }) => {
// Handle form submission here
}}
......@@ -282,6 +289,10 @@ const GiftCard = () => {
/>
{touched.message && errors.message && <div className="text-danger">{errors.message}</div>}
</div>
<div>
{/* {touched.amt && errors.amt && <div className="text-danger">{errors.amt}</div>} */}
<div className="cl-gry">Please select an amount before continuing.</div>
</div>
<div className="col-md-12 mb-3">
<button
className="btn btn-primary w-100"
......@@ -310,15 +321,33 @@ const GiftCard = () => {
setIsStep2(true);
setIsStep1(false);
}}
disabled={!amount > 0 || !values.receiverEmail || !values.email}
disabled={!amount > 0 || !values.receiverEmail || !values.email || !values.termsConditions}
>
{loading ? <Loader /> : "Continue"}
</button>
</div>
<div className="col-12">
<p>
<label className="check-container mb-0 pt-0" htmlFor="termsConditions">
<input
type="checkbox"
id="termsConditions"
name="termsConditions"
className="check-box me-2"
checked={values.termsConditions}
onChange={handleChange}
onBlur={handleBlur}
/>
<span className="checkmark"></span>By continuing you agree to our <a className="cl-blue" onClick={() => { setIsOpenEis(true) }}>Terms</a> and <a href="/privacy-policy">Privacy Policy</a>
</label>
<div className="mt-3">
{touched.termsConditions && errors.termsConditions && <div className="text-danger">{errors.termsConditions}</div>}
</div>
{/* <p>
By continuing you agree to our <a href="/terms-and-conditions">Terms</a> and <a href="/privacy-policy">Privacy Policy</a>
</p>
</p> */}
</div>
</div>
</Form>
......@@ -420,8 +449,10 @@ const GiftCard = () => {
<div className="col-12">
<div className="result-box">
<p>
Gift card sent for approval, please wait till the vendor contacts you
<br /> Thank you.
“Sorry, unable to process the Gift Card now.
This feature will be available shortly.”
{/* Gift card sent for approval, please wait till the vendor contacts you
<br /> Thank you. */}
</p>
<div>
<button
......@@ -442,6 +473,8 @@ const GiftCard = () => {
</div>
</div>
</section>
<TermsAndConditionModel isOpenEis={isOpenEis} setIsOpenEis={setIsOpenEis} />
</>
);
};
......
components/layout/Header.js
......@@ -90,7 +90,7 @@ const Header = () => {
</Navbar.Brand>
{loadedUser && loadedUser.id ? (
<div className="top-btn hide-on-desktop">
<div className="logout-bk">
<div className="logout-bk" ref={logoutBkRef}>
<a onClick={toggleGridViewDropdown} className="user-icon">
<span className="image-container user-pic">
<Image layout="fill" priority alt="" className="image img-fluid" src="/images/icons/user.svg" />
......@@ -100,7 +100,7 @@ const Header = () => {
</span>
</a>
{/* <p>{loadedUser.phone}</p> */}
<div ref={logoutBkRef} className={`inner-box ${isGridViewOpen ? "open" : ""}`}>
<div ref={innerBoxRef} className={`inner-box ${isGridViewOpen ? "open" : ""}`}>
{endUser && (
<div className="user-info">
<div className="pic">
......@@ -288,7 +288,7 @@ const Header = () => {
<>
{endUser && endUser.id ? (
<div className="top-btn hide-on-mobile">
<div className="logout-bk">
<div className="logout-bk" ref={logoutBkRef}>
<a onClick={toggleGridViewDropdown} className="user-icon">
<span className="image-container user-pic">
<Image layout="fill" priority alt="" className="image img-fluid" src="/images/icons/user.svg" />
......
components/vendor/UpdateActivity.js
......@@ -1053,7 +1053,7 @@ const UpdateActivity = () => {
</li>
<li>
<img src="/images/vendor/call.svg" className="img-fluid" />
<p className="number">+1 (407) 8798 789 asdasd</p>
<p className="number">+1 (407) 8798 789</p>
</li>
</ul>
</div>
......
styles/globals.css
......@@ -374,6 +374,7 @@ header {
.header-search .rbt .rbt-input-main {
padding-right: 2.5rem;
font-size: 0.833vw;
width: 18vw;
}
.header-search > .form-control {
......@@ -2051,14 +2052,18 @@ span.form-error,
height: calc(25px + (25 - 25) * (100vw - 320px) / (1920 - 320)) !important;
padding-top: 7px;
}
.modal-01-session h2 {
font-size: calc(32px + (32 - 32) * (100vw - 320px) / (1920 - 320));
line-height: calc(44px + (44 - 44) * (100vw - 320px) / (1920 - 320));
font-size: calc(28px + (28 - 28) * (100vw - 320px) / (1920 - 320));
line-height: calc(40px + (40 - 40) * (100vw - 320px) / (1920 - 320));
}
.modal-01-session .text01 {
font-size: calc(20px + (20 - 20) * (100vw - 320px) / (1920 - 320));
padding-top: 0.2rem;
padding-bottom: 1rem;
padding-bottom: 0.5rem;
}
.modal-header {
padding-bottom: 0;
}
.info .top-name .title {
font-size: 0.885vw;
......@@ -2074,6 +2079,9 @@ span.form-error,
.cl-blue {
color: #0a58ca !important;
}
.text-danger {
font-size: 0.8rem;
}
.info .rating-wishlist .rating {
background: #002c5f;
border-radius: 4px;
......@@ -4214,6 +4222,12 @@ footer .footer-link ul {
.vendor-signup .btn-light {
background: #fff;
}
.modal-01-session .modal-header {
border: 0 !important;
}
.modal-01-session .modal-content {
padding: 1rem;
}
@media (min-width: 992px) {
.navbar-expand-lg .navbar-nav .nav-link {
margin: 0 2rem;
......@@ -4232,7 +4246,7 @@ footer .footer-link ul {
position: relative;
}
.navbar-expand-lg .navbar-nav .nav-link.gift-card::after {
/* .navbar-expand-lg .navbar-nav .nav-link.gift-card::after {
content: "";
background: #000;
height: 2px;
......@@ -4240,7 +4254,7 @@ footer .footer-link ul {
bottom: 0;
left: 0;
position: absolute;
}
} */
.navbar-expand-lg .navbar-nav .nav-link.gift-card .image-container {
width: 21px;
......@@ -4272,7 +4286,7 @@ footer .footer-link ul {
position: relative;
}
.navbar-expand-lg .navbar-nav .nav-link.gift-card::after {
/* .navbar-expand-lg .navbar-nav .nav-link.gift-card::after {
content: "";
background: #000;
height: 2px;
......@@ -4280,7 +4294,7 @@ footer .footer-link ul {
bottom: 0;
left: 0;
position: absolute;
}
} */
.navbar-expand-lg .navbar-nav .nav-link.gift-card .image-container {
width: 1.094vw;
......@@ -4394,6 +4408,9 @@ footer .footer-link ul {
.vendor-signup a {
min-width: 140px;
}
.top-btn .inner-box {
right: -15vw;
}
}
@media (max-width: 767px) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!