Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 15ddf198 by jaymehta
Options

.

1 parent f5eb0e41
Inline Side-by-side
Showing 7 changed files with 34 additions and 45 deletions
components/gift-card/GiftCard.js
...@@ -368,9 +368,9 @@ const GiftCard = () => { ...@@ -368,9 +368,9 @@ const GiftCard = () => {
value={values.code} value={values.code}
/> />
{touched.code && errors.code && <div className="text-danger">{errors.code}</div>} {touched.code && errors.code && <div className="text-danger">{errors.code}</div>}
<div className="link-a"> {/* <div className="link-a">
<a href="">Resend Code</a> <a href="">Resend Code</a>
</div> </div> */}
</div> </div>
</div> </div>
<div className="row"> <div className="row">
......
components/home/Banner.js
...@@ -54,10 +54,10 @@ const Banner = ({ homeBanner }) => { ...@@ -54,10 +54,10 @@ const Banner = ({ homeBanner }) => {
<div className="home-banner-bg"> <div className="home-banner-bg">
<span className="image-container hide-on-mobile"> <span className="image-container hide-on-mobile">
{console.log("clean image", cleanImage(data?.attributes?.desktopBanner?.data?.attributes))} {console.log("clean image", cleanImage(data?.attributes?.desktopBanner?.data?.attributes))}
<Image layout="fill" className="image img-fluid" alt="" src={cleanImage(data?.attributes?.desktopBanner?.data?.attributes)} /> <img layout="fill" className="image img-fluid" alt="" src={cleanImage(data?.attributes?.desktopBanner?.data?.attributes)} />
</span> </span>
<span className="image-container hide-on-desktop"> <span className="image-container hide-on-desktop">
<Image layout="fill" className="image img-fluid" alt="" src={cleanImage(data?.attributes?.mobileBanner?.data?.attributes)} /> <img layout="fill" className="image img-fluid" alt="" src={cleanImage(data?.attributes?.mobileBanner?.data?.attributes)} />
</span> </span>
</div> </div>
<div className="d-table"> <div className="d-table">
......
components/home/BrowseExperiences.js
...@@ -85,7 +85,7 @@ const BrowseExperiences = ({ allActivitiesData }) => { ...@@ -85,7 +85,7 @@ const BrowseExperiences = ({ allActivitiesData }) => {
<div className="browse-experiences-item"> <div className="browse-experiences-item">
<a href="/detail" className="img-wrapper"> <a href="/detail" className="img-wrapper">
<span className="image-container"> <span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src={cleanImage(data.attributes?.image?.data?.attributes)} /> <img layout="fill" alt="" className="image img-fluid" src={cleanImage(data.attributes?.image?.data?.attributes)} />
</span> </span>
<div className="top-rated">Top Rated</div> <div className="top-rated">Top Rated</div>
</a> </a>
......
components/listing/LetDiscover.js
...@@ -42,7 +42,7 @@ const LetDiscover = ({ categories }) => { ...@@ -42,7 +42,7 @@ const LetDiscover = ({ categories }) => {
// }, [router]); // }, [router]);
useEffect(() => { useEffect(() => {
console.log("router.query.category", router.query.category); console.log("router.query.category", router.query.category);
console.log("getting id to filtered categoryiiiiiiiiiiifsdkhdjkskiiiiiiiiiiiiiiiiiiiiiiiii", parseInt(router.query.category)) // console.log("getting id to filtered categoryiiiiiiiiiiifsdkhdjkskiiiiiiiiiiiiiiiiiiiiiiiii", parseInt(router.query.category))
if (router.query.category) { if (router.query.category) {
dispatch(setActivityFilters({ filters: { category: Number(router.query.category), subCategories: [] } })); dispatch(setActivityFilters({ filters: { category: Number(router.query.category), subCategories: [] } }));
......
components/listing/ListingItems.js
...@@ -39,16 +39,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) => ...@@ -39,16 +39,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) =>
} else { } else {
queryParams.append("page", pageNumber); queryParams.append("page", pageNumber);
} }
console.log("queryParams", queryParams);
// dispatch(getActivitiesByFilters({ currentPage: pageNumber })); // router.push(`/listing?page=${pageNumber}`)
router.push({ // router.push({
query: queryParams.toString() // query: `/listing?page=${pageNumber}`
}); // });
dispatch(getActivitiesByFilters({ currentPage: pageNumber }));
}; };
console.log("page", page); console.log("page", page);
// useEffect(() => { useEffect(() => {
// dispatch(getActivitiesByFilters({ currentPage: page })); dispatch(getActivitiesByFilters({ currentPage: page }));
// }, []) }, [])
return ( return (
<> <>
...@@ -149,16 +150,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) => ...@@ -149,16 +150,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) =>
<div className="load-more"> <div className="load-more">
<Pagination <Pagination
activePage={page} activePage={page}
hideNavigation={true}
itemsCountPerPage={12} itemsCountPerPage={12}
totalItemsCount={totalCount} totalItemsCount={totalCount}
onChange={async e => { onChange={async e => {
console.log("log >", e); console.log("log >", e);
await handlePagination(e); await handlePagination(e);
}} }}
nextPageText={"›"} // nextPageText={"›"}
prevPageText={"‹"} // prevPageText={"‹"}
firstPageText={"«"} // firstPageText={"«"}
lastPageText={"»"} // lastPageText={"»"}
itemClass="page-item" itemClass="page-item"
linkClass="page-link" linkClass="page-link"
></Pagination> ></Pagination>
......
components/signup/Signup.js
...@@ -118,17 +118,17 @@ const Signup = props => { ...@@ -118,17 +118,17 @@ const Signup = props => {
"Content-Type": "application/json" "Content-Type": "application/json"
} }
}; };
const query = { // const query = {
filters: { // filters: {
$or: [{ email: { $eq: values.email } }, { phone: { $eq: values.mobile } }] // $or: [{ email: { $eq: values.email } }, { phone: { $eq: values.mobile } }]
} // }
// populate: ["role"], // // populate: ["role"],
// fields: ["email", "role"] // // fields: ["email", "role"]
}; // };
const queryString = qs.stringify(query, { // const queryString = qs.stringify(query, {
encodeValuesOnly: true // encodeValuesOnly: true
}); // });
const existingUser = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/users?${queryString}`, userConfig); // const existingUser = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/users?${queryString}`, userConfig);
// if (existingUser) { // if (existingUser) {
// console.log("existingUser", existingUser); // console.log("existingUser", existingUser);
// if (existingUser.data && existingUser.data.length > 0) { // if (existingUser.data && existingUser.data.length > 0) {
...@@ -220,19 +220,6 @@ const Signup = props => { ...@@ -220,19 +220,6 @@ 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">
{/* <select
id="countryCode"
name="countryCode"
onChange={handleChange}
onBlur={e => {
handleBlur(e);
// setCountryCode(e.target.value);
}}
style={{ width: "80px" }}
>
<option value="+91">+91</option>
<option value="+44">+44</option>
</select> */}
<input <input
type="text" type="text"
name="mobile" name="mobile"
...@@ -277,12 +264,12 @@ const Signup = props => { ...@@ -277,12 +264,12 @@ const Signup = props => {
<p>4 digit OTP is been sent on your email address.</p> <p>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">
<span className="image-container me-2"> <span className="image-container me-2">
<Image src={renderImage("/images/login/icon-resend.png")} layout="fill" className="image" /> <Image src={renderImage("/images/login/icon-resend.png")} layout="fill" className="image" />
</span> </span>
<p className="mb-0">Resend</p> <p className="mb-0">Resend</p>
</div> </div> */}
</div> </div>
</div> </div>
</> </>
......
pages/activities/[id].js
...@@ -2,7 +2,7 @@ import React, { useEffect } from "react"; ...@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import Detail from "../../components/detail/Detail"; import Detail from "../../components/detail/Detail";
import Layout from "../../components/layout/Layout"; import Layout from "../../components/layout/Layout";
import { getActivitiesByFilters, getActivityById } from "../../redux/actions/activityAction"; import { getActivityById } from "../../redux/actions/activityAction";
import { loadUser } from "../../redux/actions/userActions"; import { loadUser } from "../../redux/actions/userActions";
import { wrapper } from "../../redux/store"; import { wrapper } from "../../redux/store";
import { getFaqs } from "../../redux/actions/faqsAction"; import { getFaqs } from "../../redux/actions/faqsAction";
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!