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

components/admin/ReviewsListing.js

@@ -44,7 +44,8 @@ const ReviewsListing = ({ activityId, setshowReviews, isVendor }) => {
                   <Accordion.Item key={item.id} eventKey={item.id}>
                     <Accordion.Header>
                       <div className="title-accord">
-                        <span>{`${item.attributes.comments.slice(0, 80).trim()}...`}</span> <span className="rt-name">{`by ${item.attributes.endUser.data.attributes.email}`}</span>
+                        <span>{`${item.attributes.comments.slice(0, 80).trim()}...`}</span>{" "}
+                        <span className="rt-name">{`by ${item.attributes.endUser.data.attributes.email}`}</span>
                       </div>
                     </Accordion.Header>
                     <Accordion.Body>
@@ -79,31 +80,33 @@ const ReviewsListing = ({ activityId, setshowReviews, isVendor }) => {
           }}
           centered
         >
-          <Modal.Header closeButton>Are you sure you want to delete this review?</Modal.Header>
+          <Modal.Header closeButton><strong>Are you sure you want to delete this review?</strong></Modal.Header>
           <Modal.Body>
             <div className="row">
-              <Button
-                className="btnAdd btnApprove m-0"
-                onClick={async () => {
-                  const res = await deleteReview({ reviewId });
-                  dispatch(getReviewsAction({ activityId }));
-                  // dispatch(getActivitiesByFilters({}));
-                  toast.success("Review deleted");
-                  setshowModal(false);
-                  // console.log(res);
-                }}
-              >
-                Yes
-              </Button>
-              <Button
-                className="btnAdd btnReject m-0"
-                onClick={() => {
-                  setshowModal(false);
-                  setreviewId();
-                }}
-              >
-                Cancel
-              </Button>
+              <div className="col-12 d-flex align-items-center justify-content-center">
+                <Button
+                  className="btnAdd btnApprove me-3 w-100"
+                  onClick={async () => {
+                    const res = await deleteReview({ reviewId });
+                    dispatch(getReviewsAction({ activityId }));
+                    // dispatch(getActivitiesByFilters({}));
+                    toast.success("Review deleted");
+                    setshowModal(false);
+                    // console.log(res);
+                  }}
+                >
+                  Yes
+                </Button>
+                <Button
+                  className="btnAdd btnReject m-0 w-100"
+                  onClick={() => {
+                    setshowModal(false);
+                    setreviewId();
+                  }}
+                >
+                  Cancel
+                </Button>
+              </div>
             </div>
           </Modal.Body>
         </Modal>

components/detail/GuestReviews.js

@@ -101,7 +101,7 @@ const GuestReviews = ({ activityById }) => {
                                   rating={data.attributes.rating}
                                   starRatedColor="#ffe20" // Set the rated color to yellow
                                   starHoverColor="#ffe20" // Set the hover color to yellow
-                                  changeRating={() => {}}
+                                  changeRating={() => { }}
                                   numberOfStars={5}
                                   name="rating"
                                   starDimension="20px" // Set star width and height
@@ -149,20 +149,24 @@ const GuestReviews = ({ activityById }) => {
                       starDimension="20px" // Set star width and height
                     />
                   </div>
-                  <textarea
-                    // style={{ width: "50%" }}
-                    rows={4}
-                    className="p-2 mx-2 col-md-6"
-                    placeholder="Comments"
-                    name="comments"
-                    value={comments}
-                    onChange={e => {
-                      e.preventDefault();
-                      // console.log(e.target.value);4
-                      setcomments(e.target.value);
-                      // setrejectionReasonText(e.target.value);
-                    }}
-                  />
+                  <div className="row">
+                    <div className="col-md-6">
+                      <textarea
+                        // style={{ width: "50%" }}
+                        rows={4}
+                        className="p-2 w-100"
+                        placeholder="Comments"
+                        name="comments"
+                        value={comments}
+                        onChange={e => {
+                          e.preventDefault();
+                          // console.log(e.target.value);4
+                          setcomments(e.target.value);
+                          // setrejectionReasonText(e.target.value);
+                        }}
+                      />
+                    </div>
+                  </div>
                   <div className="view-all-btn my-3">
                     <Button
                       disabled={rating == 0 || comments == ""}

components/home/Banner.js

@@ -17,11 +17,11 @@ const Banner = ({ homeBanner }) => {
         <div>
           <Swiper
             slidesPerView={1}
-            autoplay={{
-              delay: 9000,
-              disableOnInteraction: false
-            }}
-            // autoplay={false}
+            // autoplay={{
+            //   delay: 9000,
+            //   disableOnInteraction: false
+            // }}
+            autoplay={false}
             spaceBetween={10}
             navigation={true}
             pagination={{

components/layout/Header.js

@@ -46,7 +46,7 @@ const Header = () => {
   }, [endUser]);
   return (
     <header className={`header_wrap ${isSticky ? "stick" : ""}`}>
-     {isSticky && <div style={{height :76}} className="bg-transparent"></div>}
+      {isSticky && <div style={{ height: 76 }} className="bg-transparent"></div>}
       <Navbar expand="lg" className="bg-body-tertiary">
         <Container fluid>
           <Navbar.Brand href="/">
@@ -57,6 +57,9 @@ const Header = () => {
           <Navbar.Toggle aria-controls="navbarScroll" />
           <Navbar.Collapse id="navbarScroll">
             <Nav className=" my-2 my-lg-0" style={{ maxHeight: "100px" }} navbarScroll>
+              <ActiveLink href="/user/wishlist" activeClassName="active">
+                <a className="nav-link ">Wishlist</a>
+              </ActiveLink>
               <ActiveLink href="/blog" activeClassName="active">
                 <a className="nav-link ">Blogs</a>
               </ActiveLink>

pages/user/wishlist/index.js

 import React from "react";
 import Layout from "../../../components/layout/Layout";
 import MyWhishList from "../../../components/user/MyWhishList";
+import { useSelector } from "react-redux";
 
-export default function UserProfilePage () {
-
+export default function UserProfilePage() {
+    const { wishlists } = useSelector(state => state.wishlists)
     return (
         <Layout>
-            <MyWhishList />
+            <MyWhishList data={wishlists}/>
         </Layout>
     );
 };
\ No newline at end of file

redux/actions/activityAction.js

@@ -547,7 +547,7 @@ export const getWishlists =
             }
           }
         },
-        populate: ["endUser", "experience"]
+        populate: ["endUser", "experience", "experience.image"]
       };
 
       const queryString = qs.stringify(query, {