Skip to content

Jay Mehta / zango-frontend

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

changes

1 parent c0cbf072
Inline Side-by-side
Showing 11 changed files with 383 additions and 161 deletions
components/common-components/OtpTimer.js 0 → 100644
import Image from "next/image";
import React, { useState, useEffect } from "react";
import { toast } from "react-toastify";
import { registerEndUser, registerVendor } from "../../redux/actions/userActions";
import { renderImage } from "../../services/imageHandling";
const OtpTimer = ({ initialTime, role, userData }) => {
const [timeLeft, setTimeLeft] = useState(initialTime);
const [isDisabled, setIsDisabled] = useState(true);
useEffect(() => {
if (timeLeft === 0) {
setIsDisabled(false);
return;
}
const timerId = setInterval(() => {
setTimeLeft(prevTime => prevTime - 1);
}, 1000);
return () => clearInterval(timerId);
}, [timeLeft]);
const handleResend = async () => {
setTimeLeft(initialTime);
setIsDisabled(true);
if (role == "user") {
await registerEndUser(userData);
}
if (role == "vendor") {
await registerVendor(userData);
}
toast.success("OTP has been sent again.");
// if (onResend) {
// onResend();
// }
};
const formatTime = seconds => {
const minutes = Math.floor(seconds / 60);
const secs = seconds % 60;
return `${minutes}:${secs < 10 ? "0" : ""}${secs}`;
};
return (
<div>
<p>Resend OTP in: {formatTime(timeLeft)}</p>
<button className="d-flex resend-otp" onClick={handleResend} disabled={isDisabled}>
Resend OTP
</button>
{/* <div className="d-flex resend-otp">
<span className="image-container me-2">
<Image src={renderImage("/images/login/icon-resend.png")} layout="fill" className="image" />
</span>
<p className="mb-0">Resend</p>
</div> */}
</div>
);
};
export default OtpTimer;
components/detail/Detail.js
...@@ -41,7 +41,7 @@ const Detail = () => { ...@@ -41,7 +41,7 @@ const Detail = () => {
separatorMargin: 20, separatorMargin: 20,
fontWeight: 500, fontWeight: 500,
fontSize: 16, fontSize: 16,
fontFamily: 'Sofia Pro', fontFamily: "Sofia Pro"
} }
} }
}} }}
...@@ -50,20 +50,20 @@ const Detail = () => { ...@@ -50,20 +50,20 @@ const Detail = () => {
separator={<RightOutlined />} separator={<RightOutlined />}
items={[ items={[
{ {
title: 'Home', title: "Home",
href: '/' href: "/"
}, },
{ {
title: activityById?.data?.attributes?.vendor?.data?.attributes?.city, title: activityById?.data?.attributes?.vendor?.data?.attributes?.city
}, },
{ {
title: activityById?.data?.attributes?.category?.data?.attributes?.name, title: activityById?.data?.attributes?.category?.data?.attributes?.name,
href: `/listing?category=${activityById?.data.attributes.category?.data?.id}`, href: `/listing?category=${activityById?.data.attributes.category?.data?.id}`
}, },
{ {
title: activityById?.data?.attributes?.name, title: activityById?.data?.attributes?.name,
href: `/listing?category=${activityById?.data.attributes.category?.data?.id}`, href: `/listing?category=${activityById?.data.attributes.category?.data?.id}`
}, }
]} ]}
/> />
</ConfigProvider> </ConfigProvider>
...@@ -91,6 +91,23 @@ const Detail = () => { ...@@ -91,6 +91,23 @@ const Detail = () => {
<DetailSchedule activityById={activityById} /> <DetailSchedule activityById={activityById} />
</div> </div>
</section> </section>
{activityById && activityById.data.attributes.cancellationPolicyText && (
<div className="container">
<div className="row">
<div className="col-12 my-2">
<div className="head-btn">
<div className="head01">
<div className="title">Cancellation Policy</div>
</div>
{/* <a href="" className="view-all-reviews-btn">
View All Reviews
</a> */}
</div>
</div>
<div className="col-12 my-2">{activityById.data.attributes.cancellationPolicyText}</div>
</div>
</div>
)}
<GuestReviews activityById={activityById} /> <GuestReviews activityById={activityById} />
<SimilarExperiences allActivitiesData={allActivitiesData} /> <SimilarExperiences allActivitiesData={allActivitiesData} />
<Faqs faqs={faqs} /> <Faqs faqs={faqs} />
......
components/detail/DetailInfo.js
...@@ -24,6 +24,17 @@ const DetailInfo = ({ activityById }) => { ...@@ -24,6 +24,17 @@ const DetailInfo = ({ activityById }) => {
dispatch(getCurrentEndUser()); dispatch(getCurrentEndUser());
}, []); }, []);
const calculateRating = data => {
let value = 0;
data.map(item => {
// console.log("item", item);
value = value + item.attributes.rating;
});
// console.log("value", value);
let length = data.length;
return Math.floor(value / length);
};
const [session, setSession] = useState(null); const [session, setSession] = useState(null);
const [enqDate, setenqDate] = useState(); const [enqDate, setenqDate] = useState();
const [loading, setloading] = useState(false); const [loading, setloading] = useState(false);
...@@ -83,9 +94,14 @@ const DetailInfo = ({ activityById }) => { ...@@ -83,9 +94,14 @@ const DetailInfo = ({ activityById }) => {
</motion.div> </motion.div>
</div> </div>
<div className="product-reviews"> <div className="product-reviews">
<span className="rating">{activityById.data.attributes.rating}</span> <span className="rating">
<span className="review">1,365 Reviews</span> <span className="image-container">
<span className="star"> <Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
{calculateRating(activityById.data.attributes.reviews.data)}
</span>
</span>
<span className="review">{activityById.data.attributes.reviews.data.length > 0 ? activityById.data.attributes.reviews.data.length : 0}</span>
{/* <span className="star">
<a href=""> <a href="">
<span className="image-container"> <span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" /> <Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
...@@ -111,7 +127,7 @@ const DetailInfo = ({ activityById }) => { ...@@ -111,7 +127,7 @@ const DetailInfo = ({ activityById }) => {
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" /> <Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
</span> </span>
</a> </a>
</span> </span> */}
</div> </div>
<div className="mb-2">Per Person</div> <div className="mb-2">Per Person</div>
<div className="price"> <div className="price">
...@@ -164,7 +180,6 @@ const DetailInfo = ({ activityById }) => { ...@@ -164,7 +180,6 @@ const DetailInfo = ({ activityById }) => {
Book Now Book Now
</Button> </Button>
</div> </div>
</div> </div>
</div> </div>
)} )}
......
components/gift-card/GiftCard.js
...@@ -118,75 +118,75 @@ const GiftCard = () => { ...@@ -118,75 +118,75 @@ const GiftCard = () => {
<li> <li>
<input <input
name="amt" name="amt"
id="amt-250" id="amt-20"
type="radio" type="radio"
value="" value=""
data-gtm-Form-interact-field-id="1" data-gtm-Form-interact-field-id="1"
onChange={e => { onChange={e => {
setAmount(250); setAmount(20);
setcustom(false); setcustom(false);
}} }}
/> />
<label for="amt-250">$250</label> <label for="amt-20">$20</label>
</li> </li>
<li> <li>
<input <input
name="amt" name="amt"
id="amt-500" id="amt-50"
type="radio" type="radio"
value="" value=""
data-gtm-form-interact-field-id="1" data-gtm-form-interact-field-id="1"
onChange={e => { onChange={e => {
setAmount(500); setAmount(50);
setcustom(false); setcustom(false);
}} }}
/> />
<label for="amt-500">$500</label> <label for="amt-50">$50</label>
</li> </li>
<li> <li>
<input <input
name="amt" name="amt"
id="amt-750" id="amt-100"
type="radio" type="radio"
value="" value=""
data-gtm-form-interact-field-id="1" data-gtm-form-interact-field-id="1"
onChange={e => { onChange={e => {
setAmount(750); setAmount(100);
setcustom(false); setcustom(false);
}} }}
/> />
<label for="amt-750"> <label for="amt-100">
<span>Most Popular</span> <span>Most Popular</span>
<br /> $750 <br /> $100
</label> </label>
</li> </li>
<li> <li>
<input <input
name="amt" name="amt"
id="amt-1000" id="amt-250"
type="radio" type="radio"
value="" value=""
data-gtm-form-interact-field-id="1" data-gtm-form-interact-field-id="1"
onChange={e => { onChange={e => {
setAmount(1000); setAmount(250);
setcustom(false); setcustom(false);
}} }}
/> />
<label for="amt-1000"> $1000</label> <label for="amt-250"> $250</label>
</li> </li>
<li> <li>
<input <input
name="amt" name="amt"
id="amt-1500" id="amt-500"
type="radio" type="radio"
value="" value=""
data-gtm-form-interact-field-id="1" data-gtm-form-interact-field-id="1"
onChange={e => { onChange={e => {
setAmount(1500); setAmount(500);
setcustom(false); setcustom(false);
}} }}
/> />
<label for="amt-1500"> $1500</label> <label for="amt-500"> $500</label>
</li> </li>
<li> <li>
<input <input
......
components/listing/ListingFilter.js
...@@ -9,7 +9,7 @@ import { TimePicker } from "antd"; ...@@ -9,7 +9,7 @@ import { TimePicker } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { Input } from "react-bootstrap-typeahead"; import { Input } from "react-bootstrap-typeahead";
const format = "HH:mm"; const format = "HH:mm";
const suitableAgeGroups = [2, 5, 8, 10, 12, 14, 16]; const suitableAgeGroups = [[2, 5], [5, 10], [10, 16], [16, 18], [18]];
const ListingFilter = () => { const ListingFilter = () => {
const [showContent, setShowContent] = useState(false); const [showContent, setShowContent] = useState(false);
const [sliderLowerValue, setsliderLowerValue] = useState(0); const [sliderLowerValue, setsliderLowerValue] = useState(0);
...@@ -17,12 +17,21 @@ const ListingFilter = () => { ...@@ -17,12 +17,21 @@ const ListingFilter = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { activityFilters } = useSelector(sate => sate.activityFilters); const { activityFilters } = useSelector(sate => sate.activityFilters);
const { subCategories, loading } = useSelector(sate => sate.subCategories); const { subCategories, loading } = useSelector(sate => sate.subCategories);
const [customDate, setcustomDate] = useState();
const toggleContent = () => { const toggleContent = () => {
setShowContent(!showContent); setShowContent(!showContent);
}; };
const onChange = (date, dateString) => { const onChange = (date, dateString) => {
console.log(date, dateString); console.log(date, dateString);
}; };
const disabledDate = current => {
// Can not select days before today and today
return current && current < dayjs().startOf("day");
};
const disabledDate2 = (current, customDate) => {
// Can not select days before today and today
return current && current < dayjs(customDate).startOf("day");
};
return ( return (
<> <>
<div className="listing-filter"> <div className="listing-filter">
...@@ -220,7 +229,9 @@ const ListingFilter = () => { ...@@ -220,7 +229,9 @@ const ListingFilter = () => {
<label>From</label> <label>From</label>
<Space direction="vertical"> <Space direction="vertical">
<DatePicker <DatePicker
disabledDate={disabledDate}
onChange={(date, dateString) => { onChange={(date, dateString) => {
setcustomDate(date);
console.log("date", date, dateString); console.log("date", date, dateString);
dispatch(setActivityFilters({ filters: { ...activityFilters, startDate: dateString !== "" ? dateString : null } })); dispatch(setActivityFilters({ filters: { ...activityFilters, startDate: dateString !== "" ? dateString : null } }));
}} }}
...@@ -231,6 +242,7 @@ const ListingFilter = () => { ...@@ -231,6 +242,7 @@ const ListingFilter = () => {
<label>To</label> <label>To</label>
<Space direction="vertical"> <Space direction="vertical">
<DatePicker <DatePicker
disabledDate={current => disabledDate2(current, customDate)}
onChange={(date, dateString) => { onChange={(date, dateString) => {
console.log("date", date, dateString); console.log("date", date, dateString);
dispatch(setActivityFilters({ filters: { ...activityFilters, endDate: dateString !== "" ? dateString : null } })); dispatch(setActivityFilters({ filters: { ...activityFilters, endDate: dateString !== "" ? dateString : null } }));
...@@ -270,7 +282,7 @@ const ListingFilter = () => { ...@@ -270,7 +282,7 @@ const ListingFilter = () => {
</div> </div>
<div className="time"> <div className="time">
<div> <div>
<label>maximum duration:</label> <label>Maximum duration:</label>
</div> </div>
<div className=""> <div className="">
<Input <Input
...@@ -360,23 +372,30 @@ const ListingFilter = () => { ...@@ -360,23 +372,30 @@ const ListingFilter = () => {
<div className="inner"> <div className="inner">
<Form.Select <Form.Select
onChange={e => { onChange={e => {
console.log(e.target.value); // console.log("filter 123", e);
if (e.target.value != "select") { if (e.target.value != "select") {
dispatch(setActivityFilters({ filters: { ...activityFilters, minAge: e.target.value } })); dispatch(setActivityFilters({ filters: { ...activityFilters, minAge: e.target.value } }));
} else { } else {
dispatch(setActivityFilters({ filters: { ...activityFilters, minAge: null } })); dispatch(setActivityFilters({ filters: { ...activityFilters, minAge: null } }));
} }
// setTimeout(() => {
// }, 1500);
}} }}
// onSelect={(e) => {
// console.log("filter 123", e);
// }}
aria-label="Default select example" aria-label="Default select example"
> >
<option>Select</option> <option>Select</option>
{suitableAgeGroups.map(item => { {suitableAgeGroups.map(item => {
return <option value={item}> {item}+ </option>; return <option value={item}> {item[1] ? `${item[0]} - ${item[1]}` : `${item[0]}+`} </option>;
})} })}
{/* {[
{ start: 5, end: 10 },
{ start: 10, end: 20 }
].map(item => {
return <option value={item}> {item.end ? `${item.start} - ${item.end}` : `${item[0]}+`} </option>;
})} */}
</Form.Select> </Form.Select>
</div> </div>
</div> </div>
......
components/listing/ListingItems.js
...@@ -14,6 +14,7 @@ import Link from "next/link"; ...@@ -14,6 +14,7 @@ import Link from "next/link";
const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) => { const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) => {
// const [gridClass, setGridClass] = useState('col-md-3'); // const [gridClass, setGridClass] = useState('col-md-3');
const { endUser } = useSelector(state => state.endUser); const { endUser } = useSelector(state => state.endUser);
const { activityFilters } = useSelector(state => state.activityFilters);
const router = useRouter(); const router = useRouter();
const [readMoreText, setreadMoreText] = useState(); const [readMoreText, setreadMoreText] = useState();
const [showModal, setshowModal] = useState(false); const [showModal, setshowModal] = useState(false);
...@@ -49,7 +50,70 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) => ...@@ -49,7 +50,70 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) =>
// router.push({ // router.push({
// query: `/listing?page=${pageNumber}` // query: `/listing?page=${pageNumber}`
// }); // });
dispatch(getActivitiesByFilters({ currentPage: pageNumber })); // dispatch(getActivitiesByFilters({ currentPage: pageNumber }));
let filters = {};
// console.log("subcategory here", activityFilters.startDate);
if (activityFilters.category) {
filters["category"] = { id: { $eq: activityFilters.category } };
}
if (activityFilters.subCategories?.length > 0) {
filters["category"] = null;
filters["subCategory"] = activityFilters.subCategories.map(item => {
return { subCategory: { id: { $eq: item } } };
});
}
if (activityFilters.activityType) {
filters["activityType"] = activityFilters.activityType;
}
if (activityFilters.startDate) {
filters["fromDate"] = activityFilters.startDate;
}
if (activityFilters.endDate) {
filters["toDate"] = activityFilters.endDate;
}
if (activityFilters.minDuration > 0) {
filters["minimumDuration"] = activityFilters.minDuration;
}
if (activityFilters.maxDuration > 0) {
filters["maximumDuration"] = activityFilters.maxDuration;
}
if (activityFilters.minGroupSize > 0) {
filters["minGroupSize"] = activityFilters.minGroupSize;
}
if (activityFilters.maxGroupSize > 0) {
filters["maxGroupSize"] = activityFilters.maxGroupSize;
}
if (activityFilters.minAge > 0) {
filters["ageLowerLimit"] = activityFilters.minAge;
}
if (activityFilters.sorting) {
filters["sort"] = activityFilters.sorting;
}
if (activityFilters.priceUpperLimit) {
filters["priceUpperLimit"] = activityFilters.priceUpperLimit;
}
if (activityFilters.priceLowerLimit) {
filters["priceLowerLimit"] = activityFilters.priceLowerLimit;
}
console.log("router query", filters.category);
dispatch(
getActivitiesByFilters({
subCategory: filters.subCategory,
category: filters.category,
activityType: filters.activityType,
fromDate: filters.fromDate,
toDate: filters.toDate,
minimumDuration: filters.minimumDuration,
maximumDuration: filters.maximumDuration,
minGroupSize: filters.minGroupSize,
maxGroupSize: filters.maxGroupSize,
ageLowerLimit: filters.ageLowerLimit,
sort: filters.sort,
priceUpperLimit: filters.priceUpperLimit,
priceLowerLimit: filters.priceLowerLimit,
currentPage: pageNumber
})
);
}; };
console.log("page", page); console.log("page", page);
useEffect(() => { useEffect(() => {
......
components/signup/Signup.js
...@@ -16,11 +16,14 @@ import { finishVendorOtpVerification } from "../../redux/actions/vendorActions"; ...@@ -16,11 +16,14 @@ import { finishVendorOtpVerification } from "../../redux/actions/vendorActions";
import { signIn } from "next-auth/react"; import { signIn } from "next-auth/react";
import { Loader } from "react-bootstrap-typeahead"; import { Loader } from "react-bootstrap-typeahead";
import qs from "qs"; import qs from "qs";
import PhoneInput from "react-phone-input-2";
import OtpTimer from "../common-components/OtpTimer";
const Signup = props => { const Signup = props => {
console.log("props.type", props.type); console.log("props.type", props.type);
const [otp, setOtp] = useState(new Array(4).fill("")); const [otp, setOtp] = useState(new Array(4).fill(""));
const [isOtpSent, setOtpSent] = useState(false); const [isOtpSent, setOtpSent] = useState(false);
const [otpVerified, setOtpVerified] = useState(false); const [otpVerified, setOtpVerified] = useState(false);
const [otpTimer, setotpTimer] = useState(30);
const [loading, setLoading] = useState(); const [loading, setLoading] = useState();
const dispatch = useDispatch(); const dispatch = useDispatch();
const router = useRouter(); const router = useRouter();
...@@ -42,9 +45,8 @@ const Signup = props => { ...@@ -42,9 +45,8 @@ const Signup = props => {
.required("Confirm Password is Required") .required("Confirm Password is Required")
.oneOf([Yup.ref("password"), null], "Passwords must match"), .oneOf([Yup.ref("password"), null], "Passwords must match"),
countryCode: Yup.string().required("Country Code is Required"), countryCode: Yup.string().required("Country Code is Required"),
mobile: Yup.string() mobile: Yup.string().required("Mobile Number is Required"),
.required("Mobile Number is Required") // .matches(/^[0-9\s]+$/, "Please Enter Correct Mobile No."),
.matches(/^[0-9\s]+$/, "Please Enter Correct Mobile No."),
termsConditions: Yup.bool().oneOf([true], "Please Accept Terms & Conditions"), termsConditions: Yup.bool().oneOf([true], "Please Accept Terms & Conditions"),
otp: Yup.string().when("isOtpSent", { otp: Yup.string().when("isOtpSent", {
is: true, is: true,
...@@ -73,7 +75,13 @@ const Signup = props => { ...@@ -73,7 +75,13 @@ const Signup = props => {
if (props.type == "user") { if (props.type == "user") {
} }
}; };
const startTimer = () => {
setotpTimer(otpTimer - 1);
// while (otpTimer > 0) {
// setTimeout(() => {
// }, 1000);
// }
};
return ( return (
<Fragment> <Fragment>
<div className="contaier-fluid login-banner-image"> <div className="contaier-fluid login-banner-image">
...@@ -109,7 +117,7 @@ const Signup = props => { ...@@ -109,7 +117,7 @@ const Signup = props => {
// } // }
// }} // }}
> >
{({ values, errors, touched, handleChange, handleBlur, handleSubmit, isValid, isSubmitting }) => ( {({ values, errors, touched, handleChange, handleBlur, handleSubmit, isValid, isSubmitting, setValues, setFieldValue }) => (
<Form <Form
onSubmit={async e => { onSubmit={async e => {
e.preventDefault(); e.preventDefault();
...@@ -160,6 +168,7 @@ const Signup = props => { ...@@ -160,6 +168,7 @@ const Signup = props => {
} }
setOtpSent(true); setOtpSent(true);
setLoading(false); setLoading(false);
// startTimer();
} else { } else {
e.preventDefault(); e.preventDefault();
setLoading(true); setLoading(true);
...@@ -220,14 +229,21 @@ const Signup = props => { ...@@ -220,14 +229,21 @@ const Signup = props => {
<div className="input-group"> <div className="input-group">
<label>Mobile No.</label> <label>Mobile No.</label>
<div className="contact-numbe w-100"> <div className="contact-numbe w-100">
<input {/* <input name="mobile" onChange={handleChange} onBlur={handleBlur} value={values.mobile} placeholder="" style={{ flex: "0 100%" }} /> */}
type="text" <PhoneInput
placeholder="Enter phone number"
name="mobile" name="mobile"
onChange={handleChange} onChange={e => {
console.log(values.mobile);
setValues({ ...values, mobile: e });
// handleChange(e);
}}
onBlur={handleBlur} onBlur={handleBlur}
value={values.mobile} value={values.mobile}
placeholder="#@$!%@#" // placeholder=""
style={{ flex: "0 100%" }} // style={{ flex: "0 100%" }}
// value={value}
// onChange={setValue}
/> />
</div> </div>
{errors.mobile && touched.mobile && <span className="form-error">{errors.mobile}</span>} {errors.mobile && touched.mobile && <span className="form-error">{errors.mobile}</span>}
...@@ -250,18 +266,28 @@ const Signup = props => { ...@@ -250,18 +266,28 @@ const Signup = props => {
{errors.termsConditions && touched.termsConditions && <span className="form-error">{errors.termsConditions}</span>} {errors.termsConditions && touched.termsConditions && <span className="form-error">{errors.termsConditions}</span>}
</div> </div>
{isOtpSent && ( {isOtpSent && (
// true
<> <>
<div className="input-group"> <div className="input-group">
<label> {/* <label>
OTP <span style={{ marginLeft: "190px" }}>00:30</span> OTP <span style={{ marginLeft: "190px" }}>{otpTimer}</span>
</label> </label> */}
<div className="otp-input"> <div className="otp-input">
<OTPInput setOtp={setOtp} otp={otp} /> <OTPInput setOtp={setOtp} otp={otp} />
</div> </div>
{errors.otp && touched.otp && <span className="form-error">{errors.otp}</span>} {errors.otp && touched.otp && <span className="form-error">{errors.otp}</span>}
</div> </div>
<div> <div>
<p>4 digit OTP is been sent on your email address.</p> {/* <p>OTP Timer Example</p> */}
<OtpTimer
initialTime={30}
role={props.type}
userData={{ mobileNo: values.mobile, name: values.fullname, email: values.email, password: values.password }}
/>
</div>
<div>
<p className="mt-4">4 digit OTP is been sent on your email address.</p>
<div className="d-flex align-items-center mb-4"> <div className="d-flex align-items-center mb-4">
<p className="mb-0 me-5">Didn’t Receive Yet?</p> <p className="mb-0 me-5">Didn’t Receive Yet?</p>
{/* <div className="d-flex resend-otp"> {/* <div className="d-flex resend-otp">
......
redux/actions/activityAction.js
...@@ -113,7 +113,7 @@ export const getActivitiesByVendor = () => async dispatch => { ...@@ -113,7 +113,7 @@ export const getActivitiesByVendor = () => async dispatch => {
} }
}, },
pagination: { pagination: {
pageSize: 1000, pageSize: 1000
}, },
populate: [ populate: [
"masterMonths", "masterMonths",
...@@ -274,7 +274,7 @@ export const getActivitiesForAdmin = ...@@ -274,7 +274,7 @@ export const getActivitiesForAdmin =
} }
}, },
pagination: { pagination: {
pageSize: 1000, pageSize: 1000
}, },
populate: [ populate: [
"masterMonths", "masterMonths",
...@@ -335,7 +335,7 @@ export const getActivitiesForEndUser = () => async dispatch => { ...@@ -335,7 +335,7 @@ export const getActivitiesForEndUser = () => async dispatch => {
filters: { filters: {
approved: { $eq: "approved" } approved: { $eq: "approved" }
}, },
sort: [{ createdAt: 'asc' }], sort: [{ createdAt: "asc" }],
pagination: { pagination: {
pageSize: 5 pageSize: 5
}, },
...@@ -463,8 +463,10 @@ export const getActivitiesByFilters = ...@@ -463,8 +463,10 @@ export const getActivitiesByFilters =
query.filters["activityType"] = activityType; query.filters["activityType"] = activityType;
} }
// { fromDate: {$lte: "2022-07-09"}}
if (fromDate && toDate) { if (fromDate && toDate) {
query.filters["$and"] = [{ fromDate: { $gte: fromDate } }, { toDate: { $lte: toDate } }]; query.filters["$and"] = [{ fromDate: { $gte: fromDate } }, { toDate: { $lte: toDate } }];
// query.filters["$or"] = [{ fromDate: { $gte: fromDate } }, { toDate: { $lte: toDate } }];
delete query.filters.fromDate; delete query.filters.fromDate;
delete query.filters.toDate; delete query.filters.toDate;
} }
...@@ -477,12 +479,28 @@ export const getActivitiesByFilters = ...@@ -477,12 +479,28 @@ export const getActivitiesByFilters =
} }
} }
if (maximumDuration && minimumDuration) {
query.filters["$and"] = [{ maximumDuration: { $lte: maximumDuration } }, { minimumDuration: { $gte: minimumDuration } }];
// query.filters["$or"] = [{ maximumDuration: { $gte: maximumDuration } }, { minimumDuration: { $lte: minimumDuration } }];
delete query.filters.maximumDuration;
delete query.filters.minimumDuration;
}
if (!(maximumDuration && minimumDuration)) {
if (maximumDuration) { if (maximumDuration) {
query.filters["maximumDuration"] = { $lte: maximumDuration }; query.filters["maximumDuration"] = { $lte: maximumDuration };
} }
if (minimumDuration) { if (minimumDuration) {
query.filters["minimumDuration"] = { $gte: minimumDuration }; query.filters["minimumDuration"] = { $gte: minimumDuration };
} }
}
// if (maximumDuration) {
// query.filters["maximumDuration"] = { $gte: maximumDuration };
// }
// if (minimumDuration) {
// query.filters["minimumDuration"] = { $lte: minimumDuration };
// }
if (minGroupSize) { if (minGroupSize) {
query.filters["minGroupSize"] = { $gte: minGroupSize }; query.filters["minGroupSize"] = { $gte: minGroupSize };
} }
......
redux/actions/userActions.js
...@@ -83,7 +83,7 @@ export const registerUser = userData => async dispatch => { ...@@ -83,7 +83,7 @@ export const registerUser = userData => async dispatch => {
} }
}; };
const registerVendor = async vendorData => { export const registerVendor = async vendorData => {
const authUser = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/auth/local`, { const authUser = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/auth/local`, {
identifier: vendorData.email, identifier: vendorData.email,
password: vendorData.password password: vendorData.password
...@@ -109,7 +109,7 @@ const registerVendor = async vendorData => { ...@@ -109,7 +109,7 @@ const registerVendor = async vendorData => {
return response; return response;
}; };
const registerEndUser = async vendorData => { export const registerEndUser = async vendorData => {
const authUser = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/auth/local`, { const authUser = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/auth/local`, {
identifier: vendorData.email, identifier: vendorData.email,
password: vendorData.password password: vendorData.password
......
styles/globals.css
...@@ -3956,6 +3956,9 @@ footer .footer-link ul { ...@@ -3956,6 +3956,9 @@ footer .footer-link ul {
padding: 0.5rem 0; padding: 0.5rem 0;
cursor: pointer; cursor: pointer;
} }
.contact-numbe .special-label {
display: none !important;
}
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar-expand-lg .navbar-nav .nav-link { .navbar-expand-lg .navbar-nav .nav-link {
margin: 0 2rem; margin: 0 2rem;
......
yarn.lock
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
dependencies: dependencies:
"@ctrl/tinycolor" "^3.6.1" "@ctrl/tinycolor" "^3.6.1"
"@ant-design/cssinjs@^1.18.5": "@ant-design/cssinjs@^1.18.4":
version "1.19.1" version "1.18.4"
resolved "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.19.1.tgz" resolved "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.18.4.tgz"
integrity sha512-hgQ3wiys3X0sqDKWkqCJ6EYdF79i9JCvtavmIGwuuPUKmoJXV8Ff0sY+yQQSxk2dRmMyam/bYKo/Bwor45hnZw== integrity sha512-IrUAOj5TYuMG556C9gdbFuOrigyhzhU5ZYpWb3gYTxAwymVqRbvLzFCZg6OsjLBR6GhzcxYF3AhxKmjB+rA2xA==
dependencies: dependencies:
"@babel/runtime" "^7.11.1" "@babel/runtime" "^7.11.1"
"@emotion/hash" "^0.8.0" "@emotion/hash" "^0.8.0"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz" resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz"
integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA== integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
"@ant-design/icons@^5.3.6": "@ant-design/icons@^5.3.3", "@ant-design/icons@^5.3.6":
version "5.3.6" version "5.3.6"
resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-5.3.6.tgz" resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-5.3.6.tgz"
integrity sha512-JeWsgNjvkTTC73YDPgWOgdScRku/iHN9JU0qk39OSEmJSCiRghQMLlxGTCY5ovbRRoXjxHXnUKgQEgBDnQfKmA== integrity sha512-JeWsgNjvkTTC73YDPgWOgdScRku/iHN9JU0qk39OSEmJSCiRghQMLlxGTCY5ovbRRoXjxHXnUKgQEgBDnQfKmA==
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
classnames "^2.2.6" classnames "^2.2.6"
rc-util "^5.31.1" rc-util "^5.31.1"
"@ant-design/react-slick@~1.1.2": "@ant-design/react-slick@~1.0.2":
version "1.1.2" version "1.0.2"
resolved "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz" resolved "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.0.2.tgz"
integrity sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA== integrity sha512-Wj8onxL/T8KQLFFiCA4t8eIRGpRR+UPgOdac2sYzonv+i0n3kXHmvHLLiOYL655DQx2Umii9Y9nNgL7ssu5haQ==
dependencies: dependencies:
"@babel/runtime" "^7.10.4" "@babel/runtime" "^7.10.4"
classnames "^2.2.5" classnames "^2.2.5"
...@@ -92,10 +92,10 @@ ...@@ -92,10 +92,10 @@
core-js-pure "^3.20.2" core-js-pure "^3.20.2"
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
version "7.24.4" version "7.24.1"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz"
integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA== integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==
dependencies: dependencies:
regenerator-runtime "^0.14.0" regenerator-runtime "^0.14.0"
...@@ -171,9 +171,9 @@ ...@@ -171,9 +171,9 @@
hoist-non-react-statics "^3.3.1" hoist-non-react-statics "^3.3.1"
"@emotion/serialize@^1.1.2", "@emotion/serialize@^1.1.3": "@emotion/serialize@^1.1.2", "@emotion/serialize@^1.1.3":
version "1.1.4" version "1.1.3"
resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz" resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.3.tgz"
integrity sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ== integrity sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==
dependencies: dependencies:
"@emotion/hash" "^0.9.1" "@emotion/hash" "^0.9.1"
"@emotion/memoize" "^0.8.1" "@emotion/memoize" "^0.8.1"
...@@ -352,6 +352,11 @@ ...@@ -352,6 +352,11 @@
resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.2.5.tgz" resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.2.5.tgz"
integrity sha512-0szyAo8jMCClkjNK0hknjhmAngUppoRekW6OAezbEYwHXN/VNtsXbfzgYOqjKWxEx3OoAzrT3jLwAF0HdX2MEw== integrity sha512-0szyAo8jMCClkjNK0hknjhmAngUppoRekW6OAezbEYwHXN/VNtsXbfzgYOqjKWxEx3OoAzrT3jLwAF0HdX2MEw==
"@next/swc-linux-x64-musl@12.2.5":
version "12.2.5"
resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.2.5.tgz"
integrity sha512-zg/Y6oBar1yVnW6Il1I/08/2ukWtOG6s3acdJdEyIdsCzyQi4RLxbbhkD/EGQyhqBvd3QrC6ZXQEXighQUAZ0g==
"@nodelib/fs.scandir@2.1.5": "@nodelib/fs.scandir@2.1.5":
version "2.1.5" version "2.1.5"
resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
...@@ -379,9 +384,9 @@ ...@@ -379,9 +384,9 @@
integrity sha512-MSAs9t3Go7GUkMhpKC44T58DJ5KGk2vBo+h1cqQeqlMfdGkxaVB78ZWpv9gYi/g2fa4sopag9gJsNvS8XGgWJA== integrity sha512-MSAs9t3Go7GUkMhpKC44T58DJ5KGk2vBo+h1cqQeqlMfdGkxaVB78ZWpv9gYi/g2fa4sopag9gJsNvS8XGgWJA==
"@popperjs/core@^2.0.0", "@popperjs/core@^2.10.2", "@popperjs/core@^2.11.5", "@popperjs/core@^2.11.6", "@popperjs/core@^2.9.2": "@popperjs/core@^2.0.0", "@popperjs/core@^2.10.2", "@popperjs/core@^2.11.5", "@popperjs/core@^2.11.6", "@popperjs/core@^2.9.2":
version "2.11.6" version "2.11.8"
resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz" resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz"
integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
"@rc-component/color-picker@~1.5.3": "@rc-component/color-picker@~1.5.3":
version "1.5.3" version "1.5.3"
...@@ -532,9 +537,9 @@ ...@@ -532,9 +537,9 @@
integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
"@types/prop-types@*": "@types/prop-types@*":
version "15.7.5" version "15.7.11"
resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz" resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
"@types/react-text-mask@^5.4.3": "@types/react-text-mask@^5.4.3":
version "5.4.11" version "5.4.11"
...@@ -551,9 +556,9 @@ ...@@ -551,9 +556,9 @@
"@types/react" "*" "@types/react" "*"
"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.4": "@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.4":
version "4.4.5" version "4.4.10"
resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz" resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz"
integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA== integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==
dependencies: dependencies:
"@types/react" "*" "@types/react" "*"
...@@ -844,15 +849,15 @@ antd-img-crop@^4.22.0: ...@@ -844,15 +849,15 @@ antd-img-crop@^4.22.0:
tslib "^2.6.2" tslib "^2.6.2"
antd@^5.15.3, antd@>=4.0.0: antd@^5.15.3, antd@>=4.0.0:
version "5.16.1" version "5.15.3"
resolved "https://registry.npmjs.org/antd/-/antd-5.16.1.tgz" resolved "https://registry.npmjs.org/antd/-/antd-5.15.3.tgz"
integrity sha512-XAlLRrgYV+nj9FHnkXEPS6HNcKcluEa8v44e7Cixjlp8aOXRhUI6IfZaKpc2MPGjQ+06rp62/dsxOUNJW9kfLA== integrity sha512-53dpdGbfwipHVbqITmppp8N16i+BscMzz8NUNwaJgxwSvO9VQh/NfC/90lqGq3I2oBmxQ8TzRIxzFVKD/9OhlQ==
dependencies: dependencies:
"@ant-design/colors" "^7.0.2" "@ant-design/colors" "^7.0.2"
"@ant-design/cssinjs" "^1.18.5" "@ant-design/cssinjs" "^1.18.4"
"@ant-design/icons" "^5.3.6" "@ant-design/icons" "^5.3.3"
"@ant-design/react-slick" "~1.1.2" "@ant-design/react-slick" "~1.0.2"
"@babel/runtime" "^7.24.4" "@babel/runtime" "^7.24.0"
"@ctrl/tinycolor" "^3.6.1" "@ctrl/tinycolor" "^3.6.1"
"@rc-component/color-picker" "~1.5.3" "@rc-component/color-picker" "~1.5.3"
"@rc-component/mutate-observer" "^1.1.0" "@rc-component/mutate-observer" "^1.1.0"
...@@ -864,21 +869,21 @@ antd@^5.15.3, antd@>=4.0.0: ...@@ -864,21 +869,21 @@ antd@^5.15.3, antd@>=4.0.0:
qrcode.react "^3.1.0" qrcode.react "^3.1.0"
rc-cascader "~3.24.0" rc-cascader "~3.24.0"
rc-checkbox "~3.2.0" rc-checkbox "~3.2.0"
rc-collapse "~3.7.3" rc-collapse "~3.7.2"
rc-dialog "~9.4.0" rc-dialog "~9.4.0"
rc-drawer "~7.1.0" rc-drawer "~7.1.0"
rc-dropdown "~4.2.0" rc-dropdown "~4.2.0"
rc-field-form "~1.44.0" rc-field-form "~1.42.1"
rc-image "~7.6.0" rc-image "~7.6.0"
rc-input "~1.4.5" rc-input "~1.4.5"
rc-input-number "~9.0.0" rc-input-number "~9.0.0"
rc-mentions "~2.11.1" rc-mentions "~2.11.1"
rc-menu "~9.13.0" rc-menu "~9.13.0"
rc-motion "^2.9.0" rc-motion "^2.9.0"
rc-notification "~5.4.0" rc-notification "~5.3.0"
rc-pagination "~4.0.4" rc-pagination "~4.0.4"
rc-picker "~4.3.0" rc-picker "~4.3.0"
rc-progress "~4.0.0" rc-progress "~3.5.1"
rc-rate "~2.12.0" rc-rate "~2.12.0"
rc-resize-observer "^1.4.0" rc-resize-observer "^1.4.0"
rc-segmented "~2.3.0" rc-segmented "~2.3.0"
...@@ -886,7 +891,7 @@ antd@^5.15.3, antd@>=4.0.0: ...@@ -886,7 +891,7 @@ antd@^5.15.3, antd@>=4.0.0:
rc-slider "~10.5.0" rc-slider "~10.5.0"
rc-steps "~6.0.1" rc-steps "~6.0.1"
rc-switch "~4.1.0" rc-switch "~4.1.0"
rc-table "~7.45.4" rc-table "~7.42.0"
rc-tabs "~14.1.1" rc-tabs "~14.1.1"
rc-textarea "~1.6.3" rc-textarea "~1.6.3"
rc-tooltip "~6.2.0" rc-tooltip "~6.2.0"
...@@ -1434,25 +1439,15 @@ class-utils@^0.3.5: ...@@ -1434,25 +1439,15 @@ class-utils@^0.3.5:
isobject "^3.0.0" isobject "^3.0.0"
static-extend "^0.1.1" static-extend "^0.1.1"
classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@2.2.6, classnames@2.x: classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2, classnames@^2.5.1, classnames@2.x:
version "2.2.6"
resolved "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz"
integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
classnames@^2.3.1:
version "2.5.1"
resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
classnames@^2.3.2:
version "2.5.1" version "2.5.1"
resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz" resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
classnames@^2.5.1: classnames@2.2.6:
version "2.5.1" version "2.2.6"
resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz" resolved "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz"
integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
clone-deep@^4.0.1: clone-deep@^4.0.1:
version "4.0.1" version "4.0.1"
...@@ -2512,9 +2507,9 @@ fragment-cache@^0.2.1: ...@@ -2512,9 +2507,9 @@ fragment-cache@^0.2.1:
map-cache "^0.2.2" map-cache "^0.2.2"
framer-motion@^11.0.14: framer-motion@^11.0.14:
version "11.0.14" version "11.0.25"
resolved "https://registry.npmjs.org/framer-motion/-/framer-motion-11.0.14.tgz" resolved "https://registry.npmjs.org/framer-motion/-/framer-motion-11.0.25.tgz"
integrity sha512-RFjo2hB1MTW0EWsHQaXgVn0AEUDGxAs0ZL2vVjTTJJu3N7wFiLkmqTn5ysLjL+qKZ9jvfpKXDb9waN9AyLqk8g== integrity sha512-mRt7vQGzA7++wTgb+PW1TrlXXgndqR6hCiJ48fXr2X9alte2hPQiAq556HRwDCt0Q5X98MNvcSe4KUa27Gm5Lg==
dependencies: dependencies:
tslib "^2.4.0" tslib "^2.4.0"
...@@ -2627,27 +2622,27 @@ glob-parent@~5.1.2: ...@@ -2627,27 +2622,27 @@ glob-parent@~5.1.2:
dependencies: dependencies:
is-glob "^4.0.1" is-glob "^4.0.1"
glob@^7.1.3, glob@^7.1.4, glob@7.1.7: glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
version "7.1.7" version "7.2.3"
resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
dependencies: dependencies:
fs.realpath "^1.0.0" fs.realpath "^1.0.0"
inflight "^1.0.4" inflight "^1.0.4"
inherits "2" inherits "2"
minimatch "^3.0.4" minimatch "^3.1.1"
once "^1.3.0" once "^1.3.0"
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
glob@^7.2.0: glob@7.1.7:
version "7.2.3" version "7.1.7"
resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies: dependencies:
fs.realpath "^1.0.0" fs.realpath "^1.0.0"
inflight "^1.0.4" inflight "^1.0.4"
inherits "2" inherits "2"
minimatch "^3.1.1" minimatch "^3.0.4"
once "^1.3.0" once "^1.3.0"
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
...@@ -3701,16 +3696,21 @@ move-concurrently@^1.0.1: ...@@ -3701,16 +3696,21 @@ move-concurrently@^1.0.1:
rimraf "^2.5.4" rimraf "^2.5.4"
run-queue "^1.0.3" run-queue "^1.0.3"
ms@^2.1.1, ms@2.1.2: ms@^2.1.1:
version "2.1.2" version "2.1.3"
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
ms@2.0.0: ms@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
ms@2.1.2:
version "2.1.2"
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
nanoclone@^0.2.1: nanoclone@^0.2.1:
version "0.2.1" version "0.2.1"
resolved "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz" resolved "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"
...@@ -4409,7 +4409,7 @@ rc-checkbox@~3.2.0: ...@@ -4409,7 +4409,7 @@ rc-checkbox@~3.2.0:
classnames "^2.3.2" classnames "^2.3.2"
rc-util "^5.25.2" rc-util "^5.25.2"
rc-collapse@~3.7.3: rc-collapse@~3.7.2:
version "3.7.3" version "3.7.3"
resolved "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.7.3.tgz" resolved "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.7.3.tgz"
integrity sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw== integrity sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw==
...@@ -4451,10 +4451,10 @@ rc-dropdown@~4.2.0: ...@@ -4451,10 +4451,10 @@ rc-dropdown@~4.2.0:
classnames "^2.2.6" classnames "^2.2.6"
rc-util "^5.17.0" rc-util "^5.17.0"
rc-field-form@~1.44.0: rc-field-form@~1.42.1:
version "1.44.0" version "1.42.1"
resolved "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.44.0.tgz" resolved "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.42.1.tgz"
integrity sha512-el7w87fyDUsca63Y/s8qJcq9kNkf/J5h+iTdqG5WsSHLH0e6Usl7QuYSmSVzJMgtp40mOVZIY/W/QP9zwrp1FA== integrity sha512-SqiEmWNP+I61Lt80+ofPvT+3l8Ij6vb35IS+x14gheVnCJN0SRnOwEgsqCEB5FslT7xqjUqDnU845hRZ1jzlAA==
dependencies: dependencies:
"@babel/runtime" "^7.18.0" "@babel/runtime" "^7.18.0"
async-validator "^4.1.0" async-validator "^4.1.0"
...@@ -4526,10 +4526,10 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motio ...@@ -4526,10 +4526,10 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motio
classnames "^2.2.1" classnames "^2.2.1"
rc-util "^5.21.0" rc-util "^5.21.0"
rc-notification@~5.4.0: rc-notification@~5.3.0:
version "5.4.0" version "5.3.0"
resolved "https://registry.npmjs.org/rc-notification/-/rc-notification-5.4.0.tgz" resolved "https://registry.npmjs.org/rc-notification/-/rc-notification-5.3.0.tgz"
integrity sha512-li19y9RoYJciF3WRFvD+DvWS70jdL8Fr+Gfb/OshK+iY6iTkwzoigmSIp76/kWh5tF5i/i9im12X3nsF85GYdA== integrity sha512-WCf0uCOkZ3HGfF0p1H4Sgt7aWfipxORWTPp7o6prA3vxwtWhtug3GfpYls1pnBp4WA+j8vGIi5c2/hQRpGzPcQ==
dependencies: dependencies:
"@babel/runtime" "^7.10.1" "@babel/runtime" "^7.10.1"
classnames "2.x" classnames "2.x"
...@@ -4567,10 +4567,10 @@ rc-picker@~4.3.0: ...@@ -4567,10 +4567,10 @@ rc-picker@~4.3.0:
rc-resize-observer "^1.4.0" rc-resize-observer "^1.4.0"
rc-util "^5.38.1" rc-util "^5.38.1"
rc-progress@~4.0.0: rc-progress@~3.5.1:
version "4.0.0" version "3.5.1"
resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz" resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-3.5.1.tgz"
integrity sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw== integrity sha512-V6Amx6SbLRwPin/oD+k1vbPrO8+9Qf8zW1T8A7o83HdNafEVvAxPV5YsgtKFP+Ud5HghLj33zKOcEHrcrUGkfw==
dependencies: dependencies:
"@babel/runtime" "^7.10.1" "@babel/runtime" "^7.10.1"
classnames "^2.2.6" classnames "^2.2.6"
...@@ -4645,10 +4645,10 @@ rc-switch@~4.1.0: ...@@ -4645,10 +4645,10 @@ rc-switch@~4.1.0:
classnames "^2.2.1" classnames "^2.2.1"
rc-util "^5.30.0" rc-util "^5.30.0"
rc-table@~7.45.4: rc-table@~7.42.0:
version "7.45.4" version "7.42.0"
resolved "https://registry.npmjs.org/rc-table/-/rc-table-7.45.4.tgz" resolved "https://registry.npmjs.org/rc-table/-/rc-table-7.42.0.tgz"
integrity sha512-6aSbGrnkN2GLSt3s1x+wa4f3j/VEgg1uKPpaLY5qHH1/nFyreS2V7DFJ0TfUb18allf2FQl7oVYEjTixlBXEyQ== integrity sha512-GwHV9Zs3HvWxBkoXatO/IeKoElzy3Ojf3dcyw1Rj3cyQVb+ZHtexslKdyzsrKRPJ0mUa62BoX+ZAg3zgTEql8w==
dependencies: dependencies:
"@babel/runtime" "^7.10.1" "@babel/runtime" "^7.10.1"
"@rc-component/context" "^1.4.0" "@rc-component/context" "^1.4.0"
...@@ -4838,7 +4838,16 @@ react-easy-crop@^5.0.7: ...@@ -4838,7 +4838,16 @@ react-easy-crop@^5.0.7:
normalize-wheel "^1.0.1" normalize-wheel "^1.0.1"
tslib "^2.0.1" tslib "^2.0.1"
react-event-listener@^0.6.2, react-event-listener@^0.6.6: react-event-listener@^0.6.2:
version "0.6.6"
resolved "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz"
integrity sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==
dependencies:
"@babel/runtime" "^7.2.0"
prop-types "^15.6.0"
warning "^4.0.1"
react-event-listener@^0.6.6:
version "0.6.6" version "0.6.6"
resolved "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz" resolved "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz"
integrity sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw== integrity sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==
...@@ -5148,7 +5157,7 @@ react-transition-group@^2.5.3: ...@@ -5148,7 +5157,7 @@ react-transition-group@^2.5.3:
prop-types "^15.6.2" prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4" react-lifecycles-compat "^3.0.4"
react-transition-group@^4, react-transition-group@^4.3.0, react-transition-group@4.3.0: react-transition-group@^4, react-transition-group@4.3.0:
version "4.3.0" version "4.3.0"
resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz" resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz"
integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw== integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
...@@ -5158,7 +5167,7 @@ react-transition-group@^4, react-transition-group@^4.3.0, react-transition-group ...@@ -5158,7 +5167,7 @@ react-transition-group@^4, react-transition-group@^4.3.0, react-transition-group
loose-envify "^1.4.0" loose-envify "^1.4.0"
prop-types "^15.6.2" prop-types "^15.6.2"
react-transition-group@^4.4.2: react-transition-group@^4.3.0, react-transition-group@^4.4.2:
version "4.4.5" version "4.4.5"
resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"
integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
...@@ -5660,22 +5669,17 @@ source-map-url@^0.4.0: ...@@ -5660,22 +5669,17 @@ source-map-url@^0.4.0:
resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz" resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
source-map@^0.5.6, source-map@^0.5.7: source-map@^0.5.6:
version "0.5.7" version "0.5.7"
resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
source-map@^0.6.0: source-map@^0.5.7:
version "0.6.1" version "0.5.7"
resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
source-map@^0.6.1:
version "0.6.1"
resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
source-map@~0.6.1: source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1" version "0.6.1"
resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
...@@ -5807,12 +5811,7 @@ styled-jsx@5.0.4: ...@@ -5807,12 +5811,7 @@ styled-jsx@5.0.4:
resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.4.tgz" resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.4.tgz"
integrity sha512-sDFWLbg4zR+UkNzfk5lPilyIgtpddfxXEULxhujorr5jtePTUqiPDc5BC0v1NRqTr/WaFBGQQUoYToGlF4B2KQ== integrity sha512-sDFWLbg4zR+UkNzfk5lPilyIgtpddfxXEULxhujorr5jtePTUqiPDc5BC0v1NRqTr/WaFBGQQUoYToGlF4B2KQ==
stylis@^4.0.13: stylis@^4.0.13, stylis@4.2.0:
version "4.3.1"
resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz"
integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==
stylis@4.2.0:
version "4.2.0" version "4.2.0"
resolved "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz" resolved "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz"
integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!