diff options
| -rw-r--r-- | src/core/components/elements/Navbar/NavbarDesktop.jsx | 35 | ||||
| -rw-r--r-- | src/core/components/layouts/BasicLayout.jsx | 5 | ||||
| -rw-r--r-- | src/core/utils/whatsappUrl.js | 4 |
3 files changed, 34 insertions, 10 deletions
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx index 81ec6d0e..0aa9febf 100644 --- a/src/core/components/elements/Navbar/NavbarDesktop.jsx +++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx @@ -34,6 +34,7 @@ const NavbarDesktop = () => { const [templateWA, setTemplateWA] = useState(null) const [payloadWA, setPayloadWa] = useState(null) + const [urlPath, setUrlPath] = useState(null) const router = useRouter() @@ -62,6 +63,8 @@ const NavbarDesktop = () => { } getProduct() setTemplateWA('product') + + setUrlPath(router.asPath) } return () => { @@ -97,13 +100,23 @@ const NavbarDesktop = () => { <Search /> </div> <div className='flex gap-x-4'> - <Link href='/my/transactions' target='_blank' rel='noreferrer' 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' target='_blank' rel='noreferrer' 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 && ( @@ -118,12 +131,17 @@ const NavbarDesktop = () => { Belanja </span> </Link> - <Link target='_blank' rel='noreferrer' 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' @@ -155,14 +173,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' + 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' + target='_blank' + rel='noreferrer' > Ready Stock </Link> @@ -177,7 +197,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' + target='_blank' + rel='noreferrer' > Indoteknik TV </Link> diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx index 2e98eb61..f84cce40 100644 --- a/src/core/components/layouts/BasicLayout.jsx +++ b/src/core/components/layouts/BasicLayout.jsx @@ -17,6 +17,7 @@ const AnimationLayout = dynamic(() => import('./AnimationLayout')) const BasicLayout = ({ children }) => { const [templateWA, setTemplateWA] = useState(null) const [payloadWA, setPayloadWa] = useState(null) + const [urlPath, setUrlPath] = useState(null) const router = useRouter() @@ -45,6 +46,8 @@ const BasicLayout = ({ children }) => { } getProduct() setTemplateWA('product') + + setUrlPath(router.asPath) } }, []) return ( @@ -54,7 +57,7 @@ const BasicLayout = ({ children }) => { {children} <div className='fixed bottom-4 right-4 sm:bottom-14 sm:right-10 z-50'> <a - href={whatsappUrl(templateWA, payloadWA)} + href={whatsappUrl(templateWA, payloadWA, urlPath)} className='py-2 pl-3 pr-4 rounded-full bg-[#4FB84A] border border-green-300 flex items-center' rel='noopener noreferrer' target='_blank' diff --git a/src/core/utils/whatsappUrl.js b/src/core/utils/whatsappUrl.js index c5959ed6..6c354924 100644 --- a/src/core/utils/whatsappUrl.js +++ b/src/core/utils/whatsappUrl.js @@ -1,9 +1,9 @@ import { getAuth } from "./auth" -const whatsappUrl = (template = 'default', payload) => { +const whatsappUrl = (template = 'default', payload, urlPath = '') => { let user = getAuth() if(!user){ - return '/login' + return `/login?next=${urlPath}` } let parentName = user.parentName || '-' let url = 'https://wa.me/628128080622' |