greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

pull/797/merge
Quincy Larson 2015-06-01 13:56:03 -07:00
parent 0a471b7847 73de78bbad
commit c1b560896f
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
controllers/fieldGuide.js
View File

@ -1,12 +1,10 @@
var R = require('ramda'),
FieldGuide = require('./../models/FieldGuide'),
resources = require('./resources');
resources = require('./resources'),
debug = require('debug')('freecc:fieldguides');
exports.returnIndividualFieldGuide = function(req, res, next) {
var dashedName = req.params.fieldGuideName;
var fieldGuideName = dashedName.replace(/\-/g, ' ');
if (req.user) {
var completed = req.user.completedFieldGuides;
@ -22,7 +20,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
}
FieldGuide.find(
{ name: new RegExp(fieldGuideName, 'i') },
{ dashedName: new RegExp(dashedName, 'i') },
function(err, fieldGuideFromMongo) {
if (err) {
return next(err);
@ -38,11 +36,10 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
}
var fieldGuide = R.head(fieldGuideFromMongo);
var dashedNameFull =
fieldGuide.name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, '');
if (dashedNameFull !== dashedName) {
return res.redirect('../field-guide/' + dashedNameFull);
if (fieldGuide.dashedName !== dashedName) {
return res.redirect('../field-guide/' + fieldGuide.dashedName);
}
res.render('field-guide/show', {
title: fieldGuide.name,
@ -68,7 +65,7 @@ exports.showAllFieldGuides = function(req, res) {
exports.returnNextFieldGuide = function(req, res, next) {
if (!req.user) {
return res.redirect('/field-guide/how-do-i-use-this-guide?');
return res.redirect('/field-guide/how-do-i-use-this-guide');
}
var displayedFieldGuides =
@ -89,7 +86,7 @@ exports.returnNextFieldGuide = function(req, res, next) {
].join('')
});
}
return res.redirect('../field-guide/how-do-i-use-this-guide?');
return res.redirect('../field-guide/how-do-i-use-this-guide');
}
var nameString = fieldGuide.name.toLowerCase().replace(/\s/g, '-');
return res.redirect('../field-guide/' + nameString);

5
controllers/resources.js
View File

@ -449,7 +449,10 @@ module.exports = {
return allFieldGuideNames;
} else {
allFieldGuideNames = fieldGuides.map(function (elem) {
return { name: elem.name, id: elem._id };
return {
name: elem.name,
dashedName: elem.dashedName,
id: elem._id };
});
return allFieldGuideNames;
}

2
controllers/story.js
View File

@ -346,8 +346,6 @@ exports.storySubmission = function(req, res, next) {
// if duplicate storyLink add unique number
storyLink = (storyCount === 0) ? storyLink : storyLink + ' ' + storyCount;
debug(storyLink);
var link = data.link;
if (link.search(/^https?:\/\//g) === -1) {
link = 'http://' + link;

2
seed_data/storyCleanup.js
View File

@ -18,8 +18,8 @@ function storyLinkCleanup(cb) {
console.log(i++);
this.pause();
story.storyLink = story.storyLink.
replace(/\s+/g, ' ').
replace(/[^a-z0-9\s]/gi, '').
replace(/\s+/g, ' ').
toLowerCase().
trim();
story.save(function (err) {

4
views/field-guide/all-articles.jade
View File

@ -14,11 +14,11 @@ block content
.hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center
.col-xs-12.col-sm-9.col-md-10
li.faded
a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name
a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name
else
.row
.hidden-xs.col-sm-3.col-md-2
span
.col-xs-12.col-sm-9.col-md-10
li
a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name
a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name