2 files changed, 44 insertions, 53 deletions

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index c6575831..06c15b73 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -10,7 +10,7 @@ import DesktopView from '../../views/DesktopView'
 import dynamic from 'next/dynamic'
 import IndoteknikLogo from '@/images/logo.png'
 import Category from '@/lib/category/components/Category'
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import useAuth from '@/core/hooks/useAuth'
 import NavbarUserDropdown from './NavbarUserDropdown'
 import { getCountCart } from '@/core/utils/cart'
@@ -21,11 +21,13 @@ import { getAuth, setAuth } from '@/core/utils/auth'
 import { createSlug, getIdFromSlug } from '@/core/utils/slug'
 import productApi from '@/lib/product/api/productApi'
 import { useSession } from 'next-auth/react'
+import { AuthContext } from '@/pages/_app'
 
 const Search = dynamic(() => import('./Search'))
 
 const NavbarDesktop = () => {
   const [isOpenCategory, setIsOpenCategory] = useState(false)
+  const {authenticated} = useContext(AuthContext)
   const auth = useAuth()
 
   const [cartCount, setCartCount] = useState(0)
@@ -177,7 +179,7 @@ const NavbarDesktop = () => {
             </div>
 
             <div className='w-3/12 flex gap-x-1 relative'>
-              {!auth && (
+              {!authenticated && (
                 <>
                   <Link
                     href='/login'
@@ -193,10 +195,10 @@ const NavbarDesktop = () => {
                   </Link>
                 </>
               )}
-              {auth && (
+              {authenticated && (
                 <>
                   <div href='/' className='navbar-user-dropdown-button'>
-                    <span>Halo, {auth?.name}</span>
+                    <span>Halo, {authenticated?.name}</span>
                     <div className='ml-auto'>
                       <ChevronDownIcon className='w-6' />
                     </div>
diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx
index e8f6434b..e5c6908a 100644
--- a/src/core/components/layouts/BasicLayout.jsx
+++ b/src/core/components/layouts/BasicLayout.jsx
@@ -18,26 +18,20 @@ const AnimationLayout = dynamic(() => import('./AnimationLayout'))
 const BasicLayout = ({ children }) => {
   const [templateWA, setTemplateWA] = useState(null)
   const [payloadWA, setPayloadWa] = useState(null)
-  const [isLoading, setIsloading] = useState(false)
 
   const router = useRouter()
   const { data: session } = useSession()
   const auth = getAuth()
   const setting = async () => {
-    if (!auth && session) {
-      setCookie('auth', JSON.stringify(session?.odooUser))
-      setIsloading(false)
-    }
+    setCookie('auth', JSON.stringify(session?.odooUser))
   }
 
   useEffect(() => {
-    setting()
-  }, [session])
-
-  useEffect(() => {
-    setting()
+    // if (!auth && session) {
+    //   setting()
+    // }
+    console.log('ini auth', auth)
     console.log('ini session', session)
-    console.log('ini auth', getAuth())
     const getIP = async () => {
       const ip = await odooApi('GET', '/api/ip-address')
       const data = {
@@ -65,44 +59,39 @@ const BasicLayout = ({ children }) => {
       setTemplateWA('product')
     }
   }, [])
-  if(isLoading){
-
-  }else{
-    return (
-      <>
-        <Navbar />
-        <AnimationLayout>
-          {children}
-          <div className='fixed bottom-4 right-4 sm:bottom-14 sm:right-10 z-50'>
-            <a
-              href={whatsappUrl(templateWA, payloadWA)}
-              className='py-2 pl-3 pr-4 rounded-full bg-[#4FB84A] border border-green-300 flex items-center'
-              rel='noopener noreferrer'
-              target='_blank'
-            >
-              <Image
-                src='/images/socials/WHATSAPP.svg'
-                alt='Whatsapp'
-                className='block sm:hidden'
-                width={36}
-                height={36}
-              />
-              <Image
-                src='/images/socials/WHATSAPP.svg'
-                alt='Whatsapp'
-                className='hidden sm:block'
-                width={44}
-                height={44}
-              />
-              <span className='text-white font-bold ml-1.5'>Whatsapp</span>
-            </a>
-          </div>
-        </AnimationLayout>
-        <BasicFooter />
-      </>
-    )
-  }
-  
+  return (
+    <>
+      <Navbar />
+      <AnimationLayout>
+        {children}
+        <div className='fixed bottom-4 right-4 sm:bottom-14 sm:right-10 z-50'>
+          <a
+            href={whatsappUrl(templateWA, payloadWA)}
+            className='py-2 pl-3 pr-4 rounded-full bg-[#4FB84A] border border-green-300 flex items-center'
+            rel='noopener noreferrer'
+            target='_blank'
+          >
+            <Image
+              src='/images/socials/WHATSAPP.svg'
+              alt='Whatsapp'
+              className='block sm:hidden'
+              width={36}
+              height={36}
+            />
+            <Image
+              src='/images/socials/WHATSAPP.svg'
+              alt='Whatsapp'
+              className='hidden sm:block'
+              width={44}
+              height={44}
+            />
+            <span className='text-white font-bold ml-1.5'>Whatsapp</span>
+          </a>
+        </div>
+      </AnimationLayout>
+      <BasicFooter />
+    </>
+  )
 }
 
 export default BasicLayout