From 7e79ecbb517877f0bcc67a4553a766f65fd73d52 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Tue, 26 Jul 2016 21:59:20 -0400 Subject: split up script files, only serving relevant scripts for each page accordingly --- routes/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index 74c5427..fc2827d 100644 --- a/routes/user.js +++ b/routes/user.js @@ -111,7 +111,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { getComments().then(getMail).then(function (data) { console.log('got here fere'); - res.render('user_profile_alt', {inbox: inbox, error: error, csrfToken: req.csrfToken()}); + res.render('user_profile_alt', {inbox: inbox, error: error, csrfToken: req.csrfToken(), userProfile: true}); }); //res.render('user_profile_alt', {comments : comments, inbox: inbox, csrfToken: req.csrfToken()}); -- cgit v1.2.3 From a6f8527174c8677b29eb377e2a9f235b4989ab99 Mon Sep 17 00:00:00 2001 From: Waref Haque Date: Tue, 26 Jul 2016 22:39:53 -0400 Subject: follow exam --- routes/user.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index fc2827d..ff2992b 100644 --- a/routes/user.js +++ b/routes/user.js @@ -355,6 +355,40 @@ router.post('/follow_exam/:examID',function (req, res) { } }); +router.post('/follow_exam/:examID',function (req, res) { + var examId = req.params.examID; + + if (req.isAuthenticated()){ + console.log("Exam Id follow exam: " + examId); + console.log("Username follow exam: " + req.user.user_name); + + dbFile.followExam(req.user.user_name,examId,function (success, message) { + console.log("ENTERED DBFILE!!!") + + if (success){ + console.log("SUCCESS!") + req.session.messages = {success : message}; + res.redirect('/questions/' + examId); + }else{ + console.log("FAIlURE!") + + req.session.messages = {error : message}; + res.redirect('/questions/' + examId); + } + + }); + + }else{ + var message = "Must be logged in to follow an exam!"; + console.log(message); + req.session.messages = {error : message}; + res.redirect('/questions/' + examId); + + } +}); + + + module.exports = router; -- cgit v1.2.3 From 37cb19a226c255ed0af09e04931e4bae47afad8b Mon Sep 17 00:00:00 2001 From: HumairAK Date: Tue, 26 Jul 2016 22:57:19 -0400 Subject: fixed follow exam positining --- routes/user.js | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index ff2992b..bd13723 100644 --- a/routes/user.js +++ b/routes/user.js @@ -339,21 +339,6 @@ 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); - - } -}); router.post('/follow_exam/:examID',function (req, res) { var examId = req.params.examID; @@ -363,15 +348,10 @@ router.post('/follow_exam/:examID',function (req, res) { console.log("Username follow exam: " + req.user.user_name); dbFile.followExam(req.user.user_name,examId,function (success, message) { - console.log("ENTERED DBFILE!!!") - if (success){ - console.log("SUCCESS!") req.session.messages = {success : message}; res.redirect('/questions/' + examId); }else{ - console.log("FAIlURE!") - req.session.messages = {error : message}; res.redirect('/questions/' + examId); } -- cgit v1.2.3 From 96935191ed1741aa2185a88deb32a5de4b824219 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 00:35:09 -0400 Subject: made a few adjustments, removed all avatar occurrences, a few other images for optimization and performance speed, replace pngs with svgs etc. --- routes/user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index bd13723..a2f7cc1 100644 --- a/routes/user.js +++ b/routes/user.js @@ -47,7 +47,8 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { resolve(1); } else if (object.length){ req.user.comments = object.length; - comments = object; + req.user.comment_list = comments = object; + resolve(1); } else { req.user.comments = object.length; -- cgit v1.2.3 From 95b90345d1d6a2cdf67cdae4b913268c609b2498 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 00:39:23 -0400 Subject: minor fix --- routes/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index a2f7cc1..a54b0fb 100644 --- a/routes/user.js +++ b/routes/user.js @@ -47,7 +47,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { resolve(1); } else if (object.length){ req.user.comments = object.length; - req.user.comment_list = comments = object; + req.user.comment_list = object; resolve(1); } else { -- cgit v1.2.3 From 6271b9d13139c1e55118e5f26a3a7bf8caeeb11d Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 01:20:25 -0400 Subject: Added exam following --- routes/user.js | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index a54b0fb..b2e25f4 100644 --- a/routes/user.js +++ b/routes/user.js @@ -24,6 +24,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { var comments = []; var inbox = []; var error = null; + var follows = []; function getComments() { return new Promise(function(resolve, reject) { dbFile.retrieve_userComments_history(req.user.user_name, function (success, object) { @@ -92,6 +93,48 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { }); } + function getFollows(){ + return new Promise(function(resolve, reject) { + + + + dbFile.retrieveFollows(req.user.user_name, function(success, data){ + req.user.examfollows = []; + req.user.followerCount = data.length; + if(success && data.length){ + var count = 1; + data.forEach(function(item){ + dbFile.get_exam_byID(item, function(success, error, data){ + if(success){ + req.user.examfollows.push(data); + if(count == req.user.followerCount ){ + console.log(req.user.examfollows); + resolve(1); + }else{ + count++; + } + }else{ + console.log("Error: Could not fetch one or more exams;"); + resolve(1); + } + }) + }); + + } else if(success && !data.length){ + resolve(1); + console.log("Success: But no follows found;"); + } + else{ //error + error = data; + console.log(error); + resolve(1); + } + + }); + }); + } + + /*function solutionsCount() { return new Promise(function (resolve, reject) { dbFile.retrieve_userSolutions_history(req.user.username, function (bool, results) { @@ -110,7 +153,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { - getComments().then(getMail).then(function (data) { + getComments().then(getMail).then(getFollows).then(function (data) { console.log('got here fere'); res.render('user_profile_alt', {inbox: inbox, error: error, csrfToken: req.csrfToken(), userProfile: true}); }); -- cgit v1.2.3 From 6fd4613d0bf1bb78340e46d45b269ddd3c36f190 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 02:44:05 -0400 Subject: added compression --- routes/user.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'routes/user.js') diff --git a/routes/user.js b/routes/user.js index b2e25f4..e69a2c9 100644 --- a/routes/user.js +++ b/routes/user.js @@ -95,9 +95,6 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { function getFollows(){ return new Promise(function(resolve, reject) { - - - dbFile.retrieveFollows(req.user.user_name, function(success, data){ req.user.examfollows = []; req.user.followerCount = data.length; -- cgit v1.2.3