mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-30 21:20:24 +02:00
Code Issues Releases Wiki Activity

Improve email changing/confirmation stuff

Browse Source
This commit is contained in:
Toby Zerner
2015-05-27 16:24:54 +09:30
parent f4dc1b5d04
commit b6a8416daf
18 changed files with 262 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
framework/core/js/forum/src/components/change-email-modal.js
View File

@@ -5,21 +5,39 @@ export default class ChangeEmailModal extends FormModal {
constructor(props) {
super(props);
this.success = m.prop(false);
this.email = m.prop(app.session.user().email());
}
view() {
if (this.success()) {
var emailProviderName = this.email().split('@')[1];
}
var disabled = this.loading();
return super.view({
className: 'modal-sm change-email-modal',
title: 'Change Email',
body: [
m('div.form-group', [
m('input.form-control[type=email][name=email][placeholder=Email]', {value: this.email(), onchange: m.withAttr('value', this.email)})
]),
m('div.form-group', [
m('button.btn.btn-primary.btn-block[type=submit]', 'Save Changes')
])
]
body: this.success()
? [
m('p.help-text', 'We\'ve sent a confirmation email to ', m('strong', this.email()), '. If it doesn\'t arrive soon, check your spam folder.'),
m('div.form-group', [
m('a.btn.btn-primary.btn-block', {href: 'http://'+emailProviderName}, 'Go to '+emailProviderName)
])
]
: [
m('div.form-group', [
m('input.form-control[type=email][name=email]', {
placeholder: app.session.user().email(),
value: this.email(),
onchange: m.withAttr('value', this.email),
disabled
})
]),
m('div.form-group', [
m('button.btn.btn-primary.btn-block[type=submit]', {disabled}, 'Save Changes')
])
]
});
}
@@ -33,12 +51,13 @@ export default class ChangeEmailModal extends FormModal {
this.loading(true);
app.session.user().save({ email: this.email() }).then(() => {
this.hide();
this.loading(false);
this.success(true);
this.alert(null);
m.redraw();
}, response => {
this.loading(false);
this.alert = new Alert({ type: 'warning', message: response.errors.map((error, k) => [error.detail, k < response.errors.length - 1 ? m('br') : '']) });
m.redraw();
this.$('[name='+response.errors[0].path+']').select();
this.handleErrors(response.errors);
});
}
}

25
framework/core/js/forum/src/components/login-modal.js
View File

@@ -3,6 +3,7 @@ import LoadingIndicator from 'flarum/components/loading-indicator';
import ForgotPasswordModal from 'flarum/components/forgot-password-modal';
import SignupModal from 'flarum/components/signup-modal';
import Alert from 'flarum/components/alert';
import ActionButton from 'flarum/components/action-button';
import icon from 'flarum/helpers/icon';
export default class LoginModal extends FormModal {
@@ -29,7 +30,11 @@ export default class LoginModal extends FormModal {
])
],
footer: [
m('p.forgot-password-link', m('a[href=javascript:;]', {onclick: () => app.modal.show(new ForgotPasswordModal({email: this.email()}))}, 'Forgot password?')),
m('p.forgot-password-link', m('a[href=javascript:;]', {onclick: () => {
var email = this.email();
var props = email.indexOf('@') !== -1 ? {email} : null;
app.modal.show(new ForgotPasswordModal(props));
}}, 'Forgot password?')),
m('p.sign-up-link', [
'Don\'t have an account? ',
m('a[href=javascript:;]', {onclick: () => {
@@ -50,12 +55,26 @@ export default class LoginModal extends FormModal {
onsubmit(e) {
e.preventDefault();
this.loading(true);
app.session.login(this.email(), this.password()).then(() => {
var email = this.email();
var password = this.password();
app.session.login(email, password).then(() => {
this.hide();
this.props.callback && this.props.callback();
}, response => {
this.loading(false);
this.alert = new Alert({ type: 'warning', message: 'Your login details were incorrect.' });
if (response && response.code === 'confirm_email') {
var state;
this.alert(Alert.component({
message: ['You need to confirm your email before you can log in. We\'ve sent a confirmation email to ', m('strong', response.email), '. If it doesn\'t arrive soon, check your spam folder.']
}));
} else {
this.alert(Alert.component({
type: 'warning',
message: 'Your login details were incorrect.'
}));
}
m.redraw();
this.ready();
});