From 58267593b6214ecc37489802729a5702116794af Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 29 Feb 2024 15:31:16 +0700
Subject: Update flashsale section

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 65d953d2..4bdccdb4 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,14 +1,15 @@
 import dynamic from 'next/dynamic';
-import MobileView from '@/core/components/views/MobileView';
-import DesktopView from '@/core/components/views/DesktopView';
 import { useRef } from 'react';
-import Seo from '@/core/components/Seo';
-import DelayRender from '@/core/components/elements/DelayRender/DelayRender';
+
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
-import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
-import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
+import Seo from '@/core/components/Seo';
+import DelayRender from '@/core/components/elements/DelayRender/DelayRender';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
 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';
 
 const BasicLayout = dynamic(() =>
@@ -97,7 +98,9 @@ export default function Home() {
 
           <div className='my-16 flex flex-col gap-y-16'>
             <ServiceList />
-            <PreferredBrand />
+            <div id='flashsale'>
+              <PreferredBrand />
+            </div>
             <FlashSale />
             <PromotinProgram />
             <CategoryHomeId />
-- 
cgit v1.2.3


From df1f989fac16e99925b4d74472f329f9cdb97787 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Tue, 5 Mar 2024 09:16:34 +0700
Subject: Add id flashsale on mobile

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 4bdccdb4..f0bf5843 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -75,8 +75,9 @@ export default function Home() {
         ]}
       />
 
+      <PagePopupIformation />
+
       <DesktopView>
-        <PagePopupIformation />
         <div className='container mx-auto'>
           <div
             className='flex min-h-[400px] h-[460px]'
@@ -111,7 +112,6 @@ export default function Home() {
       </DesktopView>
 
       <MobileView>
-        <PagePopupIformation />
         <DelayRender renderAfter={200}>
           <HeroBanner />
         </DelayRender>
@@ -123,7 +123,9 @@ export default function Home() {
             <PreferredBrand />
           </DelayRender>
           <DelayRender renderAfter={600}>
-            <FlashSale />
+            <div id='flashsale'>
+              <FlashSale />
+            </div>
           </DelayRender>
           <DelayRender renderAfter={600}>
             <PromotinProgram />
-- 
cgit v1.2.3


From 1113f6ab09ebec64d1f458d9177e6f2339ce554f Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Tue, 5 Mar 2024 11:09:18 +0700
Subject: Fix id flashsale position on home page

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index f0bf5843..c097530c 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -120,13 +120,13 @@ export default function Home() {
             <ServiceList />
           </DelayRender>
           <DelayRender renderAfter={400}>
-            <PreferredBrand />
-          </DelayRender>
-          <DelayRender renderAfter={600}>
             <div id='flashsale'>
-              <FlashSale />
+              <PreferredBrand />
             </div>
           </DelayRender>
+          <DelayRender renderAfter={600}>
+            <FlashSale />
+          </DelayRender>
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
-- 
cgit v1.2.3


From c88d98f06a6301bad6dd6d2e58b4908d8562638c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 7 Jun 2024 17:08:09 +0700
Subject: <iman> add promotion program

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c097530c..ddc41cbe 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -41,6 +41,11 @@ const FlashSale = dynamic(
     loading: () => <FlashSaleSkeleton />,
   }
 );
+
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -103,6 +108,7 @@ export default function Home() {
               <PreferredBrand />
             </div>
             <FlashSale />
+           <ProgramPromotion/>
             <PromotinProgram />
             <CategoryHomeId />
             <BannerSection />
@@ -126,6 +132,7 @@ export default function Home() {
           </DelayRender>
           <DelayRender renderAfter={600}>
             <FlashSale />
+           <ProgramPromotion/>
           </DelayRender>
           <DelayRender renderAfter={600}>
             <PromotinProgram />
-- 
cgit v1.2.3


From ced37d32aa345fc288483716771422e7b7c0913a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 19 Jun 2024 17:10:24 +0700
Subject: <iman> update tampilan promotion program

---
 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 ddc41cbe..80e9ef0e 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -102,13 +102,13 @@ export default function Home() {
             </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 />
            <ProgramPromotion/>
+            <FlashSale />
             <PromotinProgram />
             <CategoryHomeId />
             <BannerSection />
-- 
cgit v1.2.3


From ca0faeb73b521a40a2e96b2e7b724b839db6aa57 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 28 Jun 2024 16:47:06 +0700
Subject: <iman> update mobile view

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 80e9ef0e..3da381b6 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -130,9 +130,11 @@ export default function Home() {
               <PreferredBrand />
             </div>
           </DelayRender>
+          <DelayRender  renderAfter={400}>
+           <ProgramPromotion/>
+          </DelayRender>
           <DelayRender renderAfter={600}>
             <FlashSale />
-           <ProgramPromotion/>
           </DelayRender>
           <DelayRender renderAfter={600}>
             <PromotinProgram />
-- 
cgit v1.2.3


From 556cbc1e5ea1c1ef0170c9a1b8f470a3d92d888e Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 2 Jul 2024 10:40:06 +0700
Subject: IS SO APPROVAL

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

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

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c097530c..914fb266 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -11,6 +11,8 @@ 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 useProductDetail from '~/modules/product-detail/stores/useProductDetail';
+import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -56,6 +58,8 @@ export default function Home() {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
+  const auth = getAuth();
+
   const handleOnLoad = () => {
     wrapperRef.current.style.height =
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
@@ -102,7 +106,7 @@ export default function Home() {
             <div id='flashsale'>
               <PreferredBrand />
             </div>
-            <FlashSale />
+            {!auth?.feature?.soApproval && <FlashSale />}
             <PromotinProgram />
             <CategoryHomeId />
             <BannerSection />
@@ -124,9 +128,11 @@ export default function Home() {
               <PreferredBrand />
             </div>
           </DelayRender>
-          <DelayRender renderAfter={600}>
-            <FlashSale />
-          </DelayRender>
+          {!auth?.feature?.soApproval && (
+            <DelayRender renderAfter={600}>
+              <FlashSale />
+            </DelayRender>
+          )}
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
-- 
cgit v1.2.3

