update
This commit is contained in:
parent
c2651785df
commit
170441c829
@ -51,23 +51,16 @@ router.get('/news', function(req, res, next) {
|
|||||||
res.render('news');
|
res.render('news');
|
||||||
});
|
});
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
//login / register page
|
|
||||||
=======
|
|
||||||
//learn more page
|
//learn more page
|
||||||
router.get('/learnmore', function(req, res, next) {
|
router.get('/learnmore', function(req, res, next) {
|
||||||
res.render('learnmore');
|
res.render('learnmore');
|
||||||
});
|
});
|
||||||
|
|
||||||
//login | register page
|
//login | register page
|
||||||
>>>>>>> Stashed changes
|
|
||||||
router.get('/login', function(req, res, next) {
|
router.get('/login', function(req, res, next) {
|
||||||
res.render('signuplogin');
|
res.render('signuplogin');
|
||||||
});
|
});
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
//login / register page
|
|
||||||
=======
|
|
||||||
//profile page
|
//profile page
|
||||||
router.get('/profile', function(req, res, next) {
|
router.get('/profile', function(req, res, next) {
|
||||||
res.render('profile');
|
res.render('profile');
|
||||||
@ -80,7 +73,6 @@ router.get('/forgotPassword', function(req, res, next) {
|
|||||||
|
|
||||||
|
|
||||||
//contact page
|
//contact page
|
||||||
>>>>>>> Stashed changes
|
|
||||||
router.get('/contact', function(req, res, next) {
|
router.get('/contact', function(req, res, next) {
|
||||||
res.render('contact');
|
res.render('contact');
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user