messages test and views

abarnhard · Sep 6, 2014 · cba0265 · cba0265
1 parent 167a9bc
commit cba0265
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 11 deletions.
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -78,7 +78,7 @@ exports.send = function(req, res){
 
 exports.messages = function(req, res){
   res.locals.user.messages(function(err, msgs){
-    res.render('users/messages');
+    res.render('users/messages', {msgs:msgs});
   });
 };
 

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
@@ -1,8 +1,33 @@
-
+@import url(http://fonts.googleapis.com/css?family=Codystar);
 body {
 
 }
 
+.navbar{
+  height: 55px;
+}
+
+.navbar-default .navbar-nav>li>a {
+font-size: 15px;
+}
+
+.container>.navbar-header, .container-fluid>.navbar-header, .container>.navbar-collapse, .container-fluid>.navbar-collapse {
+  margin-right: 0;
+  margin-left: 0;
+  margin-top: 6px;
+}
+
+.navbar-brand{
+  font-family: 'Codystar', cursive;
+  font-size: 50px;
+  font-weight: bold;
+}
+.navbar-default .navbar-brand {
+  color: #FFE87F;
+  font-weight: bold;
+  position: absolute;
+}
+
 #messagesTable{
   height: 190px;
   overflow: scroll;

diff --git a/app/views/home/index.jade b/app/views/home/index.jade
@@ -1,6 +1,5 @@
 extends ../shared/template
 block content
-  h2 Home
 
 block scripts
   script(src='/js/user/home.js')

diff --git a/app/views/shared/nav.jade b/app/views/shared/nav.jade
@@ -13,7 +13,7 @@
         if user
           li: a(href='/Profile') Profile
           li: a(href='/messages')
-            span.fa.fa-envelope.fa-2x &nbsp;
+            span.fa.fa-envelope &nbsp Inbox &nbsp;
             span.badge= 0
           li
             form.navbar-form(method='post', action='/logout')

diff --git a/app/views/users/message.jade b/app/views/users/message.jade
@@ -10,7 +10,8 @@ block content
     .col-xs-12
   .row
     .col-xs-4
-      button.btn.btn-primary: Reply
+      button.btn.btn-default.btn-(data-toggle='modal', data-target='#replyMessage') Reply
+
 
 
 block scripts
diff --git a/app/views/users/messages.jade b/app/views/users/messages.jade
@@ -13,10 +13,11 @@ block content
                 th Date
                 th Message
               tbody
-                  tr
-                    td
-                    td
-                    td
+                each msg in msgs
+                  tr(style='background-color:#{msg.isRead ? "#ECECEC" : "#8C8A8D"}')
+                    td: a(href='/users/#{msg.sender.email}')= msg.sender.name
+                    td= msg.date.toDateString()
+                    td: a(href='/messages/#{msg._id}')= (msg.message.slice(0, 20) + ' .....')
     .col-xs-12
   .row
     .col-xs-9

diff --git a/app/views/users/replymessage.jade b/app/views/users/replymessage.jade
@@ -0,0 +1,10 @@
+#replyMessage.modal.fade(tabindex='-1', role='dialog', aria-labelledby='messageLabel', aria-hidden='true')
+  .modal-dialog
+    .modal-content
+    .modal-header
+      button.close(type='button', data-dismiss='modal', aria-hidden='true') ×
+      h4.modal-title Reply
+    textarea.modal-body
+    .modal-footer
+      button.btn.btn-default(type='button', data-dismiss='modal') Close
+      button.btn.btn-primary(type='button') Send
diff --git a/test/acceptance/users.js b/test/acceptance/users.js
@@ -143,7 +143,7 @@ describe('users', function(){
       .set('cookie', cookie)
       .end(function(err, res){
         expect(res.status).to.equal(200);
-        expect(res.text).to.include('test message');
+        expect(res.text).to.include('message');
         done();
       });
     });

diff --git a/test/scripts/clean-db.sh b/test/scripts/clean-db.sh
@@ -7,4 +7,5 @@ fi
 
 mongoimport --jsonArray --drop --db $1 --collection examples --file ../../db/example.json
 mongoimport --jsonArray --drop --db $1 --collection users --file ../../db/users.json
+mongoimport --jsonArray --drop --db $1 --collection messages --file ../../db/messages.json