Merge pull request #109 from Kevbyte/upvotes3

Upvotes3

Author: codydaig

client/js/controllers/post-ctrl.js

@@ -5,6 +5,7 @@
  */
 
 angular.module('RDash')
+
 .controller('PostCtrl', function PostCtrl($scope, $stateParams, $location, Posts, Comments) {
     $scope.data = {};
 
@@ -31,6 +32,7 @@ angular.module('RDash')
     Comments.addComment($scope.comment)
     .then(function(resp) {
       resp._source.created_at = new Date(resp._source.created_at).toString();
+      resp.votes = resp.votes || 0;
       $scope.data.comments.push(resp);
       $scope.simplemde.value('');
     })
@@ -39,6 +41,22 @@ angular.module('RDash')
     });
   };
 
+  $scope.upVote = function(commentID) {
+    //use commentID to send the user into the comment.upVotes array
+    Comments.upVote(commentID).then(function() {
+      $scope.fetch();
+    });
+    
+  };
+
+  $scope.downVote = function(commentID) {
+    Comments.downVote(commentID).then(function() {
+      // debugger
+      $scope.fetch();
+    });
+    
+  };
+
   $scope.$on('$viewContentLoaded', function(){
     $scope.simplemde = new SimpleMDE({
       tabSize: 2

client/js/services/services.js

@@ -79,7 +79,23 @@ angular.module('RDash.services', [])
     });
   };
 
+  var upVote = function(commentID){
+    return $http({
+      method: 'POST',
+      url: '/api/comments/'+commentID+'/upvote'
+    });
+  };
+
+  var downVote = function(commentID){
+    return $http({
+      method: 'POST',
+      url: '/api/comments/'+commentID+'/downvote'
+    });
+  };
+
   return {
+    upVote: upVote,
+    downVote: downVote,
     getComments: getComments,
     addComment: addComment
   };

client/templates/post.html

@@ -58,6 +58,20 @@
                   </div>
                 </div>
               </div>
+              <div class="votes pull-right">
+                
+                <div class="pull-left">
+                  <div ng-click='upVote(comment._id)'>
+                    <img src="http://icons.iconarchive.com/icons/icons8/windows-8/32/Hands-Thumbs-Up-icon.png"/>
+                  </div>
+                  <div ng-click="downVote(comment._id)">
+                    <img src="http://icons.iconarchive.com/icons/icons8/windows-8/32/Hands-Thumbs-Down-icon.png"/>
+                  </div>
+                </div>
+                <div class="pull-right" ng-model="comment.votes">
+                  <h2>{{comment.votes}}</h2>
+                </div>
+              </div>
             </rd-widget-body>
           </rd-widget>
           <br/>

server/controllers/comments.controllers.server.js

@@ -27,7 +27,7 @@ exports.renderComments = function(req, res) {
     search = {};
     search.index = 'comments';
     search.type = 'comment';
-    search.size = 10;
+    search.size = 1000;
     search.body = {};
       search.body.query = {};
         search.body.query.match = {};
@@ -40,7 +40,6 @@ exports.renderComments = function(req, res) {
 
     client.search(search).then(function (result) {
       var hits = result.hits.hits;
-      console.log(hits);
       for(var i=0; i<hits.length; i++) {
         hits[i].votes = hits[i]._source.upvotes.length - hits[i]._source.downvotes.length;
       }
@@ -85,54 +84,55 @@ exports.storeComment = function(req, res) {
 };
 
 exports.upvoteComment = function(req, res) {
+
   var comment = req.comment;
-  if(!comment.upvotes) {
-    comment.upvotes = [];
+  if(!comment._source.upvotes) {
+    comment._source.upvotes = [];
   }
-  if(!comment.downvotes) {
-    comment.downvotes = [];
+  if(!comment._source.downvotes) {
+    comment._source.downvotes = [];
   }
-  if(comment.downvotes.indexOf(req.session.user.id) > -1) {
-    comment.downvotes.splice(comment.downvotes.indexOf(req.session.user.id), 1);
+  if(comment._source.downvotes.indexOf(req.session.user.id) > -1) {
+    comment._source.downvotes.splice(comment._source.downvotes.indexOf(req.session.user.id), 1);
   }
-  if(comment.upvotes.indexOf(req.session.user.id) === -1) {
-    comment.upvotes.push(req.session.user.id);
+  if(comment._source.upvotes.indexOf(req.session.user.id) === -1) {
+    comment._source.upvotes.push(req.session.user.id);
   }
   var update = {};
   update.index = 'comments';
   update.type = 'comment';
   update.id = comment._id;
   update.body = {};
   update.body.doc = {};
-  update.body.upvotes = comment.upvotes;
-  update.body.downvotes = comment.downvotes;
+  update.body.doc.upvotes = comment._source.upvotes;
+  update.body.doc.downvotes = comment._source.downvotes;
   client.update(update).then(function (result) {
     res.send(result);
   });
 };
 
 exports.downvoteComment = function(req, res) {
   var comment = req.comment;
-  if(!comment.downvotes) {
-    comment.downvotes = [];
+  if(!comment._source.downvotes) {
+    comment._source.downvotes = [];
   }
-  if(!comment.upvotes) {
-    comment.upvotes = [];
+  if(!comment._source.upvotes) {
+    comment._source.upvotes = [];
   }
-  if(comment.upvotes.indexOf(req.session.user.id) > -1) {
-    comment.upvotes.splice(comment.upvotes.indexOf(req.session.user.id), 1);
+  if(comment._source.upvotes.indexOf(req.session.user.id) > -1) {
+    comment._source.upvotes.splice(comment._source.upvotes.indexOf(req.session.user.id), 1);
   }
-  if(comment.downvotes.indexOf(req.session.user.id) === -1) {
-    comment.downvotes.push(req.session.user.id);
+  if(comment._source.downvotes.indexOf(req.session.user.id) === -1) {
+    comment._source.downvotes.push(req.session.user.id);
   }
   var update = {};
   update.index = 'comments';
   update.type = 'comment';
   update.id = comment._id;
   update.body = {};
   update.body.doc = {};
-  update.body.upvotes = comment.upvotes;
-  update.body.downvotes = comment.downvotes;
+  update.body.doc.upvotes = comment._source.upvotes;
+  update.body.doc.downvotes = comment._source.downvotes;
   client.update(update).then(function (result) {
     res.send(result);
   });