From c2a9a1ca62cf1a5dc377bc614e571311b0e1df04 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 2 Jul 2015 17:31:08 -0700 Subject: [PATCH] add an ajax challenge --- public/json/cats.json | 29 ++++++++++ seed/challenges/basic-javascript.json | 32 ----------- seed/challenges/future-jquery-ajax-json.json | 58 ++++++++++++-------- seed/field-guides.json | 25 +++++---- server/boot/randomAPIs.js | 24 -------- 5 files changed, 77 insertions(+), 91 deletions(-) create mode 100644 public/json/cats.json diff --git a/public/json/cats.json b/public/json/cats.json new file mode 100644 index 0000000000..209e8ae685 --- /dev/null +++ b/public/json/cats.json @@ -0,0 +1,29 @@ +[ + { + "id": 0, + "imageLink": "http://rs611.pbsrc.com/albums/tt194/allypopper423/Funny-Cat-Green-Avacado.jpg~c200", + "codeNames": [ + "Juggernaut", + "Mrs. Wallace", + "Buttercup" + ] + }, + { + "id": 1, + "imageLink": "http://cdn.grumpycats.com/wp-content/uploads/2012/09/GC-Gravatar-copy.png", + "codeNames": [ + "Oscar", + "Scrooge", + "Tyrion" + ] + }, + { + "id": 2, + "imageLink": "http://www.kittenspet.com/wp-content/uploads/2012/08/cat_with_funny_face_3-200x200.jpg", + "codeNames": [ + "The Doctor", + "Loki", + "Joker" + ] + } +] diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index e7fe614659..b8ae5cbaa1 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -196,38 +196,6 @@ "namePt": "", "descriptionPt": [] }, - { - "id": "bd7118d8c441eddfaeb5bdef", - "name": "Waypoint: Discover Chrome DevTools", - "dashedName": "waypoint-discover-chrome-devTools", - "difficulty": 0.32, - "challengeSeed": ["110752743"], - "description": [ - "It's time to learn the most powerful tool your browser has - the Development Tools!", - "If you aren't already using Chrome, you'll want to download it here: http://www.google.com/chrome/. While it's true that Firefox has a tool called Firebug that is very similar to Chrome's DevTools, we will use Chrome for this challenge.", - "Note that this course, jointly produced by Google and Code School, is technologically impressive, but occasionally buggy. If you encounter a bug, just ignore it and keep going.", - "Go to http://discover-devtools.codeschool.com.", - "Complete \"Chapter 1: Getting Started & Basic DOM and Styles\".", - "Complete \"Chapter 2: Advanced DOM and Styles\".", - "Complete \"Chapter 3: Working with the Console\".", - "Complete \"Chapter 4: Debugging JavaScript\".", - "Complete \"Chapter 5: Improving Network Performance\".", - "Complete \"Chapter 6: Improving Performance\".", - "Complete \"Chapter 7: Memory Profiling\"." - ], - "challengeType": 2, - "tests": [], - "nameCn": "", - "descriptionCn": [], - "nameFr": "", - "descriptionFr": [], - "nameRu": "", - "descriptionRu": [], - "nameEs": "", - "descriptionEs": [], - "namePt": "", - "descriptionPt": [] - }, { "id": "bd7138d8c441eddfaeb5bdef", "name": "Waypoint: Learn Regular Expressions", diff --git a/seed/challenges/future-jquery-ajax-json.json b/seed/challenges/future-jquery-ajax-json.json index f6d8ac67d8..435381f0b8 100644 --- a/seed/challenges/future-jquery-ajax-json.json +++ b/seed/challenges/future-jquery-ajax-json.json @@ -524,7 +524,7 @@ "id": "bad87fee1348bd9ae9c08826", "name": "Waypoint: Loop through JSON Data Using jQuery", "dashedName": "waypoint-loop-through-json-data-using-jquery", - "difficulty": 0.089, + "difficulty": 0.088, "description": [ ], @@ -549,38 +549,50 @@ ], "challengeSeed": [ - + "fccss", + " $(document).ready(function() {", + "", + " });", + "fcces", + "", + "", + "
", + "
" ], "challengeType": 0 - }, { - "id": "bad87fee1348bd9aedd08826", - "name": "Waypoint: Use Shortened Hex Codes for Colors", - "dashedName": "waypoint-use-shortened-hex-codes-for-colors", - "difficulty": 0.071, - "description": [ - - ], - "tests": [ - - ], - "challengeSeed": [ - - ] } ] } diff --git a/seed/field-guides.json b/seed/field-guides.json index 777ba6e925..17d3748856 100644 --- a/seed/field-guides.json +++ b/seed/field-guides.json @@ -237,22 +237,23 @@ "dashedName": "what-are-the-official-free-code-camp-chat-rooms", "description": [ "
", - "

We have 3 official chat rooms:

", + "

We have 4 official chat rooms:

", "
    ", - "
  1. Free Code Camp - a friendly place where you can hang out and chat
    2. ", - "
  2. Help - the best place to get help from your fellow campers
    3. ", - "
  3. LetsPair - the best room to find a fellow campers to pair program with
    4. ", + "
  4. Free Code Camp - a friendly place where you can hang out and chat
    5. ", + "
  5. Help - the best place to get help from your fellow campers
    6. ", + "
  6. LetsPair - the best room to find fellow campers to pair program with using Screen Hero
    7. ", + "
  7. TeamViewer - the best room to find fellow campers who use Linux and pair with using Team Viewer
    8. ", "
", "

We also have language-specific chat rooms:

", " ", "

Finally, we have one room for each of our local Campsites.

", "

If you think we should add a chat room, please message @quincylarson in Gitter.

", diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index 35e892d376..987a488d86 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -28,10 +28,8 @@ module.exports = function(app) { router.get('/nonprofits-form', nonprofitsForm); router.get('/our-sponsors', sponsors); router.get('/jobs-form', jobsForm); - router.get('/submit-cat-photo', catPhotoSubmit); router.get('/unsubscribe/:email', unsubscribe); router.get('/unsubscribed', unsubscribed); - router.get('/cats.json', getCats); app.use(router); @@ -364,26 +362,4 @@ module.exports = function(app) { } ); } - - function getCats(req, res) { - res.send( - [ - { - 'name': 'cute', - 'imageLink': 'https://encrypted-tbn3.gstatic.com/images' + - '?q=tbn:ANd9GcRaP1ecF2jerISkdhjr4R9yM9-8ClUy-TA36MnDiFBukd5IvEME0g' - }, - { - 'name': 'grumpy', - 'imageLink': 'http://cdn.grumpycats.com/wp-content/uploads/' + - '2012/09/GC-Gravatar-copy.png' - }, - { - 'name': 'mischievous', - 'imageLink': 'http://www.kittenspet.com/wp-content' + - '/uploads/2012/08/cat_with_funny_face_3-200x200.jpg' - } - ] - ); - } };