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

Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

Browse Source
This commit is contained in:
Michael Q Larson
2015-02-04 16:43:11 -08:00
parent 829ace0365 26ee23ddf9
commit 0d854de438
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/bonfire.js
View File

@ -34,7 +34,7 @@ exports.index = function(req, res) {
exports.returnNextBonfire = function(req, res, next) { exports.returnNextBonfire = function(req, res, next) {
if (!req.user) { if (!req.user) {
return res.redirect('bonfires/meet-bonfire'); return res.redirect('../bonfires/meet-bonfire');
} }
var currentTime = parseInt(+new Date() / 1000); var currentTime = parseInt(+new Date() / 1000);
if (currentTime - req.user.lastContentSync > 10) { if (currentTime - req.user.lastContentSync > 10) {
@ -96,7 +96,7 @@ exports.returnIndividualBonfire = function(req, res, next) {
} }
var dashedNameFull = bonfire[bonfireNumber].name.toLowerCase().replace(/\s/g, '-'); var dashedNameFull = bonfire[bonfireNumber].name.toLowerCase().replace(/\s/g, '-');
if (dashedNameFull != dashedName) { if (dashedNameFull != dashedName) {
return res.redirect('/bonfires/' + dashedNameFull); return res.redirect('../bonfires/' + dashedNameFull);
} }
if (bonfire.length < 1) { if (bonfire.length < 1) {
req.flash('errors', { req.flash('errors', {

BIN
public/fonts/glyphicons-halflings-regular.eot Normal file
View File

Binary file not shown.

17
seed_data/bonfires.json
View File

@ -149,22 +149,23 @@
"expect(sumAll([10, 5])).to.equal(45);" "expect(sumAll([10, 5])).to.equal(45);"
] ]
}, },
{ {
"_id": "a5229172f011153519423690", "_id": "a5229172f011153519423690",
"name": "Sum All Odd Fibonacci Numbers", "name": "Sum All Odd Fibonacci Numbers",
"difficulty": "2.01",
"description": [ "description": [
"Return the sum of all odd fibonacci numbers up to and including the passed number.", "Return the sum of all odd fibonacci numbers up to and including the passed number if it is a fibonacci number.",
"Starting from 1, the first few numbers of a Fibonacci sequence are 1, 2, 3, 5 and 8, and each subsequent number is the sum of the previous two numbers." "The first few numbers of the Fibonacci sequence are 1, 1, 2, 3, 5 and 8, and each subsequent number is the sum of the previous two numbers.",
"As an example, passing 4 to the function should return 5 because all the odd fibonacci numbers under 4 are 1, 1, and 3."
], ],
"challengeEntryPoint": "sumFibs(1000);", "challengeEntryPoint": "sumFibs(4);",
"challengeSeed": "function sumFibs(num) {\n return num;\r\n}", "challengeSeed": "function sumFibs(num) {\n return num;\r\n}",
"tests": [ "tests": [
"expect(sumFibs(1)).to.be.a('number');", "expect(sumFibs(1)).to.be.a('number');",
"expect(sumFibs(1000)).to.equal(3382);", "expect(sumFibs(1000)).to.equal(1785);",
"expect(sumFibs(4000000)).to.equal(10316619);", "expect(sumFibs(4000000)).to.equal(4613732);",
"expect(sumFibs(4)).to.equal(10);" "expect(sumFibs(4)).to.equal(5);",
"expect(sumFibs(75024)).to.equal(60696);",
"expect(sumFibs(75025)).to.equal(135721);"
] ]
}, },
{ {