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

2 files changed, 10 insertions, 6 deletions

diff --git a/routes/index.js b/routes/index.js
index 4117e41..b2a90dc 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -23,6 +23,16 @@ router.get('/about', function(req, res, next) {
     res.render('about');
 });
 
+/** Serve the terms_and_conditions.hbs page */
+router.get('/terms_and_conditions', function(req, res, next) {
+    res.render('terms_and_conditions');
+});
+
+/** Serve the privacy_poicy.hbs page */
+router.get('/privacy_policy', function(req, res, next) {
+    res.render('privacy_policy');
+});
+
 
 /** Serve the profile page of a user with given username */
 router.get('/public_profile/:username', function(req,res,next){
diff --git a/routes/user.js b/routes/user.js
index c40d64f..8f73f21 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -158,7 +158,6 @@ router.get('/signin', loggedOut, function (req, res, next) {
     });
 });
 
-
 /** Render/GET verification page. */
 router.get('/verify', function(req, res, next) {
     if (req.user && req.user.email) {
@@ -169,7 +168,6 @@ router.get('/verify', function(req, res, next) {
 
 });
 
-
 /** Retrieves infomation from the signup form, form validates and sends it to passport.js to authenticate. */
 router.post('/signup', loggedOut, function(req, res, next) {
     req.assert('fname', 'Please enter a valid first name.').notEmpty().withMessage('First name required.').isAlpha();
@@ -387,7 +385,6 @@ router.post('/solution/vote/:examID/:qID/:solID', function(req, res, next){
 
 });
 
-
 /**
  * Retrieves information about the exam following button, redirects if there is an error, and shows an error alert
  * if the user is not logged in.
@@ -416,9 +413,6 @@ router.post('/follow_exam/:examID',function (req, res) {
     }
 });
 
-
-
-
 module.exports = router;
 
 /************** Route protection ********************/