fixed merge conflicts and tested code

Author: Rupeshiya

controller/profile.controller.js

@@ -36,79 +36,24 @@ module.exports = {
             res.redirect('/profile/profileview/' + req.user.Eid);
         });
     },
-    upvote: function (req, res) {
-
-        var p = 0;
-
-        var check = 0;
-        var comment = ' ';
-        for (var q = 0; q < proj.downvote.length; q++) {
-            if (req.body.client == proj.downvote[q]) {
-                comment = 'Cannot upvote and downvote a post ';
-                check = 1;
-                break;
-            }
-
-        }
-
-        if (check == 1) {
-            res.send({ proj, comment });
-        }
-        else {
-            for (var v = 0; v < proj.upvote.length; v++) {
-                if (req.body.client == proj.upvote[v]) {
-                    p = 1;
-                    proj.upvote.pop(req.body.client);
-                    proj.save();
-                    console.log('already present');
-                    break;
-                }
-            }
-
-            if (p == 0) {
-                proj.upvote.push(req.body.client);
-                proj.save();
-            }
-
-            res.send({ comment, proj });
-        }
-    },
-    downvote: function(req,res){
-        proj.findOne({ proid: req.body.project }).then(function (proj) {
-
-            var p = 0;
-            var check = 0;
-            var comment = '';
-
-            for (var q = 0; q < proj.upvote.length; q++) {
-                if (req.body.client == proj.upvote[q]) {
-                    comment = 'Cannot do upvote downvote at same post';
-                    check = 1;
-                    break;
-                }
-            }
-
-            if (check == 1) {
-                res.send({ comment, proj });
-            }
-            else {
-                for (var v = 0; v < proj.downvote.length; v++) {
-                    if (req.body.client == proj.downvote[v]) {
-                        p = 1;
-                        proj.downvote.pop(req.body.client);
-                        proj.save();
-                        console.log('already present');
-                        break;
-                    }
+    upDownVote: function (req,res) {
+        proj.findOne({proid: req.body.project}).then((pro)=>{
+            if(pro.upDownVote.get(req.body.client)){
+                if(pro.upDownVote.get(req.body.client)=='-1'){
+                    pro.upDownVote.set(req.body.client,'+1');
+                    return pro.save();
+                  
+                }else{
+                    pro.upDownVote.set(req.body.client,'-1');
+                    return pro.save();
+                  
                 }
-
-                if (p == 0) {
-                    proj.downvote.push(req.body.client);
-                    proj.save();
-                }
-
-                res.send({ comment, proj });
+            }else{
+                pro.upDownVote.set(req.body.client,req.body.vote);
+                return pro.save();
             }
+        }).catch((err)=>{
+            return err;
         });
     },
     ch2 : function(req,res){

routes/login.routes.js

@@ -8,8 +8,6 @@ const route = express.Router();
 
 //get request
 
-
-
 route.get('/google', passport.authenticate('google', { scope: ['profile'] }));
 
 route.get('/google/redirect', passport.authenticate('google'), function (req, res) {
@@ -47,7 +45,6 @@ route.post('/login', url, function (req, res) {
         }
     });
 
-
 });
 route.get('/logout', function (req, res) {
     req.logout();

schema/project.js

@@ -1,6 +1,6 @@
-const mongoose = require('mongoose');
-const schema = mongoose.Schema;
-const project = new schema({
+const mongoose=require('mongoose');
+const schema=mongoose.Schema;
+const project=new schema({
     pname:{
         type:String
     },
@@ -16,11 +16,9 @@ const project = new schema({
     content:{
         type:String
     },
-    upvote:{
-        type:[String]
-    },
-    downvote:{
-        type:[String]
+    upDownVote:{
+        type:Map,
+        of: String,
     },
     proid:{
         type:Number

server.js

@@ -34,7 +34,7 @@ app.use(passport.session());
 app.use(indexRoutes);
 
 
-var ser = app.listen(3000, function () {
+const ser = app.listen(3000, function () {
     console.log('Running');
 });
 

views/js/codeuino.js

@@ -73,10 +73,7 @@
         $('#loginModal').addClass('displayOff');
 
     });
-
-
-
-  
+      
     $(window).scroll(navbarCollapse);
 
 })(jQuery); 

views/js/index.js

@@ -9,7 +9,7 @@ $('.tab a').on('click', function(e) {
         .siblings()
         .removeClass('active');
 
-    var target = $(this).attr('href');
+    const target = $(this).attr('href');
 
     $('.tab-content > div')
         .not(target)