Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Jay Mehta
/
zango-frontend
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Registry
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit 15ddf198
authored
2024-06-20 19:13:58 +0530
by
jaymehta
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
.
1 parent
f5eb0e41
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
45 deletions
components/gift-card/GiftCard.js
components/home/Banner.js
components/home/BrowseExperiences.js
components/listing/LetDiscover.js
components/listing/ListingItems.js
components/signup/Signup.js
pages/activities/[id].js
components/gift-card/GiftCard.js
View file @
15ddf19
...
...
@@ -368,9 +368,9 @@ const GiftCard = () => {
value
=
{
values
.
code
}
/
>
{
touched
.
code
&&
errors
.
code
&&
<
div
className
=
"text-danger"
>
{
errors
.
code
}
<
/div>
}
<
div
className
=
"link-a"
>
{
/*
<div className="link-a">
<a href="">Resend Code</a>
<
/div
>
</div>
*/
}
<
/div
>
<
/div
>
<
div
className
=
"row"
>
...
...
components/home/Banner.js
View file @
15ddf19
...
...
@@ -54,10 +54,10 @@ const Banner = ({ homeBanner }) => {
<
div
className
=
"home-banner-bg"
>
<
span
className
=
"image-container hide-on-mobile"
>
{
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
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
>
<
/div
>
<
div
className
=
"d-table"
>
...
...
components/home/BrowseExperiences.js
View file @
15ddf19
...
...
@@ -85,7 +85,7 @@ const BrowseExperiences = ({ allActivitiesData }) => {
<
div
className
=
"browse-experiences-item"
>
<
a
href
=
"/detail"
className
=
"img-wrapper"
>
<
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
>
<
div
className
=
"top-rated"
>
Top
Rated
<
/div
>
<
/a
>
...
...
components/listing/LetDiscover.js
View file @
15ddf19
...
...
@@ -42,7 +42,7 @@ const LetDiscover = ({ categories }) => {
// }, [router]);
useEffect
(()
=>
{
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
)
{
dispatch
(
setActivityFilters
({
filters
:
{
category
:
Number
(
router
.
query
.
category
),
subCategories
:
[]
}
}));
...
...
components/listing/ListingItems.js
View file @
15ddf19
...
...
@@ -39,16 +39,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) =>
}
else
{
queryParams
.
append
(
"page"
,
pageNumber
);
}
// dispatch(getActivitiesByFilters({ currentPage: pageNumber }));
router
.
push
({
query
:
queryParams
.
toString
()
});
console
.
log
(
"queryParams"
,
queryParams
);
// router.push(`/listing?page=${pageNumber}`)
// router.push({
// query: `/listing?page=${pageNumber}`
// });
dispatch
(
getActivitiesByFilters
({
currentPage
:
pageNumber
}));
};
console
.
log
(
"page"
,
page
);
//
useEffect(() => {
//
dispatch(getActivitiesByFilters({ currentPage: page }));
//
}, [])
useEffect
(()
=>
{
dispatch
(
getActivitiesByFilters
({
currentPage
:
page
}));
},
[])
return
(
<>
...
...
@@ -149,16 +150,17 @@ const ListingItems = ({ allActivitiesData, loading, gridClass, totalCount }) =>
<
div
className
=
"load-more"
>
<
Pagination
activePage
=
{
page
}
hideNavigation
=
{
true
}
itemsCountPerPage
=
{
12
}
totalItemsCount
=
{
totalCount
}
onChange
=
{
async
e
=>
{
console
.
log
(
"log >"
,
e
);
await
handlePagination
(
e
);
}}
nextPageText
=
{
"›"
}
prevPageText
=
{
"‹"
}
firstPageText
=
{
"«"
}
lastPageText
=
{
"»"
}
//
nextPageText={"›"}
//
prevPageText={"‹"}
//
firstPageText={"«"}
//
lastPageText={"»"}
itemClass
=
"page-item"
linkClass
=
"page-link"
><
/Pagination
>
...
...
components/signup/Signup.js
View file @
15ddf19
...
...
@@ -118,17 +118,17 @@ const Signup = props => {
"Content-Type"
:
"application/json"
}
};
const
query
=
{
filters
:
{
$or
:
[{
email
:
{
$eq
:
values
.
email
}
},
{
phone
:
{
$eq
:
values
.
mobile
}
}]
}
// populate: ["role"],
// fields: ["email", "role"]
};
const
queryString
=
qs
.
stringify
(
query
,
{
encodeValuesOnly
:
true
});
const
existingUser
=
await
axios
.
get
(
`
${
process
.
env
.
NEXT_PUBLIC_BACKEND_API_URL
}
/api/users?
${
queryString
}
`
,
userConfig
);
//
const query = {
//
filters: {
//
$or: [{ email: { $eq: values.email } }, { phone: { $eq: values.mobile } }]
//
}
//
// populate: ["role"],
//
// fields: ["email", "role"]
//
};
//
const queryString = qs.stringify(query, {
//
encodeValuesOnly: true
//
});
//
const existingUser = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/users?${queryString}`, userConfig);
// if (existingUser) {
// console.log("existingUser", existingUser);
// if (existingUser.data && existingUser.data.length > 0) {
...
...
@@ -220,19 +220,6 @@ const Signup = props => {
<
div
className
=
"input-group"
>
<
label
>
Mobile
No
.
<
/label
>
<
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
type
=
"text"
name
=
"mobile"
...
...
@@ -277,12 +264,12 @@ const Signup = props => {
<
p
>
4
digit
OTP
is
been
sent
on
your
email
address
.
<
/p
>
<
div
className
=
"d-flex align-items-center mb-4"
>
<
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">
<Image src={renderImage("/images/login/icon-resend.png")} layout="fill" className="image" />
</span>
<p className="mb-0">Resend</p>
<
/div
>
</div>
*/
}
<
/div
>
<
/div
>
<
/
>
...
...
pages/activities/[id].js
View file @
15ddf19
...
...
@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
import
{
useDispatch
}
from
"react-redux"
;
import
Detail
from
"../../components/detail/Detail"
;
import
Layout
from
"../../components/layout/Layout"
;
import
{
getActivit
iesByFilters
,
getActivit
yById
}
from
"../../redux/actions/activityAction"
;
import
{
getActivityById
}
from
"../../redux/actions/activityAction"
;
import
{
loadUser
}
from
"../../redux/actions/userActions"
;
import
{
wrapper
}
from
"../../redux/store"
;
import
{
getFaqs
}
from
"../../redux/actions/faqsAction"
;
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment