gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(app): Normalize flash type

Browse Source 
Changed flash messages to use types provided by Bootstrap

Closes #16395
This commit is contained in:
cassidypignatello
2018-01-08 17:25:45 -05:00
parent 3d86eaecbc
commit f158183039
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/models/user.js
View File

@@ -238,7 +238,7 @@ module.exports = function(User) {
return User.findById(uid, (err, user) => {
if (err || !user || !user.newEmail) {
ctx.req.flash('error', {
ctx.req.flash('danger', {
msg: dedent`Oops, something went wrong, please try again later`
});
return ctx.res.redirect('/');
@@ -309,7 +309,7 @@ module.exports = function(User) {
return next();
}
req.flash('error', {
req.flash('danger', {
msg: dedent`
The ${req.body.email} email address is already associated with an account.
Try signing in with it here instead.
@@ -320,7 +320,7 @@ module.exports = function(User) {
})
.catch(err => {
console.error(err);
req.flash('error', {
req.flash('danger', {
msg: 'Oops, something went wrong, please try again later'
});
return res.redirect('/email-signin');
@@ -376,7 +376,7 @@ module.exports = function(User) {
var res = ctx.res;
var req = ctx.req;
req.flash('errors', {
req.flash('danger', {
msg: 'Invalid username or password.'
});
return res.redirect('/email-signin');