aboutsummaryrefslogtreecommitdiff
path: root/routes/user.js
diff options
context:
space:
mode:
Diffstat (limited to 'routes/user.js')
-rw-r--r--routes/user.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/routes/user.js b/routes/user.js
index e69a2c9..cfa3a79 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -20,7 +20,6 @@ router.get('/logout', loggedIn, function (req, res, next) {
router.get('/user_profile', loggedIn, isUser, function(req, res, next) {
req.session.messages = null;
-
var comments = [];
var inbox = [];
var error = null;
@@ -182,6 +181,9 @@ router.get('/signin', loggedOut, function (req, res, next) {
});
});
+router.get('/verify', function(req, res, next) {
+ res.render('verification', {noHeader: true});
+});
router.post('/signup', loggedOut, function(req, res, next) {
req.assert('fname', 'Please enter a valid first name.').notEmpty().withMessage('First name required.').isAlpha();
req.check('lname', 'Please enter a valid first name.').notEmpty().withMessage('Last name required.').isAlpha();
@@ -204,7 +206,7 @@ router.post('/signup', loggedOut, function(req, res, next) {
} else {
console.log("GOT SUCCESS");
passport.authenticate('local_signup', {
- successRedirect: '/user/user_profile',
+ successRedirect: '/user/verify',
failureRedirect: '/user/signup/failed',
failureFlash: true
})(req, res);
@@ -223,7 +225,7 @@ router.post('/signin', loggedOut, function(req, res, next) {
res.redirect('/signin');
} else {
passport.authenticate('local_signin', {
- successRedirect: '/user/user_profile',
+ successRedirect: '/user/verify',
failureRedirect: '/user/signin',
failureFlash: true
})(req, res);
@@ -232,6 +234,7 @@ router.post('/signin', loggedOut, function(req, res, next) {
});
+
router.post('/user_profile/send_message', loggedIn, function(req, res, next) {
if (req.user.user_name === req.body.receiver_username) {
req.session.messages = {error : 'You cannot send a message to yourself.'};
@@ -374,10 +377,6 @@ router.post('/solution/vote/:examID/:qID/:solID', function(req, res, next){
res.redirect('/solutions/' + examID + '/' + qID);
}
-
-
-
-
});