Merge branch 'master' of https://github.com/HumairAK/solutions_repo

2 files changed, 5 insertions, 10 deletions

diff --git a/routes/user.js b/routes/user.js
index ac7d761..698c4f8 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -7,7 +7,7 @@ var csrfProtection = csrf();
 router.use(csrfProtection); // router is protected
 
 
-router.get('/logout', function (req, res, next) {
+router.get('/logout', loggedIn, function (req, res, next) {
     req.logout();
     res.redirect('/');
 });
@@ -17,12 +17,12 @@ router.get('/user_profile', loggedIn, function(req, res, next) {
     res.render('user_profile_alt');
 });
 
-router.get('/signup', function(req, res, next) {
+router.get('/signup', loggedOut, function(req, res, next) {
     res.render('signup', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
     req.session.errors = null;
 });
 
-router.get('/signup/failed', function(req, res, next) {
+router.get('/signup/failed', loggedOut, function(req, res, next) {
     var msg = req.flash('error');
 
     res.render('signup', {csrfToken: req.csrfToken(),
@@ -31,8 +31,7 @@ router.get('/signup/failed', function(req, res, next) {
         flashMsg: msg});
 });
 
-
-router.get('/signin', function (req, res, next) {
+router.get('/signin', loggedOut, function (req, res, next) {
     var msg = req.flash('error');
     res.render('signin', {
         csrfToken: req.csrfToken(),
@@ -42,7 +41,6 @@ router.get('/signin', function (req, res, next) {
     });
 });
 
-
 router.post('/signup', loggedOut, function(req, res, next) {
     req.check('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();
@@ -91,13 +89,11 @@ router.post('/signin', loggedOut, function(req, res, next) {
         })(req, res);
 
     }
-    //res.redirect('/signup');
 
 });
 
 module.exports = router;
 
-
 function loggedIn(req, res, next) {
     if (req.isAuthenticated()) {
         return next();
@@ -105,7 +101,6 @@ function loggedIn(req, res, next) {
     res.redirect('/');
 }
 
-
 function loggedOut(req, res, next) {
     if (!req.isAuthenticated()) {
         return next();
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index 9140302..c9a6e4b 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -24,7 +24,7 @@
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-submenu">
-                            <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a>
+                            <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right pull-right"></i></a>
                             <ul class="dropdown-menu">
                                 <li><a tabindex="-1" href="/exams/csc108">CSC108</a></li>
                                 <li><a href="/exams/csc148">CSC148</a></li>