make some copy changes reflecting our shift to coderbyte

app.js

@@ -211,10 +211,6 @@ app.get('/control-shortcuts', resourcesController.deployAWebsite);
 app.get('/stats', function(req, res) {
     res.redirect(301, '/learn-to-code');
 });
-app.get(
-    '/pair-program-with-team-viewer',
-    resourcesController.pairProgramWithTeamViewer
-);
 app.get('/learn-to-code', resourcesController.about);
 app.get('/about', function(req, res) {
     res.redirect(301, '/learn-to-code');

controllers/resources.js

@@ -97,25 +97,6 @@ module.exports = {
         });
     },
 
-    pairProgramWithTeamViewer: function(req, res) {
-        Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
-            if (err) {
-                debug('Challenge err: ', err);
-                next(err);
-            }
-            res.render('resources/pair-program-with-team-viewer', {
-                title: 'Challenge: Pair Program with Team Viewer',
-                name: 'Pair Program with Team Viewer',
-                video: '',
-                time: 30,
-                steps: steps,
-                cc: req.user ? req.user.challengesHash : undefined,
-                points: req.user ? req.user.points : undefined,
-                challenges: c
-            });
-        });
-    },
-
     about: function(req, res) {
         var date1 = new Date("10/15/2014");
         var date2 = new Date();

controllers/resources.json

@@ -117,34 +117,6 @@
     "question": "Latency of Sending a packet from California to the Netherlands and back",
     "answer": "150,000,000 nanoseconds"
   }],
