From 932bc0ab657739fe83d0f81663285b1b6829c041 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 4 Aug 2015 23:24:26 -0700 Subject: [PATCH 1/7] continue working on jquery challenges --- seed/challenges/jquery-ajax-and-json.json | 546 +++++++++++++++++++++- 1 file changed, 544 insertions(+), 2 deletions(-) diff --git a/seed/challenges/jquery-ajax-and-json.json b/seed/challenges/jquery-ajax-and-json.json index ed9c2c64c9..d4158154cd 100644 --- a/seed/challenges/jquery-ajax-and-json.json +++ b/seed/challenges/jquery-ajax-and-json.json @@ -793,9 +793,9 @@ "difficulty": 3.16, "description": [ "You can also target all the even-numbered elements.", - "Note that computers start counting at zero, so technically, the first element is actually element number zero, which is an odd number.", + "Note that computers start counting at zero, so technically, the first element is actually element number zero, which is an even number.", "So what a human would consider odd numbers: 1, 3, 5, 7 - a computer would actually consider odd numbers.", - "Here's how you would target all the odd-numbered elements with class \"target\" and give them classes: $('.target:odd').addClass('animated shake');", + "Here's how you would target all the odd-numbered elements with class \"target\" and give them classes: $('.target:odd').addClass('animated bounce');", "Try selecting all the even-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of \"animated\" and \"shake\"." ], "tests": [ @@ -846,6 +846,67 @@ "challengeType": 0 }, + { + "id": "bad87fee1348bd9bed008826", + "name": "Waypoint: Target Odd Numbered Elements Using jQuery", + "dashedName": "waypoint-target-odd-numbered-elements-using-jquery", + "difficulty": 3.165, + "description": [ + "You can also target all the odd-numbered elements.", + "Note that computers start counting at zero, so technically, the first element is actually element number zero, which is an even number.", + "So what a human would consider odd numbers: 1, 3, 5, 7 - a computer would actually consider odd numbers.", + "Here's how you would target all the even-numbered elements with class \"target\" and give them classes: $('.target:even').addClass('animated bounce');", + "Try selecting all the odd-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of \"animated\" and \"fadeOut\"." + ], + "tests": [ + "assert($('.target:odd').hasClass('animated') && ($('.target:odd').hasClass('fadeOut') || $('.target:odd').hasClass('fadeout')), 'All the \"target\" elements that computer considers odd should fade out.')", + "assert(editor.match(/\\:even/g), 'You should use the :even function to modify these elements.')", + "assert(editor.match(/", + " ", + " ", + " ", + " ", + "
", + "

#right-well

", + "
", + " ", + " ", + " ", + "
", + "
", + " ", + "" + ], + "challengeType": 0 + }, + { "id": "bad87fee1348bd9aecb08826", "name": "Waypoint: Use jQuery to Modify the Entire Page", @@ -873,6 +934,7 @@ " $('#left-well').children().css('color', 'green');", " $('.target:nth-child(2)').addClass('animated bounce');", " $('.target:even').addClass('animated shake');", + " $('.target:even').addClass('animated fadeOut');", "", " });", "fcces", @@ -902,6 +964,486 @@ "" ], "challengeType": 0 + }, + + { + "id": "bad87fee1348bd9aeca08826", + "name": "Waypoint: Trigger on click Events with jQuery", + "dashedName": "waypoint-trigger-onclick-events-with-jquery", + "difficulty": 3.19, + "description": [ + ".on('click', function() {", + "", + "});" + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + "", + " });", + "fcces", + "", + "", + "", + "
", + "
", + " ", + " ", + " ", + " ", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad84fee1348bd9aecc58826", + "name": "Waypoint: Read Data from an Element Using jQuery", + "dashedName": "waypoint-read-data-from-an-element-using-jquery", + "difficulty": 3.17, + "description": [ + "Let's make everything roll with rollOut." + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + " $('button').on('click', function() {", + "", + " });", + " });", + "fcces", + "", + "", + "", + "
", + "
", + "
", + " ", + "
", + "
", + "

#check-me

", + "
", + " ", + " Is the checkbox checked?", + " ", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad84fee1348bd9aecc48826", + "name": "Waypoint: Read Data from an Element Using jQuery", + "dashedName": "waypoint-read-data-from-an-element-using-jquery", + "difficulty": 3.17, + "description": [ + "Let's make everything roll with rollOut." + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + " $('button').on('click', function() {", + " $('#click-me').addClass('animated shake');", + " });", + " });", + "fcces", + "", + "", + "", + "
", + "
", + "
", + " ", + "
", + "
", + "

#check-me

", + "
", + " ", + " Is the checkbox checked?", + " ", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad84fee1348bd9aecc38826", + "name": "Waypoint: Read Data from an Element Using jQuery", + "dashedName": "waypoint-read-data-from-an-element-using-jquery", + "difficulty": 3.17, + "description": [ + "Let's make everything roll with rollOut." + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + " $('button').on('click', function() {", + " $('#click-me').addClass('animated shake');", + " $('#checked-state').text('happy text');", + " });", + " });", + "fcces", + "", + "", + "", + "
", + "
", + "
", + " ", + "
", + "
", + "

#check-me

", + "
", + " ", + " Is the checkbox checked?", + " ", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad84fee1348bd9aecc28826", + "name": "Waypoint: Read Data from an Element Using jQuery", + "dashedName": "waypoint-read-data-from-an-element-using-jquery", + "difficulty": 3.17, + "description": [ + "Let's make everything roll with rollOut." + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + " $('button').on('click', function() {", + " $('#click-me').addClass('animated shake');", + " $('#checked-state').text($('#check-me').prop('checked'));", + " });", + " });", + "fcces", + "", + "", + "", + "
", + "
", + "
", + " ", + "
", + "
", + "

#check-me

", + "
", + " ", + " Is the checkbox checked?", + " ", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad84fee1348bd9aecc18826", + "name": "Waypoint: Read Data from an Element Using jQuery", + "dashedName": "waypoint-read-data-from-an-element-using-jquery", + "difficulty": 3.17, + "description": [ + + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " $(document).ready(function() {", + " $('button').on('click', function() {", + " $('#click-me').addClass('animated shake');", + " $('#checked-state').text($('#check-me').prop('checked'));", + " });", + " });", + "fcces", + "", + "", + "", + "
", + "
", + "
", + " ", + "
", + "
", + "

#check-me

", + "
", + " ", + " Is the checkbox checked?", + " ", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad87fee1348bd9aecc08826", + "name": "Waypoint: Trigger onHover Events with jQuery", + "dashedName": "waypoint-trigger-onhover-events-with-jquery", + "difficulty": 3.18, + "description": [ + + ], + "tests": [ + + ], + "challengeSeed": [ + + ], + "challengeType": 0 + }, + + + { + "id": "bad87fee1348bd9aebc08726", + "name": "Waypoint: Learn how JSON Works", + "dashedName": "waypoint-learn-how-json-works", + "difficulty": 3.21, + "description": [ + "JSON stands for \"JavaScript Object Notation\". It's how you create objects in JavaScript.", + "JSON is a series of \"key-value pairs\". Everything on the left of the colon (:) is the \"key\" you use to unlock the \"value\" on the right of the colon." + ], + "tests": [ + + ], + "challengeSeed": [ + "[", + " {", + " \"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\"", + " ]", + " }", + "]" + ], + "challengeType": 0 + }, + + { + "id": "bad87fee1348bd9aebc08826", + "name": "Waypoint: Get Data from an URL Using jQuery", + "dashedName": "waypoint-get-data-from-a-url-using-jquery", + "difficulty": 3.21, + "description": [ + + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + "", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + "", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad87fee1348bd9ae9c08826", + "name": "Waypoint: Loop through JSON Data Using jQuery", + "dashedName": "waypoint-loop-through-json-data-using-jquery", + "difficulty": 3.22, + "description": [ + + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + "", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + "", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad88fee1348bd9ae8c08726", + "name": "Waypoint: Wire AJAX Call into a jQuery Click Event", + "dashedName": "waypoint-wire-ajax-call-into-a-jquery-click-event", + "difficulty": 3.24, + "description": [ + "" + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " var random = function() { return Math.floor(Math.random() * 3) }", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + "", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad88fee1348bd9ae8c08626", + "name": "Waypoint: Wire AJAX Call into a jQuery Click Event", + "dashedName": "waypoint-wire-ajax-call-into-a-jquery-click-event", + "difficulty": 3.24, + "description": [ + "" + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " var random = function() { return Math.floor(Math.random() * 3) }", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + " var kitten = json[random()];", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad88fee1348bd9ae8c08526", + "name": "Waypoint: Wire AJAX Call into a jQuery Click Event", + "dashedName": "waypoint-wire-ajax-call-into-a-jquery-click-event", + "difficulty": 3.24, + "description": [ + "" + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " var random = function() { return Math.floor(Math.random() * 3) }", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + " var kitten = json[random()];", + " $(\"\").appendTo('#output');", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 + }, + + { + "id": "bad88fee1348bd9ae8c08426", + "name": "Waypoint: Wire AJAX Call into a jQuery Click Event", + "dashedName": "waypoint-wire-ajax-call-into-a-jquery-click-event", + "difficulty": 3.24, + "description": [ + "" + ], + "tests": [ + + ], + "challengeSeed": [ + "fccss", + " var random = function() { return Math.floor(Math.random() * 3) }", + " $(document).ready(function() {", + "", + " $('#cat-button').on('click', function() {", + " $.getJSON('/json/cats.json', function( json ) {", + " var kitten = json[random()];", + " $(\"\").appendTo('#output');", + " $(\"

Code name: \" + kitten.codeNames[random()] + \"

\").appendTo('#output');", + " });", + " });", + "", + " });", + "fcces", + "", + "
", + "
" + ], + "challengeType": 0 } ] } From fa86f650e25f479e9f674bd2cd65770d5ad6078f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 4 Aug 2015 23:31:00 -0700 Subject: [PATCH 2/7] update cats to fetch from s3 --- public/json/cats.json | 6 +-- seed/challenges/bootstrap.json | 68 +++++++++++++++--------------- seed/challenges/html5-and-css.json | 50 +++++++++++----------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/public/json/cats.json b/public/json/cats.json index 209e8ae685..84d9d1b243 100644 --- a/public/json/cats.json +++ b/public/json/cats.json @@ -1,7 +1,7 @@ [ { "id": 0, - "imageLink": "http://rs611.pbsrc.com/albums/tt194/allypopper423/Funny-Cat-Green-Avacado.jpg~c200", + "imageLink": "https://s3.amazonaws.com/freecodecamp/funny-cat.jpg", "codeNames": [ "Juggernaut", "Mrs. Wallace", @@ -10,7 +10,7 @@ }, { "id": 1, - "imageLink": "http://cdn.grumpycats.com/wp-content/uploads/2012/09/GC-Gravatar-copy.png", + "imageLink": "https://s3.amazonaws.com/freecodecamp/grumpy-cat.jpg", "codeNames": [ "Oscar", "Scrooge", @@ -19,7 +19,7 @@ }, { "id": 2, - "imageLink": "http://www.kittenspet.com/wp-content/uploads/2012/08/cat_with_funny_face_3-200x200.jpg", + "imageLink": "https://s3.amazonaws.com/freecodecamp/mischievous-cat.jpg", "codeNames": [ "The Doctor", "Loki", diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 5a89962f12..eaec28238b 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -50,7 +50,7 @@ "", "

Click here for cat photos.

", "", - "", + "", "", "

Things cats love:

", "
    ", @@ -92,14 +92,14 @@ "dashedName": "waypoint-make-images-mobile-responsive", "difficulty": 2.02, "description": [ - "First, Add a new image with the src attribute of \"http://bit.ly/fcc-kittens2\".", + "First, Add a new image with the src attribute of \"http://bit.ly/fcc-running-cats\".", "It would be great if this image could be exactly the width of our phone's screen.", "Fortunately, with Bootstrap, all we need to do is add the \"img-responsive\" class to your image. Do this, and the image should perfectly fit the width of your page." ], "tests": [ "assert($('img').length > 1, 'You should have a total of two images.')", "assert($('img').hasClass('img-responsive'), 'Your new image should have the class \"img-responsive\".')", - "assert(new RegExp('http://bit.ly/fcc-kittens2', 'gi').test($('img.img-responsive').attr('src')), 'Add a second image with the src of http://bit.ly/fcc-kittens2.')" + "assert(new RegExp('http://bit.ly/fcc-running-cats', 'gi').test($('img.img-responsive').attr('src')), 'Add a second image with the src of http://bit.ly/fcc-kittens2.')" ], "challengeSeed": [ "", @@ -134,7 +134,7 @@ "", "

    Click here for cat photos.

    ", "", - " ", + " ", "", "

    Things cats love:

    ", "
      ", @@ -216,9 +216,9 @@ "", "

      Click here for cat photos.

      ", "", - " ", + " ", "", - " ", + " ", "

      Things cats love:

      ", "
        ", "
      • cat nip
      • ", @@ -301,9 +301,9 @@ "", "

        Click here for cat photos.

        ", "", - " ", + " ", "", - " ", + " ", "

        Things cats love:

        ", "
          ", "
        • cat nip
        • ", @@ -389,9 +389,9 @@ "", "

          Click here for cat photos.

          ", "", - " ", + " ", "", - " ", + " ", " ", "

          Things cats love:

          ", "
            ", @@ -476,9 +476,9 @@ "", "

            Click here for cat photos.

            ", "", - " ", + " ", "", - " ", + " ", " ", "

            Things cats love:

            ", "
              ", @@ -564,9 +564,9 @@ "", "

              Click here for cat photos.

              ", "", - " ", + " ", "", - " ", + " ", " ", "

              Things cats love:

              ", "
                ", @@ -652,9 +652,9 @@ "", "

                Click here for cat photos.

                ", "", - " ", + " ", "", - " ", + " ", " ", " ", "

                Things cats love:

                ", @@ -745,9 +745,9 @@ "", "

                Click here for cat photos.

                ", "", - " ", + " ", "", - " ", + " ", " ", " ", " ", @@ -836,9 +836,9 @@ "", "

                Click here for cat photos.

                ", "", - " ", + " ", "", - " ", + " ", "
                ", "
                ", " ", @@ -925,9 +925,9 @@ "
                ", "

                CatPhotoApp

                ", "", - " ", + " ", "", - " ", + " ", "
                ", "
                ", " ", @@ -1009,10 +1009,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1094,10 +1094,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1179,10 +1179,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1265,10 +1265,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1358,10 +1358,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1460,10 +1460,10 @@ "

                CatPhotoApp

                ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index 7cbb0d11c7..3297602d56 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -814,7 +814,7 @@ "", "

                CatPhotoApp

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -877,7 +877,7 @@ "", "

                CatPhotoApp

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -943,7 +943,7 @@ "", "

                CatPhotoApp

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1009,7 +1009,7 @@ "", "

                CatPhotoApp

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1078,7 +1078,7 @@ "", "

                CatPhotoApp

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1155,7 +1155,7 @@ "", "cat photos", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1223,7 +1223,7 @@ "", "

                Click here for cat photos.

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1254,7 +1254,7 @@ "difficulty": 1.25, "description": [ "You can make elements into links by nesting them within an a element.", - "Nest your image within an a element. Here's an example: <a href='#'><img src='http://bit.ly/fcc-kittens2'/></a>.", + "Nest your image within an a element. Here's an example: <a href='#'><img src='http://bit.ly/fcc-running-cats'/></a>.", "Remember to use the hash symbol (#) as your a element's href property in order to turn it into a dead link.", "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link." ], @@ -1295,7 +1295,7 @@ "", "

                Click here for cat photos.

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1315,7 +1315,7 @@ "descriptionDe": [ "Umschließe dein img Element mit einem a Element als toten Link.", "Du kannst jedes Element in einen Link verwandeln, indem du es mit einem a Element umschließt.", - "Umschließe nun dein Bild mit einem a Element. Hier ist ein Beispiel: <a href='#'><img src='http://bit.ly/fcc-kittens2'/></a>.", + "Umschließe nun dein Bild mit einem a Element. Hier ist ein Beispiel: <a href='#'><img src='http://bit.ly/fcc-running-cats'/></a>.", "Vergewissere dich, dass du ein Hash Symbol (#) innerhalb des href Attributs des a Elements nutzt, um daraus einen toten Link zu machen.", "Sobald du das gemacht hast, kannst du mit der Maus über dein Bild fahren. Der normale Mauszeiger sollte nun zu einer Hand für Links werden. Das Bild ist jetzt ein Link." ] @@ -1366,7 +1366,7 @@ "", "

                Click here for cat photos.

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1445,7 +1445,7 @@ "", "

                Click here for cat photos.

                ", "", - "", + "", "", "

                Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

                ", "

                Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

                " @@ -1521,7 +1521,7 @@ "", "

                Click here for cat photos.

                ", "", - "", + "", "", "

                Things cats love:

                ", "
                  ", @@ -1596,7 +1596,7 @@ "", "

                  Click here for cat photos.

                  ", "", - "", + "", "", "

                  Things cats love:

                  ", "
                    ", @@ -1675,7 +1675,7 @@ "", "

                    Click here for cat photos.

                    ", "", - "", + "", "", "

                    Things cats love:

                    ", "
                      ", @@ -1757,7 +1757,7 @@ "", "

                      Click here for cat photos.

                      ", "", - "", + "", "", "

                      Things cats love:

                      ", "
                        ", @@ -1839,7 +1839,7 @@ "", "

                        Click here for cat photos.

                        ", "", - "", + "", "", "

                        Things cats love:

                        ", "
                          ", @@ -1920,7 +1920,7 @@ "", "

                          Click here for cat photos.

                          ", "", - "", + "", "", "

                          Things cats love:

                          ", "
                            ", @@ -2010,7 +2010,7 @@ "", "

                            Click here for cat photos.

                            ", "", - "", + "", "", "

                            Things cats love:

                            ", "
                              ", @@ -2101,7 +2101,7 @@ "", "

                              Click here for cat photos.

                              ", "", - "", + "", "", "

                              Things cats love:

                              ", "
                                ", @@ -2186,7 +2186,7 @@ "", "

                                Click here for cat photos.

                                ", "", - "", + "", "", "

                                Things cats love:

                                ", "
                                  ", @@ -2278,7 +2278,7 @@ "", "

                                  Click here for cat photos.

                                  ", "", - "", + "", "", "

                                  Things cats love:

                                  ", "
                                    ", @@ -2369,7 +2369,7 @@ "", "

                                    Click here for cat photos.

                                    ", "", - "", + "", "", "
                                    ", "

                                    Things cats love:

                                    ", @@ -2457,7 +2457,7 @@ "", "

                                    Click here for cat photos.

                                    ", "", - "", + "", "", "
                                    ", "

                                    Things cats love:

                                    ", @@ -2547,7 +2547,7 @@ "", "

                                    Click here for cat photos.

                                    ", "", - "", + "", "", "
                                    ", "

                                    Things cats love:

                                    ", From 959fde64fcf39b3b0a576448b34d88cf803ca9e2 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 5 Aug 2015 00:06:20 -0700 Subject: [PATCH 3/7] add a span challenge and replace more old outside images with s3 images --- seed/challenges/basic-javascript.json | 6 +- seed/challenges/bootstrap.json | 153 +++++++++++++++++++++----- seed/challenges/html5-and-css.json | 54 ++++----- 3 files changed, 157 insertions(+), 56 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index ab30786d54..f1eb0f575c 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1130,7 +1130,7 @@ " var slotTwo;", " var slotThree;", " ", - " var images = ['http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens'];", + " var images = ['https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat'];", " ", " /*Don't modify above here*/", " ", @@ -1284,7 +1284,7 @@ " var slotTwo;", " var slotThree;", " ", - " var images = ['http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens'];", + " var images = ['https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat'];", " ", " slotOne = Math.floor(Math.random() * (5 - 1 + 1)) + 1;", " slotTwo = Math.floor(Math.random() * (5 - 1 + 1)) + 1;", @@ -1445,7 +1445,7 @@ " var slotThree;", " ", " //Placeholder", - " var images = ['http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens','http://bit.ly/fcc-kittens'];", + " var images = ['https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat','https://bit.ly/fcc-relaxing-cat'];", " ", " slotOne = Math.floor(Math.random() * (5 - 1 + 1)) + 1;", " slotTwo = Math.floor(Math.random() * (5 - 1 + 1)) + 1;", diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index eaec28238b..e1af8339c0 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -50,7 +50,7 @@ "", "

                                    Click here for cat photos.

                                    ", "", - "", + "", "", "

                                    Things cats love:

                                    ", "
                                      ", @@ -99,7 +99,7 @@ "tests": [ "assert($('img').length > 1, 'You should have a total of two images.')", "assert($('img').hasClass('img-responsive'), 'Your new image should have the class \"img-responsive\".')", - "assert(new RegExp('http://bit.ly/fcc-running-cats', 'gi').test($('img.img-responsive').attr('src')), 'Add a second image with the src of http://bit.ly/fcc-kittens2.')" + "assert(new RegExp('http://bit.ly/fcc-running-cats', 'gi').test($('img.img-responsive').attr('src')), 'Add a second image with the src of http://bit.ly/fcc-running-cats.')" ], "challengeSeed": [ "", @@ -134,7 +134,7 @@ "", "

                                      Click here for cat photos.

                                      ", "", - " ", + " ", "", "

                                      Things cats love:

                                      ", "
                                        ", @@ -216,7 +216,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", "

                                        Things cats love:

                                        ", @@ -301,7 +301,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", "

                                        Things cats love:

                                        ", @@ -389,7 +389,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", " ", @@ -476,7 +476,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", " ", @@ -564,7 +564,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", " ", @@ -652,7 +652,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", " ", @@ -745,7 +745,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", " ", @@ -787,7 +787,7 @@ "descriptionPt": [] }, { - "id": "bad87fee1348bd9aedf08845", + "id": "bad87fee1348bd9aedf08745", "name": "Waypoint: Ditch Custom CSS for Bootstrap", "dashedName": "waypoint-ditch-custom-css-for-bootstrap", "difficulty": 2.10, @@ -836,7 +836,7 @@ "", "

                                        Click here for cat photos.

                                        ", "", - " ", + " ", "", " ", "
                                        ", @@ -885,6 +885,107 @@ "namePt": "", "descriptionPt": [] }, + { + "id": "bad87fee1348bd9aedf08845", + "name": "Waypoint: Use Spans for Inline Elements", + "dashedName": "waypoint-use-spans-for-inline-elements", + "difficulty": 2.105, + "description": [ + "You can use use spans to create inline elements. Remember when we used the \"btn-block\" class to make the button grow fill the entire row?", + "This image illustrates the difference between \"inline\" elements and \"block-level\" elements:", + "An \"inline\" button is as small as the text it contains. In this image, it", + "By using the span element, you can put several elements together, and even style different parts of the same element differently.", + "Nest the word \"love\" in your \"Things cats love\" element below withing a span element. Then give that span the class \"text-danger\" to make the text red.", + "Here's how you would do this with the \"Top 3 things cats hate\" element: <p>Top 3 things cats <span class\"text-danger\">hate</span></p>" + ], + "tests": [ + "assert($('p span') && $('p span').length > 0, 'Your span element should be inside your p element.')", + "assert($('p span') && $('p span').text().match(/love/i), 'Your span element should have the text \"love\".')", + "assert($('span').hasClass('text-danger'), 'Your span element should have class \"text-danger\".')", + "assert(editor.match(/<\\/span>/g) && editor.match(//g).length === editor.match(/span element has a closing tag.')" + ], + "challengeSeed": [ + "", + "", + "", + "
                                        ", + "

                                        CatPhotoApp

                                        ", + "", + "

                                        Click here for cat photos.

                                        ", + "", + " ", + "", + " ", + "
                                        ", + "
                                        ", + " ", + "
                                        ", + "
                                        ", + " ", + "
                                        ", + "
                                        ", + " ", + "
                                        ", + "
                                        ", + "

                                        Things cats love:

                                        ", + "
                                          ", + "
                                        • cat nip
                                        • ", + "
                                        • laser pointers
                                        • ", + "
                                        • lasagna
                                        • ", + "
                                        ", + "

                                        Top 3 things cats hate:

                                        ", + "
                                          ", + "
                                        1. flea treatment
                                        2. ", + "
                                        3. thunder
                                        4. ", + "
                                        5. other cats
                                        6. ", + "
                                        ", + "
                                        ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "
                                        ", + "
                                        " + ], + "challengeType": 0, + "nameCn": "", + "descriptionCn": [], + "nameFr": "", + "descriptionFr": [], + "nameRu": "", + "descriptionRu": [], + "nameEs": "", + "descriptionEs": [], + "namePt": "", + "descriptionPt": [] + }, { "id": "bad87fee1348bd9aede08845", "name": "Waypoint: Create a Custom Heading", @@ -925,7 +1026,7 @@ "
                                        ", "

                                        CatPhotoApp

                                        ", "", - " ", + " ", "", " ", "
                                        ", @@ -939,7 +1040,7 @@ " ", "
                                        ", "
                                        ", - "

                                        Things cats love:

                                        ", + "

                                        Things cats love:

                                        ", "
                                          ", "
                                        • cat nip
                                        • ", "
                                        • laser pointers
                                        • ", @@ -1009,7 +1110,7 @@ "

                                          CatPhotoApp

                                          ", "
                                        ", "
                                        ", - " ", + " ", "
                                        ", "
                                    ", " ", @@ -1024,7 +1125,7 @@ " ", "
                                    ", "
                                    ", - "

                                    Things cats love:

                                    ", + "

                                    Things cats love:

                                    ", "
                                      ", "
                                    • cat nip
                                    • ", "
                                    • laser pointers
                                    • ", @@ -1094,7 +1195,7 @@ "

                                      CatPhotoApp

                                      ", "
                ", "
                ", - " ", + " ", "
                ", "
                ", " ", @@ -1109,7 +1210,7 @@ " ", "
                ", "
                ", - "

                Things cats love:

                ", + "

                Things cats love:

                ", "
                  ", "
                • cat nip
                • ", "
                • laser pointers
                • ", @@ -1179,7 +1280,7 @@ "

                  CatPhotoApp

                  ", "
                ", "
                ", - " ", + " ", "
                ", "
", " ", @@ -1194,7 +1295,7 @@ " ", "
", "
", - "

Things cats love:

", + "

Things cats love:

", "
    ", "
  • cat nip
  • ", "
  • laser pointers
  • ", @@ -1265,7 +1366,7 @@ "

    CatPhotoApp

    ", "
", "
", - " ", + " ", "
", "
", " ", @@ -1280,7 +1381,7 @@ " ", " ", " ", - "

Things cats love:

", + "

Things cats love:

", "