From 198ce39564ebf075a2aa37d2ee9c6f4eb78c23b3 Mon Sep 17 00:00:00 2001 From: brandenbyers Date: Sun, 21 Jun 2015 00:56:20 -0500 Subject: [PATCH 01/12] Change eqls to equal --- challenges/advanced-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/advanced-bonfires.json b/challenges/advanced-bonfires.json index 978ebe81ce..58f6602791 100644 --- a/challenges/advanced-bonfires.json +++ b/challenges/advanced-bonfires.json @@ -81,7 +81,7 @@ "sym([1, 2, 3], [5, 2, 1, 4]);" ], "tests": [ - "expect(sym([1, 2, 3], [5, 2, 1, 4])).to.eqls([3, 5, 4])", + "expect(sym([1, 2, 3], [5, 2, 1, 4])).to.equal([3, 5, 4]);", "assert.deepEqual(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');", "assert.deepEqual(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');", "assert.deepEqual(sym([1, 1]), [1], 'should return an array of unique values');" From 96c3e4194136b015436af20a268f8a36eaa0bf51 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Mon, 22 Jun 2015 10:30:26 -0400 Subject: [PATCH 02/12] Fixes #1053 This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference. --- challenges/basic-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-bonfires.json b/challenges/basic-bonfires.json index ae9b0b571a..bc75adb4ac 100644 --- a/challenges/basic-bonfires.json +++ b/challenges/basic-bonfires.json @@ -14,7 +14,7 @@ "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 http://freecodecamp.slack.com/messages/letspair and type \"Hello Pair Programmers!\"", + "We have a special chat room for people ready to pair program. Go to our LetsPair chatroom on gitter 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.", From 4fee40eb8e55112fa3184b80c3db21d38f11a9fc Mon Sep 17 00:00:00 2001 From: Natasha Haggard Date: Mon, 22 Jun 2015 22:13:21 -0500 Subject: [PATCH 03/12] Issue 1036 - Fixed minor grammatical mistake Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element" --- challenges/basic-html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-html5-and-css.json b/challenges/basic-html5-and-css.json index 7fdae6da09..c90513cc28 100644 --- a/challenges/basic-html5-and-css.json +++ b/challenges/basic-html5-and-css.json @@ -1468,7 +1468,7 @@ "You can create one like this: <input type='text'>. Note that input elements are self-closing." ], "tests": [ - "assert($('input').length > 0, 'Your app should have an text field input element.')" + "assert($('input').length > 0, 'Your app should have a text field input element.')" ], "challengeSeed": [ "", From 6de5a6fb11bfbaea1770f9c37d52c4b9ee53f1c3 Mon Sep 17 00:00:00 2001 From: Natasha Haggard Date: Tue, 23 Jun 2015 22:46:28 -0500 Subject: [PATCH 04/12] Issue 1094 - Field Guide Error "Contact Jason Ruekert - he's @jsonify in Slack." Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter." --- field-guides.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/field-guides.json b/field-guides.json index 9d3e906d16..24109b4813 100644 --- a/field-guides.json +++ b/field-guides.json @@ -279,7 +279,7 @@ "

", "

    ", "
  1. Follow this tutorial to set up your computer for streaming.
    2. ", - "
  2. Contact Jason Ruekert - he's @jsonify in Slack. He's in charge of our Twitch.tv channel. Tell him what you'd like to stream, and when you're available to stream.
    3. ", + "
  3. Contact Jason Ruekert - he's @jsonify in Gitter. He's in charge of our Twitch.tv channel. Tell him what you'd like to stream, and when you're available to stream.
    4. ", "
  4. Jason will pair with you using Screen Hero to verify your computer is configured properly to stream.
    5. ", "
", "

", From 12f05fecc9257846199d4d67b4cddea8eed8ac72 Mon Sep 17 00:00:00 2001 From: Natasha Haggard Date: Tue, 23 Jun 2015 22:55:52 -0500 Subject: [PATCH 05/12] Issue 1080 Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name --- challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index 41a7229731..2fb852ade8 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -8,7 +8,7 @@ "dashedName": "waypoint-mobile-responsive-images", "difficulty": 0.047, "description": [ - "Now let's go back to our Cat Photo App. This time, we'll style it using the popular Twitter Bootstrap responsive CSS framework. First, add a new image with the src attribute of \"http://bit.ly/fcc-kittens2\", and add the \"img-responsive\" Bootstrap class to that image.", + "Now let's go back to our Cat Photo App. This time, we'll style it using the popular Bootstrap responsive CSS framework. First, add a new image with the src attribute of \"http://bit.ly/fcc-kittens2\", and add the \"img-responsive\" Bootstrap class to that image.", "It would be great if the image could be exactly the width of our phone's screen.", "Fortunately, we have access to a Responsive CSS Framework called Bootstrap. You can add Bootstrap to any app just by including it with <link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'/> at the top of your HTML. But we've gone ahead and automatically added it to your Cat Photo App for you.", "Bootstrap will figure out how wide your screen is and respond by resizing your HTML elements - hence the name Responsive Design.", From 9442f5f64899b856ae0c7fd9a2fb5832bc41a8d0 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 24 Jun 2015 07:19:54 -0700 Subject: [PATCH 06/12] Merge branch 'master' into staging Conflicts: controllers/resources.js public/js/main_0.0.2.js seed/challenges/advanced-bonfires.json seed/challenges/basic-bonfires.json seed/challenges/get-set-for-free-code-camp.json server/views/partials/navbar.jade --- challenges/get-set-for-free-code-camp.json | 48 ++++++++++++++++++---- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/challenges/get-set-for-free-code-camp.json b/challenges/get-set-for-free-code-camp.json index 379bc26f6e..ecb1762bbc 100644 --- a/challenges/get-set-for-free-code-camp.json +++ b/challenges/get-set-for-free-code-camp.json @@ -45,15 +45,18 @@ "name": "Waypoint: Join Our Chat Room", "dashedName": "waypoint-join-our-chat-room", "difficulty": 0.002, - "challengeSeed": ["131321596"], + "challengeSeed": ["131574135"], "description": [ "Now we're going to join the Free Code Camp chat room. You can come here any time of day to hang out, ask questions, or find another camper to pair program with.", "Create an account with GitHub here: https://github.com/join.", "Click the pixel art in the upper right hand corner of GitHub, then choose settings. Upload a picture of yourself. A picture of your face works best. This is how people will see you in our chat rooms, so put your best foot forward. You can add your city and your personal website if you have one.", - "Now follow this link to enter our Welcome chat room: https://gitter.im/FreeCodeCamp/welcome.", - "Once you're in our Welcome chat room, introduce yourself by saying : \"Hello world!\".", + "Go to Free Code Camp's open-source repository: https://github.com/freecodecamp/freecodecamp.", + "You can \"star\" this repository by clicking the star button in the upper right hand corner.", + "Later, you'll be able to fork this repository if you'd like to contribute to our open source codebase.", + "Join our main chat room: https://gitter.im/FreeCodeCamp/FreeCodeCamp.", + "Once you're in our chat room, introduce yourself by saying : \"Hello world!\".", "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.", - "This is the best room for new campers, but feel free to join other chat rooms as well. Our main chat room: https://gitter.im/FreeCodeCamp/FreeCodeCamp.", + "We have a busy chat room, so be sure to configure your notification settings in the top right corner.", "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.", "You can also download a desktop or mobile chat application here: https://gitter.im/apps", "You can also access this chat room by clicking the \"Chat\" button in the upper right hand corner.", @@ -234,7 +237,7 @@ "challengeSeed": ["127358841"], "description": [ "One of the best ways to stay motivated when learning to code is to hang out with other campers.", - "Slack and Camper News are great ways to communicate with other campers, but there's no substitute for meeting people in-person.", + "Our chat room and Camper News are great ways to communicate with other campers, but there's no substitute for meeting people in-person.", "The easiest way to meet other campers in your city is to join your city's Facebook Group. Click here to view our growing list of local groups.", "Click the link to your city, then, once Facebook loads, click \"Join group\".", "Our local groups are new, so if you don't see your city on this list, you should follow the directions to create a Facebook group for your city.", @@ -265,17 +268,48 @@ "descriptionPt": [] }, { + "_id": "bd7126d8c431eddfaeb5bd3e", + "name": "Waypoint: Add Free Code Camp to your LinkedIn Profile", + "difficulty": 0.008, + "challengeSeed": "131574134", + "description": [ + "LinkedIn is a critical tool for your job search later on.", + "Add Free Code Camp to your LinkedIn profile by going to https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp.", + "Estimate your dates. Keep in mind that Free Code Camp is a rigorous 1,600 hour program, and will probably take at least a year to complete.", + "In the \"Degree\" section, type \"Full Stack Web Development\".", + "In the \"Field of study\" section, type \"Computer Software Engineering\".", + "Click the \"Save Changes\" button.", + "Be sure to add your key word skills to LinkedIn's skills section as you learn them, such as HTML, jQuery, Linux and Node.js.", + "You can expand your LinkedIn network by inviting friends you meet through Free Code Camp to connect with you on LinkedIn.", + "Make your LinkedIn profile as complete as possible. Unlike other social networks, with LinkedIn, it's perfectly fine if you don't want to add a photo.", + "Let's keep moving. We're almost ready to start coding!" + ], + "challengeType": 2, + "tests": [], + "nameCn": "", + "descriptionCn": [], + "nameFr": "", + "descriptionFr": [], + "nameRu": "", + "descriptionRu": [], + "nameEs": "", + "descriptionEs": [], + "namePt": "", + "descriptionPt": [] + }, + { + "_id": "bd7137d8c441eddfaeb5bdef", "id": "bd7137d8c441eddfaeb5bdef", "name": "Waypoint: Get Help the Hacker Way with RSAP", "dashedName": "waypoint-get-help-the-hacker-way-with-rsap", - "difficulty": 0.008, + "difficulty": 0.009, "challengeSeed": ["125407432"], "description": [ "Let's cover one last thing before you start working through our lessons: how to get help.", "Any time you get stuck or don't know what to do next, follow this simple algorithm (procedure): RSAP (Read, Search, Ask, Post).", "First, R - Read the documentation or error message. A key skill that good coders have is the ability to interpret and then follow instructions.", "Next, S - Search Google. Good Google queries take a lot of practice. When you search Google, you usually want to include the language or framework you're using. You also want to limit the results to a recent period.", - "Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to https://freecodecamp.slack.com/messages/help/. Keep this chat open while you work on the remaining challenges.", + "Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to https://gitter.im/FreeCodeCamp/Help. Keep this chat open while you work on the remaining challenges.", "Finally, P - Post on Stack Overflow. Before you attempt to do this, read Stack Overflow's guide to asking good questions: http://stackoverflow.com/help/how-to-ask.", "Here's our detailed field guide on getting help: http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck.", "Now you have a clear algorithm to follow when you need help! Let's start coding! Move on to your next challenge." From 6b423dfcb1084a078e461dc93c814becdb6032a1 Mon Sep 17 00:00:00 2001 From: LumenTeun Date: Tue, 23 Jun 2015 20:53:46 +0200 Subject: [PATCH 07/12] 'Slack' to 'Gitter' --- challenges/get-set-for-free-code-camp.json | 8 ++++---- field-guides.json | 24 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/challenges/get-set-for-free-code-camp.json b/challenges/get-set-for-free-code-camp.json index 379bc26f6e..4408618ae3 100644 --- a/challenges/get-set-for-free-code-camp.json +++ b/challenges/get-set-for-free-code-camp.json @@ -234,7 +234,7 @@ "challengeSeed": ["127358841"], "description": [ "One of the best ways to stay motivated when learning to code is to hang out with other campers.", - "Slack and Camper News are great ways to communicate with other campers, but there's no substitute for meeting people in-person.", + "Gitter and Camper News are great ways to communicate with other campers, but there's no substitute for meeting people in-person.", "The easiest way to meet other campers in your city is to join your city's Facebook Group. Click here to view our growing list of local groups.", "Click the link to your city, then, once Facebook loads, click \"Join group\".", "Our local groups are new, so if you don't see your city on this list, you should follow the directions to create a Facebook group for your city.", @@ -253,7 +253,7 @@ "nameEs": "Waypoint: Encuentrate con otros Campers en tu Ciudad", "descriptionEs": [ "Una de las mejores maneras de mantenerte motivado cuando estás aprendiendo a programar es pasar el rato con otros campers.", - "Slack y Noticias de Campers son una muy buena forma de comunicarte con otros campers, pero no hay ningún substituto para conocerlos en persona.", + "Gitter y Noticias de Campers son una muy buena forma de comunicarte con otros campers, pero no hay ningún substituto para conocerlos en persona.", "La forma más fácil de encontrarte con otros campers en tu ciudad es unirte al grupo de Facebook de tu ciudad o país. Dale click a here para ver la lista de grupos locales.", "Dale click al link de tu ciudad o país y una vez que Facebook cargue, dale click a \"Join group\".", "Nuestros grupos locales son pocos, asi que en caso no veas tu ciudad o país en la lista, solamente sigue las instrucciones para crear un grupo de Facebook para ello.", @@ -275,7 +275,7 @@ "Any time you get stuck or don't know what to do next, follow this simple algorithm (procedure): RSAP (Read, Search, Ask, Post).", "First, R - Read the documentation or error message. A key skill that good coders have is the ability to interpret and then follow instructions.", "Next, S - Search Google. Good Google queries take a lot of practice. When you search Google, you usually want to include the language or framework you're using. You also want to limit the results to a recent period.", - "Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to https://freecodecamp.slack.com/messages/help/. Keep this chat open while you work on the remaining challenges.", + "Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to https://gitter.im/FreeCodeCamp/Help. Keep this chat open while you work on the remaining challenges.", "Finally, P - Post on Stack Overflow. Before you attempt to do this, read Stack Overflow's guide to asking good questions: http://stackoverflow.com/help/how-to-ask.", "Here's our detailed field guide on getting help: http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck.", "Now you have a clear algorithm to follow when you need help! Let's start coding! Move on to your next challenge." @@ -294,7 +294,7 @@ "Cualquier momento en el que te atasques o no sepas que hacer, sigue este simple algoritmo (procedimiento): RSAP (Read, Search, Ask, Post). Que en español vendría a ser Lee, Busca, Pregunta, Publica.", "Primero, Lee - Lee la documentación o el mensaje de error. El punto fuerte de un buen programador es la habilidad de interpretar y seguir instrucciones.", "Luego, Busca - Busca en Google. Buenas búsquedas o queries requieren bastante práctica. Cuando búsques en Google, idealmente tienes que incluir el lenguaje o framework que estés usando. También tendrás que limitar los resultados de búsqueda a un periodo reciente.", - "Ahora, en caso no hayas encontrado la respuesta a tu pregunta, Pregunta - Pregunta a tus amigos. En caso estes en problemas, puedes preguntar a otros campers. Tenemos una sala de chat especificamente para obtener ayuda sobre las herramientas que utilizamos en los desafíos de Free Code Camp. Ingresa a https://freecodecamp.slack.com/messages/help/. Mantén este chat abierto mientras trabajas en los desafíos subsiguientes.", + "Ahora, en caso no hayas encontrado la respuesta a tu pregunta, Pregunta - Pregunta a tus amigos. En caso estes en problemas, puedes preguntar a otros campers. Tenemos una sala de chat especificamente para obtener ayuda sobre las herramientas que utilizamos en los desafíos de Free Code Camp. Ingresa a https://gitter.im/FreeCodeCamp/Help. Mantén este chat abierto mientras trabajas en los desafíos subsiguientes.", "Finalmente, Publica - Publica tu pregunta en Stack Overflow. Antes de hacer esto lee la guía de Stack Overflow para publicar buenas preguntas: http://stackoverflow.com/help/how-to-ask. Tendrás que hacerlo en inglés, en caso no sepas como, pide que te ayuden a traducir tu pregunta en el canal #espanol de Slack.", "Aquí está nuestra guia detallada en como obtener ayuda: http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck.", "Ahora que tienes en claro el procedimiento a seguir cuando necesites ayuda. ¡Empecémos a programar! Continua con el siguiente desafío." diff --git a/field-guides.json b/field-guides.json index 24109b4813..e090157e1a 100644 --- a/field-guides.json +++ b/field-guides.json @@ -225,7 +225,7 @@ "

", "

This is the most time-efficient way to handle being stuck, and it's the most respectful of other people's time, too.

", "

Most of the time, you'll solve your problem after just one or two steps of this algorithm.

", - "

We have a special chat room just for getting help: https://freecodecamp.slack.com/messages/help/

", + "

We have a special chat room just for getting help: https://gitter.im/FreeCodeCamp/Help

", "

Also, if you need to post on Stack Overflow, be sure to read their guide to asking good questions: http://stackoverflow.com/help/how-to-ask.

", "

Learning to code is hard. But it's a lot easier if you ask for help when you need it!

", "" @@ -492,7 +492,7 @@ " A screen shot showing you the group description box on the Facebook page.", "
  • Click the \"Upload a photo button. To start out, you'll probably just want to use Free Code Camp's banner (download it here), or a scenic shot of your city. Later you can update this with a picture from one of your city's Free Code Camp events.
    • ", " A screenshot showing the \"Upload a photo\" button.", - "
  • Message @quincylarson in Slack with a link to your city's group page and he'll include it here.
    • ", + "
  • Message @quincylarson on Gitter with a link to your city's group page and he'll include it here.
    • ", "
  • Join our Local Leaders Facebook group, where we share ideas about involving campers in your city.
    • ", " ", "

    ", @@ -634,7 +634,7 @@ "

    Here are our recommended ways of collaborating:

    ", "

    ", "

      ", - "
    • • Slack has robust private messaging functionality. It's the main way our team communicates, and we recommend it over email.
      • ", + "
    • • Gitter has robust private messaging functionality. It's the main way our team communicates, and we recommend it over email.
      • ", "
    • • Trello is great for managing projects. Work with your stakeholder to create Trello cards, and update these cards regularly as you make progress on them.
      • ", "
    • • Screen Hero or Team Viewer - These are the ideal way to pair program. Tools like TMUX are good, but difficult to use. We discourage you from using screen sharing tools where only one person has control of the keyboard and mouse - that isn't real pair programming.
      • ", "
    • • Write clear and readable code, commit messages, branch names, and pull request messages.
      • ", @@ -719,9 +719,9 @@ " ", "

      ", "

      Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).

      ", - "

      We do not tolerate harassment of campers in any form, anywhere on Free Code Camp's online media (Slack, Twitch, etc.) or during pair programming. Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel, and any malicious hacking or social engineering.

      ", + "

      We do not tolerate harassment of campers in any form, anywhere on Free Code Camp's online media (Gitter, Twitch, etc.) or during pair programming. Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel, and any malicious hacking or social engineering.

      ", "

      If a camper engages in harassing behavior, our team will take any action we deem appropriate, up to and including banning them from Free Code Camp.

      ", - "

      We want everyone to feel safe and respected. If you are being harassed or notice that someone else is being harassed, say something! Message @quincylarson, @terakilobyte and @codenonprofit in Slack (preferably with a screen shot of the offending language) so we can take fast action.

      ", + "

      We want everyone to feel safe and respected. If you are being harassed or notice that someone else is being harassed, say something! Message @quincylarson, @terakilobyte and @codenonprofit on Gitter (preferably with a screen shot of the offending language) so we can take fast action.

      ", "

      If you have questions about this code of conduct, email us at team@freecodecamp.com.

      ", "" ] @@ -777,10 +777,10 @@ "

      We're happy to do a quick interview for your publication or show. Here's whom you should contact about what, and how to best reach them:

      ", "

      ", "

        ", - "
      1. Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Slack.
        2. ", - "
      2. Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Slack.
        3. ", - "
      3. Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Slack.
        4. ", - "
      4. Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Slack and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Slack and @steelcitycoach on Twitter).", + "
      5. Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Gitter.
        6. ", + "
      6. Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Gitter.
        7. ", + "
      7. Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Gitter.
        8. ", + "
      8. Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Gitter and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Gitter and @steelcitycoach on Twitter).", "
      ", "

      ", "

      We strive to be helpful and transparent in everything we do. We'll do what we can to help you share our community with your audience.

      ", @@ -838,7 +838,7 @@ "

      Contributing to our field guide is a great way to establish your history on GitHub, add to your portfolio, and help other campers. If you have a question about JavaScript or programming in general that you'd like us to add to the field guide, here are two ways to get it into the guide:

      ", "

      ", "

        ", - "
      1. You can message @danraley in Slack with your question.
        2. ", + "
      2. You can message @danraley on Gitter with your question.
        3. ", "
      3. You can also contribute to this field guide directly via GitHub pull request, by cloning Free Code Camp's main repository and modifying field-guides.json.
        4. ", "
      ", "

      ", @@ -852,7 +852,7 @@ "description": [ "
      ", "

      Our translation effort is driven by bilingual campers like you.", - "

      If you're able to help us, you can join our Trello board by sending @quincylarson your email address in Slack.

      ", + "

      If you're able to help us, you can join our Trello board by sending @quincylarson your email address on Gitter.

      ", "
      " ] }, @@ -865,7 +865,7 @@ "

      Translation is an all-or-nothing proposal.", "

      We won't be able to add new languages to Free Code Camp until all of our challenges are translated into that language.

      ", "

      In addition to translating these initially, we'll also need to maintain the translation as the challenges are gradually updated.

      ", - "

      If you're able to help us, you can join our Trello board by sending @quincylarson your email address in Slack.

      ", + "

      If you're able to help us, you can join our Trello board by sending @quincylarson your email address on Gitter.

      ", "" ] }, From 13a8a728e2404f7433c8a10b8ed2c72d551c6268 Mon Sep 17 00:00:00 2001 From: LumenTeun Date: Tue, 23 Jun 2015 20:56:25 +0200 Subject: [PATCH 08/12] 'Slack' to 'Gitter or Slack' --- field-guides.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/field-guides.json b/field-guides.json index e090157e1a..197ed132d3 100644 --- a/field-guides.json +++ b/field-guides.json @@ -625,8 +625,8 @@ "
    ", "

    ", "

    It's notoriously difficult to estimate how long building software projects will take, so feel free to ask our volunteer team for help.

    ", - "

    You'll continue to meet with your stakeholder at least twice a month in your project's Slack channel.

    ", - "

    You should also ask questions in your project's Slack channel as they come up throughout the week, and your stakeholder can answer them asynchronously.

    ", + "

    You'll continue to meet with your stakeholder at least twice a month in your project's Gitter or Slack channel.

    ", + "

    You should also ask questions in your project's Gitter or Slack channel as they come up throughout the week, and your stakeholder can answer them asynchronously.

    ", "

    Getting \"blocked\" on a task can take away your sense of forward momentum, so be sure to proactively seek answers to any ambiguities you encounter.

    ", "

    Ultimately, the project will be considered complete once both the stakeholder's needs have been met, and you and your pair are happy with the project. Then you can add it to your portfolio!

    ", "

    Working with your Pair

    ", From ef919b7ed3976c45d0c849f20de0c511a54ade57 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 25 Jun 2015 21:47:25 -0700 Subject: [PATCH 09/12] add comments migration to loopback script --- loopbackMigration.js | 46 ++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/loopbackMigration.js b/loopbackMigration.js index 02dd993b9c..1a86352e46 100644 --- a/loopbackMigration.js +++ b/loopbackMigration.js @@ -160,28 +160,46 @@ var storyCount = dbObservable }) .count(); +var commentCount = dbObservable + .flatMap(function(db) { + return createQuery(db, 'comments', {}); + }) + .withLatestFrom(dbObservable, function(comments, db) { + return { + comments: comments, + db: db + }; + }) + .flatMap(function(dats) { + return insertMany(dats.db, 'comment', dats.comments, { w: 1 }); + }) + .buffer(20) + .count(); + Rx.Observable.combineLatest( userIdentityCount, userSavesCount, storyCount, - function(userIdentCount, userCount, storyCount) { + commentCount, + function(userIdentCount, userCount, storyCount, commentCount) { return { userIdentCount: userIdentCount * 20, userCount: userCount * 20, - storyCount: storyCount * 20 + storyCount: storyCount * 20, + commentCount: commentCount * 20 }; }) .subscribe( - function(countObj) { - console.log('next'); - count = countObj; - }, - function(err) { - console.error('an error occured', err, err.stack); - }, - function() { + function(countObj) { + console.log('next'); + count = countObj; + }, + function(err) { + console.error('an error occured', err, err.stack); + }, + function() { - console.log('finished with ', count); - process.exit(0); - } -); + console.log('finished with ', count); + process.exit(0); + } + ); From 30c46a43ebf3cb30b9fd172ba3c28c92bd3239d3 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 25 Jun 2015 23:35:48 -0700 Subject: [PATCH 10/12] update emails and refine sponsor view --- challenges/get-set-for-free-code-camp.json | 2 +- field-guides.json | 2 +- nonprofits.json | 169 +++++++++++++-------- 3 files changed, 108 insertions(+), 65 deletions(-) diff --git a/challenges/get-set-for-free-code-camp.json b/challenges/get-set-for-free-code-camp.json index ecb1762bbc..9a242fbd9f 100644 --- a/challenges/get-set-for-free-code-camp.json +++ b/challenges/get-set-for-free-code-camp.json @@ -271,7 +271,7 @@ "_id": "bd7126d8c431eddfaeb5bd3e", "name": "Waypoint: Add Free Code Camp to your LinkedIn Profile", "difficulty": 0.008, - "challengeSeed": "131574134", + "challengeSeed": ["131574134"], "description": [ "LinkedIn is a critical tool for your job search later on.", "Add Free Code Camp to your LinkedIn profile by going to https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp.", diff --git a/field-guides.json b/field-guides.json index 9d3e906d16..e626d3acae 100644 --- a/field-guides.json +++ b/field-guides.json @@ -225,7 +225,7 @@ "

    ", "

    This is the most time-efficient way to handle being stuck, and it's the most respectful of other people's time, too.

    ", "

    Most of the time, you'll solve your problem after just one or two steps of this algorithm.

    ", - "

    We have a special chat room just for getting help: https://freecodecamp.slack.com/messages/help/

    ", + "

    We have a special chat room just for getting help: https://gitter.im/freecodecamp/help/

    ", "

    Also, if you need to post on Stack Overflow, be sure to read their guide to asking good questions: http://stackoverflow.com/help/how-to-ask.

    ", "

    Learning to code is hard. But it's a lot easier if you ask for help when you need it!

    ", "" diff --git a/nonprofits.json b/nonprofits.json index 23ba9af652..2b862070c0 100644 --- a/nonprofits.json +++ b/nonprofits.json @@ -1,13 +1,6 @@ [ { "id": "bd7157d8c441cbafaeb5bdef", - "requestedDeliverables": [ - "website", - "donor", - "inventory", - "volunteer", - "form" - ], "whatDoesNonprofitDo": "We help the many less-fortunate Jewish families in our community, by providing them with nutritious food and energy to grow, learn, work, and give them hope for a better and brighter future.", "websiteLink": "http://chasdeikaduri.org/", "name": "Chasdei Kaduri", @@ -21,17 +14,13 @@ ], "projectDescription": "Campers will create a system will integrate the food inventory, donor and delivery driver management systems as well as replace the current application system with a custom form solution. System will include a more streamlined operations management, with user printable lists of inventory, drivers, and deliveries.", "logoUrl": "https://trello-attachments.s3.amazonaws.com/54c7e02f2c173c37015b2f36/604x309/00580a0567a4b3afda29d52b09e7e829/rQQ6zwq31Uya8ie9QHC-MlvfXxqftm9UPPe524JUhmwSEaZjQ7oL7U1tVoHLUj-gVUwM-7uzBGFsAXD_A_cx_JyAZP4Td-GMBJ-AebJNRAQP0m0v253eKMkURp63aG4%3Ds0-d-e1-ft.png", - "imageUrl": "http://chasdeikaduri.org/images/523455_516325865106850_1885515210_n.jpg", - "estimatedHours": 200, - "interestedCampers": [], - "confirmedCampers": [], - "currentStatus": "completed" + "imageUrl": "https://pbs.twimg.com/media/B3d6B8PIYAAa6QL.jpg", + "estimatedHours": 300, + "currentStatus": "completed", + "moneySaved": 60000 }, { "id": "bd7158d8c464cbafaeb4bdef", - "requestedDeliverables": [ - "other" - ], "whatDoesNonprofitDo": "We connect simple technology with last mile communities to reduce poverty.", "websiteLink": "http://kopernik.info/", "name": "Kopernik", @@ -43,13 +32,11 @@ "logoUrl": "https://trello-attachments.s3.amazonaws.com/54d29f1e4c726fd765fa87ef/54d29f6388812dd367a243ab/x/018d9d3be5439870c56cccba5b3aa8bf/kopernik-logo-global.png", "imageUrl": "http://kopernik.info/sites/default/files/updates/Presenting_the_low_carbon_t.jpg", "estimatedHours": 100, - "currentStatus": "completed" + "currentStatus": "completed", + "moneySaved": 20000 }, { "id": "bd1326d9c245cbafaeb4bdef", - "requestedDeliverables": [ - "website" - ], "whatDoesNonprofitDo": "We distribute biodegradable toothbrushes globally to children in need.", "websiteLink": "http://www.operationbrush.org/", "name": "Operation Brush", @@ -61,15 +48,11 @@ "logoUrl": "https://trello-attachments.s3.amazonaws.com/54d9810307b159a4d9027aa2/54d981bfe5eb145560fbb769/x/cf7f318bfe4aee631b0d0eeef272225c/logo.png", "imageUrl": "http://www.operationbrush.org/images/temp/hands1.png", "estimatedHours": 100, - "interestedCampers": [], - "confirmedCampers": [], - "currentStatus": "completed" + "currentStatus": "completed", + "moneySaved": 20000 }, { "id": "bd1325d8c464cbafaeb5bdef", - "requestedDeliverables": [ - "community" - ], "whatDoesNonprofitDo": "We are the largest roller derby league in the world with around 250 adults and 150 junior skater members plus 500+ volunteers.", "websiteLink": "http://www.rosecityrollers.com/about/our-charities/", "name": "Rose City Rollers", @@ -81,13 +64,11 @@ "logoUrl": "https://trello-attachments.s3.amazonaws.com/54c1daf2d72d8eb868910b60/54c1dd4ecffcb09fc52b68a1/x/a8148f08769b449217e433bab8f39ddd/RCR-color.jpg", "imageUrl": "http://www.rosecityrollers.com/wp-content/uploads/2015/01/BZ7_5923-X3-675x375.jpg", "estimatedHours": 200, - "currentStatus": "started" + "currentStatus": "started", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb6bde1", - "requestedDeliverables": [ - "website" - ], "whatDoesNonprofitDo": "We provide urgently needed pediatric heart surgery and follow-up care for indigent children from developing countries", "websiteLink": "http://www.saveachildsheart.com/global/young-leadership-program/", "name": "Save a Child's Heart", @@ -98,14 +79,12 @@ "projectDescription": "Campers will create a single page fundraising website. In exchange for a donation, a user can customize a graphical 'heart' in someone's name or anonymously. The page will display all of the hearts on a 'wall of hearts.'", "logoUrl": "https://trello-attachments.s3.amazonaws.com/548b36629137780091a973cc/666x666/6c7a366ffb659649f6377d4a431687cd/country-logos-1-300dpi.jpg", "imageUrl": "http://www.saveachildsheart.com/wp-content/uploads/2013/10/7.2.5_Internation_Photograohy_Exhibition.jpg", - "estimatedHours": 100, - "currentStatus": "completed" + "estimatedHours": 200, + "currentStatus": "completed", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb4bdef", - "requestedDeliverables": [ - "website" - ], "whatDoesNonprofitDo": "We empower youth with technology by providing age appropriate resources and education.", "websiteLink": "http://savvycyberkids.org/", "name": "Savvy Cyber Kids", @@ -117,13 +96,11 @@ "logoUrl": "https://trello-attachments.s3.amazonaws.com/54ee3c7bf205562680177b59/218x190/1dc460de4edc9fdd4b481b24e93cfb23/logo.png", "imageUrl": "http://www.privatewifi.com/wp-content/uploads/2014/10/Halpert.jpg", "estimatedHours": 200, - "currentStatus": "started" + "currentStatus": "started", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb7bcef", - "requestedDeliverables": [ - "other" - ], "whatDoesNonprofitDo": "We bring a new edge to arts and medicine in the Bay Area through powerful live performances of new music to those who feel marginalized by their affliction.", "websiteLink": "http://transcendentpathways.org/", "name": "Transcendent Pathways", @@ -135,13 +112,11 @@ "logoUrl": "http://static1.squarespace.com/static/521b8957e4b024f66a58b214/t/521b8e9de4b093a8696eb9b8/1398718364447/?format=750w", "imageUrl": "https://trello-attachments.s3.amazonaws.com/54fdb0328917ca64e9e8a79f/54fdc3b710f67caf6da14719/x/49fbe0012179bf254928f3f2a44810b4/Screen_2BShot_2B2013-08-26_2Bat_2B1.32.35_2BPM.png", "estimatedHours": 200, - "currentStatus": "started" + "currentStatus": "started", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb8bdef", - "requestedDeliverables": [ - "other" - ], "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.", "websiteLink": "http://www.timeraiser.ca/", "name": "Timeraiser", @@ -152,19 +127,12 @@ "projectDescription": "Campers will build a mobile responsive web form to allow Timeraiser eventgoers to select which nonprofit organizations they're interested in volunteering with. System will have Salesforce integration and reporting capabilities.", "logoUrl": "http://www.timeraiser.ca/uploads/5/6/1/4/5614163/1277176.png?480", "imageUrl": "http://www.timeraiser.ca/uploads/5/6/1/4/5614163/______________4571248_orig.png", - "currentStatus": "started", - "interestedCampers": [], - "confirmedCampers": [], - "estimatedHours": 100, - "currentStatus": "completed" + "estimatedHours": 200, + "currentStatus": "completed", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb7bdef", - "requestedDeliverables": [ - "website", - "inventory", - "form" - ], "whatDoesNonprofitDo": "We focus on raising funds to assist injured homeless animals.", "websiteLink": "http://www.peoplesavinganimals.org/", "name": "People Saving Animals", @@ -178,15 +146,11 @@ "logoUrl": "https://scontent-sjc2-1.xx.fbcdn.net/hphotos-xfa1/v/t1.0-9/59709_501505959886494_1605714757_n.jpg?oh=e12c08c046d824765a02242b7c8c3bb5&oe=560CFA6A", "imageUrl": "https://scontent-sjc2-1.xx.fbcdn.net/hphotos-xta1/t31.0-8/11270516_844556088914811_757350153964826829_o.jpg", "estimatedHours": 300, - "currentStatus": "started" + "currentStatus": "started", + "moneySaved": 60000 }, { "id": "bd1325d8c464cbafaeb6bde2", - "requestedDeliverables": [ - "inventory", - "form", - "other" - ], "whatDoesNonprofitDo": "We preserve Florida's health by regulating septic contractors and reviewing logs of sewage collection and disposal.", "websiteLink": "http://www.floridahealth.gov/", "name": "Florida Department of Health", @@ -200,13 +164,11 @@ "logoUrl": "http://www.floridahealth.gov/_new/_files/images/DOH_logo.png", "imageUrl": "http://www.dep.state.fl.us/central/Home/Watershed/Home.jpg", "estimatedHours": 200, - "currentStatus": "started" + "currentStatus": "started", + "moneySaved": 40000 }, { "id": "bd1325d8c464cbafaeb6bde3", - "requestedDeliverables": [ - "website" - ], "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.", "websiteLink": "http://columbussongwritersassociation.com", "name": "Columbus Songwriters Association", @@ -218,6 +180,87 @@ "logoUrl": "https://columbussongwritersassociation.files.wordpress.com/2014/06/csa-logo.jpeg?w=705&h=435&crop=1", "imageUrl": "https://columbussongwritersassociation.files.wordpress.com/2015/03/10502364_918551148225410_5082247612691070613_n.jpg?w=705&h=344&crop=1", "estimatedHours": 100, - "currentStatus": "completed" + "currentStatus": "completed", + "moneySaved": 20000 + }, + { + "id": "bd1325d8c464cbafaeb4bbb", + "whatDoesNonprofitDo": "We leverage all the benefits of cycling to support and improve the lives of youth and teens in the Triangle region.", + "websiteLink": "http://www.trianglebikeworks.org", + "name": "Triangle Bike Works", + "endUser": "Youth and teens in the Triangle region.", + "approvedDeliverables": [ + "website" + ], + "projectDescription": "Campers will build a website with donation integration.", + "logoUrl": "http://i.imgur.com/T5OkXuT.png", + "imageUrl": "http://i.imgur.com/7bOaMPq.jpg", + "estimatedHours": 100, + "currentStatus": "open", + "moneySaved": 0 + }, + { + "id": "bd1325d8c464cbafaeb4bccc", + "whatDoesNonprofitDo": "We work to eradicate female genital mutilation in the US and Gambia. We work with survivors and communities.", + "websiteLink": "http://safehandsforgirls.org/", + "name": "Safe Hands for Girls", + "endUser": "Supporters", + "approvedDeliverables": [ + "website" + ], + "projectDescription": "Campers will build a website with donation management.", + "logoUrl": "http://i.imgur.com/QnAY6Ji.png", + "imageUrl": "http://i.imgur.com/s9E4oa9.jpg", + "estimatedHours": 100, + "currentStatus": "open", + "moneySaved": 0 + }, + { + "id": "bd1325d8c464cbafaeb4beff", + "whatDoesNonprofitDo": "We're a part of the Department of Psychiatry at Mass General Hospital. We teach an innovative way for helping people that have challenging behaviors.", + "websiteLink": "http://www.thinkkids.org/", + "name": "Think Kids at Massachusetts General Hospital", + "endUser": "Volunteers, Administrators", + "approvedDeliverables": [ + "volunteer" + ], + "projectDescription": "We would like help developing a simple online based portal for both our trainees and trainers where we can store and share documents, track their progress, and incorporate a blackboard/chat forum.", + "logoUrl": "http://www.thinkkids.org/wp-content/themes/think-kids/images/logo.png", + "imageUrl": "http://i.imgur.com/hiGJms5.png", + "estimatedHours": 300, + "currentStatus": "open", + "moneySaved": 0 + }, + { + "id": "bd1325d8c464cbaeaeb4bdef", + "whatDoesNonprofitDo": "We enable, educate, and empower students from rural backgrounds in Uttar Pradesh, India.", + "websiteLink": "http://www.milaan.in/", + "name": "Milaan", + "endUser": "Supporters", + "approvedDeliverables": [ + "website" + ], + "projectDescription": "Campers will build a basic website for the US operations of Milaan. ", + "logoUrl": "http://i.imgur.com/GLq1qqD.png", + "imageUrl": "http://www.milaan.in/wp-content/uploads/2014/07/IMG_2624-e1432218749722.jpg", + "estimatedHours": 100, + "currentStatus": "open", + "moneySaved": 0 + }, + { + "id": "bd1325d8c464cbafaeb4beee", + "whatDoesNonprofitDo": "We're committed to closing the opportunity gap for children in Baltimore City by providing high quality after school and in-school programs.", + "websiteLink": "http://childfirstauthority.org/", + "name": "Child First Authority", + "endUser": "School Coordinators", + "approvedDeliverables": [ + "volunteer" + ], + "projectDescription": "Campers will build a dynamic database that will allow 7 community school coordinators to (1) input student-level absenteeism data, (2) code and track outreach efforts, (3) code root causes for absenteeism, and (4) track trends in each area. Currently, Child First uses an unwieldy excel spreadsheet to do this.", + "logoUrl": "http://i.imgur.com/YlPsQmN.jpg", + "imageUrl": "http://childfirstauthority.org/wp-content/uploads/2012/09/CFAHEADER7.gif", + "estimatedHours": 200, + "currentStatus": "open", + "moneySaved": 0 } ] From afe0560042bd176dfa27e183b65d29daa3e2b409 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 26 Jun 2015 01:47:59 -0700 Subject: [PATCH 11/12] fix should be bufferWithCount --- loopbackMigration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loopbackMigration.js b/loopbackMigration.js index 1a86352e46..31a0ef5545 100644 --- a/loopbackMigration.js +++ b/loopbackMigration.js @@ -7,6 +7,7 @@ var Rx = require('rx'), secrets = require('../config/secrets'); var MongoClient = mongodb.MongoClient; +Rx.config.longStackSupport = true; var providers = [ 'facebook', @@ -173,7 +174,7 @@ var commentCount = dbObservable .flatMap(function(dats) { return insertMany(dats.db, 'comment', dats.comments, { w: 1 }); }) - .buffer(20) + .bufferWithCount(20) .count(); Rx.Observable.combineLatest( @@ -198,7 +199,6 @@ Rx.Observable.combineLatest( console.error('an error occured', err, err.stack); }, function() { - console.log('finished with ', count); process.exit(0); } From f6c5e35f6660856abfd703a05261f2397b59d71b Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 26 Jun 2015 01:51:27 -0700 Subject: [PATCH 12/12] fix buffer return from database query --- loopbackMigration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopbackMigration.js b/loopbackMigration.js index 31a0ef5545..f6b98b8b7b 100644 --- a/loopbackMigration.js +++ b/loopbackMigration.js @@ -165,6 +165,7 @@ var commentCount = dbObservable .flatMap(function(db) { return createQuery(db, 'comments', {}); }) + .bufferWithCount(20) .withLatestFrom(dbObservable, function(comments, db) { return { comments: comments, @@ -174,7 +175,6 @@ var commentCount = dbObservable .flatMap(function(dats) { return insertMany(dats.db, 'comment', dats.comments, { w: 1 }); }) - .bufferWithCount(20) .count(); Rx.Observable.combineLatest(