From d56cee1f7217eb871f81311d15a97087cdc9391c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 11 Jun 2015 15:01:21 -0700 Subject: [PATCH 1/6] update challenge map and news nav --- views/challengeMap/show.jade | 37 ++++++++++++++++++------------------ views/stories/news-nav.jade | 9 +++++---- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index f8adbff6c1..bc65012fb2 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -83,22 +83,21 @@ block content li.large-p.negative-10 a(href="/challenges/#{challenge.name}")= challenge.name - //#announcementModal.modal(tabindex='-1') - // .modal-dialog.animated.fadeInUp.fast-animation - // .modal-content - // .modal-header.challenge-list-header Join our Saturday Summit! - // a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × - // .modal-body - // h3.text-left Saturday at Noon EDT: We'll live-stream our Saturday Summit on Twitch.tv. - // h3.text-left We'll announce our new Front End Development Certificate Program (it's free, of course) and our new "Free Code Camp On The Go" app.   - // a(href='http://www.freecodecamp.com/twitch', target='_blank') Add us to your calendar here - // | . - // a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Follow us on Twitch.tv - // a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! - //script. - // $(document).ready(function () { - // if (!localStorage || !localStorage.day234) { - // $('#announcementModal').modal('show'); - // localStorage.day234 = "true"; - // } - // }); + #announcementModal.modal(tabindex='-1') + .modal-dialog.animated.fadeInUp.fast-animation + .modal-content + .modal-header.challenge-list-header Add us on LinkedIn + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body + img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png') + h3.text-left LinkedIn now recognizes Free Code Camp as a university. + h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute. + a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') + a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! + script. + $(document).ready(function () { + if (!localStorage || !localStorage.linkedIn) { + $('#announcementModal').modal('show'); + localStorage.linkedIn = "true"; + } + }); diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade index 6408520a20..c032a640e4 100644 --- a/views/stories/news-nav.jade +++ b/views/stories/news-nav.jade @@ -15,10 +15,11 @@ .spacer .row .col-xs-12.col-sm-8.col-sm-offset-2.well - h4.text-center Which Coders are Worth Following on Twitter? - img.img-responsive(src='https://www.evernote.com/l/AHQLuyBNcVpKj5TRhNzWssVuCvbRIEylm3oB/image.png') - p Share a link to the Twitter profile of your choice, and tell us in 140 characters or less why this person is a "Coder Worth Following". - p Use the headline: "Coder Worth Following: (their Twitter handle)". We'll publish a list of the 25 most-upvoted submissions (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post. + h4.text-center Which other free resources do you use? + img.img-responsive(src='https://www.evernote.com/l/AHRNhlwViM1Kh5qCm6iy7MSWrbdyxYbRkWkB/image.png') + p Link us to your favorite free coding resources. + p These books, video series and podcasts should be be legally available for free. + p Use the headline: "Awesome Free Resource: (the book/podcast/video series name)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post. .spacer #search-results From 1e8d58068c6d1608c635617454cf7d0772af95f4 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 11 Jun 2015 15:34:06 -0700 Subject: [PATCH 2/6] add LinkedIn easy route --- app.js | 4 ++++ seed_data/field-guides.json | 17 +++++++++++++++++ views/challengeMap/show.jade | 2 +- views/partials/footer.jade | 3 +++ views/stories/news-nav.jade | 3 +-- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 6ec67f2611..a265e530de 100755 --- a/app.js +++ b/app.js @@ -227,6 +227,10 @@ app.get('/nonprofit-project-instructions', function(req, res) { res.redirect(301, '/field-guide/how-do-free-code-camps-nonprofit-projects-work'); }); +app.get('/linkedin', function(req, res) { + res.redirect(301, '/field-guide/can-i-add-free-code-camp-to-my-linkedin-profile'); +}); + app.post('/get-help', resourcesController.getHelp); app.post('/get-pair', resourcesController.getPair); diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 56ad3be106..61513d28c7 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -231,6 +231,23 @@ "" ] }, + { + "_id": "bd7158d9c436eddfaeb5bd2e", + "name": "Can I add Free Code Camp to my LinkedIn profile?", + "dashedName": "can-i-add-free-code-camp-to-my-linkedin-profile", + "description": [ + "
", + "

