From aed8055fbef665984574bc98bb6223c1c54a821a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 09:42:57 +0700
Subject: <iman> marged develompent & category management

---
 src/pages/index.jsx | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 8af963fb..d2f6073b 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,5 +1,5 @@
 import dynamic from 'next/dynamic';
-import { useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
@@ -11,6 +11,10 @@ import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
 import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
+import CategoryPilihan from '../lib/home/components/CategoryPilihan';
+// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
+import odooApi from '@/core/api/odooApi';
+import { getIdFromSlug } from '@/core/utils/slug'
 import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
 import { getAuth } from '~/libs/auth';
 
@@ -54,12 +58,21 @@ const BannerSection = dynamic(() =>
 const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
+
+const CategoryDynamic = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamic')
+);
+
+const CategoryDynamicMobile = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamicMobile')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
-export default function Home() {
+export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
@@ -70,6 +83,18 @@ export default function Home() {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
+  const [dataCategories, setDataCategories] = useState([])
+
+  useEffect(() => {
+    const loadCategories = async () => {
+     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
+     if(getCategories){
+      setDataCategories(getCategories)
+     }
+    }
+    loadCategories()
+  }, [])
+
   return (
     <BasicLayout>
       <Seo
@@ -117,6 +142,8 @@ export default function Home() {
               </>
             )}
             <PromotinProgram />
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -150,6 +177,10 @@ export default function Home() {
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamicMobile/>
+          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
cgit v1.2.3


From 2fbfdb7a3d090b0ad8dae5527464b25e5df65c25 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:40:23 +0700
Subject: Merge branch 'Feature/category-management' into development

# Conflicts:
#	src/lib/home/components/CategoryDynamic.jsx
#	src/lib/home/components/CategoryPilihan.jsx
#	src/lib/home/components/PreferredBrand.jsx
#	src/lib/product/components/CategorySection.jsx
#	src/pages/index.jsx
---
 src/pages/index.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index db868470..0f2add9a 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -64,13 +64,13 @@ const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
 
-const CategoryDynamic = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamic')
-);
+// const CategoryDynamic = dynamic(() =>
+//   import('@/lib/home/components/CategoryDynamic')
+// );
 
-const CategoryDynamicMobile = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamicMobile')
-);
+// const CategoryDynamicMobile = dynamic(() =>
+//   import('@/lib/home/components/CategoryDynamicMobile')
+// );
 
 
 const CategoryDynamic = dynamic(() =>
@@ -86,7 +86,7 @@ const CustomerReviews = dynamic(() =>
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
-export default function Home({categoryId}) {
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
@@ -98,7 +98,7 @@ export default function Home({categoryId}) {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  const [dataCategories, setDataCategories] = useState([])
+  // const [dataCategories, setDataCategories] = useState([])
 
   useEffect(() => {
     const loadCategories = async () => {
-- 
cgit v1.2.3


From ca30fe957369a16f6833d6a3bd37df74182b2911 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:45:17 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0f2add9a..c720547e 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,7 +1,5 @@
 import dynamic from 'next/dynamic';
 import { useEffect, useRef, useState } from 'react';
-import { useEffect, useRef, useState } from 'react';
-
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
 import Seo from '@/core/components/Seo';
@@ -13,15 +11,8 @@ import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBran
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
-import { getIdFromSlug } from '@/core/utils/slug'
-import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
 import { getAuth } from '~/libs/auth';
-import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
-import odooApi from '@/core/api/odooApi';
-import { getIdFromSlug } from '@/core/utils/slug'
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -64,15 +55,6 @@ const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
 
-// const CategoryDynamic = dynamic(() =>
-//   import('@/lib/home/components/CategoryDynamic')
-// );
-
-// const CategoryDynamicMobile = dynamic(() =>
-//   import('@/lib/home/components/CategoryDynamicMobile')
-// );
-
-
 const CategoryDynamic = dynamic(() =>
   import('@/lib/home/components/CategoryDynamic')
 );
-- 
cgit v1.2.3


From c36d43c9b41eeb6f0c996476eaa8a2d13fbf42d1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:47:17 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c720547e..578c4e2d 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -80,8 +80,6 @@ export default function Home({categoryId}) {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  // const [dataCategories, setDataCategories] = useState([])
-
   useEffect(() => {
     const loadCategories = async () => {
      const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
@@ -94,16 +92,6 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
-  useEffect(() => {
-    const loadCategories = async () => {
-     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
-     if(getCategories){
-      setDataCategories(getCategories)
-     }
-    }
-    loadCategories()
-  }, [])
-
   return (
     <BasicLayout>
       <Seo
@@ -210,4 +198,4 @@ export default function Home({categoryId}) {
       </MobileView>
     </BasicLayout>
   );
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 44e1ed755b6714fbf76216ef914a8dfc73bef367 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:21:12 +0700
Subject: merge

---
 src/pages/index.jsx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 578c4e2d..ad654922 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -13,6 +13,7 @@ import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
+import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -92,6 +93,8 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
+  const [dataCategories, setDataCategories] = useState([])
+
   return (
     <BasicLayout>
       <Seo
@@ -128,6 +131,7 @@ export default function Home({categoryId}) {
             </div>
           </div>
 
+          <div className='my-16 flex flex-col gap-y-8'>
           <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
             <div id='flashsale'>
-- 
cgit v1.2.3


From 233f2501a7ad23bedb8d02b7a3e7762632108098 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:23:28 +0700
Subject: <iman> update code

---
 src/pages/index.jsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index ad654922..0b2b6046 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -93,8 +93,6 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
-  const [dataCategories, setDataCategories] = useState([])
-
   return (
     <BasicLayout>
       <Seo
@@ -145,12 +143,11 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
           </div>
+          </div>
         </div>
       </DesktopView>
 
@@ -184,10 +181,6 @@ export default function Home({categoryId}) {
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamicMobile/>
           </DelayRender>
-          <DelayRender renderAfter={600}>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamicMobile/>
-          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
cgit v1.2.3


From 5214c9578aac1db612cd154cf04ee6d75750918d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 08:49:05 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0b2b6046..110d8b17 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -13,7 +13,7 @@ import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
-import { getAuth } from '~/libs/auth';
+// import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
-- 
cgit v1.2.3


From a264e12c5af60e82f6e496209b6ac81d4a994a10 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 09:06:05 +0700
Subject: <iman> merge category management to development

---
 src/pages/index.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 110d8b17..30a7ac1f 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -70,6 +70,7 @@ const CustomerReviews = dynamic(() =>
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
 
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
-- 
cgit v1.2.3


From 53d214ef3222bcc4169b188bff3dadf6c43f6b7e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 14:27:23 +0700
Subject: <iman> git aMerge branch 'Feature/category-management' into
 development

---
 src/pages/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/pages/index.jsx')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 64c880c7..d649ee17 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -61,7 +61,7 @@ const CategoryDynamic = dynamic(() =>
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamicMobile')
+import('@/lib/home/components/CategoryDynamicMobile')
 );
 
 const CustomerReviews = dynamic(() =>
@@ -156,7 +156,7 @@ export default function Home({categoryId}) {
         <DelayRender renderAfter={200}>
           <HeroBanner />
         </DelayRender>
-        <div className='flex flex-col gap-y-12 my-6'>
+        <div className='flex flex-col gap-y-4 my-6'>
           <DelayRender renderAfter={400}>
             <ServiceList />
           </DelayRender>
-- 
cgit v1.2.3

