Skip to content

Jay Mehta / zango-frontend

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

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

2 parents 6892cb29 27c80214
Inline Side-by-side
Showing 16 changed files with 183 additions and 55 deletions
components/admin/GiftcardListing.js
import { Fragment, useEffect, useState } from "react";
import { Button, Image } from "react-bootstrap";
import { getGiftCard } from "../../redux/actions/giftCardAction";
import { useDispatch, useSelector } from "react-redux";
import { Empty, Table } from "antd";
import { Dropdown, Menu, Space, Table, Tag } from "antd";
import axios from "axios";
import { DownCircleOutlined, MoreOutlined } from "@ant-design/icons";
import { getSession } from "next-auth/react";
import { toast } from "react-toastify";
const GiftcardListing = () => {
const [session, setSession] = useState()
const [update, setupdate] = useState(false)
useEffect(() => {
const fetchSession = async () => {
setSession(await getSession());
};
fetchSession();
// dispatch(getLoggedInVendor());
}, []);
const [giftData, setGiftData] = useState([]);
useEffect(() => {
axios.get(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/gift-cards`).then((res) => {
......@@ -24,7 +33,25 @@ const GiftcardListing = () => {
}).catch((err) => {
console.log(err)
})
}, [])
}, [update])
const changeStatusFn = async ({ id, data }) => {
const config = {
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${session.jwt}`
}
}
const giftdata = {
data
}
const response = await axios.put(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/gift-cards/${id}`, giftdata, config)
if (response.status == 200) {
toast.success("Status changed")
setupdate(!update)
}
console.log("response gift card", response);
}
const columns = [
{
title: "Sender Email Address",
......@@ -48,8 +75,77 @@ const GiftcardListing = () => {
title: "Status",
dataIndex: "status",
key: "status",
render: text => <a>{text}</a>
render: tag => (
<span>
{tag == "rejected" ? (
<Tag color={"red"} key={tag}>
{tag.toUpperCase()}
</Tag>
) : (
<Tag color={"blue"} key={tag}>
{tag === "fulfilled" ? "APPROVED" : tag.toUpperCase()}
</Tag>
)}
</span>
)
},
{
title: 'Actions',
width: 100,
dataIndex: 'key',
key: 'key',
render: (_, record) => (
<Space size="middle">
{/* <a>Invite {record.name}</a> */}
<Dropdown
menu={{
items: [
{
key: "1",
label: (
<a
rel="noopener noreferrer"
onClick={async () => {
console.log("record", record);
await changeStatusFn({ id: record.key, data: { status: "fulfilled" } })
// setrejectionId(record.key);
// adminActions({ type: "reject", activityId: record.key });
}}
>
Approve
</a>
)
},
{
key: "2",
label: (
<a
target="_blank"
rel="noopener noreferrer"
onClick={async () => {
console.log("record", record);
await changeStatusFn({ id: record.key, data: { status: "rejected" } })
// setrejectionId(record.key);
// adminActions({ type: "reject", activityId: record.key });
}}
>
Reject
</a>
)
}
]
}}
placement="bottomLeft"
trigger={['click']}
>
<button className="btn border-0">
<DownCircleOutlined style={{ fontSize: "20px", color: "#08c" }} onClick={() => { }} />
</button>
</Dropdown>
</Space>
)
}
]
return (
<Fragment>
......
components/blog/BlogItem.js
......@@ -10,46 +10,46 @@ export const BlogData = [
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Adventure"
flag: "Adventure"
},
{
image: "/images/blogs/02.png",
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Adventure"
flag: "Adventure"
},
{
image: "/images/blogs/03.png",
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Art & History"
flag: "Art & History"
},
{
image: "/images/blogs/01.png",
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Adventure"
flag: "Adventure"
},
{
image: "/images/blogs/02.png",
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Adventure"
flag: "Adventure"
},
{
image: "/images/blogs/03.png",
title: "13 MOST Unique Places to Stay in Washington State",
discription: "Undoubtedly, the most unique places to stay........",
read: "10-15 Read",
flag:"Art & History"
flag: "Art & History"
}
];
const BlogsItem = ({blogs}) => {
const BlogsItem = ({ blogs }) => {
const [showContent, setShowContent] = useState(false);
const [isGridViewOpen, setIsGridViewOpen] = useState(false);
const [isOpen, setIsOpen] = useState(false);
......
components/detail/Detail.js
......@@ -33,7 +33,7 @@ const Detail = () => {
<main>
<section className="main-mt">
<div className="container mt-3">
<div className="py-5">
<div className="py-4 py-lg-5 breadcrumb-wrap">
<ConfigProvider
theme={{
components: {
......
components/detail/DetailInfo.js
......@@ -143,15 +143,13 @@ const DetailInfo = ({ activityById }) => {
router.push("/gift-card");
}
}}
variant="secondary"
variant="secondary me-3"
>
Gift Now
<span className="image-container btn-gift">
<Image layout="fill" className="image img-fluid" src="/images/icons/gift-card-icon.svg" />
</span>
</Button>
</div>
<div>
<Button
disabled={loading}
// onClick={() => {
......@@ -161,11 +159,12 @@ const DetailInfo = ({ activityById }) => {
// setenquiryModal(true);
// }
// }}
variant="primary me-3"
variant="primary"
>
Book Now
</Button>
</div>
</div>
</div>
)}
......
components/detail/DetailSchedule.js
......@@ -36,7 +36,7 @@ const DetailSchedule = ({ activityById }) => {
return array;
};
return (
<div className="row mb-5">
<div className="row mb-3 mb-lg-4">
{activityById && (
<div className="col-12">
<ul className="availability-wrappper">
......
components/detail/SimilarExperiences.js
......@@ -108,20 +108,20 @@ const SimilarExperiences = ({ allActivitiesData }) => {
<div className="browse-experiences-item">
<div className="img-wrapper">
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src={data.image} />
<Image layout="fill" alt="" className="image img-fluid" src={data.image} priority />
</span>
<div className="top-rated">{data.topRated}</div>
{/* <div className="top-rated">{data.topRated}</div> */}
</div>
<div className="info">
<div className="top-name">
<div className="title">{data.title}</div>
<div className="rating-wishlist">
<div className="rating">
{/* <div className="rating">
<span className="number">8.8</span>
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
</span>
</div>
</div> */}
{endUser && <WishlistComponent userId={endUser.id} activityId={data.id} />}
{/* <div className="wishlist">
<span className="image-container">
......@@ -132,16 +132,17 @@ const SimilarExperiences = ({ allActivitiesData }) => {
</div>
<div className="discription">
{data.discription}{" "}
<a
{/* <a
onClick={() => {
router.push(`/activities/${data.id}`);
}}
>
Read More
</a>
</a> */}
</div>
<div className="price">
${data.price} <span className="off">{data.offPrice} OFF</span>
${data.price}
{/* <span className="off">{data.offPrice} OFF</span> */}
</div>
<div className="detail">
<div className="">{data.days}</div>
......
components/detail/WIshlistComponent.js
......@@ -13,7 +13,7 @@ const WishlistComponent = ({ activityId, userId }) => {
wishlists &&
wishlists.length > 0 &&
wishlists.map(item => {
if (item.attributes.experience.data.id == activityId) {
if (item?.attributes?.experience?.data?.id == activityId) {
setisActive(true);
setwishlistId(item.id);
}
......
components/home/BrowseExperiences.js
......@@ -87,18 +87,18 @@ const BrowseExperiences = ({ allActivitiesData }) => {
<span className="image-container">
<img layout="fill" alt="" className="image img-fluid" src={cleanImage(data.attributes?.image?.data?.attributes)} />
</span>
<div className="top-rated">Top Rated</div>
{/* <div className="top-rated">Top Rated</div> */}
</a>
<div className="info">
<div className="top-name">
<div className="title">{data?.attributes?.name}</div>
<div className="rating-wishlist">
<div className="rating">
{/* <div className="rating">
<span className="number">{data?.attributes?.rating}</span>
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
</span>
</div>
</div> */}
<div className="wishlist">
{endUser && <WishlistComponent activityId={data.id} userId={endUser.id} />}
{/* <span className="image-container">
......@@ -108,13 +108,15 @@ const BrowseExperiences = ({ allActivitiesData }) => {
</div>
</div>
<div className="discription">
<span>{data?.attributes?.description}</span> <a href="/detail">Read More</a>
<span>{data?.attributes?.description}</span>
{/* <a href="/detail">Read More</a> */}
</div>
<div className="price">
${data?.attributes?.pricePerPerson} <span className="off">{data?.attributes?.off}% OFF</span>
${data?.attributes?.pricePerPerson}
{/* <span className="off">{data?.attributes?.off}% OFF</span> */}
</div>
<div className="detail">
<div className="">For 1 Night</div>
{/* <div className="">For 1 Night</div> */}
<div className="">Includes taxes & Fees</div>
</div>
<div className="explore-now">
......
components/home/ProductItem.js
......@@ -72,12 +72,12 @@ const ProductItem = () => {
<div className="top-name">
<div className="title">{data.title}</div>
<div className="rating-wishlist">
<div className="rating">
{/* <div className="rating">
<span className="number">8.8</span>
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
</span>
</div>
</div> */}
<div className="wishlist">
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/wishlist.svg" />
......@@ -85,11 +85,12 @@ const ProductItem = () => {
</div>
</div>
</div>
<div className="discription">
{/* <div className="discription">
{data.discription} <a href="">Read More</a>
</div>
</div> */}
<div className="price">
${data.price} <span className="off">{data.offPrice} OFF</span>
${data.price}
{/* <span className="off">{data.offPrice} OFF</span> */}
</div>
<div className="detail">
<div className="">{data.days}</div>
......
components/layout/Generics/GenericHeader.js
......@@ -3,6 +3,7 @@ import Image from "next/image"
import { useRouter } from "next/router";
import { signOut } from "next-auth/react";
import { UserOutlined } from '@ant-design/icons';
import { ToastContainer } from "react-toastify";
export const GenericHeader = ({ venderBusiness, venderEmail, businessLogo, adminName, adminEmail, isRoute }) => {
const router = useRouter();
const VenderDetails = () => {
......@@ -14,7 +15,7 @@ export const GenericHeader = ({ venderBusiness, venderEmail, businessLogo, admin
</div>
:
<div className="d-flex align-items-center gap-3">
<Image src={businessLogo} height={50} width={70} objectFit="contain"/>
<Image src={businessLogo} height={50} width={70} objectFit="contain" />
<div className="d-flex flex-column">
<p className="m-0">{venderBusiness}</p>
<p className="m-0">{venderEmail}</p>
......@@ -51,6 +52,7 @@ export const GenericHeader = ({ venderBusiness, venderEmail, businessLogo, admin
'-moz-box-shadow': '0px 4px 1px -3px rgba(0,0,0,0.56)'
}}
>
<Image loading="lazy" objectFit="contain" height={50} width={100} alt="" className="" src="/images/main-logo.svg" />
<div className="d-flex align-items-center gap-5">
{isRoute === 'vendor' && <VenderDetails />}
......
components/layout/Generics/GenericLayout.js
......@@ -6,7 +6,7 @@ import { GenericHeader } from "./GenericHeader";
import { GenericSidebar } from "./GenericSidebar";
import { getActivitiesForAdmin } from "../../../redux/actions/activityAction";
import { useRouter } from "next/router";
import { ToastContainer } from "react-bootstrap";
import { ToastContainer } from "react-toastify";
export const GenericLayout = ({ children }) => {
const dispatch = useDispatch();
......
components/layout/Header.js
......@@ -56,7 +56,7 @@ const Header = () => {
</Navbar.Brand>
<Navbar.Toggle aria-controls="navbarScroll" />
<Navbar.Collapse id="navbarScroll">
<Nav className=" my-2 my-lg-0" style={{ maxHeight: "100px" }} navbarScroll>
<Nav className=" my-2 my-lg-0" navbarScroll>
<ActiveLink href="/user/wishlist" activeClassName="active">
<a className="nav-link ">Wishlist</a>
</ActiveLink>
......
components/listing/ListingItems.js
......@@ -67,7 +67,7 @@ console.log("queryParams", queryParams);
<span className="image-container">
<img layout="fill" alt="" className="image img-fluid" src={cleanImage(data.attributes?.image?.data?.attributes)} />
</span>
<div className="top-rated">Top Rated</div>
{/* <div className="top-rated">Top Rated</div> */}
</div>
<div className="info">
<div className="top-name">
......@@ -92,7 +92,7 @@ console.log("queryParams", queryParams);
</span>
</div>
<div className="detail">
<div className="">For 1 Night</div>
{/* <div className="">For 1 Night</div> */}
<div className="">Includes taxes & Fees</div>
</div>
<div className="explore-now">
......
components/user/MyWhishList.js
......@@ -31,18 +31,18 @@ const MyWhishList = ({ data }) => {
<span className="image-container">
<Image src={cleanImage(data?.attributes?.experience?.data?.attributes?.image?.data?.attributes)} layout="fill" className="image img-fluid" />
</span>
<div className="top-rated">Top Rated</div>
{/* <div className="top-rated">Top Rated</div> */}
</div>
<div className="info">
<div className="top-name">
<div className="title">{data?.attributes?.experience?.data?.attributes?.name}</div>
<div className="rating-wishlist">
<div className="rating">
{/* <div className="rating">
<span className="number">{data?.attributes?.experience?.data?.attributes?.rating}</span>
<span className="image-container">
<Image layout="fill" alt="" className="image img-fluid" src="/images/icons/star.svg" />
</span>
</div>
</div> */}
<WishlistComponent activityId={data?.attributes?.experience?.data?.id} userId={data?.attributes?.endUser?.data?.id} />
</div>
</div>
......@@ -50,10 +50,11 @@ const MyWhishList = ({ data }) => {
<p className="text-trunc-2">{data?.attributes?.experience?.data?.attributes?.description}</p>
</div>
<div className="price">
${data?.attributes?.experience?.data?.attributes?.pricePerPerson} <span className="off">{}% OFF</span>
${data?.attributes?.experience?.data?.attributes?.pricePerPerson}
{/* <span className="off">{}% OFF</span> */}
</div>
<div className="detail">
<div className="">For 1 Night</div>
{/* <div className="">For 1 Night</div> */}
<div className="">Includes taxes & Fees</div>
</div>
<div className="explore-now">
......
public/favicon.ico
No preview for this file type
styles/globals.css
......@@ -31,7 +31,7 @@ acronym,
address,
big,
cite,
code,
55 code,
del,
dfn,
em,
......@@ -1959,7 +1959,7 @@ span.form-error,
}
.similar-experiences-session {
padding: 2rem 0;
padding: 1rem 0;
}
.browse-experiences-item {
......@@ -2082,7 +2082,7 @@ span.form-error,
margin-bottom: 10px;
}
.browse-experiences-item .info .discription > span {
.browse-experiences-item .info .discription {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
......@@ -2750,13 +2750,14 @@ button:focus:not(:focus-visible) {
align-items: center;
flex-wrap: wrap;
margin-top: 2rem;
padding-left: 0;
}
.availability-wrappper li {
width: 32%;
width: 31%;
display: flex;
align-items: center;
margin: 0.5rem;
margin: 0.5rem 1rem 0.5rem 0.5rem;
}
.availability-wrappper li > span {
......@@ -2805,7 +2806,7 @@ button:focus:not(:focus-visible) {
}
.guest-reviews-detail .head .name {
font-size: 24px;
font-size: calc(20px + (24 - 20) * (100vw - 320px) / (1920 - 320));
line-height: 24px;
}
......@@ -2941,7 +2942,7 @@ button:focus:not(:focus-visible) {
}
.faqs-session {
padding: 5rem 0;
padding: 4rem 0;
}
.subscribe label .btn {
......@@ -3899,6 +3900,7 @@ img:hover {
align-items: center;
justify-content: flex-end;
margin-bottom: 4rem;
margin-top: 1.5rem;
}
.load-more .pagination .page-item {
......@@ -3933,6 +3935,19 @@ img:hover {
.listing-wrapper .product-info {
padding-left: 2rem;
}
.breadcrumb-wrap .ant-breadcrumb ol li.ant-breadcrumb-separator {
margin: 0 0.8rem;
}
.breadcrumb-wrap .ant-breadcrumb ol li .ant-breadcrumb-link {
font-size: calc(14px + (14 - 14) * (100vw - 320px) / (1920 - 320));
}
.most-read-blogs-session,
.blogs-session {
padding-bottom: 3rem;
}
footer .footer-link ul {
padding-left: 0;
}
@media (min-width: 992px) {
.navbar-expand-lg .navbar-nav .nav-link {
margin: 0 2rem;
......@@ -4115,6 +4130,17 @@ img:hover {
}
@media (max-width: 767px) {
.product-info .btn-row .btn {
padding-left: 5vw;
padding-right: 5vw;
}
.load-more {
justify-content: center;
}
.btn-primary,
.vendor-signup a {
padding: 0.6rem 2rem;
}
.browse-experiences-item .img-wrapper .image-container .image {
height: 220px !important;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!