From 5d71b87027445272830e819834d4e2e6b250720d Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 10:32:59 -0700 Subject: [PATCH 01/17] fix another typo in html curriculum --- seed_data/challenges/basic-html5-and-css.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 7a3a07c47a..b99b57317c 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -2420,8 +2420,7 @@ "description": [ "Let's try this again, but with margin this time. Use Clockwise Notation to give an element a margin of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.", "Instead of specifying an element's margin-top, margin-right, margin-bottom, and margin-left attributes, you can specify them all in one line, like this: margin: 10px 20px 10px 20px;.", - "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific padding instructions.", - "You can also use this notation for margins!" + "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions." ], "tests": [ "assert($('.green-box').css('margin-top') === '40px', 'Your green-box class should give the top of elements 40px of margin.')", From 673a61715106c712a8a594075919e88c78d02510 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 14:29:45 -0700 Subject: [PATCH 02/17] create pair, help, bug modals --- controllers/resources.js | 10 ++-- public/js/main_0.0.2.js | 26 +++++++--- views/coursewares/showBonfire.jade | 13 ++--- views/coursewares/showHTML.jade | 6 ++- views/coursewares/showJS.jade | 7 +-- views/coursewares/showVideo.jade | 7 +-- views/coursewares/showZiplineOrBasejump.jade | 9 ++-- views/partials/challenge-modals.jade | 52 ++++++++++++++++++++ 8 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 views/partials/challenge-modals.jade diff --git a/controllers/resources.js b/controllers/resources.js index 7ccc73e9a8..a901ce5811 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -607,8 +607,8 @@ module.exports = { var challenge = req.body.payload.challenge; slack.send({ - text: "*" + userName + "* wants help with " + challenge + ". " + - code + "Hey, *" + userName + "*, if no one helps you right " + + text: "*@" + userName + "* wants help with " + challenge + ". " + + code + "Hey, *@" + userName + "*, if no one helps you right " + "away, try typing out your problem in detail to me. Like this: " + "http://en.wikipedia.org/wiki/Rubber_duck_debugging", channel: '#help', @@ -622,11 +622,11 @@ module.exports = { var userName = req.user.profile.username; var challenge = req.body.payload.challenge; slack.send({ - text: "Anyone want to pair with @" + userName + " on " + challenge + - "?\nMake sure you install Screen Hero here:" + + text: "Anyone want to pair with *@" + userName + "* on " + challenge + + "?\nMake sure you install Screen Hero here: " + "http://freecodecamp.com/field-guide/how-do-i-install-screenhero\n" + "Then start your pair program session with *" + userName + - "* by typing \"/hero @" + userName + "\" into Slack.\n And *"+ userName + + "* by typing \"/hero @" + userName + "\" into Slack.\n And *@"+ userName + "*, be sure to launch Screen Hero, then keep coding. " + "Another camper may pair with you soon.", channel: '#letspair', diff --git a/public/js/main_0.0.2.js b/public/js/main_0.0.2.js index b2791bdaeb..8aaf409219 100644 --- a/public/js/main_0.0.2.js +++ b/public/js/main_0.0.2.js @@ -17,7 +17,7 @@ $(document).ready(function() { setCSRFToken($('meta[name="csrf-token"]').attr('content')); $('#i-want-help').on('click', function() { - /* + $('#help-modal').modal('hide'); var editorValue = editor.getValue(); var currentLocation = window.location.href; $.post( @@ -34,11 +34,10 @@ $(document).ready(function() { } } ); - */ }); $('#i-want-help-editorless').on('click', function() { - /* + $('#help-modal-editorless').modal('hide'); var currentLocation = window.location.href; $.post( '/get-help', @@ -53,14 +52,15 @@ $(document).ready(function() { } } ); - */ }); $('#report-issue').on('click', function() { - window.open('https://github.com/freecodecamp/freecodecamp/issues/new?title=Challenge '+ window.location.href +' has an issue &body=Please%20tell%20us%20in%20detail%20here%20how%20we%20can%20make%20this%20challenge%20better.', '_blank') + $('#issue-modal').modal('hide'); + window.open('https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge '+ window.location.href +' has an issue. Please describe how to reproduce it, and include links to screen shots if possible.', '_blank') }); $('#i-want-to-pair').on('click', function() { + $('#pair-modal').modal('hide'); var currentLocation = window.location.href; $.post( '/get-pair', @@ -134,8 +134,20 @@ $(document).ready(function() { $(this).unbind("error").attr("src", "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png"); }); - $('#completed-courseware').on('click', function() { - $('#complete-courseware-dialog').modal('show'); + $('#trigger-pair-modal').on('click', function() { + $('#pair-modal').modal('show'); + }); + + $('#trigger-help-modal').on('click', function() { + $('#help-modal').modal('show'); + }); + + $('#trigger-help-editorless-modal').on('click', function() { + $('#help-editorless-modal').modal('show'); + }); + + $('#trigger-issue-modal').on('click', function() { + $('#issue-modal').modal('show'); }); $('#completed-zipline-or-basejump').on('click', function() { diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade index 8535dc1d54..471be7dc68 100644 --- a/views/coursewares/showBonfire.jade +++ b/views/coursewares/showBonfire.jade @@ -94,13 +94,13 @@ block content if (user && user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified - label.btn.btn-success#i-want-help(disabled) + label.btn.btn-success#trigger-help-modal i.fa.fa-medkit - |   Help(disabled) - label.btn.btn-success#i-want-to-pair + |   Help + label.btn.btn-success#trigger-pair-modal i.fa.fa-user-plus |   Pair - label.btn.btn-success#report-issue + label.btn.btn-success#trigger-issue-modal i.fa.fa-bug |   Bug .button-spacer @@ -142,14 +142,15 @@ block content - if (user.progressTimestamps.length > 2) - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") + a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") i.fa.fa-twitter   = phrase - else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress - + include ../partials/challenge-modals script. var MDNlinks = !{JSON.stringify(MDNlinks)}; if (!MDNlinks.length) { $('#MDN-links').addClass('collapse'); } + diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade index 34d0d268ed..3d9677811a 100644 --- a/views/coursewares/showHTML.jade +++ b/views/coursewares/showHTML.jade @@ -46,10 +46,10 @@ block content if (user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified - label.btn.btn-success#i-want-help(disabled) + label.btn.btn-success#trigger-help-modal i.fa.fa-medkit |   Help(disabled) - label.btn.btn-success#report-issue + label.btn.btn-success#trigger-issue-modal i.fa.fa-bug |   Bug .button-spacer @@ -92,3 +92,5 @@ block content span.completion-icon.ion-checkmark-circled.text-primary a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js") + include ../partials/challenge-modals + diff --git a/views/coursewares/showJS.jade b/views/coursewares/showJS.jade index f6d6f62979..5c24f9ea90 100644 --- a/views/coursewares/showJS.jade +++ b/views/coursewares/showJS.jade @@ -38,13 +38,13 @@ block content if (user && user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified - label.btn.btn-success#i-want-help + label.btn.btn-success#trigger-help-modal i.fa.fa-medkit |   Help - label.btn.btn-success#i-want-to-pair + label.btn.btn-success#trigger-pair-modal i.fa.fa-user-plus |   Pair - label.btn.btn-success#report-issue + label.btn.btn-success#trigger-issue-modal i.fa.fa-bug |   Bug .spacer @@ -85,3 +85,4 @@ block content = phrase - else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + include ../partials/challenge-modals diff --git a/views/coursewares/showVideo.jade b/views/coursewares/showVideo.jade index 9cd162988d..c180258626 100644 --- a/views/coursewares/showVideo.jade +++ b/views/coursewares/showVideo.jade @@ -23,10 +23,10 @@ block content .button-spacer if (user.sentSlackInvite) .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#i-want-help-editorless(disabled) + .btn.btn-success.btn-big#trigger-help-editorless-modal i.fa.fa-medkit - |   Get help(disabled) - .btn.btn-success.btn-big#report-issue + |   Get help + .btn.btn-success.btn-big#trigger-issue-modal i.fa.fa-bug |   Report a bug .button-spacer @@ -84,3 +84,4 @@ block content var challenge_Id = !{JSON.stringify(challengeId)}; var challenge_Name = !{JSON.stringify(name)}; var challengeType = !{JSON.stringify(challengeType)}; + include ../partials/challenge-modals diff --git a/views/coursewares/showZiplineOrBasejump.jade b/views/coursewares/showZiplineOrBasejump.jade index a114e96d0e..7ce4b850a1 100644 --- a/views/coursewares/showZiplineOrBasejump.jade +++ b/views/coursewares/showZiplineOrBasejump.jade @@ -21,13 +21,13 @@ block content if (user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#i-want-help-editorless(disabled) + .btn.btn-success.btn-big#trigger-help-editorless-modal i.fa.fa-medkit - |   Help(disabled) - .btn.btn-success.btn-big#i-want-to-pair + |   Help + .btn.btn-success.btn-big#trigger-pair-modal i.fa.fa-user-plus |   Pair - .btn.btn-success.btn-big#report-issue + .btn.btn-success.btn-big#trigger-issue-modal i.fa.fa-bug |   Bug .button-spacer @@ -101,3 +101,4 @@ block content a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. $('body').on('keypress', controlEnterHandler); + include ../partials/challenge-modals diff --git a/views/partials/challenge-modals.jade b/views/partials/challenge-modals.jade new file mode 100644 index 0000000000..2715ed0b98 --- /dev/null +++ b/views/partials/challenge-modals.jade @@ -0,0 +1,52 @@ +#pair-modal.modal(tabindex='-1') + .modal-dialog.animated.zoomIn.fast-animation + .modal-content + .modal-header.challenge-list-header Ready to pair program? + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body.text-center + h3 This will create a pair programming request. + h3 You'll need   + a(href='/field-guide/how-do-i-install-screenhero' target='_blank') Screen Hero + | . + h3 Other campers may then message you about pair programming. + a.btn.btn-lg.btn-primary.btn-block#i-want-to-pair(name='_csrf', value=_csrf) Create my pair request + a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel + +#issue-modal.modal(tabindex='-1') + .modal-dialog.animated.zoomIn.fast-animation + .modal-content + .modal-header.challenge-list-header Did you find a bug? + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body.text-center + h3 This will open our GitHub Issues page. + h3 Please tell us how to reproduce the bug and link us to screen shots if possible. + a.btn.btn-lg.btn-primary.btn-block#report-issue(name='_csrf', value=_csrf) Create my GitHub issue + a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel + +#help-modal.modal(tabindex='-1') + .modal-dialog.animated.zoomIn.fast-animation + .modal-content + .modal-header.challenge-list-header Need some help? + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body.text-center + h3 Remember to use   + a('/field-guide/how-do-i-get-help-when-i-get-stuck') RSAP + | . + h3 If you've already read the errors and searched Google, you should ask for help. + h3 This will open a help request in our Help chat room. + a.btn.btn-lg.btn-primary.btn-block#i-want-help(name='_csrf', value=_csrf) Ask for help + a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel + +#help-editorless-modal.modal(tabindex='-1') + .modal-dialog.animated.zoomIn.fast-animation + .modal-content + .modal-header.challenge-list-header Need some help? + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body.text-center + h3 Remember to use   + a('/field-guide/how-do-i-get-help-when-i-get-stuck') RSAP + | . + h3 If you've already read the errors and searched Google, you should ask for help. + h3 This will open a help request in our Help chat room. + a.btn.btn-lg.btn-primary.btn-block#i-want-help-editorless(name='_csrf', value=_csrf) Ask for help + a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel From 8501de396f6e7c7a335ae452b5c4f4ce2d010a1c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 16:18:04 -0700 Subject: [PATCH 03/17] finish fixing modals --- public/js/main_0.0.2.js | 16 +++++++++++++-- views/coursewares/showJS.jade | 2 +- views/coursewares/showVideo.jade | 21 ++++++++++---------- views/coursewares/showZiplineOrBasejump.jade | 6 ------ 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/public/js/main_0.0.2.js b/public/js/main_0.0.2.js index 8aaf409219..2d92d33321 100644 --- a/public/js/main_0.0.2.js +++ b/public/js/main_0.0.2.js @@ -37,7 +37,7 @@ $(document).ready(function() { }); $('#i-want-help-editorless').on('click', function() { - $('#help-modal-editorless').modal('hide'); + $('#help-editorless-modal').modal('hide'); var currentLocation = window.location.href; $.post( '/get-help', @@ -134,6 +134,14 @@ $(document).ready(function() { $(this).unbind("error").attr("src", "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png"); }); + $('#completed-courseware').on('click', function() { + $('#complete-courseware-dialog').modal('show'); + }); + + $('#completed-courseware-editorless').on('click', function() { + $('#complete-courseware-editorless-dialog').modal('show'); + }); + $('#trigger-pair-modal').on('click', function() { $('#pair-modal').modal('show'); }); @@ -157,6 +165,11 @@ $(document).ready(function() { $('#complete-courseware-dialog').on('hidden.bs.modal', function() { editor.focus(); }); + + $('#complete-challenge-dialog').on('hidden.bs.modal', function() { + editor.focus(); + }); + var challengeTypes = { 'HTML_CSS_JQ': 0, 'JAVASCRIPT': 1, @@ -172,7 +185,6 @@ $(document).ready(function() { case challengeTypes.HTML_CSS_JQ: case challengeTypes.JAVASCRIPT: case challengeTypes.VIDEO: - console.log(challenge_Id); $.post( '/completed-challenge/', { diff --git a/views/coursewares/showJS.jade b/views/coursewares/showJS.jade index 5c24f9ea90..71b74db08d 100644 --- a/views/coursewares/showJS.jade +++ b/views/coursewares/showJS.jade @@ -80,7 +80,7 @@ block content - if (user) a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid && existingUser.length > 0') Go to my next challenge (ctrl + enter) - 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%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/bonfires/#{dashedName}&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%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank") i.fa.fa-twitter   = phrase - else diff --git a/views/coursewares/showVideo.jade b/views/coursewares/showVideo.jade index c180258626..4e9d82a6ec 100644 --- a/views/coursewares/showVideo.jade +++ b/views/coursewares/showVideo.jade @@ -17,7 +17,7 @@ block content iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') br if (user) - a.btn.btn-primary.btn-big.btn-block#completed-courseware I've completed this challenge (ctrl + enter) + a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter) script. var userLoggedIn = true; .button-spacer @@ -41,22 +41,21 @@ block content var controlEnterHandler = function(e) { $('body').unbind('keypress'); if (e.ctrlKey && e.keyCode == 13) { - $('#complete-courseware-dialog').modal('show'); + $('#complete-courseware-editorless-dialog').modal('show'); } else { $('body').bind('keypress', controlEnterHandler); } }; var modalControlEnterHandler = function(e) { - $('#complete-courseware-dialog').unbind('keypress'); + $('#complete-courseware-editorless-dialog').unbind('keypress'); if (e.ctrlKey && e.keyCode == 13) { $('#next-courseware-button').click(); } else { - $('#complete-courseware-dialog').bind('keypress', modalControlEnterHandler); + $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); } }; - - #complete-courseware-dialog.modal(tabindex='-1') + #complete-courseware-editorless-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation .modal-content .modal-header.challenge-list-header= compliment @@ -65,17 +64,17 @@ block content .text-center .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary - - if (user) + if (user) a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) On to my next challenge (ctrl + enter) script. - $('#complete-courseware-dialog').bind('keypress', modalControlEnterHandler); + $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); - - if (user.progressTimestamps.length > 2) + if (user.progressTimestamps.length > 2) .button-spacer - 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#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&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%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank") i.fa.fa-twitter   = phrase - - else + else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress h1 #{name} script. diff --git a/views/coursewares/showZiplineOrBasejump.jade b/views/coursewares/showZiplineOrBasejump.jade index 7ce4b850a1..75dbcc3b28 100644 --- a/views/coursewares/showZiplineOrBasejump.jade +++ b/views/coursewares/showZiplineOrBasejump.jade @@ -91,12 +91,6 @@ block content a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge (ctrl + enter) script. $('#complete-zipline-or-basejump-dialog').on('keypress', modalControlEnterHandler); - - if (user.progressTimestamps.length > 2) - .button-spacer - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank") - i.fa.fa-twitter   - = phrase else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. From 560e66527bffc2f506befff9039b87919594f4b9 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 16:40:22 -0700 Subject: [PATCH 04/17] add jobs --- app.js | 10 ++- controllers/jobs.js | 14 ++++ controllers/nonprofits.js | 92 --------------------------- controllers/resources.js | 6 -- models/Job.js | 18 ++++++ seed_data/jobs.json | 30 +++++++++ seed_data/seed.js | 22 ++++++- views/jobs/directory.jade | 33 ++++++++++ views/nonprofits/other-solutions.jade | 65 ------------------- views/resources/jobs.jade | 16 ----- 10 files changed, 120 insertions(+), 186 deletions(-) create mode 100644 controllers/jobs.js create mode 100644 models/Job.js create mode 100644 seed_data/jobs.json create mode 100644 views/jobs/directory.jade delete mode 100644 views/nonprofits/other-solutions.jade delete mode 100644 views/resources/jobs.jade diff --git a/app.js b/app.js index 04df5cdf07..e431ac361f 100755 --- a/app.js +++ b/app.js @@ -43,6 +43,7 @@ var express = require('express'), fieldGuideController = require('./controllers/fieldGuide'), challengeMapController = require('./controllers/challengeMap'), challengeController = require('./controllers/challenge'), + jobsController = require('./controllers/jobs'), /** * Stories @@ -159,9 +160,8 @@ var trusted = [ '*.ytimg.com', '*.bitly.com', 'http://cdn.inspectlet.com/', - 'http://hn.inspectlet.com/', - '*.simplyhired.com', - '*.simply-partner.com' + 'wss://inspectletws.herokuapp.com/', + 'http://hn.inspectlet.com/' ]; app.use(helmet.csp({ @@ -269,8 +269,6 @@ app.get('/pmi-acp-agile-project-managers-form', app.get('/nonprofits', resourcesController.nonprofits); -app.get('/nonprofits/getNonprofitList', nonprofitController.showAllNonprofits); - app.get('/nonprofits-form', resourcesController.nonprofitsForm); app.get('/map', @@ -354,7 +352,7 @@ app.get( app.get( '/jobs', - resourcesController.jobs + jobsController.jobsDirectory ); app.get( diff --git a/controllers/jobs.js b/controllers/jobs.js new file mode 100644 index 0000000000..5d0cd348cf --- /dev/null +++ b/controllers/jobs.js @@ -0,0 +1,14 @@ +var moment = require('moment'), + Job = require('./../models/Job'), + resources = require('./resources'); + +exports.jobsDirectory = function(req, res, next) { + Job.find({}, function(err, jobs) { + if (err) { return next(err); } + + res.render('jobs/directory', { + title: 'Junior JavaScript Engineer Jobs', + jobs: jobs + }); + }); +}; diff --git a/controllers/nonprofits.js b/controllers/nonprofits.js index 77a2f04a8f..d0a3aa0798 100644 --- a/controllers/nonprofits.js +++ b/controllers/nonprofits.js @@ -13,92 +13,6 @@ exports.nonprofitsDirectory = function(req, res, next) { }); }; -exports.areYouWithARegisteredNonprofit = function(req, res) { - res.render('nonprofits/are-you-with-a-registered-nonprofit', { - title: 'Are you with a with a registered nonprofit', - step: 1 - }); -}; - -exports.areTherePeopleThatAreAlreadyBenefitingFromYourServices = - function(req, res) { - res.render( - 'nonprofits/' + - 'are-there-people-that-are-already-benefiting-from-your-services', - { - title: 'Are there people already benefiting from your services', - step: 2 - } - ); - }; - -exports.okWithJavaScript = function(req, res) { - res.render('nonprofits/ok-with-javascript', { - title: 'Are you OK with us using JavaScript', - step: 3 - }); -}; - -exports.inExchangeWeAsk = function(req, res) { - res.render('nonprofits/in-exchange-we-ask', { - title: 'In exchange we ask that you ...', - step: 4 - }); -}; - -exports.howCanFreeCodeCampHelpYou = function(req, res) { - res.render('nonprofits/how-can-free-code-camp-help-you', { - title: 'Are you with a with a registered nonprofit', - step: 5 - }); -}; - -exports.whatDoesYourNonprofitDo = function(req, res) { - res.render('nonprofits/what-does-your-nonprofit-do', { - existingParams: req.params, - title: 'What does your nonprofit do?', - step: 6 - }); -}; - -exports.linkUsToYourWebsite = function(req, res) { - res.render('nonprofits/link-us-to-your-website', { - title: 'Link us to your website', - step: 7 - }); -}; - -exports.tellUsYourEmail = function(req, res) { - res.render('nonprofits/tell-us-your-email', { - title: 'Tell us your email', - step: 8 - }); -}; - -exports.tellUsYourName = function(req, res) { - res.render('nonprofits/tell-us-your-name', { - title: 'Tell us your name', - step: 9 - }); -}; - -exports.yourNonprofitProjectApplicationHasBeenSubmitted = function(req, res) { - res.render( - 'nonprofits/your-nonprofit-project-application-has-been-submitted', - { - title: 'Your Nonprofit Project application has been submitted!', - step: 10, - getBackDay: moment().weekday(5).format('dddd') - } - ); -}; - -exports.otherSolutions = function(req, res) { - res.render('nonprofits/other-solutions', { - title: 'Here are some other possible solutions for you' - }); -}; - exports.returnIndividualNonprofit = function(req, res, next) { var dashedName = req.params.nonprofitName; var nonprofitName = dashedName.replace(/\-/g, ' '); @@ -179,12 +93,6 @@ exports.returnIndividualNonprofit = function(req, res, next) { ); }; -exports.showAllNonprofits = function(req, res) { - var data = {}; - data.nonprofitsList = resources.allNonprofitNames(); - res.send(data); -}; - exports.interestedInNonprofit = function(req, res, next) { if (req.user) { Nonprofit.findOne( diff --git a/controllers/resources.js b/controllers/resources.js index a901ce5811..a427fb433e 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -234,12 +234,6 @@ module.exports = { } }, - jobs: function jobs(req, res) { - res.render('resources/jobs', { - title: 'Job Board for Front End Developer and Full Stack JavaScript Developer Jobs' - }); - }, - jobsForm: function jobsForm(req, res) { res.render('resources/jobs-form', { title: 'Employer Partnership Form for Job Postings, Recruitment and Corporate Sponsorships' diff --git a/models/Job.js b/models/Job.js new file mode 100644 index 0000000000..9f5f444e14 --- /dev/null +++ b/models/Job.js @@ -0,0 +1,18 @@ +var mongoose = require('mongoose'); +var secrets = require('../config/secrets'); + +/** + * + * @type {exports.Schema} + */ + +var Long = mongoose.Types.Long; +var jobSchema = new mongoose.Schema({ + position: String, + company: String, + logoUrl: String, + postingUrl: String, + copy: Array +}); + +module.exports = mongoose.model('Job', jobSchema); diff --git a/seed_data/jobs.json b/seed_data/jobs.json new file mode 100644 index 0000000000..3ba4fad93e --- /dev/null +++ b/seed_data/jobs.json @@ -0,0 +1,30 @@ +[ + { + "id": "bd7167d8c441cbafaeb5bdef", + "company": "Livestream", + "position": "Junior Backend Developer (Node.js)", + "logoUrl": "https://s3.amazonaws.com/prod-heroku/greenhouse_job_boards/logos/000/001/189/resized/livestream_logo-rgb_standard-cc718e67ce1a0f6fa400f609bdefe605.png?1429547161", + "postingUrl": "https://boards.greenhouse.io/livestream/jobs/59458?t=ek25h0#.VWeTk1xVhBc?source=freecodecamp.com" + }, + { + "id": "bd7167d8c442cbafaeb5bdef", + "company": "Adobe", + "position": "Junior JavaScript Engineer", + "logoUrl": "http://cdn-3.famouslogos.us/images/adobe-logo.jpg", + "postingUrl": "https://adobe.taleo.net/careersection/2/jobdetail.ftl?job=32619&lang=en" + }, + { + "id": "bd7167d8c443cbafaeb5bdef", + "company": "Bookspan", + "position": "Full Stack JavaScript Developer (Junior)", + "logoUrl": "https://tm-prod.global.ssl.fastly.net/uploaded/companies/227/small_logo.png?v=db9dbe", + "postingUrl": "http://bookspan.theresumator.com/apply/10190b666b74087b537f4659756f7c5679000704722064232c1d2e3b2b102501310437/Fullstack-Javascript-Developer-junior?source=freecodecamp.com&sid=zvi9YD9OcHwoDZNgM3XI9uPszGvqxJo6eHf" + }, + { + "id": "bd7167d8c444cbafaeb5bdef", + "company": "Good Eggs", + "position": "Full Stack Developer", + "logoUrl": "https://d1qb2nb5cznatu.cloudfront.net/startups/i/72165-64efbd521cdfe3357c811758f5436e7d-medium_jpg.jpg", + "postingUrl": "http://www.jobscore.com/jobs2/goodeggs/full-stack-developer/cQ_hd-0USr4Om7eJe4iefn?Board=freecodecamp.com" + } +] diff --git a/seed_data/seed.js b/seed_data/seed.js index 351d78da67..0221952d72 100644 --- a/seed_data/seed.js +++ b/seed_data/seed.js @@ -2,17 +2,19 @@ require('dotenv').load(); var Challenge = require('../models/Challenge.js'), FieldGuide = require('../models/FieldGuide.js'), Nonprofit = require('../models/Nonprofit.js'), + Job = require('../models/Job.js'), mongoose = require('mongoose'), secrets = require('../config/secrets'), fieldGuides = require('./field-guides.json'), nonprofits = require('./nonprofits.json'), + jobs = require('./jobs.json'), fs = require('fs'); mongoose.connect(secrets.db); var challenges = fs.readdirSync(__dirname + '/challenges'); var counter = 0; -var offerings = 2 + challenges.length; +var offerings = 3 + challenges.length; var CompletionMonitor = function() { counter++; @@ -42,6 +44,7 @@ Challenge.remove({}, function(err, data) { }); }); }); + FieldGuide.remove({}, function(err, data) { if (err) { console.error(err); @@ -75,3 +78,20 @@ Nonprofit.remove({}, function(err, data) { }); console.log('nonprofits'); }); + +Job.remove({}, function(err, data) { + if (err) { + console.error(err); + } else { + console.log('Deleted ', data); + } + Job.create(jobs, function(err, data) { + if (err) { + console.log(err); + } else { + console.log('Saved ', data); + } + CompletionMonitor(); + }); + console.log('jobs'); +}); diff --git a/views/jobs/directory.jade b/views/jobs/directory.jade new file mode 100644 index 0000000000..b3d598e57b --- /dev/null +++ b/views/jobs/directory.jade @@ -0,0 +1,33 @@ +extends ../layout +block content + script. + var challengeName = 'Jobs View'; + .row + + .panel.panel-info + .panel-heading.text-center Junior JavaScript Engineer Jobs + .panel-body + .col-xs-12.col-sm-12.col-md-10.col-md-offset-1 + h2.text-center We want all our campers to get awesome software engineer jobs. + h2.text-center + a(href='https://www.linkedin.com/groups?viewMembers=&gid=6966827&sik=1432338555021' target='_blank') Many already have + | . + p.text-center.large-p.hidden-xs.hidden-sm This is a small sampling of the 1,000s of junior software engineer jobs. Learn about the   + a(href='http://blog.freecodecamp.com/2014/10/the-real-reason-to-learn-mean-stack.html' target='_blank') the job market in aggregate + | . + .spacer + + .text-center + a.btn.btn-primary.btn-big(href='/jobs-form') My organization is hiring software engineers + .spacer + .spacer + for job in jobs + .spacer + .row + .col-xs-12.col-sm-2 + img.img-responsive.img-center(src=job.logoUrl) + .col-xs-12.col-sm-10 + h2.negative-15= job.position + h3.negative-15= job.company + a.text-center.btn.btn-primary.btn-lg(href=job.postingUrl target='_blank') More info + .spacer diff --git a/views/nonprofits/other-solutions.jade b/views/nonprofits/other-solutions.jade deleted file mode 100644 index 752728e772..0000000000 --- a/views/nonprofits/other-solutions.jade +++ /dev/null @@ -1,65 +0,0 @@ -extends ../layout -block content - .jumbotron.text-center - h1.hug-top Here are some other solutions we recommend - .spacer - h2 Please note that Free Code Camp is not partnered with, nor do we receive a referral fee from, any of the following providers. We simply want to help guide you towards a solution for your organization. - h3 Skills-based Volunteer Organizations - ul - li - a(href='http://www.volunteermatch.com') Volunteer Match - li - a(href='http://www.catchafire.com') Catchafire - h3 DIY Websites - ul - li - a(href='http://www.wix.com') Wix - li - a(href='http://www.squarespace.com/') Square Space - - h3 Donor and Volunteer Management Systems - ul - li - a(href='https://www.thedatabank.com/') The Data Bank - li - a(href='http://www.donorsnap.com/') DonorSnap - li - a(href='http://www.donorperfect.com/') Donor Perfect - li - a(href='https://www.blackbaud.com/fundraising-crm/etapestry-donor-management') eTapestry - li - a(href='http://www.z2systems.com/') NeonCRM - li - a(href='http://www.regpacks.com/volunteer-management/') Regpack - li - a(href='http://sumac.com/') Sumac - li - a(href='http://www.volgistics.com/') Volgistics - h3 Inventory Management Systems - ul - li - a(href='https://www.ezofficeinventory.com/industries/non-profits') EZ Office Inventory - li - a(href='https://www.ordoro.com') Ordoro - li - a(href='http://www.unleashedsoftware.com') Unleashed - h3 E-Learning platforms - ul - li - a(href='http://www.dokeos.com/') Dokeos - li - a(href='http://www.efrontlearning.net/') eFront - li - a(href='https://moodle.org/') Moodle - li - a(href='https://sakaiproject.org/') Sakai - h3 Community Management - ul - li - a(href='https://civicrm.org/') CiviCRM - li - a(href='http://tcmgr.com/') Total Community Manager - h3 Electronic Forms - ul - li - a(href='http://www.google.com/forms') Google Forms diff --git a/views/resources/jobs.jade b/views/resources/jobs.jade deleted file mode 100644 index a681d7cc1b..0000000000 --- a/views/resources/jobs.jade +++ /dev/null @@ -1,16 +0,0 @@ -extends ../layout-wide -block content - .row - .col-xs-12.col-sm-8.col-sm-offset-2.text-center - h2 We want all our campers to get awesome software engineer jobs ( - a(href='https://www.linkedin.com/groups?viewMembers=&gid=6966827&sik=1432338555021' target='_blank') and many already have - | ). - h3.hidden-xs.hidden-sm This is a small sampling of the 1,000s of junior software engineer jobs. Learn about the   - a(href='http://blog.freecodecamp.com/2014/10/the-real-reason-to-learn-mean-stack.html' target='_blank') the job market in aggregate - | . - .spacer - a.btn.btn-primary.btn-big(href='/jobs-form') My organization is hiring software engineers - .spacer - .embed-responsive.embed-responsive-4by3.hidden-xs.hidden-sm - iframe.embed-responsive-item(src="http://freecodecamp.simply-partner.com" scrolling="no") - .spacer From a9d8992b8817fba2b87cc67fbac56abe4cf63f7c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 16:59:25 -0700 Subject: [PATCH 05/17] fix if else syntax in Jade and add cities --- seed_data/field-guides.json | 2 ++ views/account/account.jade | 12 ++++++------ views/account/show.jade | 14 +++++++------- views/coursewares/showBonfire.jade | 6 +++--- views/coursewares/showHTML.jade | 6 +++--- views/coursewares/showJS.jade | 6 +++--- views/coursewares/showZiplineOrBasejump.jade | 2 +- views/partials/challenge-modals.jade | 4 ++-- 8 files changed, 27 insertions(+), 25 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 2d520e480e..0fecdbcc4f 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -296,6 +296,7 @@ "
  • Berkeley
    • ", "
  • Berlin
    • ", "
  • Bhaktapur
    • ", + "
  • Bijeljina
    • ", "
  • Boston
    • ", "
  • Boulder
    • ", "
  • Brussels
    • ", @@ -396,6 +397,7 @@ "
  • Tirana
    • ", "
  • Tulsa
    • ", "
  • Verde Valley
    • ", + "
  • Valencia
    • ", "
  • Washington, DC
    • ", " ", " ", diff --git a/views/account/account.jade b/views/account/account.jade index 3ad7a8d442..1f7495fd50 100644 --- a/views/account/account.jade +++ b/views/account/account.jade @@ -260,28 +260,28 @@ block content .panel.panel-info .panel-heading.text-center Manage your account here: .panel-body - - if (!user.google || !user.facebook || !user.linkedin || !user.twitter) - - if (!user.google) + if (!user.google || !user.facebook || !user.linkedin || !user.twitter) + if (!user.google) .col-xs-12 a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/auth/google') i.fa.fa-google-plus | Link Google with my account - - if (!user.facebook) + if (!user.facebook) .col-xs-12 a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/auth/facebook') i.fa.fa-facebook | Link Facebook with my account - //- if (!user.github) + //if (!user.github) // .col-xs-12 // a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/auth/github') // i.fa.fa-github // | Link GitHub with my account - - if (!user.linkedin) + if (!user.linkedin) .col-xs-12 a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/auth/linkedin') i.fa.fa-linkedin | Link LinkedIn with my account - - if (!user.twitter) + if (!user.twitter) .col-xs-12 a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/auth/twitter') i.fa.fa-twitter diff --git a/views/account/show.jade b/views/account/show.jade index 821aa3aac1..53f95cf724 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -23,15 +23,15 @@ block content else img.img-center.img-responsive.public-profile-img(src='https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png') h1.text-center.negative-5.profile-social-icons - - if (twitterHandle) + if (twitterHandle) a.fa.fa-twitter-square.text-primary(title="@#{username}'s Twitter Profile", href="http://twitter.com/#{twitterHandle}", target='_blank') - - if (githubProfile) + if (githubProfile) a.fa.fa-github-square.text-primary(title="@#{username}'s GitHub Profile", href=githubProfile, target='_blank') - - if (codepenProfile) + if (codepenProfile) a.ion-social-codepen.text-primary(title="@#{username}'s CodePen Profile", href=codepenProfile, target='_blank') - - if (linkedinProfile) + if (linkedinProfile) a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=linkedinProfile, target='_blank') - - if (facebookProfile) + if (facebookProfile) a.fa.fa-facebook-square.text-primary(title="@#{username}'s Facebook Profile", href=facebookProfile, target='_blank') .visible-md.visible-lg .col-xs-12.col-sm-12.col-md-4.text-justify @@ -137,7 +137,7 @@ block content h4.col-sm-6.text-left Current Streak: #{currentStreak} - - if (challenges.length > 0) + if (challenges.length > 0) .col-sm-12 table.table.table-striped thead @@ -154,7 +154,7 @@ block content a(href=challenge.solution, target='_blank') View my solution br - - if (bonfires.length > 0) + if (bonfires.length > 0) .col-sm-12 table.table.table-striped thead diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade index 471be7dc68..b09968ebe3 100644 --- a/views/coursewares/showBonfire.jade +++ b/views/coursewares/showBonfire.jade @@ -136,16 +136,16 @@ block content .text-center .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary - - if (user) + if (user) a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter) - - if (user.progressTimestamps.length > 2) + if (user.progressTimestamps.length > 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") i.fa.fa-twitter   = phrase - - else + else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals script. diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade index 3d9677811a..c34ae02a61 100644 --- a/views/coursewares/showHTML.jade +++ b/views/coursewares/showHTML.jade @@ -38,7 +38,7 @@ block content span.ion-arrow-up-b | Less information br - - if (user) + if (user) a.btn.btn-primary.btn-big.btn-block#next-courseware-button | Go to my next challenge br @@ -48,14 +48,14 @@ block content .btn-group.input-group.btn-group-justified label.btn.btn-success#trigger-help-modal i.fa.fa-medkit - |   Help(disabled) + |   Help label.btn.btn-success#trigger-issue-modal i.fa.fa-bug |   Bug .button-spacer script. var userLoggedIn = true; - - else + else a.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. var userLoggedIn = false; diff --git a/views/coursewares/showJS.jade b/views/coursewares/showJS.jade index 71b74db08d..43d954a2f2 100644 --- a/views/coursewares/showJS.jade +++ b/views/coursewares/showJS.jade @@ -77,12 +77,12 @@ block content .text-center .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary - - if (user) + if (user) a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid && existingUser.length > 0') Go to my next challenge (ctrl + enter) - - if (points && points > 2) + 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%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank") i.fa.fa-twitter   = phrase - - else + else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals diff --git a/views/coursewares/showZiplineOrBasejump.jade b/views/coursewares/showZiplineOrBasejump.jade index 75dbcc3b28..ae72c47528 100644 --- a/views/coursewares/showZiplineOrBasejump.jade +++ b/views/coursewares/showZiplineOrBasejump.jade @@ -69,7 +69,7 @@ block content .text-center .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary - - if (user) + if (user) form.form-horizontal(novalidate='novalidate', name='completedWithForm') .form-group.text-center .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2.animated.fadeIn diff --git a/views/partials/challenge-modals.jade b/views/partials/challenge-modals.jade index 2715ed0b98..5270e77cd4 100644 --- a/views/partials/challenge-modals.jade +++ b/views/partials/challenge-modals.jade @@ -30,7 +30,7 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body.text-center h3 Remember to use   - a('/field-guide/how-do-i-get-help-when-i-get-stuck') RSAP + a(href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank') RSAP | . h3 If you've already read the errors and searched Google, you should ask for help. h3 This will open a help request in our Help chat room. @@ -44,7 +44,7 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body.text-center h3 Remember to use   - a('/field-guide/how-do-i-get-help-when-i-get-stuck') RSAP + a(href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank') RSAP | . h3 If you've already read the errors and searched Google, you should ask for help. h3 This will open a help request in our Help chat room. From 7e08f9d8f5eb8fca241c7d6669fb6534436ca2b2 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 17:22:45 -0700 Subject: [PATCH 06/17] update videos --- seed_data/challenges/functional-programming.json | 2 +- views/home.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/seed_data/challenges/functional-programming.json b/seed_data/challenges/functional-programming.json index 67f6a3b3f0..1bc0053f5b 100644 --- a/seed_data/challenges/functional-programming.json +++ b/seed_data/challenges/functional-programming.json @@ -6,7 +6,7 @@ "_id": "bd7129d8c441eddfbeb5bddf", "name": "Waypoint: Practice Functional Programming", "difficulty": 0.01, - "challengeSeed": "114604814", + "challengeSeed": "129169463", "description": [ "Functional programming holds the key to unlocking JavaScript's powerful asynchronous features.", "Jafar Husain's 42-step interactive Functional Programming course will familiarize you with the various ways you can recombine these functions.", diff --git a/views/home.jade b/views/home.jade index 9cc4414cdb..f1058309b5 100644 --- a/views/home.jade +++ b/views/home.jade @@ -4,7 +4,7 @@ block content if (user && user.progressTimestamps.length > 0) .col-xs-12 .embed-responsive.embed-responsive-16by9 - iframe.embed-responsive-item(src='//player.vimeo.com/video/128853855') + iframe.embed-responsive-item(src='//player.vimeo.com/video/129168884') br h3 Note: If you're using Firefox and the buttons aren't working, do a full refresh (control + f5 on Windows and command + shift + r on Mac). We're working on this. h3 Note: If you've already completed the HTML, CSS, Bootstrap Waypoints, you do not need to do these new Waypoints. From 1b9325dec0b2a2d16c2a1e69da3a21240591c26c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 29 May 2015 10:43:14 -0700 Subject: [PATCH 07/17] start adding additional tests to html waypoints to make them more robust --- controllers/resources.js | 4 ++-- seed_data/challenges/basic-html5-and-css.json | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/controllers/resources.js b/controllers/resources.js index 7ccc73e9a8..c30def54e5 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -625,8 +625,8 @@ module.exports = { text: "Anyone want to pair with @" + userName + " on " + challenge + "?\nMake sure you install Screen Hero here:" + "http://freecodecamp.com/field-guide/how-do-i-install-screenhero\n" + - "Then start your pair program session with *" + userName + - "* by typing \"/hero @" + userName + "\" into Slack.\n And *"+ userName + + "Then start your pair program session with *@" + userName + + "* by typing \"/hero @" + userName + "\" into Slack.\n And *@"+ userName + "*, be sure to launch Screen Hero, then keep coding. " + "Another camper may pair with you soon.", channel: '#letspair', diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index b99b57317c..db2b54ac5c 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -44,7 +44,8 @@ "h2 elements are slightly smaller than h1 elements. There are also h3, h4, h5 and h6 elements." ], "tests": [ - "assert(($('h2').length > 0), 'Create an h2 elements.')", + "assert(($('h2').length > 0), 'Create an h2 element.')", + "assert(new RegExp('', 'gi').test(editor), 'Be sure to complete your h2 element with a closing tag.');", "assert.isTrue((/cat(\\s)?photo(\\s)?app/gi).test($('h2').text()), 'Your h2 element should have the text \"CatPhotoApp\"')", "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')" ], @@ -74,7 +75,8 @@ ], "tests": [ "assert(($('p').length > 0), 'Create a paragraph element.')", - "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your paragraph element should have the text \"Hello Paragraph\"')" + "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your paragraph element should have the text \"Hello Paragraph\"')", + "assert(new RegExp('

    ', 'gi').test(editor), 'Be sure to complete your paragraph element with a closing tag.');" ], "challengeSeed": [ "

    Hello World

    ", @@ -1573,10 +1575,11 @@ "description": [ "Add a submit button to your form field with type submit and a test value of \"Submit\".", "Let's add a submit button to your form. Clicking this button will send the data from your form to the URL you specified with your form's action attribute.", - "Here's an example submit button: <button type='submit'>this button submits the form</button>" + "Here's an example submit button: <button type='submit'>this button submits the form</button>" ], "tests": [ - "assert(new RegExp('', 'gi').test(editor), 'Make sure you have completely declared your button!');" + "assert(new RegExp('', 'gi').test(editor), 'Be sure to complete your button element with a closing tag.');" ], "challengeSeed": [ "", From 8b79a56135efb1a4917e06e504b8ae1bc24722c9 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 29 May 2015 11:04:27 -0700 Subject: [PATCH 08/17] improvements to early html challenges --- seed_data/challenges/basic-html5-and-css.json | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index db2b54ac5c..9549a6f4a8 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -16,7 +16,7 @@ "To enable the \"Go to my next challenge\" button on this exercise, change your h1 tag's text to say \"Hello World\" instead of \"Hello\"." ], "tests": [ - "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')" + "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')" ], "challengeSeed": [ "

    Hello

    " @@ -45,9 +45,9 @@ ], "tests": [ "assert(($('h2').length > 0), 'Create an h2 element.')", - "assert(new RegExp('', 'gi').test(editor), 'Be sure to complete your h2 element with a closing tag.');", - "assert.isTrue((/cat(\\s)?photo(\\s)?app/gi).test($('h2').text()), 'Your h2 element should have the text \"CatPhotoApp\"')", - "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')" + "assert(new RegExp('', 'gi').test(editor), 'Be sure to complete your h2 element with a closing tag.')", + "assert.isTrue((/cat(\\s)?photo(\\s)?app/gi).test($('h2').text()), 'Your h2 element should have the text \"CatPhotoApp\"')", + "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')" ], "challengeSeed": [ "

    Hello World

    " @@ -74,9 +74,9 @@ "You can create a paragraph element like so: <p>I'm a p tag!</p>" ], "tests": [ - "assert(($('p').length > 0), 'Create a paragraph element.')", - "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your paragraph element should have the text \"Hello Paragraph\"')", - "assert(new RegExp('

    ', 'gi').test(editor), 'Be sure to complete your paragraph element with a closing tag.');" + "assert(($('p').length > 0), 'Create a p element.')", + "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your p element should have the text \"Hello Paragraph\"')", + "assert(new RegExp('

    ', 'gi').test(editor), 'Be sure to complete your p element with a closing tag.')" ], "challengeSeed": [ "

    Hello World

    ", @@ -105,7 +105,7 @@ "You'll encounter other self-closing element tags soon." ], "tests": [ - "assert(($('br').length > 0), 'You should have a br element between your h2 and paragraph elements.')" + "assert(($('br').length > 0), 'Add a br element between your h2 and p elements.')" ], "challengeSeed": [ "

    Hello World

    ", @@ -135,9 +135,10 @@ "You can start a comment with <!-- and end a comment with -->." ], "tests": [ - "assert($('h1').length > 0, 'The h1 element should not be commented. It should be visible in the browser.')", - "assert($('h2').length > 0, 'The h2 element should not be commented. It should be visible in the browser.')", - "assert($('p').length > 0, 'The paragraph element should not be commented. It should be visible in the browser.')" + "assert($('h1').length > 0, 'Your h1 element should not be commented. It should be visible in the browser.')", + "assert($('h2').length > 0, 'Your h2 element should not be commented. It should be visible in the browser.')", + "assert($('p').length > 0, 'Your p element should not be commented. It should be visible in the browser.')", + "assert(!new RegExp('-->', 'gi').test(editor), 'Be sure to delete the --> that ends the comment.')" ], "challengeSeed": [ "', 'gi').test(editor), 'Be sure to delete the --> that ends the comment.')" ], "challengeSeed": [ @@ -168,14 +168,14 @@ "name": "Waypoint: Comment out HTML", "difficulty": 0.014, "description": [ - "Comment out the h1 element and the p element, but leave the h2 element uncommented.", + "Comment out your h1 element and your p element, but leave your h2 element uncommented.", "Remember that in order to start a comment, you need to use <!-- and to end a comment, you need to use -->.", - "Here you'll need to end the comment before the h2 element begins." + "Here you'll need to end the comment before your h2 element begins." ], "tests": [ - "assert(($('h1').length == 0), 'The h1 element should be commented. It should not be visible in the browser.')", - "assert(($('h2').length > 0), 'The h2 element should not commented. It should be visible in the browser.')", - "assert(($('p').length == 0), 'The paragraph element should be commented. It should not be visible in the browser.')" + "assert(($('h1').length === 0), 'Comment out your h1 element so that it is not visible on your page.')", + "assert(($('h2').length > 0), 'Leave your h2 element uncommented so that is not visible on your page.')", + "assert(($('p').length === 0), 'Comment out your p element so that it is not visible on your page.')" ], "challengeSeed": [ "