-  "steps": [
-    "In the spirit of keeping Free Code Camp 100% free, we've created directions for using a totally free pair programming tool called Team Viewer. It's not as user-friendly as Screen Hero, but it gets the job done (and works on Linux!).",
-    "Go to <a href='http://www.teamviewer.com/en/index.aspx' target='_blank'>http://www.teamviewer.com/en/index.aspx</a> and download Team Viewer. Be sure not to download the beta version, which isn't compatible with the current stable version everyone else will be using.",
-    "Install it and launch it",
-    "We have a special chat room for people ready to pair program. Go to <a href='https://gitter.im/FreeCodeCamp/LetsPair' target='_blank'>https://gitter.im/FreeCodeCamp/LetsPair</a> and type \"Hello Pair Programmers!\".  you on a CoderByte challenge.",
-    "If someone is available, they will be your \"pair\" - the person you pair programming with.",
-    "<strong>First, you will pair program on your pair's computer.</strong> Ask your pair for his or her Team Viewer ID and password.",
-    "Enter this id, and then password, to start the session.",
-    "Once the Team Viewer session starts, look at the the top of the screen. You will see 6 buttons. If you hover your cursor over the buttons, they will slide down so that you can read them. Click the audio/video button. This will allow you to turn on Voice Over IP and unmute your microphone, opening up your voice channel.",
-    "Note that you can now control your pair's keyboard and mouse, enabling you to step in and code yourself on your pair's computer when desired",
-    "Now you can click the X to end the pair programming session.",
-    "<strong>Next, you will pair program on your computer.</strong> Copy your Team Viewer ID and paste it into the private chat, so that your pair can use it to connect with you.",
-    "You will need to share your randomly generated password with your pair as well.",
-    "Once your pair connects, you will see a Team Viewer side menu. ",
-    "Click the audio button that drops down.",
-    "Click the headset icon and choose Voice over IP",
-    "Click the microphone button to unmute your microphone. Once your pair does the same, you two will have an open voice channel.",
-    "Now you can click the X to end the pair programming session.",
-    "Now it's time to tackle CoderByte.",
-    "Create a CoderByte account at <a href='http://coderbyte.com/sl/' target='_blank'>http://coderbyte.com/sl/</a>",
-    "Now go to <a href='http://coderbyte.com/CodingArea/Challenges/#easyChals' target='_blank'>http://coderbyte.com/CodingArea/Challenges/#easyChals</a> and start working through Coderbyte's easy algorithm scripting challenges using JavaScript.",
-    "When you are finished pair programming, click the X to end the session.",
-    "Congratulations! You have completed your first pair programming session.",
-    "You should pair program with different campers until you've completed all the Easy, Medium and Hard CoderByte challenges. This is a big time investment, but the JavaScript practice you'll get, along with the scripting and algorithm experience, are well worth it!",
-    "You can complete CoderByte problems while you continue to work through Free Code Camp's challenges.",
-    "Be sure to pair program on these challenges, and remember to apply the RSAP methodology.",
-    "Click the button below to return to the Pair Programming challenge, then mark it complete."
-  ],
   "verbs": [
     "aced",
     "nailed",

controllers/user.js

@@ -233,7 +233,6 @@ exports.returnUser = function(req, res, next) {
           username: user.profile.username,
           name: user.profile.name,
           location: user.profile.location,
-          coderbyteProfile: user.profile.coderbyteProfile,
           githubProfile: user.profile.githubProfile,
           linkedinProfile: user.profile.linkedinProfile,
           codepenProfile: user.profile.codepenProfile,
@@ -329,7 +328,6 @@ exports.postUpdateProfile = function(req, res, next) {
         user.profile.username = req.body.username.trim() || '';
         user.profile.location = req.body.location.trim() || '';
         user.profile.githubProfile = req.body.githubProfile.trim() || '';
-        user.profile.coderbyteProfile = req.body.coderbyteProfile.trim() || '';
         user.profile.linkedinProfile = req.body.linkedinProfile.trim() || '';
         user.profile.codepenProfile = req.body.codepenProfile.trim() || '';
         user.profile.twitterHandle = req.body.twitterHandle.trim() || '';

seed_data/challenges.json

@@ -412,7 +412,7 @@
     ]
   },
   {
-    "name": "Pair Program on CoderByte",
+    "name": "Pair Program on Bonfires",
     "time": 60,
     "video": "114635308",
     "challengeNumber": 34,
@@ -421,21 +421,19 @@
       "Pair Programming is where two people code together on the same computer. It is an efficient way to collaborate, and widely practiced at software companies. Pair Programming is one of the core concepts of \"Agile\" Software Development, which you will hear more about later.",
       "Many people use Skype or Google Hangouts to pair program, but if you talk with professional software engineers, they will tell you that it's not really pair programming unless both people have the ability to use the keyboard and mouse.",
       "The most popular tool for pair programming is Screen Hero. You can download Screen Hero for <a href='http://links.screenhero.com/e/c/eyJlbWFpbF9pZCI6Ik1qQTNNem9XQkNJQ1pBQUNjd0FYQVZrVEdnRkxNamtfX0JWZEdGVEpSZkVCWlRwbFpXRTBNamM0WVMxaE56SmlMVEV4WlRRdE9HUXpZUzFpWXpVNE1HRTJNalkxTldNNk1UUTJNVEEyQUE9PSIsInBvc2l0aW9uIjowLCJocmVmIjoiaHR0cDovL2RsLnNjcmVlbmhlcm8uY29tL3NtYXJ0ZG93bmxvYWQvZklYQU1UUUJBTEtQQkhQTC9TY3JlZW5oZXJvLnppcD9zb3VyY2U9d2ViIn0=' target='_blank'>Mac</a> or <a href='http://links.screenhero.com/e/c/eyJlbWFpbF9pZCI6Ik1qQTNNem9XQkNJQ1pBQUNjd0FYQVZrVEdnRkxNamtfX0JWZEdGVEpSZkVCWlRwbFpXRTBNamM0WVMxaE56SmlMVEV4WlRRdE9HUXpZUzFpWXpVNE1HRTJNalkxTldNNk1UUTJNVEEyQUE9PSIsInBvc2l0aW9uIjoxLCJocmVmIjoiaHR0cDovL2RsLnNjcmVlbmhlcm8uY29tL3NtYXJ0ZG93bmxvYWQvZklYQU1UUUJBTEtQQkhQTC9TY3JlZW5oZXJvLXNldHVwLmV4ZSJ9' target='_blank'>Windows</a>. Create your new user account from within the app.",
-      "If you are using Linux, go to <a href='http://www.freecodecamp.com/pair-program-with-team-viewer' target='_blank'>http://www.freecodecamp.com/pair-program-with-team-viewer</a> to learn how to use an alternative (but inferior) tool called Team Viewer.",
       "We have a special chat room for people ready to pair program. Go to <a href='https://gitter.im/FreeCodeCamp/LetsPair' target='_blank'>https://gitter.im/FreeCodeCamp/LetsPair</a> and type \"Hello Pair Programmers!\"",
       "If someone is available, they will be your \"pair\" - the person you pair programming with.",
-      "Private message your pair and ask for the email address he or she used to register Screen Hero.",
+      "If no one gets back to you in the first few minutes, don't worry. There will be lots of opportunities to pair program in the future.",
+      "If someone does get back to you, private message them and ask for the email address they used to register Screen Hero.",
       "Add them as a new contact in Screen Hero, then click the monitor-looking button to attempt to share your screen with them.",
       "Once the Screen Hero session starts, your screen's margins will glow orange. You are now sharing your screen.",
-      "Your pair will have his or her own cursor, and will be able to type text on his or her and keyboard.",
+      "Your pair will have their own cursor, and will be able to type text on his or her and keyboard.",
-      "Now it's time to tackle CoderByte.",
+      "Now it's time to tackle our Bonfires.",
-      "Create a CoderByte account at <a href='http://coderbyte.com/sl/' target='_blank'>http://coderbyte.com/sl/</a>",
+      "Go to <a href='http://freecodecamp.com/bonfires' target='_blank'>http://freecodecamp.com/bonfires</a> and start working through our Bonfire challenges.",
-      "Now go to <a href='http://coderbyte.com/CodingArea/Challenges/#easyChals' target='_blank'>http://coderbyte.com/CodingArea/Challenges/#easyChals</a> and start working through Coderbyte's easy algorithm scripting challenges using JavaScript.",
+      "Once you you finish pair programming, end the session in Screen Hero session.",
-      "When you are finished pair programming, end the session in Screen Hero session.",
       "Congratulations! You have completed your first pair programming session.",
-      "You should pair program with different campers until you've completed all the Easy, Medium and Hard CoderByte challenges. This is a big time investment, but the JavaScript practice you'll get, along with the scripting and algorithm experience, are well worth it!",
+      "Try to pair program with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you'll get, along with the scripting and algorithm experience, are well worth it!",
-      "You can complete CoderByte problems while you continue to work through Free Code Camp's challenges.",
+      "You can complete Bonfire challenges while you continue to work through Free Code Camp's challenges. Take your time.",
-      "Be sure to pair program on these challenges, and remember to apply the RSAP methodology.",
       "Mark this challenge as complete and move on."
     ]
   },

