Merge branch 'dvjsharma:master' into nav-adjustment

dvjsharma · Jul 17, 2024 · 32926f4 · 32926f4
2 parents 3631e7a + e26a431
commit 32926f4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/client/src/components/Navbar/navbar.jsx b/client/src/components/Navbar/navbar.jsx
@@ -141,7 +141,7 @@ const Navbar = () => {
                         to="/"
                         className={({ isActive }) =>
                             isActive
-                                ? "nav-link-active underline nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10"
+                                ? "nav-link-active font-bold nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 w-10"
                                 : "nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10"
                         }
                     >
@@ -151,7 +151,7 @@ const Navbar = () => {
                         to="categories"
                         className={({ isActive }) =>
                             isActive
-                                ? "nav-link-active underline nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
+                                ? "nav-link-active font-bold nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 w-10 mr-8"
                                 : "nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
                         }
                     >
@@ -161,7 +161,7 @@ const Navbar = () => {
                         to="customize"
                         className={({ isActive }) =>
                             isActive
-                                ? "nav-link-active underline nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
+                                ? "nav-link-active font-bold nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 w-10 mr-8"
                                 : "nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
                         }
                     >
@@ -171,7 +171,7 @@ const Navbar = () => {
                         to="shop"
                         className={({ isActive }) =>
                             isActive
-                                ? "nav-link-active underline nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
+                                ? "nav-link-active font-bold nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 w-10 mr-8"
                                 : "nav-link bg-white-500 hover:bg-white-600 active:bg-white-700 focus:outline-none focus:ring-white-300 hover:font-bold w-10 mr-8"
                         }
                     >

diff --git a/client/src/pages/Cart/index.jsx b/client/src/pages/Cart/index.jsx
@@ -36,12 +36,6 @@ const Cart = () => {
         rzpay.open();
     }, [subtotal]);
 
-    useEffect(() => {
-        if (isLoaded) {
-            handlePayment();
-        }
-    }, [isLoaded, handlePayment]);
-
     let toDisplay = [];
     useEffect(() => {
         const fetchcart = async () => {
@@ -96,16 +90,16 @@ const Cart = () => {
                     <div className="rounded-lg md:w-2/3">
                         {cartitems
                             ? cartitems.map((item) => (
-                                  <Cartcard 
-                                      key={item.productId}
-                                      productId={item.productId}
-                                      productImage={item.productImage}
-                                      shoename={item.shoename}
-                                      shoeSize={item.shoeSize}
-                                      quantity={item.quantity}
-                                      price={item.price}
-                                  />
-                              ))
+                                <Cartcard
+                                    key={item.productId}
+                                    productId={item.productId}
+                                    productImage={item.productImage}
+                                    shoename={item.shoename}
+                                    shoeSize={item.shoeSize}
+                                    quantity={item.quantity}
+                                    price={item.price}
+                                />
+                            ))
                             : " "}
                     </div>
                     <div className="mt-6 h-full rounded-lg border bg-white p-6 shadow-md md:mt-0 md:w-1/3">