added message counter to navbar

abarnhard · Aug 29, 2014 · 35d0eb0 · 35d0eb0
1 parent d82c84c
commit 35d0eb0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/app/models/user.js b/app/models/user.js
@@ -16,7 +16,11 @@ Object.defineProperty(User, 'collection', {
 User.findById = function(id, cb){
   var _id = Mongo.ObjectID(id);
   User.collection.findOne({_id:_id}, function(err, obj){
-    cb(err, _.create(User.prototype, obj));
+    Message.countUnreadForUser(obj._id, function(err2, count){
+      obj.unreadMessages = count;
+      console.log('*******user from findById', obj);
+      cb(err, _.create(User.prototype, obj));
+    });
   });
 };
 
@@ -35,6 +39,7 @@ User.authenticate = function(o, cb){
     if(!isOk){return cb();}
     Message.countUnreadForUser(user._id, function(err2, count){
       user.unreadMessages = count;
+      console.log('*******user from authenticate', user);
       cb(user);
     });
   });

diff --git a/app/static/css/style.css b/app/static/css/style.css
diff --git a/app/static/css/style.less b/app/static/css/style.less
@@ -12,3 +12,7 @@ body{
 .message-text {
   margin-top: 10px;
 }
+
+.unread {
+  color: white;
+}
diff --git a/app/views/shared/nav.jade b/app/views/shared/nav.jade
@@ -12,6 +12,7 @@
       ul.nav.navbar-nav.navbar-right
         if user
           li: a(href='/messages') Messages
+          li.unread= user.unreadMessages > 0 ? user.unreadMessages : null
           li: a(href='/users') Users
           li: a(href='/profile') Profile
           li