Merged in CR/tampilan (pull request #58)

CR/tampilan

1 files changed, 28 insertions, 4 deletions

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 6fdea644..655c4732 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -37,6 +37,7 @@ const NavbarDesktop = () => {
 
   const [templateWA, setTemplateWA] = useState(null)
   const [payloadWA, setPayloadWa] = useState(null)
+  const [urlPath, setUrlPath] = useState(null)
 
   const router = useRouter()
   
@@ -65,6 +66,8 @@ const NavbarDesktop = () => {
       }
       getProduct()
       setTemplateWA('product')
+
+      setUrlPath(router.asPath)
     }
 
     return () => {
@@ -100,13 +103,23 @@ const NavbarDesktop = () => {
             <Search />
           </div>
           <div className='flex gap-x-4'>
-            <Link href='/my/transactions' className='flex items-center gap-x-2 !text-gray_r-12/80'>
+            <Link
+              href='/my/transactions'
+              target='_blank'
+              rel='noreferrer'
+              className='flex items-center gap-x-2 !text-gray_r-12/80'
+            >
               <DocumentCheckIcon className='w-7' />
               Daftar
               <br />
               Quotation
             </Link>
-            <Link href='/shop/cart' className='flex items-center gap-x-2 !text-gray_r-12/80'>
+            <Link
+              href='/shop/cart'
+              target='_blank'
+              rel='noreferrer'
+              className='flex items-center gap-x-2 !text-gray_r-12/80'
+            >
               <div className={`relative ${cartCount > 0 && 'mr-2'}`}>
                 <ShoppingCartIcon className='w-7' />
                 {cartCount > 0 && (
@@ -121,12 +134,17 @@ const NavbarDesktop = () => {
                 Belanja
               </span>
             </Link>
-            <Link href='/my/wishlist' className='flex items-center gap-x-2 !text-gray_r-12/80'>
+            <Link
+              target='_blank'
+              rel='noreferrer'
+              href='/my/wishlist'
+              className='flex items-center gap-x-2 !text-gray_r-12/80'
+            >
               <HeartIcon className='w-7' />
               Wishlist
             </Link>
             <a
-              href={whatsappUrl(templateWA, payloadWA)}
+              href={whatsappUrl(templateWA, payloadWA, urlPath)}
               target='_blank'
               rel='noreferrer'
               className='flex items-center gap-x-1 !text-gray_r-12/80'
@@ -158,12 +176,16 @@ const NavbarDesktop = () => {
               <Link
                 href='/shop/brands'
                 className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                target='_blank'
+                rel='noreferrer'
               >
                 Semua Brand
               </Link>
               <Link
                 href='/shop/search?orderBy=stock'
                 className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                target='_blank'
+                rel='noreferrer'
               >
                 Ready Stock
               </Link>
@@ -178,6 +200,8 @@ const NavbarDesktop = () => {
               <Link
                 href='/video'
                 className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                target='_blank'
+                rel='noreferrer'
               >
                 Indoteknik TV
               </Link>