LinkedIn recognizes Free Code Camp as a university.

", + "

You can explore our alumni activity here.

", + "

You should add Free Code Camp to your LinkedIn profile. Here's how:

", + "
    ", + "
  1. Follow this link: https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp
  2. ", + "
  3. Follow these instructions:
  4. ", + "
", + "

Once you complete our curriculum (or complete at least one Nonprofit Project and then get a coding job), we will issue you an official Full Stack Web Development certificate that you can also add to your LinkedIn profile.

", + "
" + ] + }, { "_id": "bd7158d9c436eddfaeb5bd3f", "name": "Can I jump around in this guide?", diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index bc65012fb2..e7b8e8c969 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -92,7 +92,7 @@ block content img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png') h3.text-left LinkedIn now recognizes Free Code Camp as a university. h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute. - a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') + a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! script. $(document).ready(function () { diff --git a/views/partials/footer.jade b/views/partials/footer.jade index 6230b178ad..fe25c7723a 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -3,6 +3,7 @@ a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')  Blog   a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')  GitHub   a.ion-social-twitch-outline(href="/twitch")  Twitch  + a.ion-social-linkedin(href="/linkedin")  LinkedIn  a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city")  Facebook   a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')  Twitter   a.ion-locked(href="/privacy")  Privacy   @@ -13,6 +14,8 @@ span.sr-only Free Code Camp on GitHub a.ion-social-twitch-outline(href="/twitch") span.sr-only Free Code Camp Live Pair Programming on Twitch.tv + a.ion-social-linkedin(href="/linkedin") + span.sr-only Free Code Camp LinkedIn Alumni Network a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city") span.sr-only Free Code Camp local groups on Facebook a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade index c032a640e4..48f64ae561 100644 --- a/views/stories/news-nav.jade +++ b/views/stories/news-nav.jade @@ -18,8 +18,7 @@ h4.text-center Which other free resources do you use? img.img-responsive(src='https://www.evernote.com/l/AHRNhlwViM1Kh5qCm6iy7MSWrbdyxYbRkWkB/image.png') p Link us to your favorite free coding resources. - p These books, video series and podcasts should be be legally available for free. - p Use the headline: "Awesome Free Resource: (the book/podcast/video series name)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post. + p Use the headline: "Awesome Free Resource: (the name of the book, podcast, or video series)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post, and in an upcoming Field Guide article. Also - as always - you'll get 1 point every time someone upvotes your post. .spacer #search-results From 66d4ffba320dc48d892acdd3ebad8721bb292c36 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 11 Jun 2015 15:46:41 -0700 Subject: [PATCH 3/6] update modal --- views/challengeMap/show.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index e7b8e8c969..594793fbc2 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -86,14 +86,14 @@ block content #announcementModal.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation .modal-content - .modal-header.challenge-list-header Add us on LinkedIn + .modal-header.challenge-list-header Add us to your LinkedIn profile a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body - img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png') h3.text-left LinkedIn now recognizes Free Code Camp as a university. - h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute. - a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') - a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! + img.img-responsive.img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png') + h3.text-left It takes less than a minute to add Free Code Camp to your LinkedIn profile. + a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/linkedin', target='_blank') Show me how to do this + a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up script. $(document).ready(function () { if (!localStorage || !localStorage.linkedIn) { From 7077b1848041cd7974f0fd9003cb3c31bbd6f427 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 11 Jun 2015 18:57:22 -0700 Subject: [PATCH 4/6] fix twitch view --- views/resources/twitch.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/resources/twitch.jade b/views/resources/twitch.jade index 678d983411..1b89b17432 100644 --- a/views/resources/twitch.jade +++ b/views/resources/twitch.jade @@ -34,32 +34,32 @@ block content .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/Z_43xApGB9Y') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/Z_43xApGB9Y .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/PvWHzcebjjQ') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/PvWHzcebjjQ .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/yHL6mEr-LGY') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/yHL6mEr-LGY .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/dolG-yRMcPs') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/dolG-yRMcPs .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/YMz_vrK_KlQ') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/YMz_vrK_KlQ .col-xs-12.col-sm-12.col-md-6 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/bbFVxaza8Ik') - p.wrappable.negative-45 link:   + p.wrappable.negative-30 link:   a(href="http://www.youtube.com/watch/S7iRBZJwOAs") http://www.youtube.com/watch/bbFVxaza8Ik br br From 03df5cf492f4267c4801f4e28e1c913068fed14e Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 11 Jun 2015 19:01:31 -0700 Subject: [PATCH 5/6] remove reference to original alumni network --- seed_data/field-guides.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 61513d28c7..136433aab4 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -518,16 +518,6 @@ "" ] }, - { - "_id": "bd7158d9c436eddfaeb5bd3e", - "name": "Does Free Code Camp have an alumni network?", - "dashedName": "does-free-code-camp-have-an-alumni-network", - "description": [ - "
", - "

