feat: Toast text after register success.

This commit is contained in:
Ahmed Bouhuolia
2020-05-26 20:15:17 +02:00
parent 1e663b6e49
commit c9d5162014
2 changed files with 39 additions and 20 deletions

View File

@@ -31,19 +31,27 @@ function Register({ requestRegister }) {
}, [shown]); }, [shown]);
const ValidationSchema = Yup.object().shape({ const ValidationSchema = Yup.object().shape({
organization_name: Yup.string().required().label(formatMessage({id:'organization_name_'})), organization_name: Yup.string()
first_name: Yup.string().required().label(formatMessage({id:'first_name_'})), .required()
last_name: Yup.string().required().label(formatMessage({id:'last_name_'})), .label(formatMessage({ id: 'organization_name_' })),
first_name: Yup.string()
.required()
.label(formatMessage({ id: 'first_name_' })),
last_name: Yup.string()
.required()
.label(formatMessage({ id: 'last_name_' })),
email: Yup.string() email: Yup.string()
.email() .email()
.required() .required()
.label(formatMessage({ id: 'email' })), .label(formatMessage({ id: 'email' })),
phone_number: Yup.string() phone_number: Yup.string()
.matches() .matches()
.required().label(formatMessage({id:'phone_number_'})), .required()
.label(formatMessage({ id: 'phone_number_' })),
password: Yup.string() password: Yup.string()
.min(4) .min(4)
.required().label(formatMessage({id:'password'})), .required()
.label(formatMessage({ id: 'password' })),
}); });
const initialValues = useMemo( const initialValues = useMemo(
@@ -55,7 +63,7 @@ function Register({ requestRegister }) {
phone_number: '', phone_number: '',
password: '', password: '',
}), }),
[] [],
); );
const { const {
@@ -75,7 +83,10 @@ function Register({ requestRegister }) {
requestRegister(values) requestRegister(values)
.then((response) => { .then((response) => {
AppToaster.show({ AppToaster.show({
message: formatMessage({ id: 'success' }), message: formatMessage({
id: 'welcome_organization_account_has_been_created',
}),
intent: Intent.SUCCESS,
}); });
setSubmitting(false); setSubmitting(false);
history.push('/auth/login'); history.push('/auth/login');
@@ -83,13 +94,16 @@ function Register({ requestRegister }) {
.catch((errors) => { .catch((errors) => {
if (errors.some((e) => e.type === 'PHONE_NUMBER_EXISTS')) { if (errors.some((e) => e.type === 'PHONE_NUMBER_EXISTS')) {
setErrors({ setErrors({
phone_number: phone_number: formatMessage({
'The phone number is already used in another account.', id: 'the_phone_number_already_used_in_another_account',
}),
}); });
} }
if (errors.some((e) => e.type === 'EMAIL_EXISTS')) { if (errors.some((e) => e.type === 'EMAIL_EXISTS')) {
setErrors({ setErrors({
email: 'The email is already used in another account.', email: formatMessage({
id: 'the_email_already_used_in_another_account',
}),
}); });
} }
setSubmitting(false); setSubmitting(false);
@@ -99,26 +113,26 @@ function Register({ requestRegister }) {
const passwordRevealerTmp = useMemo( const passwordRevealerTmp = useMemo(
() => ( () => (
<span class='password-revealer' onClick={() => passwordRevealer()}> <span class="password-revealer" onClick={() => passwordRevealer()}>
<If condition={shown}> <If condition={shown}>
<> <>
<Icon icon='eye-slash' />{' '} <Icon icon="eye-slash" />{' '}
<span class='text'> <span class="text">
<T id={'hide'} /> <T id={'hide'} />
</span> </span>
</> </>
</If> </If>
<If condition={!shown}> <If condition={!shown}>
<> <>
<Icon icon='eye' />{' '} <Icon icon="eye" />{' '}
<span class='text'> <span class="text">
<T id={'show'} /> <T id={'show'} />
</span> </span>
</> </>
</If> </If>
</span> </span>
), ),
[shown, passwordRevealer] [shown, passwordRevealer],
); );
return ( return (
@@ -129,7 +143,7 @@ function Register({ requestRegister }) {
<T id={'register_a_new_organization'} /> <T id={'register_a_new_organization'} />
</h3> </h3>
<T id={'you_have_a_bigcapital_account'} /> <T id={'you_have_a_bigcapital_account'} />
<Link to='/auth/login'> <Link to="/auth/login">
{' '} {' '}
<T id={'login'} /> <T id={'login'} />
</Link> </Link>
@@ -268,7 +282,7 @@ function Register({ requestRegister }) {
<Button <Button
className={'btn-register'} className={'btn-register'}
intent={Intent.PRIMARY} intent={Intent.PRIMARY}
type='submit' type="submit"
fill={true} fill={true}
loading={isSubmitting} loading={isSubmitting}
> >
@@ -278,7 +292,7 @@ function Register({ requestRegister }) {
</form> </form>
<If condition={isSubmitting}> <If condition={isSubmitting}>
<div class='authentication-page__loading-overlay'> <div class="authentication-page__loading-overlay">
<Spinner size={50} /> <Spinner size={50} />
</div> </div>
</If> </If>

View File

@@ -266,6 +266,7 @@ export default {
trial_balance_sheet: 'Trial Balance Sheet', trial_balance_sheet: 'Trial Balance Sheet',
journal: 'Journal', journal: 'Journal',
general_ledger: 'General Ledger', general_ledger: 'General Ledger',
general_ledger_sheet: 'General Ledger Sheet',
profit_loss_sheet: 'Profit Loss Sheet', profit_loss_sheet: 'Profit Loss Sheet',
expenses: 'Expenses', expenses: 'Expenses',
expenses_list: 'Expenses List', expenses_list: 'Expenses List',
@@ -369,4 +370,8 @@ export default {
"Once you delete these items, you won't be able to retrieve them later. Are you sure you want to delete them?", "Once you delete these items, you won't be able to retrieve them later. Are you sure you want to delete them?",
ops_something_went_wrong: 'Something went wrong! Please try again.', ops_something_went_wrong: 'Something went wrong! Please try again.',
session_expired: 'Session Expired!', session_expired: 'Session Expired!',
this_report_does_not_contain_any_data_between_date_period: 'This report does not contain any data between date period.',
welcome_organization_account_has_been_created: '👋 Welcome, You organization account has been created, Sign in now!',
the_phone_number_already_used_in_another_account: 'he phone number is already used in another account',
the_email_already_used_in_another_account: 'The email is already used in another account',
}; };