From 6b173eaf8a95432316822b1d41b084875adfbd83 Mon Sep 17 00:00:00 2001
From: "tri.susilo" <tri.susilo@altama.co.id>
Date: Wed, 8 May 2024 14:47:11 +0700
Subject: [agnes] - Feature category management

---
 src/pages/index.jsx | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c097530c..9675c355 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,9 @@ 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 odooApi from '@/core/api/odooApi';
+import { getIdFromSlug } from '@/core/utils/slug'
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -52,7 +55,7 @@ const CustomerReviews = dynamic(() =>
 );
 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);
 
@@ -61,6 +64,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
@@ -104,7 +119,8 @@ export default function Home() {
             </div>
             <FlashSale />
             <PromotinProgram />
-            <CategoryHomeId />
+            <CategoryPilihan categories={dataCategories}/>
+            {/* <CategoryHomeId /> */}
             <BannerSection />
             <CustomerReviews />
           </div>
-- 
cgit v1.2.3


From 59cba752134fa41063956569a3f4e7ed2a6d2537 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 8 Jul 2024 08:48:29 +0700
Subject: <iman> add dynamic category

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 9675c355..149352c2 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -12,6 +12,7 @@ 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'
 
@@ -120,6 +121,7 @@ export default function Home({categoryId}) {
             <FlashSale />
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             {/* <CategoryHomeId /> */}
             <BannerSection />
             <CustomerReviews />
-- 
cgit v1.2.3


From 0840f5ccc7493dfa091508db84bad8a21e073268 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 18 Jul 2024 17:24:36 +0700
Subject: <iman> update category-management

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 149352c2..b5d004ca 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -12,7 +12,7 @@ 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 CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
 import { getIdFromSlug } from '@/core/utils/slug'
 
@@ -51,6 +51,11 @@ const BannerSection = dynamic(() =>
 const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
+
+const CategoryDynamic = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamic')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
@@ -122,7 +127,7 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            {/* <CategoryHomeId /> */}
+            <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
           </div>
-- 
cgit v1.2.3


From 911e0fdc6beb2f97c7e390a6aec5773202189d68 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 19 Jul 2024 17:07:23 +0700
Subject: <iman> update mobile view

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index b5d004ca..0255e239 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -56,6 +56,10 @@ const CategoryDynamic = dynamic(() =>
   import('@/lib/home/components/CategoryDynamic')
 );
 
+const CategoryDynamicMobile = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamicMobile')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
@@ -153,6 +157,10 @@ export default function Home({categoryId}) {
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+            {/* <CategoryPilihan categories={dataCategories}/> */}
+            <CategoryDynamicMobile/>
+          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
cgit v1.2.3


From a78251dc5cdfdd5438aad3ce7b7e342fceb7275e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 22 Jul 2024 16:57:47 +0700
Subject: <iman> update category management

---
 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 0255e239..cdbe0dd0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -158,7 +158,7 @@ export default function Home({categoryId}) {
             <PromotinProgram />
           </DelayRender>
           <DelayRender renderAfter={600}>
-            {/* <CategoryPilihan categories={dataCategories}/> */}
+            <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamicMobile/>
           </DelayRender>
           <DelayRender renderAfter={800}>
-- 
cgit v1.2.3


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

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index cdbe0dd0..578c4e2d 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,6 +1,5 @@
 import dynamic from 'next/dynamic';
 import { useEffect, useRef, useState } from 'react';
-
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
 import Seo from '@/core/components/Seo';
@@ -12,9 +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 { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -45,6 +43,11 @@ const FlashSale = dynamic(
     loading: () => <FlashSaleSkeleton />,
   }
 );
+
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -65,17 +68,18 @@ const CustomerReviews = dynamic(() =>
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
+  const auth = getAuth();
+
   const handleOnLoad = () => {
     wrapperRef.current.style.height =
       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})
@@ -86,6 +90,8 @@ export default function Home({categoryId}) {
     loadCategories()
   }, [])
 
+  const [dataCategories, setDataCategories] = useState([])
+
   return (
     <BasicLayout>
       <Seo
@@ -122,15 +128,21 @@ export default function Home({categoryId}) {
             </div>
           </div>
 
-          <div className='my-16 flex flex-col gap-y-16'>
+          <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
             <div id='flashsale'>
               <PreferredBrand />
             </div>
-            <FlashSale />
+            {!auth?.feature?.soApproval && (
+              <>
+                <ProgramPromotion /> <FlashSale />
+              </>
+            )}
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -151,11 +163,22 @@ export default function Home({categoryId}) {
               <PreferredBrand />
             </div>
           </DelayRender>
+          {!auth?.feature?.soApproval && (
+            <>
+              <DelayRender renderAfter={400}>
+                <ProgramPromotion />
+              </DelayRender>
+              <DelayRender renderAfter={600}>
+                <FlashSale />
+              </DelayRender>
+            </>
+          )}
           <DelayRender renderAfter={600}>
-            <FlashSale />
+            <PromotinProgram />
           </DelayRender>
           <DelayRender renderAfter={600}>
-            <PromotinProgram />
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamicMobile/>
           </DelayRender>
           <DelayRender renderAfter={600}>
             <CategoryPilihan categories={dataCategories}/>
@@ -175,4 +198,4 @@ export default function Home({categoryId}) {
       </MobileView>
     </BasicLayout>
   );
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


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

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 578c4e2d..6558f605 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -141,8 +141,6 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -180,10 +178,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 e244185f6a83ad396be4d1f84bf22c2d6be0997e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:11:48 +0700
Subject: <iman> update error 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 6558f605..60dcb9e0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -44,10 +44,6 @@ const FlashSale = dynamic(
   }
 );
 
-const ProgramPromotion = dynamic(() =>
-  import('@/lib/home/components/PromotionProgram')
-);
-
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -135,7 +131,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <ProgramPromotion /> <FlashSale />
+                <FlashSale />
               </>
             )}
             <PromotinProgram />
@@ -163,9 +159,6 @@ export default function Home({categoryId}) {
           </DelayRender>
           {!auth?.feature?.soApproval && (
             <>
-              <DelayRender renderAfter={400}>
-                <ProgramPromotion />
-              </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
               </DelayRender>
-- 
cgit v1.2.3


From 0768abc2828369a0c41a8042e0d005d32b5315ba Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 08:59:29 +0700
Subject: <iman> update error code

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 60dcb9e0..0e4ee5e6 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -124,6 +124,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'>
@@ -141,6 +142,7 @@ export default function Home({categoryId}) {
             <BannerSection />
             <CustomerReviews />
           </div>
+          </div>
         </div>
       </DesktopView>
 
-- 
cgit v1.2.3


From 1f07818ba6718755684de5863e01636805b80867 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 15:16:00 +0700
Subject: <iman> update to avoid conflict

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0e4ee5e6..30a7ac1f 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')
@@ -44,6 +45,10 @@ const FlashSale = dynamic(
   }
 );
 
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -65,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);
@@ -132,7 +138,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <FlashSale />
+                <ProgramPromotion /> <FlashSale />
               </>
             )}
             <PromotinProgram />
@@ -161,6 +167,9 @@ export default function Home({categoryId}) {
           </DelayRender>
           {!auth?.feature?.soApproval && (
             <>
+              <DelayRender renderAfter={400}>
+                <ProgramPromotion />
+              </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
               </DelayRender>
-- 
cgit v1.2.3


From e79b956cd190419100e52a5468f91eefb7933387 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 15:25:59 +0700
Subject: <iman> update category management

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 30a7ac1f..64c880c7 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -45,9 +45,9 @@ const FlashSale = dynamic(
   }
 );
 
-const ProgramPromotion = dynamic(() =>
-  import('@/lib/home/components/PromotionProgram')
-);
+// const ProgramPromotion = dynamic(() =>
+//   import('@/lib/home/components/PromotionProgram')
+// );
 
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
@@ -138,7 +138,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <ProgramPromotion /> <FlashSale />
+                {/* <ProgramPromotion /> <FlashSale /> */}
               </>
             )}
             <PromotinProgram />
@@ -168,7 +168,7 @@ export default function Home({categoryId}) {
           {!auth?.feature?.soApproval && (
             <>
               <DelayRender renderAfter={400}>
-                <ProgramPromotion />
+                {/* <ProgramPromotion /> */}
               </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
-- 
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

