diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/address/components/CreateAddress.jsx | 6 | ||||
| -rw-r--r-- | src/lib/address/components/EditAddress.jsx | 6 | ||||
| -rw-r--r-- | src/lib/auth/components/RegisterDesktop.jsx | 13 | ||||
| -rw-r--r-- | src/lib/auth/components/RegisterMobile.jsx | 24 | ||||
| -rw-r--r-- | src/lib/auth/hooks/useRegister.js | 5 |
5 files changed, 46 insertions, 8 deletions
diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx index 475d8548..a4669ee0 100644 --- a/src/lib/address/components/CreateAddress.jsx +++ b/src/lib/address/components/CreateAddress.jsx @@ -182,6 +182,7 @@ const CreateAddress = () => { <HookFormSelect {...props} options={districts} disabled={!watchCity} /> )} /> + <div className='text-caption-2 text-red_r-11 mt-1'>{errors.district?.message}</div> </div> <div> @@ -208,11 +209,12 @@ const CreateAddress = () => { const validationSchema = Yup.object().shape({ type: Yup.string().required('Harus di-pilih'), name: Yup.string().min(3, 'Minimal 3 karakter').required('Harus di-isi'), - email: Yup.string().email('Format harus seperti contoh@email.com').required('Harus di-isi'), + // email: Yup.string().email('Format harus seperti contoh@email.com').required('Harus di-isi'), mobile: Yup.string().required('Harus di-isi'), street: Yup.string().required('Harus di-isi'), zip: Yup.string().required('Harus di-isi'), - city: Yup.string().required('Harus di-pilih') + city: Yup.string().required('Harus di-pilih'), + district: Yup.string().required('Harus di-pilih') }) const defaultValues = { diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx index d754cbd9..006ea407 100644 --- a/src/lib/address/components/EditAddress.jsx +++ b/src/lib/address/components/EditAddress.jsx @@ -197,6 +197,7 @@ const EditAddress = ({ id, defaultValues }) => { <HookFormSelect {...props} options={districts} disabled={!watchCity} /> )} /> + <div className='text-caption-2 text-red_r-11 mt-1'>{errors.district?.message}</div> </div> <div> @@ -222,11 +223,12 @@ const EditAddress = ({ id, defaultValues }) => { const validationSchema = Yup.object().shape({ type: Yup.string().required('Harus di-pilih'), name: Yup.string().min(3, 'Minimal 3 karakter').required('Harus di-isi'), - email: Yup.string().email('Format harus seperti johndoe@example.com').required('Harus di-isi'), + // email: Yup.string().email('Format harus seperti johndoe@example.com').required('Harus di-isi'), mobile: Yup.string().required('Harus di-isi'), street: Yup.string().required('Harus di-isi'), zip: Yup.string().required('Harus di-isi'), - city: Yup.string().required('Harus di-pilih') + city: Yup.string().required('Harus di-pilih'), + district: Yup.string().required('Harus di-pilih') }) const types = [ diff --git a/src/lib/auth/components/RegisterDesktop.jsx b/src/lib/auth/components/RegisterDesktop.jsx index 71cc29d8..5f0caf73 100644 --- a/src/lib/auth/components/RegisterDesktop.jsx +++ b/src/lib/auth/components/RegisterDesktop.jsx @@ -3,6 +3,7 @@ import useRegister from '../hooks/useRegister' import Link from '@/core/components/elements/Link/Link' import Alert from '@/core/components/elements/Alert/Alert' import PageContent from '@/lib/content/components/PageContent' +import BottomPopup from '@/core/components/elements/Popup/BottomPopup' const RegisterDesktop = () => { const { @@ -14,7 +15,9 @@ const RegisterDesktop = () => { companyNameRef, fullnameRef, emailRef, - passwordRef + passwordRef, + tnd, + setTnd } = useRegister() return ( @@ -86,6 +89,10 @@ const RegisterDesktop = () => { placeholder='••••••••••••' /> </div> + <div class="flex items-center mt-4 "> + <input type="checkbox" id='sdk' className='form-input flex items-start w-fit mr-2' required /> + <label onClick={() => setTnd(true)} className='inline cursor-pointer text-red_r-10'>Syarat dan Ketentuan</label> + </div> <button type='submit' className='btn-yellow w-full mt-2' @@ -95,6 +102,10 @@ const RegisterDesktop = () => { </button> </form> + <div> + <BottomPopup active={tnd} close={() => setTnd(false)}><PageContent path='/register#tnd'></PageContent></BottomPopup> + </div> + <div className='text-gray_r-11 mt-10'> Sudah punya akun Indoteknik?{' '} <Link href='/login' className='inline'> diff --git a/src/lib/auth/components/RegisterMobile.jsx b/src/lib/auth/components/RegisterMobile.jsx index 007b127c..11935439 100644 --- a/src/lib/auth/components/RegisterMobile.jsx +++ b/src/lib/auth/components/RegisterMobile.jsx @@ -4,6 +4,8 @@ import Image from 'next/image' import Link from '@/core/components/elements/Link/Link' import useRegister from '../hooks/useRegister' import MobileView from '@/core/components/views/MobileView' +import BottomPopup from '@/core/components/elements/Popup/BottomPopup' +import PageContent from '@/lib/content/components/PageContent' const RegisterMobile = () => { const { @@ -15,7 +17,9 @@ const RegisterMobile = () => { companyNameRef, fullnameRef, emailRef, - passwordRef + passwordRef, + tnd, + setTnd } = useRegister() return ( @@ -89,12 +93,28 @@ const RegisterMobile = () => { placeholder='••••••••••••' /> </div> - + <div class='flex items-center mt-4 '> + <input + type='checkbox' + id='sdk' + className='form-input flex items-start w-fit mr-2' + required + /> + <label onClick={() => setTnd(true)} className='inline cursor-pointer text-red_r-10'> + Syarat dan Ketentuan + </label> + </div> <button type='submit' className='btn-yellow w-full mt-2' disabled={!isValid || isLoading}> {!isLoading ? 'Daftar' : 'Loading...'} </button> </form> + <div> + <BottomPopup active={tnd} close={() => setTnd(false)}> + <PageContent path='/register#tnd'></PageContent> + </BottomPopup> + </div> + <div className='text-gray_r-11 mt-4'> Sudah punya akun Indoteknik?{' '} <Link href='/login' className='inline'> diff --git a/src/lib/auth/hooks/useRegister.js b/src/lib/auth/hooks/useRegister.js index 7642a666..2375cf19 100644 --- a/src/lib/auth/hooks/useRegister.js +++ b/src/lib/auth/hooks/useRegister.js @@ -6,6 +6,7 @@ const useRegister = () => { const [isLoading, setIsLoading] = useState(false) const [alert, setAlert] = useState(null) const [isValid, setIsValid] = useState(false) + const [tnd, setTnd] = useState(false) const fullnameRef = useRef(null) const emailRef = useRef(null) @@ -73,7 +74,9 @@ const useRegister = () => { companyNameRef, fullnameRef, emailRef, - passwordRef + passwordRef, + tnd, + setTnd } } |