views/account/show.jade

@@ -24,8 +24,6 @@ block content
                                     a.ion-social-linkedin.text-primary(title="@#{username}'s LinkedIn Profile", href=linkedinProfile, target='_blank')
                                 - if (codepenProfile)
                                     a.ion-social-codepen.text-primary(title="@#{username}'s CodePen Profile", href=codepenProfile, target='_blank')
-                                - if (coderbyteProfile)
-                                    a.ion-social-javascript.text-primary(title="@#{username}'s CoderByte Profile", href=coderbyteProfile, target='_blank')
                         .visible-md.visible-lg
                             .col-xs-12.col-sm-12.col-md-4.text-justify
                                 h1.flat-top.wrappable= name

views/partials/about.jade

@@ -20,7 +20,7 @@
                         p.negative-10 "I code whenever I'm not sleeping or in school. Making computers obey me is a dream come true."
                     .col-xs-12.col-sm-4.col-md-3.team-member
                         h3.negative-10.text-nowrap Branden Byers
-                        h4.negative-10.text-nowrap Community Builder
+                        h4.negative-10.text-nowrap Instructional Designer
                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/branden-byers.jpg' alt="Branden Byers picture")
                         h4.text-nowrap Madison, Wisconsin
                         p.negative-10 "Cookbook author and stay-at-home-dad. Started coding as a kid, got distracted, but now I'm back in full JavaScript force!"
