From 2e1babb12dc7618a03971cfea96be71f7659d51a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 16 Jun 2015 13:46:24 -0700 Subject: [PATCH] finalize calculator for release --- public/js/calculator.js | 6 +- server/views/partials/footer.jade | 3 - server/views/resources/calculator.jade | 193 +++++++++++++------------ 3 files changed, 104 insertions(+), 98 deletions(-) diff --git a/public/js/calculator.js b/public/js/calculator.js index bb92d6a65b..8786b78bea 100644 --- a/public/js/calculator.js +++ b/public/js/calculator.js @@ -20,7 +20,7 @@ $(document).ready(function () { $(this).addClass('animated pulse'); setTimeout(function () { $('#income').hide(); - $('#chart').show(); + $('#chart').addClass('animated fadeIn').show(); $('#chart-controls').addClass('animated fadeIn').show(); $('#explanation').addClass('animated fadeIn').show(); }, 1000); @@ -28,7 +28,7 @@ $(document).ready(function () { $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function (txt) { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); }) + ', and making $' + lastYearsIncome.toString().replace(/0000$/, '0,000') + ', your true costs will be:'); - var categoryNames = ['Opportunity Cost at Current Wage', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing']; + var categoryNames = ['Lost Wages', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing']; bootcamps.forEach(function (camp) { var x0 = 0; if (camp.cities.indexOf(city) > -1) { @@ -56,7 +56,7 @@ $(document).ready(function () { x1: x0 += weeklyHousing * camp.weeks }, { name: camp.name, - label: 'Opportunity Cost at Current Wage', + label: 'Lost Wages', value: +(Math.floor(camp.weeks * lastYearsIncome / 50)), x0: camp.finance ? +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks) : +camp.cost + weeklyHousing * camp.weeks, x1: x0 += +(Math.floor(camp.weeks * lastYearsIncome / 50)) diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade index 0af2fce328..fe25c7723a 100644 --- a/server/views/partials/footer.jade +++ b/server/views/partials/footer.jade @@ -7,7 +7,6 @@ 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   - a.ion-android-mail(href="mailto:team@freecodecamp.com")  Contact   .col-xs-12.visible-xs.visible-sm a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank') span.sr-only Free Code Camp's Blog @@ -23,5 +22,3 @@ span.sr-only Free Code Camp on Twitter a.ion-locked(href="/privacy") span.sr-only Free Code Camp's Privacy Policy - a.ion-android-mail(href="mailto:team@freecodecamp.com") - span.sr-only Contact Free Code Camp by email diff --git a/server/views/resources/calculator.jade b/server/views/resources/calculator.jade index 8ae888041b..5e25352139 100644 --- a/server/views/resources/calculator.jade +++ b/server/views/resources/calculator.jade @@ -1,95 +1,104 @@ -extends ../layout +extends ../layout-wide block content script(src="../../../js/calculator.js") - .panel.panel-info - .panel-heading.text-center Coding Bootcamp Cost Calculator - .panel-body - .row + .row + .col-xs-12.col-sm-10.col-md-8.col-lg-6.col-sm-offset-1.col-md-offset-2.col-lg-offset-3 + h3.text-center.text-primary#chosen Coming from _______, and making $_______, your true costs will be: + #city-buttons + .spacer + h2.text-center Where do you live? + .spacer + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#atlanta.btn.btn-primary.btn-block.btn-lg Atlanta + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#austin.btn.btn-primary.btn-block.btn-lg Austin + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#brisbane.btn.btn-primary.btn-block.btn-lg Brisbane + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#boulder.btn.btn-primary.btn-block.btn-lg Boulder + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#chicago.btn.btn-primary.btn-block.btn-lg Chicago + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#denver.btn.btn-primary.btn-block.btn-lg Denver + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#hong-kong.btn.btn-primary.btn-block.btn-lg Hong Kong + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#london.btn.btn-primary.btn-block.btn-lg London + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#los-angeles.btn.btn-primary.btn-block.btn-lg Los Angeles + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#manchester.btn.btn-primary.btn-block.btn-lg Manchester + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#melbourne.btn.btn-primary.btn-block.btn-lg Melbourne + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#new-york-city.btn.btn-primary.btn-block.btn-lg New York City + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#portland.btn.btn-primary.btn-block.btn-lg Portland + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#raleigh-durham.btn.btn-primary.btn-block.btn-lg Raleigh-Durham + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#san-francisco.btn.btn-primary.btn-block.btn-lg San Fransisco + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#seattle.btn.btn-primary.btn-block.btn-lg Seattle + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#singapore.btn.btn-primary.btn-block.btn-lg Singapore + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#toronto.btn.btn-primary.btn-block.btn-lg Toronto + .col-xs-12.btn-nav + button#other.btn.btn-primary.btn-block.btn-lg Other + .spacer + #income.initially-hidden + .spacer + h2.text-center How much money did you make last year (in USD)? + .spacer + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#0.btn.btn-primary.btn-block.btn-lg(href='#') $0 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#20000.btn.btn-primary.btn-block.btn-lg(href='#') $20,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#30000.btn.btn-primary.btn-block.btn-lg(href='#') $30,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#40000.btn.btn-primary.btn-block.btn-lg(href='#') $40,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#50000.btn.btn-primary.btn-block.btn-lg(href='#') $50,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#60000.btn.btn-primary.btn-block.btn-lg(href='#') $60,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#70000.btn.btn-primary.btn-block.btn-lg(href='#') $70,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#80000.btn.btn-primary.btn-block.btn-lg(href='#') $80,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#90000.btn.btn-primary.btn-block.btn-lg(href='#') $90,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#100000.btn.btn-primary.btn-block.btn-lg(href='#') $100,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#120000.btn.btn-primary.btn-block.btn-lg(href='#') $120,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#140000.btn.btn-primary.btn-block.btn-lg(href='#') $140,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#160000.btn.btn-primary.btn-block.btn-lg(href='#') $160,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000 + .col-xs-12.col-sm-12.col-md-4.btn-nav + button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000 + .spacer + #chart.initially-hidden + .d3-centered + svg.chart + #explanation.initially-hidden .col-xs-12.col-sm-10.col-sm-offset-1 - h3.text-primary#chosen Coming from _______, and making $_______, your true costs will be: - #city-buttons - h2 Where do you live? - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#atlanta.btn.btn-primary.btn-block.btn-lg Atlanta - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#austin.btn.btn-primary.btn-block.btn-lg Austin - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#brisbane.btn.btn-primary.btn-block.btn-lg Brisbane - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#boulder.btn.btn-primary.btn-block.btn-lg Boulder - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#chicago.btn.btn-primary.btn-block.btn-lg Chicago - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#denver.btn.btn-primary.btn-block.btn-lg Denver - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#hong-kong.btn.btn-primary.btn-block.btn-lg Hong Kong - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#london.btn.btn-primary.btn-block.btn-lg London - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#los-angeles.btn.btn-primary.btn-block.btn-lg Los Angeles - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#manchester.btn.btn-primary.btn-block.btn-lg Manchester - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#melbourne.btn.btn-primary.btn-block.btn-lg Melbourne - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#new-york-city.btn.btn-primary.btn-block.btn-lg New York City - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#portland.btn.btn-primary.btn-block.btn-lg Portland - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#raleigh-durham.btn.btn-primary.btn-block.btn-lg Raleigh-Durham - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#san-francisco.btn.btn-primary.btn-block.btn-lg San Fransisco - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#seattle.btn.btn-primary.btn-block.btn-lg Seattle - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#singapore.btn.btn-primary.btn-block.btn-lg Singapore - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#toronto.btn.btn-primary.btn-block.btn-lg Toronto - .col-xs-12.btn-nav - button#other.btn.btn-primary.btn-block.btn-lg Other - .spacer - #income.initially-hidden - h2 How much money did you make last year (in USD)? - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#0.btn.btn-primary.btn-block.btn-lg(href='#') $0 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#20000.btn.btn-primary.btn-block.btn-lg(href='#') $20,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#30000.btn.btn-primary.btn-block.btn-lg(href='#') $30,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#40000.btn.btn-primary.btn-block.btn-lg(href='#') $40,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#50000.btn.btn-primary.btn-block.btn-lg(href='#') $50,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#60000.btn.btn-primary.btn-block.btn-lg(href='#') $60,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#70000.btn.btn-primary.btn-block.btn-lg(href='#') $70,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#80000.btn.btn-primary.btn-block.btn-lg(href='#') $80,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#90000.btn.btn-primary.btn-block.btn-lg(href='#') $90,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#100000.btn.btn-primary.btn-block.btn-lg(href='#') $100,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#120000.btn.btn-primary.btn-block.btn-lg(href='#') $120,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#140000.btn.btn-primary.btn-block.btn-lg(href='#') $140,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#160000.btn.btn-primary.btn-block.btn-lg(href='#') $160,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000 - .col-xs-12.col-sm-6.col-md-4.btn-nav - button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000 - .spacer - #chart.initially-hidden - .d3-centered - svg.chart - #explanation.initially-hidden - .text-center - .text-center - button#transform.btn.btn-primary.btn-block.btn-lg Transform - .button-spacer - a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON - span   •   - a(href='/coding-bootcamp-cost-calculator') Recalculate - p.large-p Test + .text-center + button#transform.btn.btn-primary.btn-lg Transform + .button-spacer + a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON + span   •   + a(href='/coding-bootcamp-cost-calculator') Recalculate + h3 Notes: + ol + li.large-li For cash-up-front bootcamps, we assumed an APR of 6% and a term of 3 years. + li.large-li For wage-garnishing bootcamps, we assume 18% of first year wages at their advertised starting annual salary of around $100,000. + li.large-li We assume a cost of living of $500 for cities like San Francisco and New York City, and $400 per week for everywhere else. + li.large-li The most substantial cost for most people is lost wages. A 40-hour-per-week job at the US Federal minimum wage would pay at least $15,000 per year. You can read more about economic cost + a(href='https://en.wikipedia.org/wiki/Economic_cost' target='_blank') here + | . + li.large-li Free Code Camp. We don't charge tuition or garnish wages. We're fully online so you don't have to move. We're self-paced so you don't have to quit your job. Thus, your true cost of attending Free Code Camp will be $0.