diff --git a/controllers/bonfire.js b/controllers/bonfire.js index d9a2c7967d..3b98c1bef8 100644 --- a/controllers/bonfire.js +++ b/controllers/bonfire.js @@ -85,9 +85,9 @@ exports.returnNextBonfire = function(req, res, next) { }; exports.returnIndividualBonfire = function(req, res, next) { - var bonfireName = req.params.bonfireName; + var dashedName = req.params.bonfireName; - bonfireName = bonfireName.replace(/\-/g, ' '); + bonfireName = dashedName.replace(/\-/g, ' '); var bonfireNumber = 0; Bonfire.find({"name" : new RegExp(bonfireName, 'i')}, function(err, bonfire) { @@ -103,6 +103,7 @@ exports.returnIndividualBonfire = function(req, res, next) { res.render('bonfire/show', { completedWith: null, title: bonfire[bonfireNumber].name, + dashedName: dashedName, name: bonfire[bonfireNumber].name, difficulty: Math.floor(+bonfire[bonfireNumber].difficulty), brief: bonfire[bonfireNumber].description[0], diff --git a/controllers/resources.json b/controllers/resources.json index 0c9427e5bb..dc926ce9a8 100644 --- a/controllers/resources.json +++ b/controllers/resources.json @@ -149,47 +149,31 @@ "aced", "nailed", "rocked", - "scorched", - "devastated", "destroyed", "owned", "crushed", "conquered", - "killed", "shredded", - "annihilated", - "nuked", - "smashed", - "decimated", "demolished", "devoured", - "pulvarized", "banished", - "throttled", - "blew away", - "roundhoused", - "tangoed", - "wrangled", - "shot down", - "scarfed", - "grappled", - "incinerated" + "wrangled" ], "compliments": [ - "You've got the power!", - "Nicely done!", - "Rock and roll!", - "High five!", - "Bravo!", - "Yes!", - "Swoosh!", - "There is no try", - "Done and done!", - "You make this look easy", - "Terminated", + "Over the top!", + "Down the rabbit hole we go!", + "Somewhere over the rainbow!", + "Eye of the tiger!", + "Run, Forest, run!", + "Welcome to the Rock!", + "Bring that rain!", + "Target acquired!", + "Feel that need for speed!", + "You've got guts!", "We have liftoff!", "To infinity and beyond!", "Encore!", + "Onward, ho!", "Challenge destroyed!", "Power level 9000!", "Most efficient!", @@ -197,15 +181,15 @@ "You've got the touch!", "You're on fire!", "Don't hurt 'em, Hammer!", - "The town is now red", + "The town is now red!", "To the nines!", "Nothing but net!", - "Grumpy cat approves", - "The world rejoices", + "Grumpy cat approves!", + "The world rejoices!", "That's the way it's done!", "You rock!", "Woo-hoo!", - "We knew you could do it", + "We knew you could do it!", "Hyper Combo Finish!", "Nothing but net!", "Boom-shakalaka!", @@ -216,17 +200,22 @@ "Walk on that sunshine!", "Keep on trucking!", "Off the charts!", - "There is no spoon", + "There is no spoon!", "Cranked it up to 11!", "Escape velocity reached!", "You make this look easy!", "Passed with flying colors!", - "One step closer...", "You've got this!", - "Happy happy joy joy!", + "Happy, happy, joy, joy!", "Tomorrow, the world!", + "Your powers combined!", + "A winner is you!", + "It's alive. It's alive!", + "Sonic Boom!", "Here's looking at you, Code!", - "It's alive. It's alive!" + "The more you code!", + "Legen - wait for it - dary!", + "Ludicrous Speed! Go!" ], "phrases": [ "Shout it from on top of a mountain", diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade index 259634d536..272b1114af 100644 --- a/views/bonfire/show.jade +++ b/views/bonfire/show.jade @@ -125,7 +125,7 @@ block content - if (points && points > 2) - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/bonfires/#{number}&hashtags=learntocode, javascript" target="_blank") + a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/bonfires/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank") i.fa.fa-twitter   = phrase - else diff --git a/views/challenges/show.jade b/views/challenges/show.jade index ddb2fa6dce..79f75342cf 100644 --- a/views/challenges/show.jade +++ b/views/challenges/show.jade @@ -28,7 +28,7 @@ block content - if (cc) a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block.next-challenge-button(name='_csrf', value=_csrf, aria-hidden='true') Take me to my next challenge - if (points && points > 2) - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=learntocode, javascript" target="_blank") + a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=LearnToCode, JavaScript" target="_blank") i.fa.fa-twitter   = phrase - else