diff options
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/user.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/routes/user.js b/routes/user.js index dcf4c19..e3340e0 100644 --- a/routes/user.js +++ b/routes/user.js @@ -6,6 +6,8 @@ var passport = require('passport'); var dbFile = require("../node_simple.js"); var Promise = require('promise'); +var $ = require('jquery')(require("jsdom").jsdom().parentWindow); + var csrfProtection = csrf(); router.use(csrfProtection); // router is protected @@ -18,6 +20,7 @@ router.get('/logout', loggedIn, function (req, res, next) { /* Render/GET user_profile page */ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { + req.session.messages = null; var comments = []; @@ -59,6 +62,12 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { dbFile.checkMailbox(req.user.user_name, function(success, error, data, message){ if (success) { inbox = data; + // needed to display in layout + var i = 0; + inbox.forEach(function(element) { + element.class = i; + i ++; + }); resolve(1); } else if (error) { // For testing purposes, remove later: @@ -80,6 +89,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', {comments : comments, inbox: inbox, csrfToken: req.csrfToken()}); }); @@ -179,11 +189,15 @@ router.post('/user_profile/send_message', loggedIn, function(req, res, next) { dbFile.sendMail(mail_data, function(success, error, message) { if ((!success && !error) || (error)) { req.session.messages = {error : message}; - res.redirect('/user/user_profile'); + res.redirect('/user/user_profile/'); + } else { req.session.messages = {success: message}; - res.redirect('/user/user_profile'); + res.redirect('/user/user_profile/'); + $('#profile-send-message').show(); + + } }); |
