gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9625 from FreeCodeCamp/staging

Browse Source 
Release staging
This commit is contained in:
Berkeley Martinez
2016-07-08 16:42:28 -07:00
committed by GitHub
parent 249be52cbd bc4cf4ab9d
commit 751d3b1311
4 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -30,7 +30,7 @@
"async": "^1.5.0",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.26",
"babel-eslint": "^6.0.0",
"babel-eslint": "6.1.0",
"babel-loader": "^6.2.1",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-es2015": "^6.3.13",

2
seed/challenges/01-front-end-development-certification/intermediate-bonfires.json
View File

@ -663,7 +663,7 @@
"title": "Sum All Primes",
"description": [
"Sum all the prime numbers up to and including the provided number.",
"A prime number is defined as having only two divisors, 1 and itself. For example, 2 is a prime number because it's only divisible by 1 and 2. 1 isn't a prime number, because it's only divisible by itself.",
"A prime number is defined as a number greater than one and having only two divisors, one and itself. For example, 2 is a prime number because it's only divisible by one and two.",
"The provided number may not be a prime.",
"Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/FreeCodeCamp-Get-Help' target='_blank'>Read-Search-Ask</a> if you get stuck. Try to pair program. Write your own code."
],

2
server/views/partials/flyer.jade
View File

@ -1,4 +1,4 @@
if (user && user.points > 5)
if (user && user.points > 15)
.container
.row.flashMessage.negative-30
.col-xs-12

58
server/views/resources/shop.jade
View File

@ -3,7 +3,7 @@ block content
h2.text-center Buy cool things and support our open source community
hr
.row
.col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
img.img-responsive.img-center(src='//i.imgur.com/FNFqn9Tg.jpg')
h3 Free Code Camp laptop stickers
h4 Get 2 for only $5, with free shipping anywhere!
@ -12,20 +12,60 @@ block content
<form action="//www.paypal.com/cgi-bin/webscr" onSubmit="ga('send', 'event', 'SHOP', 'SHOP-STICKER', 'Sticker PayPal button clicked');" method="post" target="_blank">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="R9AGYKJUCU37N">
<input type="image" src="//www.paypalobjects.com/en_US/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<input type="submit" class="btn btn-cta signup-btn btn-block" name="submit" value='Buy now with PayPal or a Credit Card'>
<img alt="" border="0" src="//www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
hr
.row
.col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
img.img-responsive.img-center(src='//i.imgur.com/BTtb8P0g.jpg')
h3 Get a $10 credit your own Digital Ocean server.
p After you spend $25, our community gets a $25 credit.
a.btn.btn-cta.signup-btn.btn-block#digital-ocean-cta(href="//m.do.co/c/ba8a71773373" target='_blank' onClick="ga('send', 'event', 'SHOP', 'SHOP-DIGITAL-OCEAN', 'Digital Ocean affiliate button clicked');") Claim your $10 credit
h3 Get a $10 credit your for own Digital Ocean server.
p Digital Ocean gives our community a $25 credit after you spend $25.
a.btn.btn-cta.signup-btn.btn-block(href="//m.do.co/c/ba8a71773373" target='_blank' onClick="ga('send', 'event', 'SHOP', 'SHOP-DIGITAL-OCEAN', 'Digital Ocean affiliate button clicked');") Claim your $10 credit now
hr
.row
.col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
img.img-responsive.img-center(src='http://i.imgur.com/YqZqTN6g.jpg')
h3 Buy some affordable domain names.
p Our community gets a 15% of your first purchase.
a.btn.btn-cta.signup-btn.btn-block#namecheap-cta(href="//www.namecheap.com/?aff=102130" onClick="ga('send', 'event', 'SHOP', 'SHOP-NAMECHEAP', 'Namecheap affiliate button clicked');") Claim your domain names
p Namecheap gives our community a 15% commission on your first purchase.
a.btn.btn-cta.signup-btn.btn-block(href="//www.namecheap.com/?aff=102130" onClick="ga('send', 'event', 'SHOP', 'SHOP-NAMECHEAP', 'Namecheap affiliate button clicked');") Get your domain name now
hr
.row
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
h2 Books our community recommends
p Amazon gives our community a commission if you make a purchase right after clicking one of these buttons.
.spacer
img.img-responsive.img-center(src='//i.imgur.com/hV9F2bo.jpg' alt='Cracking the Coding Interivew book cover')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/0984782850/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0984782850&linkCode=as2&tag=out0b4b-20&linkId=41b9f338b2a1a8ba00d67f944f68a982" onClick="ga('send', 'event', 'SHOP', 'SHOP-CRACKING', 'Cracking the Code Interivew affiliate button clicked');" target='_blank') Buy "Cracking the Coding Interview" on Amazon
.spacer
hr
.spacer
img.img-responsive.img-center(src='//i.imgur.com/rLN9oKk.jpg' alt='JavaScript: The Definitive Guide book cover')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/0596805527/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596805527&linkCode=as2&tag=out0b4b-20&linkId=f490d30d420bf57fc1efe2de57eece65" onClick="ga('send', 'event', 'SHOP', 'SHOP-JS-DIFINITIVE-GUIDE', 'JavaScript the Definitive Guide affiliate button clicked');" target='_blank') Buy "JavaScript: the Definitive Guide" on Amazon
.spacer
hr
.spacer
img.img-responsive.img-center(src='//i.imgur.com/KU60I7r.jpg' alt='How Linux Works: What Every Superuser Should Know book cover')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/1593275676/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1593275676&linkCode=as2&tag=out0b4b-20&linkId=a6a83ec9ed8d137f3ff56fbcfc6c05ce" onClick="ga('send', 'event', 'SHOP', 'SHOP-HOW-LINUX-WORKS', 'How Linux Works affiliate button clicked');" target='_blank') Buy "How Linux Works" on Amazon
.spacer
hr
.spacer
img.img-responsive.img-center(src='//i.imgur.com/nR4VIU4.jpg' alt='JavaScript: The Good Parts book cover')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/0596517742/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596517742&linkCode=as2&tag=out0b4b-20&linkId=644f8ba9661c9db7dd4bb3ff6216a8d1" onClick="ga('send', 'event', 'SHOP', 'SHOP-JAVASCRIPT-THE-GOOD-PARTS', 'JavaScript the Good Parts affiliate button clicked');" target='_blank') Buy "JavaScript: The Good Parts" on Amazon
.spacer
hr
.spacer
img.img-responsive.img-center(src='//i.imgur.com/CR2dSql.jpg' alt='Eloquent JavaScript: A Modern Introduction to Programming book cover')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/1593272820/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1593272820&linkCode=as2&tag=out0b4b-20&linkId=c1c6d7e0eed6ae696a4bffe7eb935711" onClick="ga('send', 'event', 'SHOP', 'SHOP-ELOQUENT-JAVASCRIPT', 'Eloquent JavaScript affiliate button clicked');" target='_blank') Buy "Elopquent JavaScript" on Amazon
.spacer
hr
.spacer
img.img-responsive.img-center(src='//i.imgur.com/IplEMb4.jpg' alt='JavaScript and jQuery: Interactive Front End Development')
.button-spacer
a.btn.signup-btn(href="//www.amazon.com/gp/product/1118531647/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1118531647&linkCode=as2&tag=out0b4b-20&linkId=fdce3ef75bf3cd1cb220020a595decba" onClick="ga('send', 'event', 'SHOP', 'SHOP-JAVASCRIPT-AND-JQUERY', 'JavaScript and jQuery affiliate button clicked');" target='_blank') Buy "JavaScript and jQuery" on Amazon