Merged in Feature/page_tracking_awb (pull request #59)

Feature/page tracking awb

6 files changed, 25 insertions, 12 deletions

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index ff673953..2faede9b 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -93,7 +93,7 @@ const CompanyProfile = () => {
               />
             </div>
             <div className='flex flex-wrap'>
-              <div className='w-full mb-3'>Nama Usaha</div>
+              <div className='w-full mb-3'>Badan Usaha</div>
               <div className='w-3/12 pr-1'>
                 <Controller
                   name='companyType'
diff --git a/src/lib/auth/components/LoginDesktop.jsx b/src/lib/auth/components/LoginDesktop.jsx
index 42fa8896..d22da6f8 100644
--- a/src/lib/auth/components/LoginDesktop.jsx
+++ b/src/lib/auth/components/LoginDesktop.jsx
@@ -95,7 +95,7 @@ const LoginDesktop = () => {
                 {!isLoading ? 'Masuk' : 'Loading...'}
               </button>
             </form>
-            <div className='flex  items-center mt-3 mb-3'>
+            {/* <div className='flex  items-center mt-3 mb-3'>
               <hr className='flex-1' />
               <p className='text-gray-400'>ATAU</p>
               <hr className='flex-1' />
@@ -114,7 +114,7 @@ const LoginDesktop = () => {
                 height={10}
               />
               <p>Masuk dengan Google</p>
-            </button>
+            </button> */}
 
             <div className='text-gray_r-11 mt-10'>
               Belum punya akun Indoteknik?{' '}
diff --git a/src/lib/auth/components/LoginMobile.jsx b/src/lib/auth/components/LoginMobile.jsx
index 095f4174..6e1831d4 100644
--- a/src/lib/auth/components/LoginMobile.jsx
+++ b/src/lib/auth/components/LoginMobile.jsx
@@ -13,10 +13,19 @@ import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
 import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner'
 import odooApi from '@/core/api/odooApi'
 import { getAuth } from '@/core/utils/auth'
+import PageContent from '@/lib/content/components/PageContent'
 
 const LoginMobile = () => {
-  const { handleSubmit, handleChangeInput, isLoading, isValid, alert, emailRef, passwordRef, handleGoogleSubmit } =
-    useLogin()
+  const {
+    handleSubmit,
+    handleChangeInput,
+    isLoading,
+    isValid,
+    alert,
+    emailRef,
+    passwordRef,
+    handleGoogleSubmit
+  } = useLogin()
 
   const router = useRouter()
   const [query, setQuery] = useState(router?.query?.next || '/')
@@ -91,7 +100,7 @@ const LoginMobile = () => {
             {!isLoading ? 'Masuk' : 'Loading...'}
           </button>
         </form>
-        <div className='flex  items-center mt-3 mb-3'>
+        {/* <div className='flex  items-center mt-3 mb-3'>
           <hr className='flex-1' />
           <p className='text-gray-400'>ATAU</p>
           <hr className='flex-1' />
@@ -110,7 +119,7 @@ const LoginMobile = () => {
             height={10}
           />
           <p>Masuk dengan Google</p>
-        </button>
+        </button> */}
 
         <div className='text-gray_r-11 mt-4'>
           Belum punya akun Indoteknik?{' '}
@@ -118,6 +127,9 @@ const LoginMobile = () => {
             Daftar
           </Link>
         </div>
+        {/* <div className='mt-5'>
+          <PageContent path='/login' />
+        </div> */}
       </div>
     </MobileView>
   )
diff --git a/src/lib/auth/components/Menu.jsx b/src/lib/auth/components/Menu.jsx
index 939a0d5f..f475db1f 100644
--- a/src/lib/auth/components/Menu.jsx
+++ b/src/lib/auth/components/Menu.jsx
@@ -1,6 +1,7 @@
 import Link from '@/core/components/elements/Link/Link'
 import { useRouter } from 'next/router'
 import ImageNext from 'next/image'
+import whatsappUrl from '@/core/utils/whatsappUrl'
 
 const Menu = () => {
   const router = useRouter()
@@ -42,7 +43,7 @@ const Menu = () => {
       </LinkItem>
       <div className='mt-4 mb-1 font-medium'>Pusat Bantuan</div>
 
-      <LinkItem href='/'>
+      <LinkItem href={whatsappUrl('', '', '')} rel='noopener noreferrer' target='_blank'>
         <div className='flex gap-x-3 items-center'>
           <ImageNext src='/images/icon/icon_layanan_pelanggan.svg' width={18} height={20} />
           <p>Layanan Pelanggan</p>
diff --git a/src/lib/auth/components/RegisterDesktop.jsx b/src/lib/auth/components/RegisterDesktop.jsx
index a2bc98c2..6072bfb9 100644
--- a/src/lib/auth/components/RegisterDesktop.jsx
+++ b/src/lib/auth/components/RegisterDesktop.jsx
@@ -152,7 +152,7 @@ const RegisterDesktop = () => {
                 <PageContent path='/register#tnd'></PageContent>
               </BottomPopup>
             </div>
-            <div className='flex  items-center mt-3 mb-3'>
+            {/* <div className='flex  items-center mt-3 mb-3'>
               <hr className='flex-1' />
               <p className='text-gray-400'>ATAU</p>
               <hr className='flex-1' />
@@ -171,7 +171,7 @@ const RegisterDesktop = () => {
                 height={10}
               />
               <p>Daftar dengan Google</p>
-            </button>
+            </button> */}
 
             <div className='text-gray_r-11 mt-10'>
               Sudah punya akun Indoteknik?{' '}
diff --git a/src/lib/auth/components/RegisterMobile.jsx b/src/lib/auth/components/RegisterMobile.jsx
index 2e918a14..1b0d2adf 100644
--- a/src/lib/auth/components/RegisterMobile.jsx
+++ b/src/lib/auth/components/RegisterMobile.jsx
@@ -151,7 +151,7 @@ const RegisterMobile = () => {
           </BottomPopup>
         </div>
 
-        <div className='flex  items-center mt-3 mb-3'>
+        {/* <div className='flex  items-center mt-3 mb-3'>
           <hr className='flex-1' />
           <p className='text-gray-400'>ATAU</p>
           <hr className='flex-1' />
@@ -170,7 +170,7 @@ const RegisterMobile = () => {
             height={10}
           />
           <p>Daftar dengan Google</p>
-        </button>
+        </button> */}
 
         <div className='text-gray_r-11 mt-4'>
           Sudah punya akun Indoteknik?{' '}