diff --git a/controllers/contact.js b/controllers/contact.js index fa8d931793..7fcc77ccd6 100644 --- a/controllers/contact.js +++ b/controllers/contact.js @@ -1,7 +1,8 @@ exports.getContact = function(req, res) { res.render('contact', { title: 'Contact', - user: req.user + user: req.user, + messages: req.flash('messages') }); }; diff --git a/controllers/user.js b/controllers/user.js index aee03620c3..eeb765b01a 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -75,10 +75,11 @@ exports.postSignup = function(req, res) { user.save(function(err) { if (err) { + if (err.name === 'ValidationError') { req.flash('messages', _.map(err.errors, function(value, key) { return value.message; })); - } + if (err.code === 11000) { req.flash('messages', 'User already exists'); } diff --git a/views/account.jade b/views/account.jade index 4e299fe744..2dbf64e9b4 100644 --- a/views/account.jade +++ b/views/account.jade @@ -1,4 +1,5 @@ extends layout + block content h3 Account Management form(role='form', method='POST') diff --git a/views/contact.jade b/views/contact.jade index f5279abf5e..a625c042c7 100644 --- a/views/contact.jade +++ b/views/contact.jade @@ -1,4 +1,25 @@ extends layout block content - h1 Contact page \ No newline at end of file + h3 Contact Form + form(role='form', method='POST') + .form-group + .row + .col-xs-6.col-sm-6.col-md-6 + label(for='firstName') First Name + input.form-control(type='text', name='firstName', id='firstName') + .col-xs-6.col-sm-6.col-md-6 + label(for='lastName') Last Name + input.form-control(type='text', name='lastName', id='lastName') + .form-group + label(for='email') Email + input.form-control(type='email', name='email', id='email') + .form-group + label(for='contactBody') Body + textarea.form-control(type='text', name='contactBody', id='contactBody') + .form-group + button.btn.btn.btn-primary(type='submit') Send + if messages.length + .alert.alert-danger + for message in messages + div= message \ No newline at end of file