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

components/layout/VendorDashboardSidebar.js

@@ -22,36 +22,44 @@ const Sidebar = () => {
       </button> */}
       <ul>
         <li className={router.pathname === "/vendor/dashboard" ? "active" : ""}>
-          <span className="d-flex">
-            <Image className="" alt="" width={22} height={15} src="/images/vendor/icon-dashboard.svg" />
-            <div className="mx-2 text-center">
-              <Link href="/vendor/dashboard">Dashboard</Link>
-            </div>
-          </span>
+          <Link href="/vendor/dashboard">
+            <span className="d-flex cursor-pointer">
+              <Image className="" alt="" width={22} height={15} src="/images/vendor/icon-dashboard.svg" />
+              <div className="mx-2 text-center">
+                Dashboard
+              </div>
+            </span>
+          </Link>
         </li>
         <li className={router.pathname === "/vendor/enquiries" ? "active" : ""}>
-          <span className="d-flex">
-            <Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" />
-            <div className="mx-2 text-center">
-              <Link href="/vendor/enquiries">Enquiries</Link>
-            </div>
-          </span>
+          <Link href="/vendor/enquiries">
+            <span className="d-flex cursor-pointer">
+              <Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" />
+              <div className="mx-2 text-center">
+                Enquiries
+              </div>
+            </span>
+          </Link>
         </li>
         <li className={router.pathname === "/vendor/activities" ? "active" : ""}>
-          <span className="d-flex">
-            <Image alt="" width={22} height={15} src="/images/vendor/icon-activities.svg" />
-            <div className="mx-2 text-center">
-              <Link href="/vendor/activities">Activities</Link>
-            </div>
-          </span>
+          <Link href="/vendor/activities">
+            <span className="d-flex cursor-pointer">
+              <Image alt="" width={22} height={15} src="/images/vendor/icon-activities.svg" />
+              <div className="mx-2 text-center">
+                Activities
+              </div>
+            </span>
+          </Link>
         </li>
         <li className={router.pathname === "/vendor/reviews" ? "active" : ""}>
-          <span className="d-flex">
-            <Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" />
-            <div className="mx-2 text-center">
-              <Link href="/vendor/reviews">Reviews</Link>
-            </div>
-          </span>
+          <Link href="/vendor/reviews">
+            <span className="d-flex cursor-pointer">
+              <Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" />
+              <div className="mx-2 text-center">
+                Reviews
+              </div>
+            </span>
+          </Link>
         </li>
       </ul>
     </div>

components/vendor/ActivityDetails.js

@@ -39,100 +39,6 @@ const getBase64 = file =>
     reader.onerror = error => reject(error);
   });
 
-const format = "HH:mm";
-let timeArray = [];
-
-const hoursArray = [
-  { value: "01", label: "01" },
-  { value: "02", label: "02" },
-  { value: "03", label: "03" },
-  { value: "04", label: "04" },
-  { value: "05", label: "05" },
-  { value: "06", label: "06" },
-  { value: "07", label: "07" },
-  { value: "08", label: "08" },
-  { value: "09", label: "09" },
-  { value: "10", label: "10" },
-  { value: "11", label: "11" },
-  { value: "12", label: "12" }
-];
-const minutesArray = [
-  { value: "00", label: "00" },
-  { value: "01", label: "01" },
-  { value: "02", label: "02" },
-  { value: "03", label: "03" },
-  { value: "04", label: "04" },
-  { value: "05", label: "05" },
-  { value: "06", label: "06" },
-  { value: "07", label: "07" },
-  { value: "08", label: "08" },
-  { value: "09", label: "09" },
-  { value: "10", label: "10" },
-  { value: "11", label: "11" },
-  { value: "12", label: "12" },
-  { value: "13", label: "13" },
-  { value: "14", label: "14" },
-  { value: "15", label: "15" },
-  { value: "16", label: "16" },
-  { value: "17", label: "17" },
-  { value: "18", label: "18" },
-  { value: "19", label: "19" },
-  { value: "20", label: "20" },
-  { value: "21", label: "21" },
-  { value: "22", label: "22" },
-  { value: "23", label: "23" },
-  { value: "24", label: "24" },
-  { value: "25", label: "25" },
-  { value: "26", label: "26" },
-  { value: "27", label: "27" },
-  { value: "28", label: "28" },
-  { value: "29", label: "29" },
-  { value: "30", label: "30" },
-  { value: "31", label: "31" },
-  { value: "32", label: "32" },
-  { value: "33", label: "33" },
-  { value: "34", label: "34" },
-  { value: "35", label: "35" },
-  { value: "36", label: "36" },
-  { value: "37", label: "37" },
-  { value: "38", label: "38" },
-  { value: "39", label: "39" },
-  { value: "40", label: "40" },
-  { value: "41", label: "41" },
-  { value: "42", label: "42" },
-  { value: "43", label: "43" },
-  { value: "44", label: "44" },
-  { value: "45", label: "45" },
-  { value: "46", label: "46" },
-  { value: "47", label: "47" },
-  { value: "48", label: "48" },
-  { value: "49", label: "49" },
-  { value: "50", label: "50" },
-  { value: "51", label: "51" },
-  { value: "52", label: "52" },
-  { value: "53", label: "53" },
-  { value: "54", label: "54" },
-  { value: "55", label: "55" },
-  { value: "56", label: "56" },
-  { value: "57", label: "57" },
-  { value: "58", label: "58" },
-  { value: "59", label: "59" }
-];
-const monthsArray = [
-  { value: "january", label: "January" },
-  { value: "february", label: "February" },
-  { value: "march", label: "March" },
-  { value: "april", label: "April" },
-  { value: "may", label: "May" },
-  { value: "june", label: "June" },
-  { value: "july", label: "July" },
-  { value: "august", label: "August" },
-  { value: "september", label: "September" },
-  { value: "october", label: "October" },
-  { value: "november", label: "November" },
-  { value: "december", label: "December" }
-];
-
 // import { colourOptions } from '../data';
 const animatedComponents = makeAnimated();
 const ActivityDetails = ({ isUpdate }) => {
@@ -402,7 +308,7 @@ const ActivityDetails = ({ isUpdate }) => {
                   }}
                   validationSchema={activityDetailsValidationSchema}
                   // enableReinitialize={true}
-                  onSubmit={values => {}}
+                  onSubmit={values => { }}
                 >
                   {({ values, errors, touched, handleChange, handleBlur, handleSubmit, setFieldValue, resetForm }) => (
                     <Form