From 9c7746a9e860bb096999f58a66242c493a435610 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 25 May 2015 17:09:49 -0700 Subject: [PATCH] improve challenge map view --- seed_data/challenges/basic-bonfires.json | 28 +++++++++ seed_data/challenges/basic-javascript.json | 28 --------- ...p.json => get-set-for-free-code-camp.json} | 2 +- views/challengeMap/show.jade | 60 ++++++++++--------- 4 files changed, 60 insertions(+), 58 deletions(-) rename seed_data/challenges/{getting-set-for-free-code-camp.json => get-set-for-free-code-camp.json} (99%) diff --git a/seed_data/challenges/basic-bonfires.json b/seed_data/challenges/basic-bonfires.json index cfa9d1f87d..aa9f46a4a5 100644 --- a/seed_data/challenges/basic-bonfires.json +++ b/seed_data/challenges/basic-bonfires.json @@ -2,6 +2,34 @@ "name": "Basic Algorithm Scripting", "order" : 0.007, "challenges": [ + { + "_id": "bd7139d8c441eddfaeb5bdef", + "name": "Waypoint: Pair Program on Bonfires", + "difficulty": 0.44, + "challengeSeed": "119657641", + "description": [ + "OK, we're finally ready to start pair programming!", + "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 Mac or Windows. Create your new user account from within the app.", + "We have a special chat room for people ready to pair program. Go to our Slack chat room, navigate to the #letspair channel and type \"Hello Pair Programmers!\"", + "If someone is available, they will be your \"pair\" - the person you pair programming with.", + "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 their own cursor, and will be able to type text on his or her and keyboard.", + "Now it's time to tackle our Bonfires.", + "Go to http://freecodecamp.com/bonfires and start working through our Bonfire challenges.", + "Once you you finish pair programming, end the session in Screen Hero session.", + "Congratulations! You have completed your first pair programming session.", + "Pair program as much as possible with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you get will be well worth it!", + "Mark this Waypoint complete and move on." + ], + "challengeType": 2, + "tests": [], + "challengeType": 0 + }, { "_id": "ad7123c8c441eddfaeb5bdef", "name": "Bonfire: Meet Bonfire", diff --git a/seed_data/challenges/basic-javascript.json b/seed_data/challenges/basic-javascript.json index 4865ed9af2..bd531192d7 100644 --- a/seed_data/challenges/basic-javascript.json +++ b/seed_data/challenges/basic-javascript.json @@ -160,34 +160,6 @@ "challengeType": 2, "tests": [], "challengeType": 0 - }, - { - "_id": "bd7139d8c441eddfaeb5bdef", - "name": "Waypoint: Pair Program on Bonfires", - "difficulty": 0.44, - "challengeSeed": "119657641", - "description": [ - "OK, we're finally ready to start pair programming!", - "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 Mac or Windows. Create your new user account from within the app.", - "We have a special chat room for people ready to pair program. Go to our Slack chat room, navigate to the #letspair channel and type \"Hello Pair Programmers!\"", - "If someone is available, they will be your \"pair\" - the person you pair programming with.", - "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 their own cursor, and will be able to type text on his or her and keyboard.", - "Now it's time to tackle our Bonfires.", - "Go to http://freecodecamp.com/bonfires and start working through our Bonfire challenges.", - "Once you you finish pair programming, end the session in Screen Hero session.", - "Congratulations! You have completed your first pair programming session.", - "Pair program as much as possible with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you get will be well worth it!", - "Mark this Waypoint complete and move on." - ], - "challengeType": 2, - "tests": [], - "challengeType": 0 } ] } diff --git a/seed_data/challenges/getting-set-for-free-code-camp.json b/seed_data/challenges/get-set-for-free-code-camp.json similarity index 99% rename from seed_data/challenges/getting-set-for-free-code-camp.json rename to seed_data/challenges/get-set-for-free-code-camp.json index 3af8a0b0de..b1cfc7e22f 100644 --- a/seed_data/challenges/getting-set-for-free-code-camp.json +++ b/seed_data/challenges/get-set-for-free-code-camp.json @@ -1,5 +1,5 @@ { - "name": "Getting Set for Free Code Camp", + "name": "Get Set for Free Code Camp", "order" : 0.001, "challenges": [ { diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index 0cb1ace524..a83a74feab 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -23,37 +23,39 @@ block content span.text-primary #{daysRunning}   | days ago. .spacer - .negative-15 for challengeBlock in challengeList - h3 #{challengeBlock.name} - ol - for challenge in challengeBlock.challenges - if completedChallengeList.indexOf(challenge._id) > -1 - .row - .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.large-p - .col-xs-12.col-sm-9.col-md-10 - li.faded.large-p - a(href="/challenges/#{challenge.name}")= challenge.name + .row + .col-xs-12.col-sm-8.col-sm-offset-2 + h3 #{challengeBlock.name} + .row + .col-xs-12 + ol + for challenge in challengeBlock.challenges + if completedChallengeList.indexOf(challenge._id) > -1 + .row + .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.large-p.negative-10 + .col-xs-12.col-sm-9.col-md-10 + li.faded.large-p.negative-10 + a(href="/challenges/#{challenge.name}")= challenge.name - else - .row - .hidden-xs.col-sm-3.col-md-2 - span - .col-xs-12.col-sm-9.col-md-10 - li.large-p - a(href="/challenges/#{challenge.name}")= challenge.name - - h2 - span.ion-ios-heart   Nonprofit Projects (800 hours of real-world experience)* - h3.negative-15 - ul - .row - .hidden-xs.col-sm-3.col-md-2 - span - .col-xs-12.col-sm-9.col-md-10 - li - a(href="/nonprofits/directory") Browse our nonprofit projects - p * Complete all Waypoints, Bonfires, Ziplines and Basejumps to be assigned your first nonprofit project + else + .row + .hidden-xs.col-sm-3.col-md-2 + span.negative-10 + .col-xs-12.col-sm-9.col-md-10 + li.large-p.negative-10 + a(href="/challenges/#{challenge.name}")= challenge.name + h3.text-center Nonprofit Projects (800 hours of real-world experience)* + .row + .col-xs-12 + ul + .row + .hidden-xs.col-sm-3.col-md-2 + span.negative-10 + .col-xs-12.col-sm-9.col-md-10 + li.large-p.negative-10 + a(href="/nonprofits/directory") Browse our nonprofit projects + p * Complete all Waypoints, Bonfires, Ziplines and Basejumps to be assigned your first nonprofit project #announcementModal.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation