Merge branch 'development' into ft-stats-#187300236

atlp-rwanda · Jul 16, 2024 · 5169286 · 5169286
2 parents b6a1be0 + 8d1e55e
commit 5169286
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -39,10 +39,10 @@ const Header = () => {
     (state: RootState) => state.wishlist
   )
 
-  const { isOrdersOverlayOpen, toggleOrdersSlider } = OrdersOverlay();
+  const { isOrdersOverlayOpen, setIsOrdersOverlayOpen, toggleOrdersSlider } = OrdersOverlay();
   const [activelink, setActivelink] = useState('home');
 
-  const { isWishlistOverlayOpen, toggleWishlistSlider } = WishlistOverlay();
+  const { isWishlistOverlayOpen, setIsWishlistOverlayOpen, toggleWishlistSlider } = WishlistOverlay();
   const [showlModal, setShowmodal] = useState(false);
 
   const [showCart, setShowCart] = useState(false);
@@ -53,11 +53,25 @@ const Header = () => {
     'cart' | 'notification' | null
   >(null);
 
+  const handleShowWishlist=()=>{
+    setIsOrdersOverlayOpen(false);
+    setOverlayComponent(null);
+    toggleWishlistSlider();
+  }
+  const handleShowOrders=()=>{
+    setIsWishlistOverlayOpen(false);
+    setOverlayComponent(null);
+    toggleOrdersSlider();
+  }
   const handleShowCart = () => {
+    setIsWishlistOverlayOpen(false);
+    setIsOrdersOverlayOpen(false);
     setOverlayComponent('cart');
   };
 
   const handleShowNotification = () => {
+    setIsWishlistOverlayOpen(false);
+    setIsOrdersOverlayOpen(false);
     setOverlayComponent('notification');
   };
 
@@ -122,7 +136,7 @@ const Header = () => {
                 </i>
                 <MdOutlineShoppingCart className="hover:bg-black text-white cursor-pointer z-20" />
               </span>
-               <span className='flex items-center mx-2  cursor-pointer' onClick={toggleWishlistSlider}>
+               <span className='flex items-center mx-2  cursor-pointer' onClick={handleShowWishlist}>
                 <i className=" bg-black  border items-center border-slate-100 w-6 h-6 text-center rounded-[100%] relative top-[-10px] right-[-5px] text-[#ffff] text-[12px]">
                     {wishNumber}
                   </i>
@@ -173,7 +187,7 @@ const Header = () => {
                   <>
                     <li
                       className="text-black hover:text-blue-600"
-                      onClick={toggleOrdersSlider}
+                      onClick={handleShowOrders}
                     >
                       Order
                     </li>
@@ -223,7 +237,7 @@ const Header = () => {
               </li>
               <li
                 className={`${isOrdersOverlayOpen === true ? 'text-blue-600' : 'text-black'} font-normal hover:text-blue-600 cursor-pointer `}
-                onClick={toggleOrdersSlider}
+                onClick={handleShowOrders}
               >
                 Order
               </li>
@@ -326,15 +340,16 @@ const Header = () => {
         ) : (
           ''
         )}
-      </div>
-      {isWishlistOverlayOpen ? (
+        {isWishlistOverlayOpen ? (
           <WishlistContainer
             isWishlistOverlayOpen={isWishlistOverlayOpen}
             toggleWishlistSlider={toggleWishlistSlider}
           />
         ) : (
           ''
         )}
+      </div>
+
       {overlayComponent && (
         <SideBarOverlay handleOpenOverlay={handleCloseOverlay}>
           {overlayComponent === 'cart' && (

diff --git a/src/components/ProductList.tsx b/src/components/ProductList.tsx
@@ -22,14 +22,8 @@ const ProductList: React.FC<ProdductProps> = ({ activeNav,searchResults }) => {
     switch (nav) {
       case 'All':
         return `/products?page=${activeButton}&limit=10`;
-      case 'Electronics':
-        return '/products/electronics?page=1&limit=10';
       case 'wishes':
-        return `/wishes?page=${activeButton}&limit=10`;
-      case 'Featured':
-        return '/products/Featured?page=1&limit=10';
-      case 'Featured':
-        return '/products/Featured?page=1&limit=10';
+        return `/wishes`;
       default:
         return `/products?page=${activeButton}&limit=10`;
     }
@@ -49,10 +43,10 @@ const ProductList: React.FC<ProdductProps> = ({ activeNav,searchResults }) => {
         data = response.products;
         dispatch(storeAllProduct(data));
         return data;
-      } else if (response.data) {
+      } else if (response.wishes) {
         const allProduct: any = await request.get(`/products`);
         const filterdeArray = allProduct.products.filter((el1: any) =>
-          response.data.some((el: any) => el1.id === el.product.id),
+          response.wishes.some((el: any) => el1.id === el.product.id),
         );
         data = filterdeArray;
       }
@@ -62,7 +56,7 @@ const ProductList: React.FC<ProdductProps> = ({ activeNav,searchResults }) => {
       return data;
     },
   });
-
+  console.log('this is fetched data', data);
   if (isLoading) {
     return (
       <div data-testid="loading">

diff --git a/src/components/allProducts.tsx b/src/components/allProducts.tsx
@@ -14,8 +14,7 @@ export const ProductWithFilter = () => {
   const router = useRouter();
   const Options = [
     { laber: 'All', value: 1 },
-    { laber: 'Rating', value: 2 },
-    { laber: 'wishes', value: 3 },
+    { laber: 'wishes', value: 3 }
   ];
 
   useEffect(() => {
@@ -82,24 +81,24 @@ export const ProductWithFilter = () => {
         <div className="flex sm:gap-5 mb-10 sm:ml-24 gap-1  ">
           {locarstorage === 'buyer' && (
             <>
-              <button
+              {/* <button
                 className={buttonClass('Featured')}
                 onClick={() => handleButtonClick('Featured')}
               >
-                Featured
-              </button>
+                Shoes
+              </button> */}
               <button
                 className={buttonClass('wishes')}
                 onClick={() => handleButtonClick('wishes')}
               >
                 wishes
               </button>
-              <button
+              {/* <button
                 className={buttonClass('Electronics')}
                 onClick={() => handleButtonClick('Electronics')}
               >
-                Electronics
-              </button>
+                Cars
+              </button> */}
             </>
           )}
           <button

diff --git a/src/redux/slices/wishlistSlice.ts b/src/redux/slices/wishlistSlice.ts
@@ -1,9 +1,11 @@
+"use client"
+import { checkUserLoggedIn } from '@/components/isLogged';
 import request from '@/utils/axios';
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 const handleFetchUserWishes = async ():Promise<number>=>{
-    const token = localStorage.getItem('token');
-    if(token){
+    const check = checkUserLoggedIn();
+    if(check){
         const response:any = await request.get('/wishes');
         console.log('this is data from wishlist', response);
         if(response.status == 200){