Merge branch 'release' into CR/search_enggine

3 files changed, 122 insertions, 83 deletions

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index b7798a24..11a15d6d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,105 +1,149 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import useCategoryManagement from '../hooks/useCategoryManagement';
+import {fetchPopulerProductSolr} from '../api/categoryManagementApi'
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
 import odooApi from '@/core/api/odooApi';
-import { Skeleton} from '@chakra-ui/react'
+import { Skeleton } from '@chakra-ui/react';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
+import 'swiper/css/navigation';
+import 'swiper/css/pagination';
+import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
+
+  const [manufactures, setManufactures] = useState([])
+  const loadBrand = useCallback(async () => {
+    // setIsLoading(true)
+    //Get brand from odoo
+    /*const result = await odooApi(
+      'GET',
+      `/api/v1/manufacture?limit=0&offset=${manufactures.length}&name=${name}`
+    )*/
+
+    // Change get brands from solr
+    const items = await fetchPopulerProductSolr();
+
+    console.log("items",items)
+    
+    // setIsLoading(false)
+    // setManufactures((manufactures) => [...result.data])
+  }, [])
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
   const { categoryManagement } = useCategoryManagement();
-  const [categoryData, setCategoryData] = useState({});
-  const [subCategoryData, setSubCategoryData] = useState({});
+  // const [categoryData, setCategoryData] = useState({});
+  // const [subCategoryData, setSubCategoryData] = useState({});
   
-  useEffect(() => {
-    const fetchCategoryData = async () => {
-      if (categoryManagement && categoryManagement.data) {
-        const updatedCategoryData = {};
-        const updatedSubCategoryData = {};
+  // useEffect(() => {
+  //   const fetchCategoryData = async () => {
+  //     if (categoryManagement && categoryManagement.data) {
+  //       const updatedCategoryData = {};
+  //       const updatedSubCategoryData = {};
         
-        for (const category of categoryManagement.data) {
-          const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
+  //       for (const category of categoryManagement.data) {
+  //         const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
           
-          updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
+  //         updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
           
-          for (const subCategory of countLevel1.children) {
-            updatedSubCategoryData[subCategory.id] = subCategory.numFound;
-          }
-        }
+  //         for (const subCategory of countLevel1?.children) {
+  //           updatedSubCategoryData[subCategory.id] = subCategory?.numFound;
+  //         }
+  //       }
 
-        setCategoryData(updatedCategoryData);
-        setSubCategoryData(updatedSubCategoryData);
-      }
-    };
+  //       setCategoryData(updatedCategoryData);
+  //       setSubCategoryData(updatedSubCategoryData);
+  //     }
+  //   };
 
-    fetchCategoryData();
-  }, [categoryManagement.isLoading]);
+  //   fetchCategoryData();
+  // }, [categoryManagement.isLoading]);
+
+  const swiperBanner = {
+    modules: [Pagination, ],
+    classNames:'mySwiper',
+    slidesPerView: 3,
+    spaceBetween:10, 
+    pagination: {
+      dynamicBullets: true,
+      clickable: true,
+    }
+  };
  
   return (
     <div>
         {categoryManagement && categoryManagement.data?.map((category) => {
-          const countLevel1 = categoryData[category.categoryIdI] || 0;
+          // const countLevel1 = categoryData[category.categoryIdI] || 0;
           
           return (
             <Skeleton key={category.id} isLoaded={categoryManagement}>
-            <div key={category.id}>
-              <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
-                <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-                <Skeleton isLoaded={countLevel1 !=0}>
-                  <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
-                </Skeleton>
-                <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-              </div>
-              <div className='grid grid-cols-3 gap-2'>
-                {category.categories.map((subCategory) => {
-                  const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
+              <div key={category.id}>
+                <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
+                  <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+                  {/* <Skeleton isLoaded={countLevel1 != 0}>
+                    <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
+                  </Skeleton> */}
+                  <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                </div>
+                
+                {/* Swiper for SubCategories */}
+                <Swiper {...swiperBanner}
+                >
+                  {category.categories.map((subCategory) => {
+                    // const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
-                  return (
-                    <div key={subCategory.id} className='border rounded justify-start items-start'>
-                      <div className='p-3'>
-                        <div className='flex flex-row border rounded mb-2 justify-start items-center'>
-                          <NextImage
-                            src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
-                            alt={subCategory.name}
-                            width={90}
-                            height={30}
-                            className='object-fit'
-                          />
-                          <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                            <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                            <Skeleton isLoaded={countLevel2 != 0}>
-                            <p className={`text-gray_r-10 text-sm`}>
-                              {countLevel2} Produk tersedia
-                            </p>
-                            </Skeleton>
-                            <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-                          </div>
-                        </div>
-                        <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
-                          {subCategory.childFrontendIdI.map((childCategory) => (
-                            <div key={childCategory.id}>
-                              <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
-                                <NextImage
-                                  src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
-                                  alt={childCategory.name}
-                                  className='p-2 ml-1'
-                                  width={40}
-                                  height={40}
-                                />
-                                <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                  <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                    return (
+                      <SwiperSlide key={subCategory.id}>
+                        <div className='border rounded justify-start items-start '>
+                          <div className='p-3'>
+                            <div className='flex flex-row border rounded mb-2 justify-start items-center'>
+                              <NextImage
+                                src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
+                                alt={subCategory.name}
+                                width={90}
+                                height={30}
+                                className='object-fit p-4'
+                              />
+                              <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                                <div className='font-semibold text-lg mr-2'>{subCategory?.name}</div>
+                                {/* <Skeleton isLoaded={countLevel2 != 0}>
+                                  <p className={`text-gray_r-10 text-sm`}>
+                                    {countLevel2} Produk tersedia
+                                  </p>
+                                </Skeleton> */}
+                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                              </div>
+                            </div>
+                            <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px] min-h-[240px] content-start'>
+                              {subCategory.childFrontendIdI.map((childCategory) => (
+                                <div key={childCategory.id} className=''>
+                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                    <NextImage
+                                      src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
+                                      alt={childCategory.name}
+                                      className='p-2 ml-1'
+                                      width={40}
+                                      height={40}
+                                    />
+                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                      <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                                    </div>
+                                  </Link>
                                 </div>
-                              </Link>
+                              ))}
                             </div>
-                          ))}
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  );
-                })}
+                      </SwiperSlide>
+                    );
+                  })}
+                </Swiper>
               </div>
-            </div>
-          </Skeleton>
+            </Skeleton>
           );
         })}
     </div>
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index c1433a2d..2877a5a7 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -59,11 +59,10 @@ const CategoryDynamicMobile = () => {
                         alt={index.name}
                         width={30}
                         height={30}
-                        className='object-'
+                        className=''
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
                         <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
-                        <p className='text-gray_r-10 text-[10px]'>999 rb+ Produk</p>
                       </div>
                     </div>
                   </div>
@@ -82,6 +81,7 @@ const CategoryDynamicMobile = () => {
                         alt={x.name}
                         width={40}
                         height={40}
+                        className='p-2'
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
                         <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x.name}</div>
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 56268db7..b30fa5c9 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -65,11 +65,6 @@ const PreferredBrand = () => {
             Lihat Semua
           </Link>
         )}
-        {isMobile && (
-          <Link href='/shop/brands' className='!text-red-500 font-semibold sm:text-h-sm'>
-            Lihat Semua
-          </Link>
-        )}
       </div>
       <div className=''>
         {manufactures.isLoading && <PreferredBrandSkeleton />}