Merge branch 'master' into CR/tampilan

1 files changed, 52 insertions, 9 deletions

diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx
index c8e1e7e9..a0ce223e 100644
--- a/src/pages/my/menu.jsx
+++ b/src/pages/my/menu.jsx
@@ -5,15 +5,19 @@ import useAuth from '@/core/hooks/useAuth'
 import { deleteAuth } from '@/core/utils/auth'
 import IsAuth from '@/lib/auth/components/IsAuth'
 import { ChevronRightIcon, UserIcon } from '@heroicons/react/24/solid'
+import { signOut, useSession } from 'next-auth/react'
 import { useRouter } from 'next/router'
+import ImageNext from 'next/image'
 
 export default function Menu() {
   const auth = useAuth()
   const router = useRouter()
+  const { data: session } = useSession()
 
   const logout = () => {
-    deleteAuth()
-    router.push('/login')
+    deleteAuth().then(() => {
+      router.push('/login')
+    })
   }
 
   return (
@@ -40,10 +44,38 @@ export default function Menu() {
             <MenuHeader>Aktivitas Pembelian</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/my/quotations'>Daftar Quotation</LinkItem>
-              <LinkItem href='/my/transactions'>Daftar Transaksi</LinkItem>
-              <LinkItem href='/my/invoices'>Invoice & Faktur Pajak</LinkItem>
-              <LinkItem href='/my/wishlist'>Wishlist</LinkItem>
+              <LinkItem href='/my/quotations'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_quotation.svg' width={18} height={20} />
+                  <p>Daftar Quotation</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/transactions'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_transaksi.svg' width={18} height={20} />
+                  <p>Daftar Transaksi</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/shipments'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_pengiriman.svg' width={18} height={20} />
+                  <p>Daftar Pengiriman</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/invoices'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_invoice.svg' width={18} height={20} />
+                  <p>Invoice & Faktur Pajak</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/wishlist'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_wishlist.svg' width={18} height={20} />
+                  <p>Wishlist</p>
+                </div>
+              </LinkItem>
             </div>
           </div>
 
@@ -51,7 +83,13 @@ export default function Menu() {
             <MenuHeader>Pusat Bantuan</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/'>Layanan Pelanggan</LinkItem>
+              <LinkItem href='/'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_layanan_pelanggan.svg' width={18} height={20} />
+                  <p>Layanan Pelanggan</p>
+                </div>
+              </LinkItem>
             </div>
           </div>
 
@@ -59,10 +97,15 @@ export default function Menu() {
             <MenuHeader>Pengaturan Akun</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/my/address'>Daftar Alamat</LinkItem>
+              <LinkItem href='/my/address'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_alamat.svg' width={18} height={20} />
+                  <p>Daftar Alamat</p>
+                </div>
+              </LinkItem>
             </div>
 
-            <div onClick={logout} className='p-4 mt-2'>
+            <div onClick={() => logout()} className='p-4 mt-2'>
               <button className='w-full btn-red'>Keluar Akun</button>
             </div>
           </div>