Merge branch 'new-release' into Feature/switch-account

4 files changed, 53 insertions, 46 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 4688b15b..05dc4d8c 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -264,7 +264,7 @@ const InformationCenter = () => (
       <li className='text-gray_r-12/80 flex items-center'>
         <PhoneArrowUpRightIcon className='w-[18px] mr-2' />
         <a href='tel:02129338828' target='_blank' rel='noreferrer'>
-          (021) 2933-8828
+          (021) 29338828
         </a>
       </li>
       <li className='text-gray_r-12/80 flex items-center'>
diff --git a/src/core/components/elements/Footer/SimpleFooter.jsx b/src/core/components/elements/Footer/SimpleFooter.jsx
index 371b1652..1f5e13e7 100644
--- a/src/core/components/elements/Footer/SimpleFooter.jsx
+++ b/src/core/components/elements/Footer/SimpleFooter.jsx
@@ -13,7 +13,7 @@ const SimpleFooter = () => (
       <ul className='flex flex-col gap-y-2'>
         <li className='text-gray_r-12/80 flex items-center'>
           <PhoneArrowUpRightIcon className='w-[18px] mr-2' />
-          <a href='tel:02129338828'>(021) 2933-8828 / 29</a>
+          <a href='tel:02129338828'>(021) 29338828</a>
         </li>
         <li className='text-gray_r-12/80 flex items-center'>
           <EnvelopeIcon className='w-[18px] mr-2' />
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index eebfbcd5..fa3df5bf 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -5,34 +5,28 @@ import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
-import Quotationheader from '../../../../../src/lib/quotation/components/Quotationheader.jsx';
 import Category from '@/lib/category/components/Category';
-import { useProductCartContext } from '@/contexts/ProductCartContext';
+import useTransactions from '@/lib/transaction/hooks/useTransactions';
+import {
+  Menu,
+  MenuButton,
+  MenuItem,
+  MenuList,
+  useDisclosure
+} from '@chakra-ui/react';
 import {
   ChevronDownIcon,
-  DocumentCheckIcon,
-  HeartIcon,
-  ArrowUpRightIcon,
+  HeartIcon
 } from '@heroicons/react/24/outline';
 import dynamic from 'next/dynamic';
-import Image from 'next/image';
+import { default as Image, default as NextImage } from 'next/image';
 import { useRouter } from 'next/router';
 import { useCallback, useEffect, useState } from 'react';
+import { useCartStore } from '~/modules/cart/stores/useCartStore';
+import Quotationheader from '../../../../../src/lib/quotation/components/Quotationheader.jsx';
 import DesktopView from '../../views/DesktopView';
 import Link from '../Link/Link';
 import NavbarUserDropdown from './NavbarUserDropdown';
-import NextImage from 'next/image';
-import {
-  Button,
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuList,
-  useDisclosure,
-} from '@chakra-ui/react';
-import style from './style/NavbarDesktop.module.css';
-import useTransactions from '@/lib/transaction/hooks/useTransactions';
-import { useCartStore } from '~/modules/cart/stores/useCartStore';
 
 const Search = dynamic(() => import('./Search'), { ssr: false });
 const TopBanner = dynamic(() => import('./TopBanner'), { ssr: false });
@@ -397,7 +391,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/youtube.webp'
-          alt='Youtube - Indoteknik.com'
+          // alt='Youtube - Indoteknik.com'
           width={24}
           height={24}
         />
@@ -409,7 +403,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/tiktok.png'
-          alt='TikTok - Indoteknik.com'
+          // alt='TikTok - Indoteknik.com'
           width={24}
           height={24}
         />
@@ -429,7 +423,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/Facebook.png'
-          alt='Facebook - Indoteknik.com'
+          // alt='Facebook - Indoteknik.com'
           width={24}
           height={24}
         />
@@ -441,7 +435,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/Instagram.png'
-          alt='Instagram - Indoteknik.com'
+          // alt='Instagram - Indoteknik.com'
           width={24}
           height={24}
         />
@@ -453,7 +447,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/Linkedin.png'
-          alt='Linkedin - Indoteknik.com'
+          // alt='Linkedin - Indoteknik.com'
           width={24}
           height={24}
         />
@@ -465,7 +459,7 @@ const SocialMedias = () => (
       >
         <NextImage
           src='/images/socials/g_maps.png'
-          alt='Maps - Indoteknik.com'
+          // alt='Maps - Indoteknik.com'
           width={24}
           height={24}
         />
diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index f438ae67..709495ce 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -1,22 +1,37 @@
 import Image from 'next/image';
-import { useQuery } from 'react-query';import useDevice from '@/core/hooks/useDevice'
+import { useQuery } from 'react-query';
+import useDevice from '@/core/hooks/useDevice';
 import odooApi from '@/core/api/odooApi';
 import SmoothRender from '~/components/ui/smooth-render';
 import Link from '../Link/Link';
 import { background } from '@chakra-ui/react';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 const TopBanner = ({ onLoad = () => {} }) => {
-  const { isDesktop, isMobile } = useDevice()
-  const topBanner = useQuery({
-    queryKey: 'topBanner',
-    queryFn: async () => await odooApi('GET', '/api/v1/banner?type=top-banner'),
-    refetchOnWindowFocus: false,
-  });
+  const [topBanner, setTopBanner] = useState([]);
+  const { isDesktop, isMobile } = useDevice();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const res = await fetch(`/api/hero-banner?type=top-banner`);
+      const { data } = await res.json();
+      if (data) {
+        setTopBanner(data);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  // const topBanner = useQuery({
+  //   queryKey: 'topBanner',
+  //   queryFn: async () => await odooApi('GET', '/api/v1/banner?type=top-banner'),
+  //   refetchOnWindowFocus: false,
+  // });
 
   // const backgroundColor = topBanner.data?.[0]?.backgroundColor || 'transparent';
-  const hasData = topBanner.data?.length > 0;
-  const data = topBanner.data?.[0] || null;
+  const hasData = topBanner?.length > 0;
+  const data = topBanner?.[0] || null;
 
   useEffect(() => {
     if (hasData) {
@@ -31,17 +46,15 @@ const TopBanner = ({ onLoad = () => {} }) => {
       duration='700ms'
       delay='300ms'
       className='h-auto'
-      >
+    >
       <Link
-          href={data?.url}
-          className="block bg-cover bg-center h-3 md:h-6 lg:h-[36px]"
-          style={{
-            backgroundImage: `url('${data?.image}')`,
-          }}
-        >
-        </Link>
-
-      </SmoothRender>
+        href={data?.url}
+        className='block bg-cover bg-center h-3 md:h-6 lg:h-[36px]'
+        style={{
+          backgroundImage: `url('${data?.image}')`,
+        }}
+      ></Link>
+    </SmoothRender>
   );
 };