We have a growing alumni network on LinkedIn. Once you've finished Free Code Camp and have gotten a coding job, we'd love to include you in this group, too!

", - "
" - ] - }, { "_id": "bd7158d9c442eddfaeb5bdef", "name": "How do I best use the Global Control Shortcuts for Mac?", From 3979dc42b9d611f6a2c96d03de022198262626e3 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 12 Jun 2015 11:59:07 -0700 Subject: [PATCH 6/6] start importing calculator --- app.js | 2 + controllers/resources.js | 6 + views/resources/calculator.jade | 656 ++++++++++++++++++++++++++++++++ 3 files changed, 664 insertions(+) create mode 100644 views/resources/calculator.jade diff --git a/app.js b/app.js index a265e530de..1819529515 100755 --- a/app.js +++ b/app.js @@ -239,6 +239,8 @@ app.get('/chat', resourcesController.chat); app.get('/twitch', resourcesController.twitch); +app.get('/calculator', resourcesController.calculator); + app.get('/cats.json', function(req, res) { res.send( [ diff --git a/controllers/resources.js b/controllers/resources.js index 0bf414954b..2b156dbbce 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -283,6 +283,12 @@ module.exports = { }); }, + calculator: function calculator(req, res) { + res.render('resources/calculator', { + title: "Coding Bootcamp Cost Calculator" + }); + }, + unsubscribe: function unsubscribe(req, res, next) { User.findOne({ email: req.params.email }, function(err, user) { if (user) { diff --git a/views/resources/calculator.jade b/views/resources/calculator.jade new file mode 100644 index 0000000000..7db81dab2a --- /dev/null +++ b/views/resources/calculator.jade @@ -0,0 +1,656 @@ +extends ../layout +block content + .panel.panel-info + .panel-heading.text-center Coding Bootcamp Cost Calculator + .panel-body + .row + .col-xs-12.col-sm-10.col-sm-offset-1 + style. + #lastYearIncome{ + clear:both; + margin: 2% 0; + width: 110px; + } + #income, #calculate { + visibility:hidden; + } + .step { + font-size: 2em; + padding: 1%; + clear: both; + } + .city-buttons { + display: block; + clear: right; + } + #four p{ + font-size: .6em; + color: black; + } + .chart rect { + fill: steelblue; + } + .chart text { + fill: #121401; + font: 10px sans-serif; + text-anchor: end; + } + .axis path, + .axis line { + fill: none; + stroke: #121401; + stroke-width: 2px; + shape-rendering: crispEdges; + } + html. + +
+
+ +
Step 1: Choose your City
+
+
    +
  • New York City
  • +
  • San Fransisco
  • +
  • Austin
  • +
  • Los Angeles
  • +
  • Chicago
  • +
  • Other
  • +
+
+   + +
Step 2: Enter last Year's Income
+
+ + +
+ +
Step 3: Calculate
+ + + + + +
+ +