From 5dbbb935a5252f106eaf01a10461c19fbb805634 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sat, 18 Oct 2014 00:46:30 -0700 Subject: [PATCH] thrashing on the routes a bit --- app.js | 6 ++-- controllers/challenge.js | 35 +++++++++++++++++++ .../first_pair_programming_session.jade | 3 ++ views/challenge/index.jade | 3 +- views/course/index.jade | 2 +- 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 controllers/challenge.js create mode 100644 views/challenge/first_pair_programming_session.jade diff --git a/app.js b/app.js index ae1c3301e53..d8034bacacb 100644 --- a/app.js +++ b/app.js @@ -126,10 +126,10 @@ app.get('/courses/:id', courseController.view); app.get('/courses', courseController.index); app.get('/challenges/:id', challengeController.view); app.get('/challenges', challengeController.index); -app.get('/challenges/first_website', challengeController.firstWebsite) +//app.get('/challenges/first_website', challengeController.firstWebsite) app.get('/challenges/first_pair_programming_session', challengeController.firstPairProgrammingSession) -app.get('/challenges/first_dynamic_website', challengeController.firstDynamicWebsite) -app.get('/challenges/first_codepen', challengeController.firstCodePen) +//app.get('/challenges/first_dynamic_website', challengeController.firstDynamicWebsite) +//app.get('/challenges/first_codepen', challengeController.firstCodePen) app.get('/login', userController.getLogin); app.post('/login', userController.postLogin); app.get('/logout', userController.logout); diff --git a/controllers/challenge.js b/controllers/challenge.js new file mode 100644 index 00000000000..f58922793f3 --- /dev/null +++ b/controllers/challenge.js @@ -0,0 +1,35 @@ +/** + * GET / + * Home page. + */ +var Challenge = require('./../models/Challenge') + +exports.index = function(req, res) { + Challenge.find(function(err, challenges){ + res.render('challenge/index', { + title: 'Challenges', + challenges: challenges + }); + }); +}; +exports.view = function(req, res) { + Challenge.findById(req.param.id, function(err, challenge){ + res.render('challenge/view', { + title: 'Challenge', + challenge: challenge + }); + }); +}; +exports.firstPairProgrammingSession = function(req, res) { + Challenge.findOne({ name: "Start Your First Pair Programming Session" }).exec (function(err, challenge) { + res.render('challenge/first_pair_programming_session', { + title: 'Challenge', + challenge: challenge + }); + }); +}; + +//firstPairProgrammingSession +//firstCodePen +//firstDynamicWebsite +//firstWebsite \ No newline at end of file diff --git a/views/challenge/first_pair_programming_session.jade b/views/challenge/first_pair_programming_session.jade new file mode 100644 index 00000000000..25f2dd47746 --- /dev/null +++ b/views/challenge/first_pair_programming_session.jade @@ -0,0 +1,3 @@ +extends ../layout +block content + li= challenge.name \ No newline at end of file diff --git a/views/challenge/index.jade b/views/challenge/index.jade index 03a48f5b4c9..53eb2c2fee8 100644 --- a/views/challenge/index.jade +++ b/views/challenge/index.jade @@ -2,4 +2,5 @@ extends ../layout block content each challenge in challenges li - a(href="/challenges/#{challenge._id}") #{challenge.name} \ No newline at end of file + a(href="/challenges/#{challenge._id}") #{challenge.name} + TEST \ No newline at end of file diff --git a/views/course/index.jade b/views/course/index.jade index fa640a7472e..540c7303b95 100644 --- a/views/course/index.jade +++ b/views/course/index.jade @@ -2,4 +2,4 @@ extends ../layout block content each course in courses li - a(href="/courses/#{course._id}") #{course.name} + a(href="/courses/#{course._id}") #{course.name} \ No newline at end of file