gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected

Browse Source
This commit is contained in:
Nathan Leniz
2015-02-04 23:27:57 -05:00
parent adfe5588d6
commit 5898de7ab9
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/bonfire.js
View File

@ -59,8 +59,14 @@ exports.returnNextBonfire = function(req, res) {
next(err);
}
bonfire = bonfire.pop();
if (bonfire === undefined) {
req.flash('errors', {
msg: "It looks like you've completed all the bonfires we have available. Good job!"
})
return res.redirect('../bonfires/meet-bonfire');
}
nameString = bonfire.name.toLowerCase().replace(/\s/g, '-');
return res.redirect('/bonfires/' + nameString);
return res.redirect('../bonfires/' + nameString);
});
};

13
controllers/courseware.js
View File

@ -38,10 +38,13 @@ exports.returnNextCourseware = function(req, res) {
}
courseware = courseware.pop();
if (courseware === undefined) {
req.flash('errors', {
msg: "It looks like you've completed all the courses we have available. Good job!"
})
return res.redirect('../coursewares/intro');
}
nameString = courseware.name.toLowerCase().replace(/\s/g, '-');
return res.redirect('/coursewares/' + nameString);
return res.redirect('../coursewares/' + nameString);
});
};
@ -54,13 +57,17 @@ exports.returnIndividualCourseware = function(req, res, next) {
if (err) {
next(err);
}
if (courseware.length < 1) {
courseware = courseware.pop();
var dashedNameFull = courseware.name.toLowerCase().replace(/\s/g, '-');
if (dashedNameFull != dashedName) {
return res.redirect('../coursewares/' + dashedNameFull);
}
if (courseware.length < 1) {
req.flash('errors', {
msg: "404: We couldn't find a challenge with that name. Please double check the name."
});
return res.redirect('/coursewares')
} else {
courseware = courseware.pop();
res.render('coursewares/show', {
title: courseware.name,
dashedName: dashedName,