From e4b3b26b616f94b7cd85c8726fe56a9f39bfb558 Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Mon, 18 Nov 2013 18:00:05 -0500
Subject: [PATCH] Added error flash message on login page

---
 controllers/user.js |  5 ++---
 views/layout.jade   |  2 +-
 views/login.jade    | 10 +++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/controllers/user.js b/controllers/user.js
index 388fd3caed..2d5be0f1df 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -14,7 +14,7 @@ exports.getLogin = function(req, res) {
   res.render('login', {
     title: 'Login',
     user: req.user,
-    message: req.session.messages
+    messages: req.flash('messages')
   });
 };
 
@@ -28,7 +28,7 @@ exports.postLogin = function(req, res, next) {
       return next(err);
     }
     if (!user) {
-      req.flash('message', [info.message]);
+      req.flash('messages', info.message);
       return res.redirect('/login');
     }
     req.logIn(user, function(err) {
@@ -53,7 +53,6 @@ exports.getSignup = function(req, res) {
  * POST /signup
  */
 exports.postSignup = function(req, res) {
-
   var user = new User({
     firstName: req.body.firstName,
     lastName: req.body.lastName,
diff --git a/views/layout.jade b/views/layout.jade
index 7034b3c283..e9123cb4fd 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -40,4 +40,4 @@ html
                 a(href='/logout') Logout
   .container
       block content
-  script(src='/js/lib/jquery.js')
\ No newline at end of file
+  script(src='/js/lib/jquery.js')
diff --git a/views/login.jade b/views/login.jade
index efc78f11de..c040b7e691 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -1,8 +1,7 @@
 extends layout
 
 block content
-  if message
-    p= message
+
 
   .main
     h3
@@ -29,4 +28,9 @@ block content
           input(type='checkbox')
           | Remember me
       button.btn.btn.btn-success(type='submit')
-        | Log In
\ No newline at end of file
+        | Log In
+
+    if messages.length
+      p.alert.alert-danger
+        strong Error!
+        |  #{messages}
\ No newline at end of file