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

components/admin/VendorDetails.js

@@ -150,9 +150,10 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) =>
                   </div>
                 </div>
               </div> */}
+              <div className="col-md-12 d-flex">
               <Button
                 variant=""
-                className="btnAdd btnApprove  col-6"
+                className="btnAdd btnApprove  col-6 me-2"
                 onClick={async () => {
                   await updateApprovalStatusAdmin({ status: "approved", userId: detail[0].attributes.user.data.id });
                   toast.success("User approved");
@@ -164,6 +165,7 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) =>
               <Button variant="" className="btnAdd btnReject  col-6" onClick={handleShowRejectModal}>
                 Reject
               </Button>
+              </div>
             </div>
           </div>
           <div className="col-12 col-lg-12 mt-4">

components/layout/Header.js

@@ -71,7 +71,7 @@ const Header = () => {
             </Form>
             {/* {console.log(user.id)} */}
             {loadedUser && loadedUser.id ? (
-              <div>
+              <div className="top-btn">
                 <div>
                   <p>Brand Logo</p>
                 </div>

components/listing/LetDiscover.js

@@ -75,10 +75,11 @@ const LetDiscover = ({ categories }) => {
               <div className="let-discover-carousal position-relative">
                 <Swiper
                   slidesPerView={3}
-                  autoplay={{
-                    delay: 9000,
-                    disableOnInteraction: false
-                  }}
+                  autoplay={false}
+                  // autoplay={{
+                  //   delay: 9000,
+                  //   disableOnInteraction: false
+                  // }}
                   spaceBetween={10}
                   navigation={{ nextEl: ".letdiscover-arrow-left", prevEl: ".letdiscover-arrow-right" }}
                   breakpoints={{

components/listing/ListingFilter.js

@@ -255,7 +255,7 @@ const ListingFilter = () => {
                   </div>
                   <div className="time">
                     <div>
-                      <label>Minimum duration:</label>
+                      <label>maximum duration:</label>
                     </div>
                     <div className="">
                       <Input

styles/globals.css

@@ -404,6 +404,21 @@ header {
   width: 100%;
   height: 100%;
 }
+.home-banner-bg::before {
+  content: "";
+  position: absolute; 
+  bottom: 0; 
+  background: rgb(0, 0, 0);
+  background: rgba(0, 0, 0, 0.5); /* Black see-through */
+  color: #f1f1f1; 
+  width: 100%;
+  transition: .5s ease;
+  /* opacity:0; */
+  height: 100%;
+  width: 100%;
+  z-index: 1;
+  border-radius: 0 0 8rem 8rem;
+}
 .home-banner-bg > span {
   height: 100%;
   display: block;
@@ -669,7 +684,9 @@ span.form-error,
 .form-container .input-group {
   margin-bottom: 28px;
 }
-
+.form-container .input-group .form-error{
+  margin-top: 0.4rem;
+}
 .form-container label {
   color: #000;
   font-family: "Sofia Pro Light";
@@ -895,7 +912,7 @@ span.form-error,
 }
 
 .signupdiv {
-  min-height: 95%;
+  /* min-height: 95%; */
   max-height: 95%;
   overflow-y: scroll;
   scrollbar-width: none;
@@ -2313,7 +2330,7 @@ footer hr {
 }
 
 .time-filter .time input {
-  width: 55px;
+  /* width: 55px; */
   border: 1px solid #D1D1D1;
     border-radius: 5px;
     padding: 0.4rem;