fix: resolve merge conflict artifacts in 4 page files (closes #256)

frontend/src/components/Nav.jsx

@@ -6,8 +6,6 @@ import { IoMdHome } from 'react-icons/io';
 
 import { HiOutlineCollection } from 'react-icons/hi';
 
-import { RiContactsLine } from 'react-icons/ri';
-import { HiOutlineCollection } from 'react-icons/hi';
 import { RiContactsLine } from 'react-icons/ri';
 import { BsSearch, BsSun, BsMoon, BsBoxSeam } from 'react-icons/bs';
 import { FaUserCircle, FaHeart } from 'react-icons/fa';

frontend/src/context/ShopContext.jsx

@@ -26,10 +26,6 @@
   const currency = '₹';
   const delivery_fee = 40;
   //wishlist functions
-  const fetchWishlist = async () => {
-    try {
-      const response = await apiConfig.get('/wishlist');
- //wishlist functions
   const fetchWishlist = async () => {
     setLoadingWishlist(true);
     setWishlistError(null);
@@ -41,24 +37,13 @@
         setWishlistError(response.data.message || 'Failed to fetch wishlist');
       }
     } catch (error) {
       console.log(error);
       setWishlistError(error.response?.data?.message || error.message || 'Failed to fetch wishlist');
     } finally {
       setLoadingWishlist(false);
     }
   };
-const addToWishlist = async (productId) => {
-  try {
-    const response = await apiConfig.post('/wishlist/add', { productId });
 
-      if (response.data.success) {
-        setWishlist(response.data.wishlist);
-      }
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(error);
-    }
-  };
   const addToWishlist = async (productId) => {
     try {
       const response = await apiConfig.post('/wishlist/add', { productId });
@@ -108,7 +93,7 @@
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error('Error fetching products:', error);
       console.log('Error fetching products:', error);
       setProductsError(error.response?.data?.message || error.message || 'Failed to load products.');
     } finally {
       setLoadingProducts(false);
@@ -156,7 +141,7 @@
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error('Error fetching cart:', error);
       console.log('❌ Error fetching cart:', error);
       setCartError(error.response?.data?.message || error.message || 'Failed to load cart.');
     } finally {
       setLoadingCart(false);
@@ -252,7 +237,7 @@
 
   useEffect(() => {
     getProducts();
   }, []);
   useEffect(() => {
     if (userData) {
       getUserCart();
@@ -289,13 +274,10 @@
     removeFromCompare,
     comparePanelOpen,
     toggleComparePanel,
-    wishlist,
+    wishlist, loadingWishlist, wishlistError,
     addToWishlist,
     fetchWishlist,
     removeFromWishlist,
-    setCartItem, UpdateQuantity, getCartAmount,
-    compareList, toggleCompare, removeFromCompare, comparePanelOpen, toggleComparePanel,
-    wishlist, loadingWishlist, wishlistError, addToWishlist, fetchWishlist, removeFromWishlist
   };
 
   return (

frontend/src/pages/BestSellers.jsx

@@ -1,12 +1,9 @@
 import { useContext, useEffect, useState, useRef } from 'react';
+import { motion } from 'framer-motion';
+import gsap from 'gsap';
 import { shopDataContext } from '../context/ShopContext';
 import Card from '../components/Card';
 import Title from '../components/Title';
-import { motion } from 'framer-motion';
-import gsap from 'gsap';
-import { ScrollTrigger } from 'gsap/ScrollTrigger';
-
-gsap.registerPlugin(ScrollTrigger);
 
 const BestSellers = () => {
   const { product, compareList, toggleCompare } = useContext(shopDataContext);

frontend/src/pages/NewArrivals.jsx

@@ -1,12 +1,9 @@
 import { useContext, useEffect, useState, useRef } from 'react';
+import { motion } from 'framer-motion';
+import gsap from 'gsap';
 import { shopDataContext } from '../context/ShopContext';
 import Card from '../components/Card';
 import Title from '../components/Title';
-import { motion } from 'framer-motion';
-import gsap from 'gsap';
-import { ScrollTrigger } from 'gsap/ScrollTrigger';
-
-gsap.registerPlugin(ScrollTrigger);
 
 const NewArrivals = () => {
   const {

frontend/src/pages/Order.jsx

@@ -2,23 +2,14 @@
 import { shopDataContext } from '../context/ShopContext';
 import apiConfig from '../utils/apiConfig';
 import {
-  FaBox,
-  FaShoppingBag,
-  FaShippingFast,
-  FaCheckCircle,
-  FaClock,
-  FaMapMarkerAlt,
-  FaUndo,
+  FaBox, FaShoppingBag, FaShippingFast, FaCheckCircle,
+  FaClock, FaMapMarkerAlt, FaUndo, FaCalendarAlt, FaMoneyBillWave, FaStar,
 } from 'react-icons/fa';
 import gsap from 'gsap';
 import { ScrollTrigger } from 'gsap/ScrollTrigger';
-import { FaCalendarAlt, FaMoneyBillWave, FaStar } from 'react-icons/fa';
-import { FaBox, FaShoppingBag, FaShippingFast, FaCheckCircle, FaClock, FaMapMarkerAlt, FaUndo, FaCalendarAlt, FaMoneyBillWave, FaStar } from 'react-icons/fa';
 import { GiReceiveMoney } from 'react-icons/gi';
 import Title from '../components/Title';
 import { LoadingState, EmptyState, ErrorState } from '../components/StateComponents';
-import gsap from 'gsap';
-import { ScrollTrigger } from 'gsap/ScrollTrigger';
 
 gsap.registerPlugin(ScrollTrigger);
 
@@ -55,7 +46,7 @@
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error('Error loading orders:', error);
       console.log('Error loading orders:', error);
       setError(error.response?.data?.message || error.message || 'Failed to load orders.');
     } finally {
       setIsLoading(false);

frontend/src/pages/wishlist.jsx

@@ -5,15 +5,9 @@ import { LoadingState, EmptyState, ErrorState } from '../components/StateCompone
 import { FaHeart, FaTrash } from 'react-icons/fa';
 
 function Wishlist() {
-  const { wishlist, fetchWishlist, currency, removeFromWishlist } =
-    useContext(shopDataContext);
   const {
-    wishlist,
-    fetchWishlist,
-    currency,
-    removeFromWishlist,
-    loadingWishlist,
-    wishlistError,
+    wishlist, fetchWishlist, currency, removeFromWishlist,
+    loadingWishlist, wishlistError,
   } = useContext(shopDataContext);
 
   const navigate = useNavigate();