diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 514d473130..49b143fd43 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -24,7 +24,6 @@ exports.index = function(req, res) {
details: '',
tests: [],
challengeSeed: '',
- challengeEntryPoint: '',
cc: req.user ? req.user.bonfiresHash : undefined,
points: req.user ? req.user.points : undefined,
verb: resources.randomVerb(),
@@ -105,7 +104,6 @@ exports.returnIndividualBonfire = function(req, res, next) {
details: bonfire.description.slice(1),
tests: bonfire.tests,
challengeSeed: bonfire.challengeSeed,
- challengeEntryPoint: bonfire.challengeEntryPoint,
cc: !!req.user,
points: req.user ? req.user.points : undefined,
verb: resources.randomVerb(),
@@ -131,7 +129,6 @@ exports.returnGenerator = function(req, res) {
details: null,
tests: null,
challengeSeed: null,
- challengeEntryPoint: null,
bonfireHash: randomString()
});
};
@@ -160,7 +157,6 @@ exports.testBonfire = function(req, res) {
bonfireTests = req.body.tests,
bonfireDifficulty = req.body.difficulty,
bonfireDescription = req.body.description,
- bonfireEntryPoint = req.body.challengeEntryPoint,
bonfireChallengeSeed = req.body.challengeSeed;
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
@@ -176,7 +172,6 @@ exports.testBonfire = function(req, res) {
details: bonfireDescription.slice(1),
tests: bonfireTests,
challengeSeed: bonfireChallengeSeed,
- challengeEntryPoint: bonfireEntryPoint,
cc: req.user ? req.user.bonfiresHash : undefined,
points: req.user ? req.user.points : undefined,
verb: resources.randomVerb(),
@@ -202,7 +197,6 @@ exports.generateChallenge = function(req, res) {
bonfireTests = req.body.tests,
bonfireDifficulty = req.body.difficulty,
bonfireDescription = req.body.description,
- bonfireEntryPoint = req.body.challengeEntryPoint,
bonfireChallengeSeed = req.body.challengeSeed;
bonfireTests = bonfireTests.split('\r\n');
bonfireDescription = bonfireDescription.split('\r\n');
@@ -216,7 +210,6 @@ exports.generateChallenge = function(req, res) {
name: bonfireName,
difficulty: bonfireDifficulty,
description: bonfireDescription,
- challengeEntryPoint: bonfireEntryPoint,
challengeSeed: bonfireChallengeSeed,
tests: bonfireTests
};
diff --git a/controllers/courseware.js b/controllers/courseware.js
index fe48720a35..eca76fd68a 100644
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -72,23 +72,84 @@ exports.returnIndividualCourseware = function(req, res, next) {
return res.redirect('../coursewares/' + dashedNameFull);
}
- // Render the view for the user
- res.render('coursewares/show', {
- title: courseware.name,
- dashedName: dashedName,
- name: courseware.name,
- brief: courseware.description[0],
- details: courseware.description.slice(1),
- tests: courseware.tests,
- challengeSeed: courseware.challengeSeed,
- cc: !!req.user,
- points: req.user ? req.user.points : undefined,
- verb: resources.randomVerb(),
- phrase: resources.randomPhrase(),
- compliment: resources.randomCompliment(),
- coursewareHash: courseware._id,
- environment: resources.whichEnvironment()
- });
+ var challengeType = {
+ 0 : function() {
+ res.render('coursewares/show', {
+ title: courseware.name,
+ dashedName: dashedName,
+ name: courseware.name,
+ brief: courseware.description[0],
+ details: courseware.description.slice(1),
+ tests: courseware.tests,
+ challengeSeed: courseware.challengeSeed,
+ cc: !!req.user,
+ points: req.user ? req.user.points : undefined,
+ verb: resources.randomVerb(),
+ phrase: resources.randomPhrase(),
+ compliment: resources.randomCompliment(),
+ coursewareHash: courseware._id,
+ environment: resources.whichEnvironment()
+ });
+ },
+
+ 1 : function() {
+ res.render('coursewares/showJS', {
+ title: courseware.name,
+ dashedName: dashedName,
+ name: courseware.name,
+ brief: courseware.description[0],
+ details: courseware.description.slice(1),
+ tests: courseware.tests,
+ challengeSeed: courseware.challengeSeed,
+ cc: !!req.user,
+ points: req.user ? req.user.points : undefined,
+ verb: resources.randomVerb(),
+ phrase: resources.randomPhrase(),
+ compliment: resources.randomCompliment(),
+ coursewareHash: courseware._id,
+ environment: resources.whichEnvironment(),
+
+ });
+ },
+
+ 2: function() {
+ res.render('coursewares/showVideo', {
+ title: courseware.name,
+ dashedName: dashedName,
+ name: courseware.name,
+ details: courseware.description,
+ tests: courseware.tests,
+ video: courseware.challengeSeed[0],
+ cc: !!req.user,
+ points: req.user ? req.user.points : undefined,
+ verb: resources.randomVerb(),
+ phrase: resources.randomPhrase(),
+ compliment: resources.randomCompliment(),
+ coursewareHash: courseware._id,
+ environment: resources.whichEnvironment()
+ });
+ }
+ };
+
+ return challengeType[courseware.challengeType]();
+
+ //// Render the view for the user
+ //res.render('coursewares/show', {
+ // title: courseware.name,
+ // dashedName: dashedName,
+ // name: courseware.name,
+ // brief: courseware.description[0],
+ // details: courseware.description.slice(1),
+ // tests: courseware.tests,
+ // challengeSeed: courseware.challengeSeed,
+ // cc: !!req.user,
+ // points: req.user ? req.user.points : undefined,
+ // verb: resources.randomVerb(),
+ // phrase: resources.randomPhrase(),
+ // compliment: resources.randomCompliment(),
+ // coursewareHash: courseware._id,
+ // environment: resources.whichEnvironment()
+ //});
});
};
diff --git a/models/Bonfire.js b/models/Bonfire.js
index d8785f7196..cee4c8413a 100644
--- a/models/Bonfire.js
+++ b/models/Bonfire.js
@@ -15,8 +15,7 @@ var bonfireSchema = new mongoose.Schema({
difficulty: String,
description: Array,
tests: Array,
- challengeSeed: String,
- challengeEntryPoint: String,
+ challengeSeed: String
});
module.exports = mongoose.model('Bonfire', bonfireSchema);
diff --git a/public/js/lib/bonfire/bonfireFramework_v0.1.1.js b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
similarity index 96%
rename from public/js/lib/bonfire/bonfireFramework_v0.1.1.js
rename to public/js/lib/bonfire/bonfireFramework_v0.1.2.js
index 03d531a5a0..4b2edebb0e 100644
--- a/public/js/lib/bonfire/bonfireFramework_v0.1.1.js
+++ b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
@@ -73,11 +73,10 @@ var editorValue;
var challengeSeed = challengeSeed || null;
var tests = tests || [];
-var challengeEntryPoint = challengeEntryPoint || null;
if (challengeSeed !== null) {
- editorValue = challengeSeed + '\n\n' + challengeEntryPoint;
+ editorValue = challengeSeed;
} else {
editorValue = nonChallengeValue;
}
@@ -121,9 +120,7 @@ function bonfireExecute() {
userJavaScript = removeComments(userJavaScript);
userJavaScript = scrapeTests(userJavaScript);
// simple fix in case the user forgets to invoke their function
- if (challengeEntryPoint && challengeSeed) {
- //userJavaScript = challengeEntryPoint + ' ' + userJavaScript;
- }
+
submit(userJavaScript, function(cls, message) {
if (cls) {
codeOutput.setValue(message.error);
diff --git a/public/js/lib/coursewares/coursewaresFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
similarity index 100%
rename from public/js/lib/coursewares/coursewaresFramework_v0.1.1.js
rename to public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
diff --git a/public/js/lib/coursewares/coursewaresJSFramework.js b/public/js/lib/coursewares/coursewaresJSFramework.js
new file mode 100644
index 0000000000..72a24eff4d
--- /dev/null
+++ b/public/js/lib/coursewares/coursewaresJSFramework.js
@@ -0,0 +1,245 @@
+var widgets = [];
+var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
+ lineNumbers: true,
+ mode: "javascript",
+ theme: 'monokai',
+ runnable: true,
+ lint: true,
+ matchBrackets: true,
+ autoCloseBrackets: true,
+ scrollbarStyle: 'null',
+ lineWrapping: true,
+ gutters: ["CodeMirror-lint-markers"],
+ onKeyEvent: doLinting
+});
+var editor = myCodeMirror;
+editor.setSize("100%", "auto");
+
+// Hijack tab key to enter two spaces intead
+editor.setOption("extraKeys", {
+ Tab: function(cm) {
+ var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+ cm.replaceSelection(spaces);
+ },
+ "Ctrl-Enter": function() {
+ bonfireExecute();
+ return false;
+ }
+});
+
+
+
+var attempts = 0;
+if (attempts) {
+ attempts = 0;
+}
+
+// Default value for editor if one isn't provided in (i.e. a challenge)
+var nonChallengeValue = '/*Welcome to Bonfire, Free Code Camp\'s future CoderByte replacement.\n' +
+ 'Please feel free to use Bonfire as an in-browser playground and linting tool.\n' +
+ 'Note that you can also write tests using Chai.js by using the keywords assert and expect */\n\n' +
+ 'function test() {\n' +
+ ' assert(2 !== 3, "2 is not equal to 3");\n' +
+ ' return [1,2,3].map(function(elem) {\n' +
+ ' return elem * elem;\n' +
+ ' });\n' +
+ '}\n' +
+ 'expect(test()).to.be.a("array");\n\n' +
+ 'assert.deepEqual(test(), [1,4,9]);\n\n' +
+ 'var foo = test();\n' +
+ 'foo.should.be.a("array");\n\n' +
+ 'test();\n';
+
+var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
+ lineNumbers: false,
+ mode: "text",
+ theme: 'monokai',
+ readOnly: 'nocursor',
+ lineWrapping: true
+});
+
+codeOutput.setValue('/**\n' +
+' * Your output will go here.\n' + ' * Console.log() -type statements\n' +
+' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' +
+' */');
+codeOutput.setSize("100%", "100%");
+var info = editor.getScrollInfo();
+var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
+if (info.top + info.clientHeight < after)
+ editor.scrollTo(null, after - info.clientHeight + 3);
+
+var editorValue;
+
+
+var challengeSeed = challengeSeed || null;
+var tests = tests || [];
+
+var allSeeds = '';
+(function() {
+ challengeSeed.forEach(function(elem) {
+ allSeeds += elem + '\n';
+ });
+})();
+
+editorValue = allSeeds;
+
+
+myCodeMirror.setValue(editorValue);
+
+function doLinting () {
+ editor.operation(function () {
+ for (var i = 0; i < widgets.length; ++i)
+ editor.removeLineWidget(widgets[i]);
+ widgets.length = 0;
+ JSHINT(editor.getValue());
+ for (var i = 0; i < JSHINT.errors.length; ++i) {
+ var err = JSHINT.errors[i];
+ if (!err) continue;
+ var msg = document.createElement("div");
+ var icon = msg.appendChild(document.createElement("span"));
+ icon.innerHTML = "!!";
+ icon.className = "lint-error-icon";
+ msg.appendChild(document.createTextNode(err.reason));
+ msg.className = "lint-error";
+ widgets.push(editor.addLineWidget(err.line - 1, msg, {
+ coverGutter: false,
+ noHScroll: true
+ }));
+ }
+ });
+};
+
+$('#submitButton').on('click', function () {
+ bonfireExecute();
+});
+
+function bonfireExecute() {
+ attempts++;
+ ga('send', 'event', 'Challenge', 'ran-code', challengeName);
+ userTests= null;
+ $('#codeOutput').empty();
+ var userJavaScript = myCodeMirror.getValue();
+ userJavaScript = removeComments(userJavaScript);
+ userJavaScript = scrapeTests(userJavaScript);
+ // simple fix in case the user forgets to invoke their function
+
+ submit(userJavaScript, function(cls, message) {
+ if (cls) {
+ codeOutput.setValue(message.error);
+ runTests('Error', null);
+ } else {
+ codeOutput.setValue(message.output);
+ message.input = removeLogs(message.input);
+ runTests(null, message);
+ }
+ });
+}
+
+
+var userTests;
+var testSalt = Math.random();
+
+
+var scrapeTests = function(userJavaScript) {
+
+ // insert tests from mongo
+ for (var i = 0; i < tests.length; i++) {
+ userJavaScript += '\n' + tests[i];
+ }
+
+ var counter = 0;
+ var regex = new RegExp(/(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/);
+ var match = regex.exec(userJavaScript);
+ while (match != null) {
+ var replacement = '//' + counter + testSalt;
+ userJavaScript = userJavaScript.substring(0, match.index) + replacement + userJavaScript.substring(match.index + match[0].length);
+
+ if (!userTests) {
+ userTests= [];
+ }
+ userTests.push({"text": match[0], "line": counter, "err": null});
+ counter++;
+ match = regex.exec(userJavaScript);
+ }
+
+ return userJavaScript;
+};
+
+function removeComments(userJavaScript) {
+ var regex = new RegExp(/(\/\*[^(\*\/)]*\*\/)|\/\/[^\n]*/g);
+ return userJavaScript.replace(regex, '');
+}
+
+function removeLogs(userJavaScript) {
+ return userJavaScript.replace(/(console\.[\w]+\s*\(.*\;)/g, '');
+}
+
+var pushed = false;
+var createTestDisplay = function() {
+ if (pushed) {
+ userTests.pop();
+ }
+ for (var i = 0; i < userTests.length;i++) {
+ var test = userTests[i];
+ var testDoc = document.createElement("div");
+ if (test.err != null) {
+ $(testDoc)
+ .html("
" + test.text + "
" + test.err + "