From 20220f9c3cf0cf8e1efbe850aba4a99f23d9a0cb Mon Sep 17 00:00:00 2001 From: Waref Haque Date: Tue, 26 Jul 2016 20:25:57 -0400 Subject: follow_exam --- routes/user.js | 16 ++++++++++++++++ views/questions.hbs | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/routes/user.js b/routes/user.js index 5ddd4b8..22a30a4 100644 --- a/routes/user.js +++ b/routes/user.js @@ -339,6 +339,22 @@ router.post('/solution/vote/:examID/:qID/:solID', function(req, res, next){ }); +router.post('/follow_exam/:examID',function (req, res) { + + console.log("ENTERED THE FUNCTION FOLLOW EXAM!!"); + var examId = req.params.examID; + + if (req.isAuthenticated()){ + console.log("Exam Id follow exam: " + examId); + console.log("Username follow exam: " + req.user.user_name); + }else{ + var message = "Must be logged in to follow an exam!"; + req.session.messages = {error : message}; + res.redirect('/questions/' + examID); + } +}); + + module.exports = router; /************** Route protection ********************/ diff --git a/views/questions.hbs b/views/questions.hbs index 4b40d33..e5bf21d 100644 --- a/views/questions.hbs +++ b/views/questions.hbs @@ -3,6 +3,24 @@ +
+ + +
+ + + + + + + + + +
-- cgit v1.2.3 From 7e30cb0b87d8ead0b4746238c533630f252619ef Mon Sep 17 00:00:00 2001 From: HumairAK Date: Tue, 26 Jul 2016 20:49:21 -0400 Subject: fixed csrf and redirect issues with follow exam --- routes/index.js | 3 ++- routes/user.js | 3 ++- views/questions.hbs | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/routes/index.js b/routes/index.js index 219b7b7..d631d7b 100644 --- a/routes/index.js +++ b/routes/index.js @@ -184,7 +184,8 @@ router.get('/questions/:exam_id', function (req,res) { pageCount : exam.page_count, questionCount : exam.questions_count }; - res.render('questions', {query: qList, examInfo: examInfo}); + res.render('questions', {query: qList, examInfo: examInfo, csrfToken: req.csrfToken()}); + req.session.messages = null; }); }else{ req.session.messages = {error : "Could not find exam."}; diff --git a/routes/user.js b/routes/user.js index 22a30a4..74c5427 100644 --- a/routes/user.js +++ b/routes/user.js @@ -350,7 +350,8 @@ router.post('/follow_exam/:examID',function (req, res) { }else{ var message = "Must be logged in to follow an exam!"; req.session.messages = {error : message}; - res.redirect('/questions/' + examID); + res.redirect('/questions/' + examId); + } }); diff --git a/views/questions.hbs b/views/questions.hbs index e5bf21d..1d62a2b 100644 --- a/views/questions.hbs +++ b/views/questions.hbs @@ -1,9 +1,14 @@