From c0156b41e2f879928bee12a0a1fb78cd637db545 Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Tue, 29 May 2018 02:23:19 +0530 Subject: [PATCH] fix: make success message relevant --- common/models/user.js | 9 +- .../views/account/accept-privacy-terms.jade | 14 +-- server/views/account/update-email.jade | 98 +++++++++---------- 3 files changed, 58 insertions(+), 63 deletions(-) diff --git a/common/models/user.js b/common/models/user.js index b33b40cdb2..69472224ff 100644 --- a/common/models/user.js +++ b/common/models/user.js @@ -576,14 +576,9 @@ module.exports = function(User) { this.update$({ emailAuthLinkTTL }) ); }) - .map(() => isSignUp ? + .map(() => dedent` - We created a new account for you! - Check your email and click the sign in link we sent you. - ` : - dedent` - We found your existing account. - Check your email and click the sign in link we sent you. + Check your email and click the link we sent you to confirm you email. ` ); } diff --git a/server/views/account/accept-privacy-terms.jade b/server/views/account/accept-privacy-terms.jade index f0b9f0ef63..eaf7c7c804 100644 --- a/server/views/account/accept-privacy-terms.jade +++ b/server/views/account/accept-privacy-terms.jade @@ -1,12 +1,12 @@ extends ../layout block content - .container - .row.flashMessage.negative-30 - .col-sm-6.col-sm-offset-3 - #flash-board.alert.fade.in(style='display: none;') - button.close(type='button', data-dismiss='alert') - span.ion-close-circled#flash-close - #flash-content + .row.flashMessage.negative-30 + .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3 + #flash-board.alert.fade.in(style='display: none;') + button.close(type='button', data-dismiss='alert') + span.ion-close-circled#flash-close + #flash-content + .row .col-xs-12 #accept-privacy-terms .row diff --git a/server/views/account/update-email.jade b/server/views/account/update-email.jade index c1887bed74..0de7f0183d 100644 --- a/server/views/account/update-email.jade +++ b/server/views/account/update-email.jade @@ -1,57 +1,57 @@ extends ../layout block content + .row.flashMessage.negative-30 + .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3 + #flash-board.alert.fade.in(style='display: none;') + button.close(type='button', data-dismiss='alert') + span.ion-close-circled#flash-close + #flash-content .container - .row.flashMessage.negative-30 - .col-xs-12 - #flash-board.alert.fade.in(style='display: none;') - button.close(type='button', data-dismiss='alert') - span.ion-close-circled#flash-close - #flash-content - h2.text-center Update your email address here: - form.form-horizontal.update-email(method='POST', action='/update-my-email', name="updateEmailForm") - .row - .col-sm-6.col-sm-offset-3 - input(type='hidden', name='_csrf', value=_csrf) - .form-group - input.input-lg.form-control(type='email', name='email', id='email', value=user.email || '', placeholder=user.email || 'Enter your new email', autofocus, required, autocomplete="off") - .form-group - button.btn.btn-lg.btn-primary.btn-block(type='submit')= !user.email || user.emailVerified ? 'Update my Email' : 'Verify Email' - a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout') - | Sign out + h2.text-center Update your email address here: + form.form-horizontal.update-email(method='POST', action='/update-my-email', name="updateEmailForm") + .row + .col-sm-6.col-sm-offset-3 + input(type='hidden', name='_csrf', value=_csrf) + .form-group + input.input-lg.form-control(type='email', name='email', id='email', value=user.email || '', placeholder=user.email || 'Enter your new email', autofocus, required, autocomplete="off") + .form-group + button.btn.btn-lg.btn-primary.btn-block(type='submit')= !user.email || user.emailVerified ? 'Update my Email' : 'Verify Email' + a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout') + | Sign out - script. - $(document).ready(function() { - $('form').submit(function(event){ - event.preventDefault(); - $('#flash-board').hide(); - var $form = $(event.target); - $.ajax({ - type : 'POST', - url : $form.attr('action'), - data : $form.serialize(), - dataType : 'json', - encode : true, - xhrFields : { withCredentials: true } - }) - .fail(error => { - if (error.responseText){ - var data = JSON.parse(error.responseText); - if(data.message) + script. + $(document).ready(function() { + $('form').submit(function(event){ + event.preventDefault(); + $('#flash-board').hide(); + var $form = $(event.target); + $.ajax({ + type : 'POST', + url : $form.attr('action'), + data : $form.serialize(), + dataType : 'json', + encode : true, + xhrFields : { withCredentials: true } + }) + .fail(error => { + if (error.responseText){ + var data = JSON.parse(error.responseText); + if(data.message) + $('#flash-content').html(data.message); + $('#flash-board') + .removeClass('alert-success') + .addClass('alert-info') + .fadeIn(); + } + }) + .done(data =>{ + if(data && data.message){ $('#flash-content').html(data.message); $('#flash-board') - .removeClass('alert-success') - .addClass('alert-info') - .fadeIn(); + .removeClass('alert-info') + .addClass('alert-success') + .fadeIn(); } - }) - .done(data =>{ - if(data && data.message){ - $('#flash-content').html(data.message); - $('#flash-board') - .removeClass('alert-info') - .addClass('alert-success') - .fadeIn(); - } + }); }); - }); - }); + });