aboutsummaryrefslogtreecommitdiff
path: root/routes/user.js
diff options
context:
space:
mode:
authornanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-25 11:02:14 +0000
committernanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-25 11:02:14 +0000
commitbca90452150c6a128f88765d04481a0235059af3 (patch)
tree3d262800ae64ae2b7491f030728aea008154b9a0 /routes/user.js
parent91638c435076736ea1d6ac7f532a35523bd79f89 (diff)
need pull"
Diffstat (limited to 'routes/user.js')
-rw-r--r--routes/user.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/routes/user.js b/routes/user.js
index 9f200eb..b0b2d47 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 = [];
@@ -242,16 +245,21 @@ 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();
+
+
}
});
});
+
// Authentication check in code
router.post('/comment/submit/:examID/:qID/:solID', function(req, res, next){
var examID = req.params.examID;