diff --git a/bower.json b/bower.json
index 2f4a054399..0d92dd37c2 100644
--- a/bower.json
+++ b/bower.json
@@ -24,6 +24,7 @@
"bootstrap": "~3.3.4",
"font-awesome": "~4.3.0",
"moment": "~2.10.2",
- "angular-bootstrap": "~0.13.0"
+ "angular-bootstrap": "~0.13.0",
+ "ramda": "~0.13.0"
}
}
diff --git a/controllers/fieldGuide.js b/controllers/fieldGuide.js
index a7d00fc97b..f8e35a47de 100644
--- a/controllers/fieldGuide.js
+++ b/controllers/fieldGuide.js
@@ -9,15 +9,17 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
var fieldGuideName = dashedName.replace(/\-/g, ' ');
- var completed = req.user.completedFieldGuides;
+ if (req.user) {
+ var completed = req.user.completedFieldGuides;
- var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
- if (completed.indexOf(elem) === -1) {
- return elem;
- }
- });
- req.user.uncompletedFieldGuides = uncompletedFieldGuides;
- req.user.save();
+ var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
+ if (completed.indexOf(elem) === -1) {
+ return elem;
+ }
+ });
+ req.user.uncompletedFieldGuides = uncompletedFieldGuides;
+ req.user.save();
+ }
FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuideFromMongo) {
if (err) {
@@ -59,7 +61,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 = FieldGuide.find({'_id': req.user.uncompletedFieldGuides[0]});
diff --git a/gulpfile.js b/gulpfile.js
index 4faab8e3ad..b8568baefc 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -57,7 +57,7 @@ gulp.task('sync', ['serve'], function() {
logLeval: 'debug',
files: ['public/js/lib/*/*.{js, jsx}'],
port: 3001,
- open: true,
+ open: false,
reloadDelay: reloadDelay
});
});
diff --git a/public/css/main.less b/public/css/main.less
index 4b632e2dbc..8d8986d47f 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -729,7 +729,7 @@ div.CodeMirror-scroll {
}
.test-vertical-center {
- margin-top: 15px;
+ margin-top: 8px;
}
.cm-s-monokai.CodeMirror {
@@ -1073,6 +1073,10 @@ hr {
border-radius: 5px;
}
+.grayed-out-test-output {
+ color: @gray-light;
+}
+
//uncomment this to see the dimensions of all elements outlined in red
//* {
// border-color: red;
diff --git a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js b/public/js/lib/bonfire/bonfireFramework_v0.1.3.js
similarity index 95%
rename from public/js/lib/bonfire/bonfireFramework_v0.1.2.js
rename to public/js/lib/bonfire/bonfireFramework_v0.1.3.js
index 2e68888f53..fb56ced9d0 100644
--- a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
+++ b/public/js/lib/bonfire/bonfireFramework_v0.1.3.js
@@ -197,11 +197,11 @@ var createTestDisplay = function() {
var testDoc = document.createElement("div");
if (test.err != null) {
$(testDoc)
- .html("
" + test.text + "
" + test.err + "
" + test.text + "
" + test.err + "
" + test.text + "
" + test.err + "
" + test.text + "
" + test.err + "
If you didn't see your city on this list, you should create your own Facebook group for your city. Please follow these steps:
",
@@ -318,7 +342,8 @@
" 
",
" Click the \"Upload a photo button. To start out, you'll probably just want to use Free Code Camp's banner (download it here), or a scenic shot of your city. Later you can update this with a picture from one of your city's Free Code Camp events.",
" 
",
- " Finally, message @quincylarson in Slack with a link to your city's group page and he'll include it here.",
+ " Message @quincylarson in Slack with a link to your city's group page and he'll include it here.",
+ " Join our #local-group-leaders channel on Slack, where we share ideas about involving campers in your city.",
" ",
" ",
" If you don't have a Facebook page, we strongly recommend you create one, even if it's just for the purpose of coordinating with campers in your city through this group.
",
@@ -343,10 +368,10 @@
" We're happy to do a quick interview for your publication or show. Here's whom you should contact about what, and how to best reach them:
",
" ",
" ",
- " - Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Slack.
",
- " - Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Slack.
",
- " - Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Slack.
",
- " - Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Slack and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Slack and @steelcitycoach on Twitter).",
+ "
- Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Slack.
",
+ " - Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Slack.
",
+ " - Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Slack.
",
+ " - Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Slack and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Slack and @steelcitycoach on Twitter).",
"
",
"
",
" We strive to be helpful and transparent in everything we do. We'll do what we can to help you share our community with your audience.
",
@@ -547,6 +572,30 @@
""
]
},
+ {
+ "_id": "bd7158d9c451eddfaeb5bdee",
+ "name": "What is Free Code Camp's Code of Conduct?",
+ "description": [
+ "",
+ "
Free Code Camp is friendly place to learn to code. We're committed to keeping it that way.
",
+ "
All campers are required to agree with the following code of conduct. We'll enforce this code. We're expecting cooperation from all campers in ensuring a friendly environment for everybody.
",
+ "
In short: be nice to your fellow campers.
",
+ "
Remember these 3 things and your fellow campers will like you:
",
+ "
",
+ " ",
+ " - Compliment your fellow campers when they do good work. Congratulate them when they accomplish something (like finishing a nonprofit project or getting a job).
",
+ " - Critique the work, not the camper doing it.
",
+ " - Only argue about something if it's important to the greater discussion.
",
+ "
",
+ "
",
+ "
Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).
",
+ "
We do not tolerate harassment of campers in any form, anywhere on Free Code Camp's online media (Slack, Twitch, etc.) or during pair programming. Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel, and any malicious hacking or social engineering.
",
+ "
If a camper engages in harassing behavior, our team will take any action we deem appropriate, up to and including banning them from Free Code Camp.
",
+ "
We want everyone to feel safe and respected. If you are being harassed or notice that someone else is being harassed, say something! Message @quincylarson, @terakilobyte and @codenonprofit in Slack (preferably with a screen shot of the offending language) so we can take fast action.
",
+ "
If you have questions about this code of conduct, email us at team@freecodecamp.com.
",
+ "
