From acc1236d42b399f8681372c85be50d20124ba0af Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 1 Jun 2015 12:18:45 -0700 Subject: [PATCH 1/3] remove vestigial mention of camp counselor team --- config/passport.js | 8 ++-- controllers/user.js | 2 +- seed_data/field-guides.json | 6 +-- views/partials/field-guide.jade | 43 ------------------- views/partials/github.jade | 13 ------ .../nonprofit-application-progress-bar.jade | 39 ----------------- views/partials/nonprofits.jade | 24 ----------- views/resources/nonprofits.jade | 1 + 8 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 views/partials/field-guide.jade delete mode 100644 views/partials/github.jade delete mode 100644 views/partials/nonprofit-application-progress-bar.jade delete mode 100644 views/partials/nonprofits.jade diff --git a/config/passport.js b/config/passport.js index 799ee1f83b..9671114c73 100644 --- a/config/passport.js +++ b/config/passport.js @@ -114,7 +114,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r 'Feel free to email us at this address if you have any questions about Free Code Camp.\n', "And if you have a moment, check out our blog: blog.freecodecamp.com.\n", 'Good luck with the challenges!\n\n', - '- Our All-Volunteer Team' + '- the Free Code Camp Volunteer Team' ].join('') }; transporter.sendMail(mailOptions, function(err) { @@ -189,7 +189,7 @@ passport.use(new GitHubStrategy(secrets.github, function(req, accessToken, refre 'Feel free to email us at this address if you have any questions about Free Code Camp.\n', "And if you have a moment, check out our blog: blog.freecodecamp.com.\n", 'Good luck with the challenges!\n\n', - '- the Volunteer Camp Counselor Team' + '- the Free Code Camp Volunteer Team' ].join('') }; transporter.sendMail(mailOptions, function(err) { @@ -311,7 +311,7 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre 'Feel free to email us at this address if you have any questions about Free Code Camp.\n', "And if you have a moment, check out our blog: blog.freecodecamp.com.\n", 'Good luck with the challenges!\n\n', - '- the Volunteer Camp Counselor Team' + '- the Free Code Camp Volunteer Team' ].join('') }; transporter.sendMail(mailOptions, function(err) { @@ -387,7 +387,7 @@ passport.use(new LinkedInStrategy(secrets.linkedin, function(req, accessToken, r 'Feel free to email us at this address if you have any questions about Free Code Camp.\n', "And if you have a moment, check out our blog: blog.freecodecamp.com.\n", 'Good luck with the challenges!\n\n', - '- the Volunteer Camp Counselor Team' + '- the Free Code Camp Volunteer Team' ].join('') }; transporter.sendMail(mailOptions, function(err) { diff --git a/controllers/user.js b/controllers/user.js index f83ac9e0be..103a816dfb 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -229,7 +229,7 @@ exports.postEmailSignup = function(req, res, next) { 'And if you have a moment, check out our blog: ', 'blog.freecodecamp.com.\n', 'Good luck with the challenges!\n\n', - '- the Volunteer Camp Counselor Team' + '- the Free Code Camp Volunteer Team' ].join('') }; transporter.sendMail(mailOptions, function(err) { diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 4de82c5a26..f8a3e621a0 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -570,7 +570,7 @@ "

Choosing your first Nonprofit Project

", "

We've categorized all the nonprofit projects by estimated time investment per camper: 100 hours, 200 hours, and 300 hours. These are only rough estimates.

", "

Example: if you and the camper you're paired up with (your pair) each stated you could work 20 hours per week. If the project is a 100 hour per camper project, you should be able to complete it in about 5 weeks.

", - "

Our team of nonprofit project camp counselors will match you and your pair based on:

", + "

Our Nonprofit Project team will match you and your pair based on:

", "

", "

    ", "
  1. Your estimated time commitment (10, 20 or 40 hours per week)
    2. ", @@ -603,7 +603,7 @@ "
  2. and establish deadlines based on your weekly time commitment, and how long you think each task will take.
    3. ", " ", "

    ", - "

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

    ", + "

    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.

    ", "

    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.

    ", @@ -626,7 +626,7 @@ "

    Once you complete a nonprofit project, your obligation to its stakeholder is finished. You goal is to leave behind a well documented solution that can be easily maintained by a contract JavaScript developer (or even a less-technical \"super user\").

    ", "

    While you will no longer need to help with feature development, we encourage you to consider helping your stakeholder with occasional patches down the road. After all, this project will be an important piece of your portfolio, and you'll want it to remain in good shape for curious future employers.

    ", "

    Pledging to finish the project

    ", - "

    Your nonprofit stakeholder, your pair, and the volunteer camp counselor team are all counting on you to finish your nonprofit project. If you walk away from an unfinished nonprofit project, you'll become ineligible to ever be assigned another one.

    ", + "

    Your nonprofit stakeholder, your pair, and our volunteer team are all counting on you to finish your nonprofit project. If you walk away from an unfinished nonprofit project, you'll become ineligible to ever be assigned another one.

    ", "

    To confirm that you understand the seriousness of this commitment, we require that all campers  sign this pledge  before starting on their nonprofit projects.

    ", "

    There will likely be times of confusion or frustration. This is normal in software development. The most important thing is that you do not give up and instead persevere through these setbacks. As Steve Jobs famously said, \"Real artists ship.\" And you are going to ship one successful nonprofit project after another until you feel ready to take the next step in your promising career.

    ", "" diff --git a/views/partials/field-guide.jade b/views/partials/field-guide.jade deleted file mode 100644 index e4d70b01d1..0000000000 --- a/views/partials/field-guide.jade +++ /dev/null @@ -1,43 +0,0 @@ -h3 - ol#fieldGuideList - script(src='/js/lib/ramda/ramda.min.js') - script. - var getLinkedName = function getLinkedName(name) { - // ensure name is a string - name = name + ''; - return name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, ''); - } - $.ajax({ - url: '/field-guide/getFieldGuideList', - type: 'GET' - }) - .success( - function(data) { - var docfrag = document.createDocumentFragment(); - for (var i = 0; i < data.fieldGuideList.length; i++) { - var div = document.createElement("div"); - // strike through field guides previously read - var linkedName = getLinkedName(data.fieldGuideList[i].name); - if (data.completedFieldGuides.indexOf(data.fieldGuideIds[i]) > -1) { - $(div).html("
    " + - "" + - "
    " + - "
  3. " + data.fieldGuideList[i].name + "
    4. " + - "
    " + - "
    " + - "
    " + - ""); - } else { - $(div).html("
    " + - "" + - "
    " + - "
  4. " + data.fieldGuideList[i].name + "
    5. " + - "
    " + - "
    " + - "
    " + - ""); - } - docfrag.appendChild(div); - }; - $('#fieldGuideList').append(docfrag); - }); diff --git a/views/partials/github.jade b/views/partials/github.jade deleted file mode 100644 index 5bd7e19f7e..0000000000 --- a/views/partials/github.jade +++ /dev/null @@ -1,13 +0,0 @@ -#github -script. - (function() { - $.ajax({ - url: '/api/github', - type: 'GET' - }).done( - function(data) { - var github = document.createElement('div'); - $(github).html('

    ' + data.issues + ' GitHub issues are open. (create one)

    ' + data.pulls + ' pull requests are open. (create one)').prependTo($('#github')) - } - ); - })(); \ No newline at end of file diff --git a/views/partials/nonprofit-application-progress-bar.jade b/views/partials/nonprofit-application-progress-bar.jade deleted file mode 100644 index e9ed80c441..0000000000 --- a/views/partials/nonprofit-application-progress-bar.jade +++ /dev/null @@ -1,39 +0,0 @@ -.spacer -.progress - .progress-bar(role='progressbar', aria-valuenow= (step * 10), aria-valuemin='0', aria-valuemax='100', style="width: #{step * 10}%;") - span.sr-only= step * 10 - | % Complete -h3.gray-text.text-center Step #{step} of 10 - - -script. - $('#story-url').on('keypress', function (e) { - if (e.which === 13 || e === 13) { - $('#preliminary-story-submit').click(); - } - }); - var preliminaryStorySubmit = function preliminaryStorySubmit() { - var storyURL = $('#story-url').val(); - $('#preliminary-story-submit').attr('disabled', 'disabled'); - $.post('/stories/preliminary', - { - data: { - url: storyURL - } - }) - .fail(function (xhr, textStatus, errorThrown) { - $('#preliminary-story-submit').attr('disabled', false); - }) - .done(function (data, textStatus, xhr) { - if (data.alreadyPosted) { - window.location = data.storyURL; - } else { - window.location = '/stories/submit/new-story?url=' + - encodeURIComponent(data.storyURL) + - '&title=' + encodeURIComponent(data.storyTitle) + - '&image=' + encodeURIComponent(data.storyImage) + - '&description=' + encodeURIComponent(data.storyMetaDescription); - } - }); - } - $('#preliminary-story-submit').on('click', preliminaryStorySubmit); diff --git a/views/partials/nonprofits.jade b/views/partials/nonprofits.jade deleted file mode 100644 index c7a9db255a..0000000000 --- a/views/partials/nonprofits.jade +++ /dev/null @@ -1,24 +0,0 @@ -h3 - ol#nonprofitsList - script(src='/js/lib/ramda/ramda.min.js') - script. - var getLinkedName = function getLinkedName(name) { - // ensure name is a string - name = name + ''; - return name.toLowerCase().replace(/\s/g, '-'); - } - $.ajax({ - url: '/nonprofits/getNonprofitList', - type: 'GET' - }) - .success( - function(data) { - var docfrag = document.createDocumentFragment(); - for (var i = 0; i < data.nonprofitsList.length; i++) { - var li = document.createElement("li"); - var linkedName = getLinkedName(data.nonprofitsList[i].name); - $(li).html("" + data.nonprofitsList[i].name + ""); - docfrag.appendChild(li); - }; - $('#nonprofitsList').append(docfrag); - }); diff --git a/views/resources/nonprofits.jade b/views/resources/nonprofits.jade index 670b9730f3..ab079a1893 100644 --- a/views/resources/nonprofits.jade +++ b/views/resources/nonprofits.jade @@ -53,3 +53,4 @@ block content h2.black-text ...and other tools .big-break a.btn.btn-cta.signup-btn.btn-block(href="/nonprofits-form") My nonprofit needs coding help + .btn-spacer From d7a600bc20daf3e408d13a20488f2bf9adee52dc Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 1 Jun 2015 12:39:01 -0700 Subject: [PATCH 2/3] update nonprofit buttons to allow directory access from nonprofit landing page --- views/nonprofits/directory.jade | 7 +++++-- views/nonprofits/show.jade | 17 +++++++++-------- views/resources/nonprofits.jade | 3 ++- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/views/nonprofits/directory.jade b/views/nonprofits/directory.jade index 61c5ff44ab..2cb2794cbc 100644 --- a/views/nonprofits/directory.jade +++ b/views/nonprofits/directory.jade @@ -16,5 +16,8 @@ block content h2.negative-15= nonprofit.name h3.negative-15= nonprofit.whatDoesNonprofitDo a.text-center.btn.btn-primary.btn-lg(href='/nonprofits/' + nonprofit.name.toLowerCase().replace(/\s/g, '-')) Read more - .spacer - .spacer + + .col-xs-12.col-sm-8.col-sm-offset-2 + if (!user) + a.btn.btn-cta.signup-btn.btn-block(href="/nonprofits-form") My nonprofit needs coding help + .spacer diff --git a/views/nonprofits/show.jade b/views/nonprofits/show.jade index 07a9c6cda0..e8c5f8debc 100644 --- a/views/nonprofits/show.jade +++ b/views/nonprofits/show.jade @@ -55,20 +55,21 @@ block content for assignedCamper in assignedCampers a(href='/' + assignedCamper.username class="interested-camper-image") img.profile-picture.float-right(src=assignedCamper.picture) - .spacer if (!buttonActive) .col-xs-12.col-sm-8.col-sm-offset-2 .text-center - a.btn.btn-primary.btn-big.btn-block.disabled(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project * - p * Complete all our Bonfires, Ziplines, and Basejumps to unlock this. + if !user + a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free) + .button-spacer + else + a.btn.btn-primary.btn-big.btn-block.disabled(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project * + p * Complete all our Bonfires, Ziplines, and Basejumps to unlock this. a.btn.btn-info.btn-big.btn-block(href='/nonprofits/directory') Show all Nonprofit Projects + .spacer if (buttonActive) .col-xs-12.col-sm-8.col-sm-offset-2 .text-center a.btn.btn-primary.btn-big.btn-block(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project + .button-spacer a.btn.btn-info.btn-big.btn-block(href='/nonprofits/directory') Show all Nonprofit Projects - .row - .col-xs-12.text-center - if !user - a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free) - .spacer + .spacer diff --git a/views/resources/nonprofits.jade b/views/resources/nonprofits.jade index ab079a1893..250488d5bd 100644 --- a/views/resources/nonprofits.jade +++ b/views/resources/nonprofits.jade @@ -53,4 +53,5 @@ block content h2.black-text ...and other tools .big-break a.btn.btn-cta.signup-btn.btn-block(href="/nonprofits-form") My nonprofit needs coding help - .btn-spacer + .button-spacer + a.btn.btn-cta.btn-success.btn-block(href="/nonprofits/directory") Browse our directory of nonprofit we've helped From 8fb22fbaa6caadc56d9d62f9e5cc829147e3e00a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 1 Jun 2015 12:45:39 -0700 Subject: [PATCH 3/3] update cities --- seed_data/field-guides.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index f8a3e621a0..ba1d8e9f4d 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -293,6 +293,7 @@ "
  5. Austin
    6. ", "
  6. Baltimore
    7. ", "
  7. Bandung
    8. ", + "
  8. Belem
    9. ", "
  9. Belgrade
    10. ", "
  10. Bellingham
    11. ", "
  11. Bengaluru
    12. ", @@ -300,6 +301,7 @@ "
  12. Berlin
    13. ", "
  13. Bhaktapur
    14. ", "
  14. Bijeljina
    15. ", + "
  15. Birmingham, Alabama
    16. ", "
  16. Bismarck, ND
    17. ", "
  17. Bogota
    18. ", "
  18. Boston
    19. ", @@ -335,6 +337,7 @@ "
  19. Florianopolis
    20. ", "
  20. Fort Worth
    21. ", "
  21. Frankfurt
    22. ", + "
  22. Freehold
    23. ", "
  23. Geneva
    24. ", "
  24. Glendora
    25. ", "
  25. Jakarta
    26. ", @@ -366,6 +369,7 @@ "
  26. Limassol
    27. ", "
  27. London
    28. ", "
  28. Los Angeles
    29. ", + "
  29. Lubbock
    30. ", "
  30. Manila
    31. ", "
  31. Miami
    32. ", "
  32. Minneapolis
    33. ", @@ -376,6 +380,7 @@ "
  33. Mysore
    34. ", "
  34. Nairobi
    35. ", "
  35. Nashville
    36. ", + "
  36. New Haven
    37. ", "
  37. New Orleans
    38. ", "
  38. New York City
    39. ", "
  39. Oakland
    40. ", @@ -383,7 +388,6 @@ "
  40. Omaha
    41. ", "
  41. Orange County
    42. ", "
  42. Orlando
    43. ", - "
  43. Oxford, Alabama
    44. ", "
  44. Parana
    45. ", "
  45. Paris
    46. ", "
  46. Philadelphia
    47. ", @@ -423,6 +427,7 @@ "
  47. Valencia
    48. ", "
  48. Vancouver
    49. ", "
  49. Washington, DC
    50. ", + "
  50. Winnipeg
    51. ", "
  51. Zurich
    52. ", "

", " ",