From 189c183337cf3281056d313c4724536e450a46fd Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Wed, 27 Jul 2016 14:02:13 -0400
Subject: fixed tests to work again, added db connectivity, moved dbtests
 folder out so as not to interfere with mocha recursive search

---
 routes/user.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'routes')

diff --git a/routes/user.js b/routes/user.js
index ac9494f..a373393 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -158,13 +158,11 @@ router.get('/signin', loggedOut, function (req, res, next) {
     });
 });
 
-
 /** Render/GET verification page. */
 router.get('/verify', function(req, res, next) {
     res.render('verification', {noHeader: true, noFooter: true});
 });
 
-
 /** 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();
@@ -382,7 +380,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.
@@ -411,9 +408,6 @@ router.post('/follow_exam/:examID',function (req, res) {
     }
 });
 
-
-
-
 module.exports = router;
 
 /************** Route protection ********************/
-- 
cgit v1.2.3


From ceba1e6492485dba09ef2989a61c090480543072 Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Wed, 27 Jul 2016 17:06:53 -0400
Subject: added privacy and terms pages, added routes as well

---
 routes/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'routes')

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){
-- 
cgit v1.2.3