diff --git a/src/pages/gallery/components/ErrorAlert.tsx b/src/pages/gallery/components/ErrorAlert.tsx index 35235508b..707b43e94 100644 --- a/src/pages/gallery/components/ErrorAlert.tsx +++ b/src/pages/gallery/components/ErrorAlert.tsx @@ -13,7 +13,6 @@ export default function ErrorAlert({ errorCode }) { default: errorMessage = errorCode; } - console.log(errorCode); return ( {errorMessage} diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 7e1b5ecb6..168ee2992 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -10,6 +10,7 @@ import * as Yup from 'yup'; import { getOtt } from 'services/userService'; import Container from 'components/Container'; import { setData, LS_KEYS, getData } from 'utils/storage/localStorage'; +import { Alert } from 'react-bootstrap'; interface formValues { email: string; @@ -18,6 +19,7 @@ interface formValues { export default function Home() { const [loading, setLoading] = useState(false); const router = useRouter(); + const [showMessage, setShowMessage] = useState(false); useEffect(() => { router.prefetch('/verify'); @@ -38,77 +40,91 @@ export default function Home() { setData(LS_KEYS.USER, { email }); router.push('/verify'); } catch (e) { - setFieldError('email', `${constants.UNKNOWN_ERROR} ${e.message}`); + if (e.response.status == 403) { + setFieldError('email', `${constants.USER_DOES_NOT_EXIST}`); + } else { + setFieldError( + 'email', + `${constants.UNKNOWN_ERROR} ${e.message}` + ); + } } setLoading(false); }; const register = () => { - router.push('/signup'); + setShowMessage(true); + setTimeout(() => setShowMessage(false), 15000); }; return ( - - - - - {constants.LOGIN} - - - initialValues={{ email: '' }} - validationSchema={Yup.object().shape({ - email: Yup.string() - .email(constants.EMAIL_ERROR) - .required(constants.REQUIRED), - })} - onSubmit={loginUser} - > - {({ - values, - errors, - touched, - handleChange, - handleBlur, - handleSubmit, - }) => ( -
- - +
+ {constants.WEB_SIGNUPS_DISABLED} +
+ + + + + + {constants.LOGIN} + + + initialValues={{ email: '' }} + validationSchema={Yup.object().shape({ + email: Yup.string() + .email(constants.EMAIL_ERROR) + .required(constants.REQUIRED), + })} + onSubmit={loginUser} + > + {({ + values, + errors, + touched, + handleChange, + handleBlur, + handleSubmit, + }) => ( + + + + + {errors.email} + + + - - )} - - - Don't have an account? - - - - + style={{ marginBottom: '12px' }} + > + {constants.SUBMIT} + + + )} + + + Don't have an account? + +
+
+
+ ); } diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index bea57802e..4e76c934d 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -61,6 +61,9 @@ const englishConstants = { "You don't have a active subscription plan!! Please get one in the mobile app", STORAGE_QUOTA_EXCEEDED: 'You have exceeded your designated storage Quota, please upgrade your plan to add more files', + WEB_SIGNUPS_DISABLED: + 'Web signups are disabled for now, please install the mobile app and signup there', + USER_DOES_NOT_EXIST: 'Incorrect EmailId, No such user exists', }; export default englishConstants;