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

Resolve merge conflicts using Webstorm's merge integration tool.

Browse Source
This commit is contained in:
terakilobyte
2015-04-17 00:11:13 -04:00
parent 56e45ba9dd 9c67d4988f
commit b49d2fd343
23 changed files with 1159 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
controllers/bonfire.js
View File

@@ -175,7 +175,7 @@ function getMDNlinks(links) {
return populatedLinks;
};
}
/**
*
@@ -187,11 +187,11 @@ exports.testBonfire = function(req, res) {
bonfireDifficulty = req.body.difficulty,
bonfireDescription = req.body.description,
bonfireChallengeSeed = req.body.challengeSeed;
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
bonfireTests.filter(getRidOfEmpties);
bonfireDescription.filter(getRidOfEmpties);
bonfireChallengeSeed = bonfireChallengeSeed.replace('\r', '');
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
bonfireTests.filter(getRidOfEmpties);
bonfireDescription.filter(getRidOfEmpties);
bonfireChallengeSeed = bonfireChallengeSeed.replace('\r', '');
res.render('bonfire/show', {
completedWith: null,
@@ -228,11 +228,11 @@ exports.generateChallenge = function(req, res) {
bonfireDifficulty = req.body.difficulty,
bonfireDescription = req.body.description,
bonfireChallengeSeed = req.body.challengeSeed;
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
bonfireTests.filter(getRidOfEmpties);
bonfireDescription.filter(getRidOfEmpties);
bonfireChallengeSeed = bonfireChallengeSeed.replace('\r', '');
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
bonfireTests.filter(getRidOfEmpties);
bonfireDescription.filter(getRidOfEmpties);
bonfireChallengeSeed = bonfireChallengeSeed.replace('\r', '');
var response = {
@@ -306,7 +306,6 @@ exports.completedBonfire = function (req, res, next) {
}
});
} else {
console.log('look here!', bonfireName);
req.user.completedBonfires.push({
_id: bonfireHash,
name: bonfireName,