Merge pull request #9613 from FreeCodeCamp/staging

Release Staging

seed/challenges/00-getting-started/getting-started.json

@@ -391,7 +391,7 @@
         ],
         [
           "//i.imgur.com/pYk0wOk.gif",
-          "A gif showing how you Free Code Camp's GitHub repo.",
+          "A gif showing you Free Code Camp's GitHub repo.",
           "Open Free Code Camp's open-source repository. This is where our volunteer team collaborates on building Free Code Camp.",
           "https://github.com/freecodecamp/freecodecamp"
         ],

server/middlewares/csp.js

@@ -11,7 +11,7 @@ if (process.env.NODE_ENV !== 'production') {
 export default function csp() {
   return helmet.contentSecurityPolicy({
     directives: {
-      defaultSrc: trusted,
+      defaultSrc: trusted.concat('*.optimizely.com'),
       scriptSrc: [
         "'unsafe-eval'",
         "'unsafe-inline'",

server/views/partials/flyer.jade

@@ -3,6 +3,6 @@ if (user && user.points > 5)
         .row.flashMessage.negative-30
             .col-xs-12
                 #bill-board.alert.alert-info.fade.in(style='display: none;')
-                    button.close(type='button', data-dismiss='alert')
+                    button.close(type='button', data-dismiss='alert', id='dismiss-bill')
-                        span.ion-close-circled#dismiss-bill
+                        span.ion-close-circled
                     #bill-content

server/views/partials/footer.jade

@@ -1,5 +1,6 @@
 // scripts should be moved here
 script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
+script(src="https://cdn.optimizely.com/js/999692993.js")
 aside.map-aside.is-collapsed
   .map-aside-action-bar
       a.map-aside-action-item.map-aside-action-pop-out(href='/map' target='_blank' aria-label='open map in new tab')

server/views/resources/code-of-conduct.jade

@@ -9,7 +9,7 @@ block content
         ul
             li <bold>Harassment</bold> includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel and any malicious hacking or social engineering. Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).
             li <bold>Trolling</bold> includes posting inflammatory comments to provoke an emotional response or disrupt discussions.
-            li <bold>Spamming</bold> includes posting off-topic messages to disrupt discussions or promote a product.
+            li <bold>Spamming</bold> includes posting off-topic messages to disrupt discussions, promote a product, or solicit donations.
         p If you see someone harass, troll, or spam anywhere on Free Code Camp's online media (Gitter, YouTube, Facebook, etc.), notify us in our &thinsp;
             a(href='https://gitter.im/freecodecamp/admin' target='_blank') Admin room in Gitter
             | &thinsp; - preferably with a screen shot of the offense. Our team will take any action we deem appropriate, up to and including banning the offender from Free Code Camp.

server/views/resources/shop.jade

@@ -1,17 +1,31 @@
 extends ../layout
 block content
-    h1.text-center Shop
+    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
-            img.img-responsive.img-center(src='//i.imgur.com/MH1CvwY.jpg')
+            img.img-responsive.img-center(src='//i.imgur.com/FNFqn9Tg.jpg')
-            h3 Free Code Camp laptop stickers are here!
+            h3 Free Code Camp laptop stickers
-            h4 Get two for only $5, with free shipping anywhere!
+            h4 Get 2 for only $5, with free shipping anywhere!
             p These durable 2" (5 cm) stickers sport a matte finish, and look great anywhere - especially on your laptop.
             html.
-                <form action="//www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+                <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!">
                 <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
+            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
+    hr
+    .row
+        .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.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