Merge branch 'master' of https://github.com/HumairAK/solutions_repo

1 files changed, 18 insertions, 9 deletions

diff --git a/routes/user.js b/routes/user.js
index c9bbebe..5ddd4b8 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -312,20 +312,29 @@ router.post('/comment/submit/:examID/:qID/:solID', function(req, res, next){
     }
 });
 
-router.post('/solution/vote/:examID/:qID/:solID', loggedIn, function(req, res, next){
+router.post('/solution/vote/:examID/:qID/:solID', function(req, res, next){
     var vote = req.body.vote;
     var examID = req.params.examID;
     var qID = req.params.qID;
     var solutionID = req.params.solID;
-    dbFile.vote_solution(solutionID, vote, function(voteCounted, statusMsg){
-        if(voteCounted){
-            console.log("Success!");
-        }else{
-            console.log("Action failed!");
-        }
-        console.log(statusMsg); // Change to display message above
+
+    if(req.isAuthenticated()){
+        dbFile.vote_solution(solutionID, vote, function(voteCounted, statusMsg){
+            if(voteCounted){
+                res.redirect('/solutions/' + examID + '/' + qID);
+            }else{
+                req.session.messages  = {error : statusMsg};
+                res.redirect('/solutions/' + examID + '/' + qID);
+            }
+        });
+    } else { //User not logged in
+        var message = "Must be logged in to Vote!";
+        req.session.messages  = {error : message};
         res.redirect('/solutions/' + examID + '/' + qID);
-    });
+    }
+
+
+
 
 
 });