diff --git a/app.js b/app.js index bda9e6393ea..0168a5b8b86 100644 --- a/app.js +++ b/app.js @@ -131,8 +131,8 @@ app.get( app.get('/learn-to-code', resourcesController.learnToCode); app.get('/privacy', resourcesController.privacy); app.get('/jquery-exercises', resourcesController.jqueryExercises); -app.get('/text-based-adventure-tutorial-app', resourcesController.textBasedAdventureTutorial); app.get('/chromebook', resourcesController.chromebook); +app.get('/pair-program-with-team-viewer', resourcesController.pairProgramWithTeamViewer); app.get('/programmer-interview-questions-app', resourcesController.programmerInterviewQuestionsApp); app.get('/about', resourcesController.about); app.get('/login', userController.getLogin); diff --git a/controllers/resources.js b/controllers/resources.js index d4844a83f43..3232b76f24e 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -29,16 +29,46 @@ exports.jqueryExercises = function(req, res) { exports.programmerInterviewQuestionsApp = function(req, res) { res.render('programmer-interview-questions-app', { - title: 'programmer-interview-questions-app' + title: 'Programmer Interview Questions App' }); } -exports.textBasedAdventureTutorial = function(req, res) { - res.render('text-based-adventure-tutorial-app', { - title: 'text-based-adventure-tutorial-app' +exports.pairProgramWithTeamViewer = function(req, res) { + res.render('pair-program-with-team-viewer', { + title: 'Challenge: Pair Program with Team Viewer', + name: "Pair Program with Team Viewer", + video: '', + time: 30, + 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 http://www.teamviewer.com/en/index.aspx 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", + "Go to the chat room and ask if anyone wants to pair program with you on a CoderByte challenge.", + "If someone is interested, they will be your \"pair\" - the person you pair programming with.", + "First, you will pair program on your pair's computer. 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.", + "Next, you will pair program on your computer. 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 http://coderbyte.com/sl/", + "Now go to http://coderbyte.com/CodingArea/Challenges/#easyChals 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 Code 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."], + cc: req.user.challengesHash + }); } - exports.about = function(req, res) { res.render('about', { title: 'Who We Are' diff --git a/seed_data/challenges.json b/seed_data/challenges.json index f5a8604b3a7..cf784c9dae3 100644 --- a/seed_data/challenges.json +++ b/seed_data/challenges.json @@ -394,33 +394,22 @@ "steps": [ "OK, we're finally ready to start pair programming!", "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. Both programmers get their own mouse cursor. The only problem is that Screen Hero isn't currently free, and it's not yet available for Linux.", - "So in the spirit of keeping Free Code Camp 100% free, we've created directions for using a totally free tool called Team Viewer. It's not as user-friendly as Screen Hero, but it gets the job done (and works on Linux!).", - "If you want, You can skip these steps and simply install Screen Hero (which comes with a 14 day free trial) here: https://screenhero.com/download.html.", - "Otherwise, go to http://www.teamviewer.com/en/index.aspx 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", + "The most popular tool for pair programming is Screen Hero. Both programmers get their own mouse cursor. Note that Screen Hero isn't free, and isn't yet available for Linux. Screen Hero does come with a 14 day free trial, is free for students, and you can also use it for free if your pair has a 14-day trial or a paid subscription to it. Download Scree Hero here: https://screenhero.com/download.html.", + "If you are using Linux, or if your 14 day free trial for Screen Hero has expired and you don't want to pay $10 per month for it, go to https://www.freecodecamp.com/pair-program-with-team-viewer.html to learn how to use an alternative (but inferior) tool called Team Viewer.", "Go to the chat room and ask if anyone wants to pair program with you on a CoderByte challenge.", "If someone is interested, they will be your \"pair\" - the person you pair programming with.", - "First, you will pair program on your pair's computer. 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.", - "Next, you will pair program on your computer. 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.", + "Private message your pair and ask for the email address he or she 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.", "Now it's time to tackle CoderByte.", "Create a CoderByte account at http://coderbyte.com/sl/", "Now go to http://coderbyte.com/CodingArea/Challenges/#easyChals 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.", + "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 Code 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 programming on these challenges, and remember to apply the RSAP methodology.", + "Be sure to pair program on these challenges, and remember to apply the RSAP methodology.", "Mark this challenge as complete and move on." ] }, diff --git a/views/pair-program-with-team-viewer.jade b/views/pair-program-with-team-viewer.jade new file mode 100644 index 00000000000..3e512b7379d --- /dev/null +++ b/views/pair-program-with-team-viewer.jade @@ -0,0 +1,27 @@ +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 \ No newline at end of file