Merge branch 'master' into Feature/SLA

# Conflicts:
#	src/lib/product/components/Product/ProductDesktop.jsx
#	src/lib/product/components/Product/ProductMobile.jsx

2 files changed, 20 insertions, 10 deletions

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 9900e405..12d2ab46 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -6,6 +6,7 @@ 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'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const HeroBanner = dynamic(() => import('@/components/ui/HeroBanner'), {
@@ -71,6 +72,9 @@ export default function Home() {
             <DelayRender renderAfter={600}>
               <FlashSale />
             </DelayRender>
+            <DelayRender renderAfter={600}>
+              <PromotinProgram />
+            </DelayRender>
             <DelayRender renderAfter={1000}>
               <CategoryHomeId />
               <BannerSection />
@@ -93,6 +97,9 @@ export default function Home() {
           <DelayRender renderAfter={600}>
             <FlashSale />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+              <PromotinProgram />
+            </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
diff --git a/src/pages/shop/cart.jsx b/src/pages/shop/cart.jsx
index e574f14d..a7f2037b 100644
--- a/src/pages/shop/cart.jsx
+++ b/src/pages/shop/cart.jsx
@@ -2,6 +2,7 @@ import Seo from '@/core/components/Seo'
 import BasicLayout from '@/core/components/layouts/BasicLayout'
 import DesktopView from '@/core/components/views/DesktopView'
 import MobileView from '@/core/components/views/MobileView'
+import IsAuth from '@/lib/auth/components/IsAuth'
 import dynamic from 'next/dynamic'
 
 const AppLayout = dynamic(() => import('@/core/components/layouts/AppLayout'))
@@ -12,17 +13,19 @@ export default function Cart() {
     <>
       <Seo title='Keranjang Belanja Indoteknik.com' />
 
-      <MobileView>
-        <AppLayout title='Keranjang' withFooter={false}>
-          <CartComponent />
-        </AppLayout>
-      </MobileView>
+      <IsAuth>
+        <MobileView>
+          <AppLayout title='Keranjang' withFooter={false}>
+            <CartComponent />
+          </AppLayout>
+        </MobileView>
 
-      <DesktopView>
-        <BasicLayout>
-          <CartComponent />
-        </BasicLayout>
-      </DesktopView>
+        <DesktopView>
+          <BasicLayout>
+            <CartComponent />
+          </BasicLayout>
+        </DesktopView>
+      </IsAuth>
     </>
   )
 }