From 3e777af0387821e7a7fe03792cf79915d1b20bc7 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Sun, 24 Jul 2016 02:12:21 -0400 Subject: fixed inbox mail pull --- config/passport.js | 18 +- routes/index.js | 1 - routes/user.js | 12 +- views/user_profile_alt.hbs | 466 +++++++++++++++++++++++---------------------- 4 files changed, 257 insertions(+), 240 deletions(-) diff --git a/config/passport.js b/config/passport.js index 6cb6292..38e9397 100644 --- a/config/passport.js +++ b/config/passport.js @@ -15,17 +15,31 @@ var comparePassword = function (password1, password2) { passport.serializeUser(function (user, done) { - + //console.log("In serialize User"); + //console.log(user); done(null, user); }); passport.deserializeUser(function(user, done) { - + //console.log("In de-serialize User: " + user.email); done(null, user); }); +/* +passport.serializeUser(function (user, done) { + console.log("In serialize User"); + console.log(user); + done(null, user._id); +}); +passport.deserializeUser(function(id, done) { + console.log("In de-serialize User"); + dbFile.findUserByID(id, function(err, user){ + done(err, user); + }); +});*/ + // fields - [email, user_name, f_name, l_name, uni, department, password, phone_num] diff --git a/routes/index.js b/routes/index.js index 961a60d..ae7b194 100644 --- a/routes/index.js +++ b/routes/index.js @@ -86,7 +86,6 @@ router.get('/search', function(req, res, next) { res.redirect('/exams/' + courseName); }); - /* This is a redirect from the exams page, route is generated in exams.hbs * * EXAMPLE DATA GIVEN BELOW: diff --git a/routes/user.js b/routes/user.js index b2864b8..f88be68 100644 --- a/routes/user.js +++ b/routes/user.js @@ -76,7 +76,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { inbox.push(mail_data); inbox.push(mail_data); - res.render('user_profile_alt', {comments : comments, inbox: inbox}); + res.render('user_profile_alt', {comments : comments, inbox: inbox, csrfToken: req.csrfToken()}); }); /* Adds a solution into the database, redirect to exam/question/solution page */ @@ -207,7 +207,7 @@ router.post('/signin', loggedOut, function(req, res, next) { }); -router.get('/user_profile/send_message/:id', loggedIn, function(req, res, next) { +router.post('/user_profile/send_message', loggedIn, function(req, res, next) { var date = new Date(); var current_date = date.toString().slice(0, 24); var mail_data = { @@ -215,8 +215,10 @@ router.get('/user_profile/send_message/:id', loggedIn, function(req, res, next) receiver: req.body.receiver_username, message: req.body.message, date: current_date - } + }; + console.log(mail_data); + /* dbFile.sendMail(mail_data, function(success, error, message) { if ((!success && !error) || (error)) { res.redirect('/user/user_profile', {error: message}); @@ -225,9 +227,9 @@ router.get('/user_profile/send_message/:id', loggedIn, function(req, res, next) res.redirect('/user/user_profile', {success: message}); $('#profile-send-message').show(); } - }); + });*/ - //res.redirect('/user/user_profile'); + res.redirect('/user/user_profile'); }); module.exports = router; diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index 652cfee..ab6a9ce 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -1,257 +1,259 @@
-
\ No newline at end of file -- cgit v1.2.3