login and register merge:
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
VITE_TOKEN_NAME = 'dsc_token'
|
VITE_TOKEN_NAME = 'dsc_token'
|
||||||
VITE_REFRESH_TOKEN_NAME = 'dsc_refresh_token'
|
VITE_REFRESH_TOKEN_NAME = 'dsc_refresh_token'
|
||||||
VITE_BASE_URL = 'https://api.danakcorp.com'
|
VITE_BASE_URL = 'https://api.danakcorp.com'
|
||||||
# VITE_BASE_URL = 'http://192.168.1.113:4000'
|
# VITE_BASE_URL = 'http://192.168.1.119:4001'
|
||||||
@@ -7,8 +7,6 @@ import * as Yup from 'yup'
|
|||||||
import { useAuthStore } from '../store/AuthStore'
|
import { useAuthStore } from '../store/AuthStore'
|
||||||
import Error from '../../../components/Error'
|
import Error from '../../../components/Error'
|
||||||
import Button from '../../../components/Button'
|
import Button from '../../../components/Button'
|
||||||
import { Link } from 'react-router-dom'
|
|
||||||
import { Pages } from '../../../config/Pages'
|
|
||||||
import { isEmail } from '../../../config/func'
|
import { isEmail } from '../../../config/func'
|
||||||
import { useCheckHasAccount, useLoginWithOtp } from '../hooks/useAuthData'
|
import { useCheckHasAccount, useLoginWithOtp } from '../hooks/useAuthData'
|
||||||
import { ErrorType } from '../../../helpers/types'
|
import { ErrorType } from '../../../helpers/types'
|
||||||
@@ -94,16 +92,16 @@ const LoginStep1: FC = () => {
|
|||||||
isLoading={loginWithOtp.isPending || checkHasAccount.isPending}
|
isLoading={loginWithOtp.isPending || checkHasAccount.isPending}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div className='mt-6 flex justify-center gap-2 items-center text-sm'>
|
{/* <div className='mt-6 flex justify-center gap-2 items-center text-sm'>
|
||||||
<p className='text-description'>
|
<p className='text-description'>
|
||||||
{t('auth.have_account')}
|
{t('auth.have_account')}
|
||||||
</p>
|
</p>
|
||||||
<Link to={Pages.auth.register}>
|
<Link to={Pages.auth.register}>
|
||||||
<div>{t('auth.register')}</div>
|
<div>{t('auth.register')}</div>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div> */}
|
||||||
|
|
||||||
<a href='https://accounts.danakcorp.com' target='_blank' className='mt-4 flex gap-1 text-sm justify-center text-description'>
|
<a href='https://accounts.danakcorp.com' target='_blank' className='mt-6 flex gap-1 text-sm justify-center text-description'>
|
||||||
<div>
|
<div>
|
||||||
{t('auth.old_version')}
|
{t('auth.old_version')}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user