Merge branch 'new-release' into CR/website-improvement

6 files changed, 200 insertions, 134 deletions

diff --git a/src/pages/api/flashsale-header.js b/src/pages/api/flashsale-header.js
new file mode 100644
index 00000000..31f8efdd
--- /dev/null
+++ b/src/pages/api/flashsale-header.js
@@ -0,0 +1,40 @@
+import odooApi from '@/core/api/odooApi';
+import { createClient } from 'redis';
+
+const client = createClient();
+
+client.on('error', (err) => console.error('Redis Client Error', err));
+
+const connectRedis = async () => {
+  if (!client.isOpen) {
+    await client.connect();
+  }
+};
+
+export default async function handler(req, res) {
+  try {
+    await connectRedis();
+    const cacheKey = `flashsale_header`;
+    // await client.del(cacheKey);
+    let cachedData = await client.get(cacheKey);
+
+    if (cachedData) {
+      const data = JSON.parse(cachedData);
+      return res.status(200).json({ data });
+    } else {
+      const flashSale = await odooApi('GET', `/api/v1/flashsale/header`);
+
+      await client.set(
+        cacheKey,
+        JSON.stringify(flashSale),
+        'EX',
+        flashSale.duration
+      );
+      cachedData = await client.get(cacheKey);
+      return res.status(200).json({ data: cachedData });
+    }
+  } catch (error) {
+    console.error('Error interacting with Redis or fetching data:', error);
+    return res.status(500).json({ error: 'Internal Server Error' });
+  }
+}
diff --git a/src/pages/api/page-content.js b/src/pages/api/page-content.js
index 3cb8a237..a6514505 100644
--- a/src/pages/api/page-content.js
+++ b/src/pages/api/page-content.js
@@ -22,7 +22,6 @@ export default async function handler(req, res) {
 
       if (!cachedData) {
         const items = await getPageContent({ path });
-        console.log('items', items);
         await client.set(
           `page-content:${path}`,
           JSON.stringify(items),
diff --git a/src/pages/api/search-flashsale.js b/src/pages/api/search-flashsale.js
new file mode 100644
index 00000000..d9e56c83
--- /dev/null
+++ b/src/pages/api/search-flashsale.js
@@ -0,0 +1,45 @@
+import odooApi from '@/core/api/odooApi';
+import { createClient } from 'redis';
+import _ from 'lodash-contrib';
+import axios from 'axios';
+
+const client = createClient();
+
+client.on('error', (err) => console.error('Redis Client Error', err));
+
+const connectRedis = async () => {
+  if (!client.isOpen) {
+    await client.connect();
+  }
+};
+
+export default async function handler(req, res) {
+  const { query, operation, duration } = req.query;
+  try {
+    await connectRedis();
+    const cacheKey = `flashsale_product`;
+    // await client.del(cacheKey);
+    let cachedData = await client.get(cacheKey);
+
+    if (cachedData) {
+      const data = JSON.parse(cachedData);
+      return res.status(200).json({ data });
+    } else {
+      const dataProductSearch = await axios(
+        `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?${query}&operation=${operation}]`
+      );
+
+      await client.set(
+        cacheKey,
+        JSON.stringify(dataProductSearch.data),
+        'EX',
+        duration
+      );
+      cachedData = await client.get(cacheKey);
+      return res.status(200).json({ data: cachedData });
+    }
+  } catch (error) {
+    console.error('Error interacting with Redis or fetching data:', error);
+    return res.status(500).json({ error: 'Internal Server Error' });
+  }
+}
diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js
index 247f2a04..faa96028 100644
--- a/src/pages/api/shop/product-detail.js
+++ b/src/pages/api/shop/product-detail.js
@@ -8,7 +8,7 @@ export default async function handler(req, res) {
     )
     let productVariants = await axios(
       process.env.SOLR_HOST +
-        `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100&fq=-publish_b:false`
+        `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100&fq=-publish_b:false AND price_tier1_v2_f:[1 TO *]`
     )
     let auth  = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth
     let result = productMappingSolr(productTemplate.data.response.docs, auth || false)
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 65927bbc..63ec7ca0 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -19,12 +19,7 @@ export default async function handler(req, res) {
     source = '',
   } = req.query;
 
-  
-  
-  console.log('fq new', fq);
-
   let { stock = '' } = req.query;
-
   let paramOrderBy = '';
   switch (orderBy) {
     case 'flashsale-discount-desc':
@@ -93,7 +88,6 @@ export default async function handler(req, res) {
     'price_tier1_v2_f:[1 TO *]',
   ];
 
-
   if (fq && source != 'similar' && typeof fq != 'string') {
     // filterQueries.push(fq);
     fq.push(...filterQueries);
@@ -103,7 +97,7 @@ export default async function handler(req, res) {
   let keywords = newQ;
   if (source === 'similar' || checkQ.length < 3) {
     if (checkQ.length < 2 || checkQ[1].length < 2) {
-      keywords = newQ ;
+      keywords = newQ;
     } else {
       keywords = newQ + '*';
     }
@@ -170,7 +164,6 @@ export default async function handler(req, res) {
     parameter = parameter.concat(
       fq.map((val) => `fq=${encodeURIComponent(val)}`)
     );
-
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index cc4d68db..2ec1231a 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -45,18 +45,19 @@ const FlashSale = dynamic(
   }
 );
 
-const ProgramPromotion = dynamic(() =>
-  import('@/lib/home/components/PromotionProgram'),
-{
-  loading: () => <BannerPromoSkeleton />,
-}
+const ProgramPromotion = dynamic(
+  () => import('@/lib/home/components/PromotionProgram'),
+  {
+    loading: () => <BannerPromoSkeleton />,
+  }
 );
 
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
-);  
-const CategoryHomeId = dynamic(() =>
-  import('@/lib/home/components/CategoryHomeId'), {ssr: false}
+);
+const CategoryHomeId = dynamic(
+  () => import('@/lib/home/components/CategoryHomeId'),
+  { ssr: false }
 );
 
 const CategoryDynamic = dynamic(() =>
@@ -64,17 +65,18 @@ const CategoryDynamic = dynamic(() =>
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-import('@/lib/home/components/CategoryDynamicMobile')
+  import('@/lib/home/components/CategoryDynamicMobile')
 );
 
-const CustomerReviews = dynamic(() =>
-  import('@/lib/review/components/CustomerReviews'), {ssr: false}
+const CustomerReviews = dynamic(
+  () => import('@/lib/review/components/CustomerReviews'),
+  { ssr: false }
 ); // need to ssr:false
-const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'), {ssr: false}); // need to ssr: false
+const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'), {
+  ssr: false,
+}); // need to ssr: false
 
-
-
-export default function Home({categoryId}) {
+export default function Home({ categoryId }) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
@@ -85,123 +87,110 @@ export default function Home({categoryId}) {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  useEffect(() => {
-    const loadCategories = async () => {
-     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
-     if(getCategories){
-      setDataCategories(getCategories)
-     }
-    }
-    loadCategories()
-  }, [])
-
-  const [dataCategories, setDataCategories] = useState([])
   return (
     <>
-    <BasicLayout>
-      <Seo
-        title='Indoteknik.com: B2B Industrial Supply & Solution'
-        description='Temukan pilihan produk B2B Industri &amp; Alat Teknik untuk Perusahaan, UMKM &amp; Pemerintah dengan lengkap, mudah dan transparan.'
-        additionalMetaTags={[
-          {
-            name: 'keywords',
-            content: 'indoteknik, indoteknik.com, toko teknik, toko perkakas, jual genset, jual fogging, jual krisbow, harga krisbow, harga alat safety, harga pompa air',
-          },
-        ]} />
-
-      <PagePopupIformation />
-
-      <DesktopView>
-        <div className='container mx-auto'>
-          <div
-            className='flex min-h-[400px] h-[460px]'
-            ref={wrapperRef}
-            onLoad={handleOnLoad}
-          >
-            <div className='w-2/12'>
-              <HeroBannerSecondary />
-            </div>
-            <div className='w-7/12 px-1' ref={bannerRef}>
-              <HeroBanner />
+      <BasicLayout>
+        <Seo
+          title='Indoteknik.com: B2B Industrial Supply & Solution'
+          description='Temukan pilihan produk B2B Industri &amp; Alat Teknik untuk Perusahaan, UMKM &amp; Pemerintah dengan lengkap, mudah dan transparan.'
+          additionalMetaTags={[
+            {
+              name: 'keywords',
+              content:
+                'indoteknik, indoteknik.com, toko teknik, toko perkakas, jual genset, jual fogging, jual krisbow, harga krisbow, harga alat safety, harga pompa air',
+            },
+          ]}
+        />
+
+        <PagePopupIformation />
+
+        <DesktopView>
+          <div className='container mx-auto'>
+            <div
+              className='flex min-h-[400px] h-[460px]'
+              ref={wrapperRef}
+              onLoad={handleOnLoad}
+            >
+              <div className='w-2/12'>
+                <HeroBannerSecondary />
+              </div>
+              <div className='w-7/12 px-1' ref={bannerRef}>
+                <HeroBanner />
+              </div>
+              <div className='w-3/12'>
+                <DelayRender renderAfter={200}>
+                  <PopularProduct />
+                </DelayRender>
+              </div>
             </div>
-            <div className='w-3/12'>
-              <DelayRender renderAfter={200}>
-                <PopularProduct />
-              </DelayRender>
-            </div>
-          </div>
 
-          <div className='my-16 flex flex-col gap-y-8'>
-            <ServiceList />
-            <div id='flashsale'>
-              <PreferredBrand />
+            <div className='my-16 flex flex-col gap-y-8'>
+              <ServiceList />
+              <div id='flashsale'>
+                <PreferredBrand />
+              </div>
+              {!auth?.feature?.soApproval && (
+                <>
+                  <DelayRender renderAfter={200}>
+                    <ProgramPromotion />
+                  </DelayRender>
+                  <DelayRender renderAfter={200}>
+                    <FlashSale />
+                  </DelayRender>
+                </>
+              )}
+              {/* <PromotinProgram /> */}
+              <CategoryPilihan />
+              <CategoryDynamic />
+              <CategoryHomeId />
+              <BannerSection />
+              <CustomerReviews />
             </div>
+          </div>
+        </DesktopView>
+        <MobileView>
+          <DelayRender renderAfter={200}>
+            <HeroBanner />
+          </DelayRender>
+          <div className='flex flex-col gap-y-4 my-6'>
+            <DelayRender renderAfter={400}>
+              <ServiceList />
+            </DelayRender>
+            <DelayRender renderAfter={400}>
+              <div id='flashsale'>
+                <PreferredBrand />
+              </div>
+            </DelayRender>
             {!auth?.feature?.soApproval && (
               <>
-              <DelayRender renderAfter={200}>
-                <ProgramPromotion />
-              </DelayRender>
-              <DelayRender renderAfter={200}>
-                <FlashSale />
-              </DelayRender>
+                <DelayRender renderAfter={400}>
+                  <ProgramPromotion />
+                </DelayRender>
+                <DelayRender renderAfter={600}>
+                  <FlashSale />
+                </DelayRender>
               </>
             )}
-            {/* <PromotinProgram /> */}
-            {dataCategories &&(
-              <CategoryPilihan categories={dataCategories} />
-            )}
-            <CategoryDynamic /> 
-            <CategoryHomeId />
-            <BannerSection />
-            <CustomerReviews />
+            <DelayRender renderAfter={600}>
+              {/* <PromotinProgram /> */}
+            </DelayRender>
+            <DelayRender renderAfter={600}>
+              <CategoryPilihan />
+              <CategoryDynamicMobile />
+            </DelayRender>
+            <DelayRender renderAfter={800}>
+              <PopularProduct />
+            </DelayRender>
+            <DelayRender renderAfter={1000}>
+              <CategoryHomeId />
+              <BannerSection />
+            </DelayRender>
+            <DelayRender renderAfter={1200}>
+              <CustomerReviews />
+            </DelayRender>
           </div>
-        </div>
-    </DesktopView>
-    <MobileView>
-        <DelayRender renderAfter={200}>
-          <HeroBanner />
-        </DelayRender>
-        <div className='flex flex-col gap-y-4 my-6'>
-          <DelayRender renderAfter={400}>
-            <ServiceList />
-          </DelayRender>
-          <DelayRender renderAfter={400}>
-            <div id='flashsale'>
-              <PreferredBrand />
-            </div>
-          </DelayRender>
-          {!auth?.feature?.soApproval && (
-            <>
-              <DelayRender renderAfter={400}>
-                <ProgramPromotion />
-              </DelayRender>
-              <DelayRender renderAfter={600}>
-                <FlashSale />
-              </DelayRender>
-            </>
-          )}
-          <DelayRender renderAfter={600}>
-            {/* <PromotinProgram /> */}
-          </DelayRender>
-          <DelayRender renderAfter={600}>
-            {dataCategories &&(
-              <CategoryPilihan categories={dataCategories} />
-            )}
-            <CategoryDynamicMobile />
-          </DelayRender>
-          <DelayRender renderAfter={800}>
-            <PopularProduct />
-          </DelayRender>
-          <DelayRender renderAfter={1000}>
-            <CategoryHomeId />
-            <BannerSection />
-          </DelayRender>
-          <DelayRender renderAfter={1200}>
-            <CustomerReviews />
-          </DelayRender>
-        </div>
-      </MobileView>
-    </BasicLayout>
-  </>
+        </MobileView>
+      </BasicLayout>
+    </>
   );
-}
\ No newline at end of file
+}