@@ -68,7 +68,7 @@
                         p.negative-10 "I love origami, piano, and playing minecraft with my kids. My JavaScript grows stronger every day."
                     .col-xs-12.col-sm-4.col-md-3.team-member
                         h3.negative-10.text-nowrap Charles Watson
-                        h4.negative-10.text-nowrap iOS Engineer
+                        h4.negative-10.text-nowrap JavaScript Engineer
                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/charles-watson.jpg' alt="Charles Watson's picture")
                         h4.text-nowrap Minneapolis, Minnesota
                         p.negative-10 "I skipped college. I build iOS apps. I love the obstacles and puzzles that coding presents me."

views/resources/nonprofit-project-instructions.jade

@@ -14,8 +14,10 @@ block content
                     li Read this document, which will answer many questions you may have about our nonprofit projects:  
                         a(href="http://forum.freecodecamp.com/t/an-introduction-to-our-nonprofit-projects/856" target="_blank") http://forum.freecodecamp.com/t/an-introduction-to-our-nonprofit-projects/856
                         | .
-                    li We'll send you an invite to our Nonprofit Projects Trello board. Once we do, go there and add yourself to each of the nonprofit projects that interests you.
+                    li We'll send you an invite to our Nonprofit Projects Trello board. Once we do, go there and add yourself to at least 3 nonprofit projects that interest you.
-                    li Finish any unfinished easy and medium coderbyte challenges. These challenges serve as the Free Code Camp "exit test". You must be complete these before you can start working on nonprofit projects.
+                    li Finish any unfinished Bonfire challenges. These challenges serve as the Free Code Camp "exit test". You must complete these before you can start working on nonprofit projects. If you completed CoderByte or CodeWars challenges instead of Bonfire, email us and we'll take a look: 
+                        a(href="mailto:team@freecodecamp.com") team@freecodecamp.com
+                        | .
                 h4 Please email us if you have further questions:  
                     a(href="mailto:team@freecodecamp.com") team@freecodecamp.com
                     | .

views/resources/pair-program-with-team-viewer.jade

@@ -1,27 +0,0 @@
-extends ../layout
-block content
-    .row
-        .col-sm-12.col-md-8.col-xs-12
-            .panel.panel-primary
-                .panel-heading #{name} (takes #{time} minutes)
-                .panel.panel-body
-                    //.embed-responsive.embed-responsive-16by9
-                    //    iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
-                    h3 Steps:
-                    h4
-                        ol
-                        for step in steps
-                            li!= step
-                    a.btn.btn-primary.btn-big.btn-block.completed-challenge(href='/challenges/34') Take me back to the Pair Programming Challenge
-                .panel-footer.text-center
-                    span Need a break? Check out our: 
-                    a(href="https://gitter.im/FreeCodeCamp/FreeCodeCamp", target="_blank") Chat Room
-                    |  , 
-                    a(href="http://blog.freecodecamp.com", target="_blank") Blog
-                    |  , 
-                    a(href="https://twitter.com/freecodecamp", target="_blank") Twitter Feed
-                    |  , or 
-                    a(href="https://reddit.com/r/freecodecamp", target="_blank") Subreddit
-                    | .
-        .col-sm-12.col-md-4.col-xs-12
-            include ../partials/challenges