Merge branch 'master' into development_tri/implementasi_raja_ongkir

4 files changed, 32 insertions, 12 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index d340ff3e..75e9926d 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -159,6 +159,9 @@ const Form = () => (
     <div className={`${headerClassName} mb-3`}>Formulir</div>
     <ul className='flex flex-col gap-y-2'>
       <li>
+        <InternalItemLink href='/my/request-for-quotation'>Request for Quotation</InternalItemLink>
+      </li>
+      <li>
         <InternalItemLink href='/my/kunjungan-sales'>Kunjungan Sales</InternalItemLink>
       </li>
       <li>
@@ -219,10 +222,23 @@ const SocialMedias = () => (
   <div>
     <div className={headerClassName + 'block md:hidden'}>Temukan Kami</div>
     <div className='flex flex-wrap gap-2 mt-2'>
-      <NextImage src='/images/socials/Whatsapp.png' alt='Whatsapp Logo' width={24} height={24} />
-      <NextImage src='/images/socials/Facebook.png' alt='Facebook Logo' width={24} height={24} />
-      <NextImage src='/images/socials/Twitter.png' alt='Twitter Logo' width={24} height={24} />
-      <NextImage src='/images/socials/Linkedin.png' alt='Linkedin Logo' width={24} height={24} />
+      <a target='_blank' rel='noreferrer' href={whatsappUrl(null)}>
+        <NextImage src='/images/socials/Whatsapp.png' alt='Whatsapp Logo' width={24} height={24} />
+      </a>
+      <a target='_blank' rel='noreferrer' href='https://www.facebook.com/indoteknikcom'>
+        <NextImage src='/images/socials/Facebook.png' alt='Facebook Logo' width={24} height={24} />
+      </a>
+      <a target='_blank' rel='noreferrer' href='https://www.instagram.com/indoteknikcom/'>
+        <NextImage
+          src='/images/socials/Instagram.png'
+          alt='Instagram Logo'
+          width={24}
+          height={24}
+        />
+      </a>
+      <a target='_blank' rel='noreferrer' href='https://www.linkedin.com/company/pt-indoteknik-dotcom-gemilang/'>
+        <NextImage src='/images/socials/Linkedin.png' alt='Linkedin Logo' width={24} height={24} />
+      </a>
     </div>
   </div>
 )
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 3da0035a..26edd5a4 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -73,11 +73,13 @@ const NavbarDesktop = () => {
               Quotation
             </Link>
             <Link href='/shop/cart' className='flex items-center gap-x-2 !text-gray_r-12/80'>
-              <div className='relative mr-2'>
+              <div className={`relative ${cartCount > 0 && 'mr-2'}`}>
                 <ShoppingCartIcon className='w-7' />
-                <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
-                  {cartCount}
-                </span>
+                {cartCount > 0 && (
+                  <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
+                    {cartCount}
+                  </span>
+                )}
               </div>
               <span>
                 Keranjang
diff --git a/src/core/components/elements/Navbar/NavbarMobile.jsx b/src/core/components/elements/Navbar/NavbarMobile.jsx
index 7ac967fa..b69e86e8 100644
--- a/src/core/components/elements/Navbar/NavbarMobile.jsx
+++ b/src/core/components/elements/Navbar/NavbarMobile.jsx
@@ -43,9 +43,11 @@ const NavbarMobile = () => {
             </Link>
             <Link href='/shop/cart' className='relative'>
               <ShoppingCartIcon className='w-6 text-gray_r-12' />
-              <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
-                {cartCount}
-              </span>
+              {cartCount > 0 && (
+                <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
+                  {cartCount}
+                </span>
+              )}
             </Link>
             <button type='button' aria-label='sidebarMenuButton' onClick={open}>
               <Bars3Icon className='w-6 text-gray_r-12' />
diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx
index df42e403..04b189f9 100644
--- a/src/core/components/layouts/BasicLayout.jsx
+++ b/src/core/components/layouts/BasicLayout.jsx
@@ -12,7 +12,7 @@ const BasicLayout = ({ children }) => {
       <Navbar />
       <AnimationLayout>
         {children}
-        <div className='fixed bottom-4 right-4 sm:bottom-10 sm:right-8 z-50'>
+        <div className='fixed bottom-4 right-4 sm:bottom-14 sm:right-10 z-50'>
           <a
             href={whatsappUrl(null)}
             className='py-2 pl-3 pr-4 rounded-full bg-[#4FB84A] border border-green-300 flex items-center'