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

3 files changed, 34 insertions, 17 deletions

diff --git a/routes/admin.js b/routes/admin.js
index 7e5c7fe..027722d 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -86,6 +86,7 @@ router.post('/add/admin', function(req,res){
     res.redirect('/admin');
 });
 
+/* Remove an exam route, redirect to admin panel */
 router.post('/remove/exam', function(req,res){
     var course_code = req.body.course_code,
         year = req.body.year,
@@ -108,6 +109,37 @@ router.post('/remove/exam', function(req,res){
     res.redirect('/admin');
 });
 
+/* Remove a course route, redirect to admin panel */
+router.post('/remove/course', function(req,res){
+    var course_code = req.body.course_code;
+    dbFile.remove_course(course_code, function(courseRemoved, statusMessage){
+            if(courseRemoved){
+                console.log("Success.");
+            } else {
+                console.log("Failed.");
+            }
+            console.log(statusMessage);
+        });
+
+    res.redirect('/admin');
+});
+
+/* Remove a user route, redirect to admin panel */
+router.post('/remove/user', function(req,res){
+    var username = req.body.username;
+    dbFile.remove_user(username, function(userRemoved, statusMessage){
+        if(userRemoved){
+            console.log("Success.");
+        } else {
+            console.log("Failed.");
+        }
+        console.log(statusMessage);
+    });
+
+    res.redirect('/admin');
+});
+
+
 /* Takes an input string delimited by commas, will split by comma and trim white
  * spaces. Consider callback.
  */
diff --git a/routes/index.js b/routes/index.js
index 23cd7c3..698305b 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -29,12 +29,6 @@ router.get('/user_solutions', function(req, res, next) {
     res.render('user_solutions');
 });
 
-/* Render/GET questions page
-router.get('/questions', function(req, res, next) {
-    res.render('questions');
-});
-*/
-
 //EXAMPLE EXPECTED DATA GIVEN BELOW:
 /*[     {courseCode: 'CSC240',
         year: 2016,
@@ -137,13 +131,6 @@ router.get('/questions/:exam_id', function (req,res) {
             res.render('questions', {query: qList, examInfo: examInfo});
         });
     });
-
-    /*dbFile.get_exam_info_by_ID(examID, function (questions) {
-        console.log(questions);
-        res.render('questions', {query: questions});
-
-    });*/
-
 });
 
 /*GET the solutions for a given exam given the question number and the exam_id
@@ -182,11 +169,9 @@ router.get('/questions/:exam_id', function (req,res) {
     */
 
 router.get('/solutions/:exam_id/:q_num', function (req, res) {
-    console.log("index.js::Getting solutions");
     var examID = req.params.exam_id;
     var qID = req.params.q_num;
     dbFile.get_all_solutions(examID, qID, function (solutions) {
-        console.log("index.js::GOT solutions");
         solutions.forEach(function(soln){
             soln.commentCount = soln.comments.length;
         });
diff --git a/routes/user.js b/routes/user.js
index 4ba4dba..90e3b8d 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -285,6 +285,7 @@ router.post('/user_profile/send_message', loggedIn, function(req, res, next) {
 
 });
 
+// Authentication check in code
 router.post('/comment/submit/:examID/:qID/:solID', function(req, res, next){
     var examID = req.params.examID;
     var qID = req.params.qID;
@@ -292,7 +293,6 @@ router.post('/comment/submit/:examID/:qID/:solID', function(req, res, next){
     var username = req.user.user_name;
     var solutionID = req.params.solID;
     // Must be a logged in user to access
-    console.log(examID + "," + qID + "," + comment + "," + username + "," + solutionID);
     var fields = [comment, username];
     if(req.isAuthenticated()){
         dbFile.add_comment(solutionID, fields, function(commentAdded, statusMessage){
@@ -310,7 +310,7 @@ router.post('/comment/submit/:examID/:qID/:solID', function(req, res, next){
     }
 });
 
-router.post('/solution/vote/:examID/:qID/:solID', function(req, res, next){
+router.post('/solution/vote/:examID/:qID/:solID', loggedIn, function(req, res, next){
     var vote = req.body.vote;
     var examID = req.params.examID;
     var qID = req.params.qID;