Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed spelling of non-profit to nonprofit, line 77, join-us.html #3076

Merged

Conversation

JayBarbanel
Copy link
Member

@JayBarbanel JayBarbanel commented Apr 21, 2022

Fixes #2914

What changes did you make and why did you make them ?

  • Changed text on line 77 in the join-us.html page from non-profit to nonprofit.

Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

Visuals before changes are applied

![image](
Screen Shot 2022-04-21 at 7 53 42 PM
)

Visuals after changes are applied

![image](
Screen Shot 2022-04-21 at 8 00 30 PM
)

@github-actions
Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!

From your project repository, check out a new branch and test the changes.

git checkout -b JayBarbanel-fix-misspelled-word-2914 gh-pages
git pull https://github.com/JayBarbanel/Hack-For-LA-Website.git fix-misspelled-word-2914

@github-actions github-actions bot added good first issue Good for newcomers P-Feature: Join Page https://www.hackforla.org/join role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less labels Apr 21, 2022
@Sparky-code Sparky-code self-requested a review April 21, 2022 23:34
@Sparky-code
Copy link
Member

Avail: 1hr
ETA: 4/22 EOD

@tamara-snyder tamara-snyder self-requested a review April 22, 2022 01:35
@tamara-snyder
Copy link
Member

Availability: 1 hour
Review ETA: 04/21/2022

Copy link
Member

@tamara-snyder tamara-snyder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @JayBarbanel, great work! I'm just requesting you to change line 77 from "NonProfit" to "Nonprofit" to match what is written in the issue description, and also to post screenshots of your visual changes in your PR. Thank you!

pages/join-us.html Outdated Show resolved Hide resolved
Copy link
Member

@Sparky-code Sparky-code left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @JayBarbanel, welcome to H4LA!
Your changes to join-us.html look good 👍
Since the issue is looking specifically at spelling and capitalization:

  • The changes made doesn't read as accurate

  • Your before image doesn't seem to show the correct 'prior' state from looking at your file change.

  • I'm curious why there are changes to the docker-compose.yml file as well (I know there were some issue with docker for new volunteers, wondering if its related to that)

@JayBarbanel
Copy link
Member Author

@Sparky-code weird - on my end it looks like it's updated and correct.
As for the image - I had pushed my first commit and then added the images after, so it only shows the version I had updated, not how the file was originally. I had to go back and just fix the cap on the 'P' in Nonprofit.
Next time I know to screenshot before doing any updating.

As for the .yml file - I was having issues but was advised to update that file, worked once I did.

Let me know how to move forward here, thank you!

@Sparky-code
Copy link
Member

Sparky-code commented Apr 23, 2022

@JayBarbanel Sorry, bad phrasing. In your initial comment. Referencing the changes made.

What changes did you make and why did you make them ?
Changed text on line 77 in the join-us.html page from Non-Profit to Nonprofit.

No worries on the images, just wanted to note it. Same with the capitalization. just wanted to note it. If you can fix that text in the initial comment though. If you've addressed Tamara's request you should be able to 'request re-review' (the little recycle for her request and that should kick all the automated tests to complete and be ready for merge.
image

Gotcha on the .yml file 👍 glad that's working for you with an easy fix.

@JayBarbanel
Copy link
Member Author

@Sparky-code Should be all good now! Thanks for walking me through that, I appreciate the help.

@Sparky-code
Copy link
Member

@JayBarbanel Of course, we're all learning new stuff. Don't forget to re-request those reviews!
I'm going to check with the merge team about committing those changes to the .yml file, since that feels like it should be a separate issue.

Copy link
Member

@JessicaLucindaCheng JessicaLucindaCheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JayBarbanel Thanks for working on this issue! In addition to my in-line change requests, do the following:

  • Please check off the items you have completed in your issue Fix misspelled word on join-us.html file from "non-profit" to "nonprofit" #2914

  • Please add your pr to the Project Board.

    Click here for more detailed instructions on how to add your pr to the Project Board
    1. On the right, under the "Projects" section

    2. Click on the gear icon

    3. Then click on Project Board to add your pull request to the project board.

Also, in the future, you can take screenshots from the current, live website (https://www.hackforla.org/) for your before pictures instead of having to undo your changes to take the before screenshots.

docker-compose.yml Outdated Show resolved Hide resolved
pages/join-us.html Outdated Show resolved Hide resolved
@kathrynsilvaconway kathrynsilvaconway self-requested a review April 26, 2022 22:40
@kathrynsilvaconway
Copy link
Member

Availability: 1 hour
Review ETA: 04/27/2022

Copy link
Member

@kathrynsilvaconway kathrynsilvaconway left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JayBarbanel Nice work fixing this error. I see you have made the requested change on line 77. Everything looks good in the html and I can see the changes locally. Good first issue!

@JayBarbanel
Copy link
Member Author

@JessicaLucindaCheng Added this to the project board. As far as checking off what I've done in the issue..Where do I do that? I made a comment in the initial issue showing that I changed line 77, is there somewhere else I need to do that?

I think i should be all set, but I'm still seeing 3 change requests. Could you let me know if/what else I need to do to wrap this one up? Thank you!

@JessicaLucindaCheng
Copy link
Member

  • Availability: 2 hours
  • Review ETA: Thu, Apr 28

@Sparky-code
Copy link
Member

Sparky-code commented Apr 28, 2022

@JayBarbanel if you click through to the original issue you assigned yourself to (#2914), you'll find the 'Action Items' that you completed to create this PR. Check those off there.

Action Item Not completed

image

Action Item completed

image

Copy link
Member

@Sparky-code Sparky-code left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Jay,

  • Looks good!
  • Thanks for addressing the detailed changes!

Copy link
Member

@JessicaLucindaCheng JessicaLucindaCheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JayBarbanel Thanks for making the changes. The code looks good to me now.

As far as checking off what I've done in the issue..Where do I do that?

See @Sparky-code's comment above about how to do that: #3076 (comment)
Please make sure to do that for any issues you work on.

@JessicaLucindaCheng JessicaLucindaCheng dismissed tamara-snyder’s stale review April 28, 2022 23:19

Requested changes have been addressed.

@JessicaLucindaCheng JessicaLucindaCheng merged commit 4b90d9d into hackforla:gh-pages Apr 28, 2022
JessicaLucindaCheng added a commit to JessicaLucindaCheng/website that referenced this pull request May 13, 2022
* Update meeting data

* Update meeting data

* Update contributor and language data

* Added few points to issue progression action item

Added few points to issue progression action item

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update add labels trigger hackforla#2939 (hackforla#3042)

* Update add-labels-template.md

* Update add-labels-template.md

Rearranged original note

* Update open-community-survey.md

* Updated pre-work developer template

* Changed typo in _projects/home-unite-us.md from 'non-profits' to 'nonprofits'. (hackforla#3062)

* Update meeting data

* Update contributor and language data

* fixed the spelling of sustainability (hackforla#3067)

* Update pre-work dev issue template

* Update meeting data

* Update contributor and language data

* Update issue templates

Added Wiki: Research Plan Review:  [REPLACE WITH NAME OF PAGE]

* Updated Project Profile Card review and update issue template

* Update issue templates

updated designer time

* Updated Credits file template: Edit content field and remove type field

* Updated Credits file template: Edit content field and remove type field

* Update meeting data

* Update contributor and language data

* Fix misspelling of "community" on line 93 of pages/join-us.html (hackforla#3072)

* Update meeting data

* Update contributor and language data

* Added feature-tech-dropdown branch

* Update meeting data

* Added feature-tech-dropdown branch

* Added feature-tech-dropdown branch

* Update contributor and language data

* changed the spelling from webapp to web app on line 56 (hackforla#3073)

* Update meeting data

* Update contributor and language data

* Revert " changed the spelling from webapp to web app on line 56 (hackforla#3073)" (hackforla#3078)

This reverts commit f6deeff.

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edit content field and remove type field from avatar.yml credits file 2793 (hackforla#3079)

* Delete unused project-filter.js file (hackforla#3081)

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* fixed spelling of non-profit to nonprofit, line 77, join-us.html (hackforla#3076)

* fixed spelling of non-profit to nonprofit, line 77, join-us.html

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Add so go survey credit page 3022 (hackforla#3043)

* add new headers and tools section to credit page

* updated to empty alt tags for tools section

* fix snytax errors

* fix spacing in code and website page

* Fix indentation and add functionality for additional teams in "By:" field

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edited items on how to pick up your first issue.

Edited items on how to pick up your first issue.

* Create new Privacy Policy page and its credit, and edit label (hackforla#3083)

* Added privacy-policy.jpg

* Add privacy-policy.yml to credits

* Added initial privacy-policy scss and html files

* Added header and overview section

* Redoing the html page from scratch

* Added a line in main.scss to import privacy-policy.scss

* Added header section

* Added the content for section Visiting HackforLA.org

* Added content for section Email Addresses

* Added content for Google Analytics section

* Added content up through and including Third party service providers section

* Finished adding all the content in the HTML file

* Moved the import of privacy-policy.scss to the bottom of the components section

Reason is it didn't make sense that I just put it in the middle on the components section without any reason.

* Added styling for desktop version of page

* Added mobile styling and finished desktop styling

* Updated privacy-policy.yml credit

* Fixed styling

* Fixed styling

* Added spacing before the address on the bottom of the page

* Clarified "Project Profile Card review and update" template

* Update meeting data

* Update contributor and language data

Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Saumil Dhankar <[email protected]>
Co-authored-by: Poorvi Rao <[email protected]>
Co-authored-by: Bonnie Wolfe <[email protected]>
Co-authored-by: Wilny Duong <[email protected]>
Co-authored-by: gardenqu <[email protected]>
Co-authored-by: Simone Campbell <[email protected]>
Co-authored-by: Trisha Johnson <[email protected]>
Co-authored-by: Erick Odero <[email protected]>
Co-authored-by: Devin Krizwold <[email protected]>
Co-authored-by: Matthew Arofin <[email protected]>
Co-authored-by: Jay Barbanel <[email protected]>
Co-authored-by: Jaret Balba <[email protected]>
JessicaLucindaCheng added a commit to JessicaLucindaCheng/website that referenced this pull request May 13, 2022
* Homepage redesign (hackforla#2373)

* Adds communities of practice icons

* Adds COP icons to credits

* Links icons to CoP yml

* Update nav link

* Add communities icons for home page

* create new contact use section

* create new hero section of home page

* create home page communities section

* create home page join us section

* create mvp for home page program areas

* Adds anchor for home page links

* adds new home page technology section

* create home page wins section with wins card

* restyles home age for redesign

* Update program areas images

* Add border radius to containers

* Update padding on embrace section

* Hero mobile design

* Remove join text on mobile view

* Fix join text on tablet-up

* Remove contact text on mobiel view

* Develop mobile technologies section'

* Fix header padding

* Update hero CoP icons credits links

* Update hero CoP icons credits links

* Communities section mobile version

* Create small button element

* Final communities section gradient fix

* Random homepage win logic:

* Hide horizontal sidebars to match design

* Reposition homepage win overlay

* Resolve filename typo

* Change dataKey to match JSON variable

* Reposition home join us header

* Update photo for Civic Tech Infrastructure

* Use new _wins-data

* Update image link to use absolute_url variable

* Add homepage program areas links

* Refactor home wins js for _wins-data

* Disable link leading to about page

* Fix broken link path

* Remove about page link from main nav

* Move nav button styling to appropriate selector

* Sm 1 feature homepage launch (#18)

* Update meeting data

* Update meeting data

* Update contributor and language data

* Added few points to issue progression action item

Added few points to issue progression action item

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update add labels trigger hackforla#2939 (hackforla#3042)

* Update add-labels-template.md

* Update add-labels-template.md

Rearranged original note

* Update open-community-survey.md

* Updated pre-work developer template

* Changed typo in _projects/home-unite-us.md from 'non-profits' to 'nonprofits'. (hackforla#3062)

* Update meeting data

* Update contributor and language data

* fixed the spelling of sustainability (hackforla#3067)

* Update pre-work dev issue template

* Update meeting data

* Update contributor and language data

* Update issue templates

Added Wiki: Research Plan Review:  [REPLACE WITH NAME OF PAGE]

* Updated Project Profile Card review and update issue template

* Update issue templates

updated designer time

* Updated Credits file template: Edit content field and remove type field

* Updated Credits file template: Edit content field and remove type field

* Update meeting data

* Update contributor and language data

* Fix misspelling of "community" on line 93 of pages/join-us.html (hackforla#3072)

* Update meeting data

* Update contributor and language data

* Added feature-tech-dropdown branch

* Update meeting data

* Added feature-tech-dropdown branch

* Added feature-tech-dropdown branch

* Update contributor and language data

* changed the spelling from webapp to web app on line 56 (hackforla#3073)

* Update meeting data

* Update contributor and language data

* Revert " changed the spelling from webapp to web app on line 56 (hackforla#3073)" (hackforla#3078)

This reverts commit f6deeff.

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edit content field and remove type field from avatar.yml credits file 2793 (hackforla#3079)

* Delete unused project-filter.js file (hackforla#3081)

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* fixed spelling of non-profit to nonprofit, line 77, join-us.html (hackforla#3076)

* fixed spelling of non-profit to nonprofit, line 77, join-us.html

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Add so go survey credit page 3022 (hackforla#3043)

* add new headers and tools section to credit page

* updated to empty alt tags for tools section

* fix snytax errors

* fix spacing in code and website page

* Fix indentation and add functionality for additional teams in "By:" field

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edited items on how to pick up your first issue.

Edited items on how to pick up your first issue.

* Create new Privacy Policy page and its credit, and edit label (hackforla#3083)

* Added privacy-policy.jpg

* Add privacy-policy.yml to credits

* Added initial privacy-policy scss and html files

* Added header and overview section

* Redoing the html page from scratch

* Added a line in main.scss to import privacy-policy.scss

* Added header section

* Added the content for section Visiting HackforLA.org

* Added content for section Email Addresses

* Added content for Google Analytics section

* Added content up through and including Third party service providers section

* Finished adding all the content in the HTML file

* Moved the import of privacy-policy.scss to the bottom of the components section

Reason is it didn't make sense that I just put it in the middle on the components section without any reason.

* Added styling for desktop version of page

* Added mobile styling and finished desktop styling

* Updated privacy-policy.yml credit

* Fixed styling

* Fixed styling

* Added spacing before the address on the bottom of the page

* Clarified "Project Profile Card review and update" template

* Update meeting data

* Update contributor and language data

Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Saumil Dhankar <[email protected]>
Co-authored-by: Poorvi Rao <[email protected]>
Co-authored-by: Bonnie Wolfe <[email protected]>
Co-authored-by: Wilny Duong <[email protected]>
Co-authored-by: gardenqu <[email protected]>
Co-authored-by: Simone Campbell <[email protected]>
Co-authored-by: Trisha Johnson <[email protected]>
Co-authored-by: Erick Odero <[email protected]>
Co-authored-by: Devin Krizwold <[email protected]>
Co-authored-by: Matthew Arofin <[email protected]>
Co-authored-by: Jay Barbanel <[email protected]>
Co-authored-by: Jaret Balba <[email protected]>

Co-authored-by: Sarah W <[email protected]>
Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Saumil Dhankar <[email protected]>
Co-authored-by: Poorvi Rao <[email protected]>
Co-authored-by: Bonnie Wolfe <[email protected]>
Co-authored-by: Wilny Duong <[email protected]>
Co-authored-by: gardenqu <[email protected]>
Co-authored-by: Simone Campbell <[email protected]>
Co-authored-by: Trisha Johnson <[email protected]>
Co-authored-by: Erick Odero <[email protected]>
Co-authored-by: Devin Krizwold <[email protected]>
Co-authored-by: Matthew Arofin <[email protected]>
Co-authored-by: Jay Barbanel <[email protected]>
Co-authored-by: Jaret Balba <[email protected]>
JessicaLucindaCheng added a commit to JessicaLucindaCheng/website that referenced this pull request May 14, 2022
* Update meeting data

* Update meeting data

* Update contributor and language data

* Added few points to issue progression action item

Added few points to issue progression action item

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update add labels trigger hackforla#2939 (hackforla#3042)

* Update add-labels-template.md

* Update add-labels-template.md

Rearranged original note

* Update open-community-survey.md

* Updated pre-work developer template

* Changed typo in _projects/home-unite-us.md from 'non-profits' to 'nonprofits'. (hackforla#3062)

* Update meeting data

* Update contributor and language data

* fixed the spelling of sustainability (hackforla#3067)

* Update pre-work dev issue template

* Update meeting data

* Update contributor and language data

* Update issue templates

Added Wiki: Research Plan Review:  [REPLACE WITH NAME OF PAGE]

* Updated Project Profile Card review and update issue template

* Update issue templates

updated designer time

* Updated Credits file template: Edit content field and remove type field

* Updated Credits file template: Edit content field and remove type field

* Update meeting data

* Update contributor and language data

* Fix misspelling of "community" on line 93 of pages/join-us.html (hackforla#3072)

* Update meeting data

* Update contributor and language data

* Added feature-tech-dropdown branch

* Update meeting data

* Added feature-tech-dropdown branch

* Added feature-tech-dropdown branch

* Update contributor and language data

* changed the spelling from webapp to web app on line 56 (hackforla#3073)

* Update meeting data

* Update contributor and language data

* Revert " changed the spelling from webapp to web app on line 56 (hackforla#3073)" (hackforla#3078)

This reverts commit f6deeff.

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edit content field and remove type field from avatar.yml credits file 2793 (hackforla#3079)

* Delete unused project-filter.js file (hackforla#3081)

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* fixed spelling of non-profit to nonprofit, line 77, join-us.html (hackforla#3076)

* fixed spelling of non-profit to nonprofit, line 77, join-us.html

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Add so go survey credit page 3022 (hackforla#3043)

* add new headers and tools section to credit page

* updated to empty alt tags for tools section

* fix snytax errors

* fix spacing in code and website page

* Fix indentation and add functionality for additional teams in "By:" field

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Update meeting data

* Update contributor and language data

* Edited items on how to pick up your first issue.

Edited items on how to pick up your first issue.

* Create new Privacy Policy page and its credit, and edit label (hackforla#3083)

* Added privacy-policy.jpg

* Add privacy-policy.yml to credits

* Added initial privacy-policy scss and html files

* Added header and overview section

* Redoing the html page from scratch

* Added a line in main.scss to import privacy-policy.scss

* Added header section

* Added the content for section Visiting HackforLA.org

* Added content for section Email Addresses

* Added content for Google Analytics section

* Added content up through and including Third party service providers section

* Finished adding all the content in the HTML file

* Moved the import of privacy-policy.scss to the bottom of the components section

Reason is it didn't make sense that I just put it in the middle on the components section without any reason.

* Added styling for desktop version of page

* Added mobile styling and finished desktop styling

* Updated privacy-policy.yml credit

* Fixed styling

* Fixed styling

* Added spacing before the address on the bottom of the page

* Clarified "Project Profile Card review and update" template

* Update meeting data

* Update contributor and language data

Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Saumil Dhankar <[email protected]>
Co-authored-by: Poorvi Rao <[email protected]>
Co-authored-by: Bonnie Wolfe <[email protected]>
Co-authored-by: Wilny Duong <[email protected]>
Co-authored-by: gardenqu <[email protected]>
Co-authored-by: Simone Campbell <[email protected]>
Co-authored-by: Trisha Johnson <[email protected]>
Co-authored-by: Erick Odero <[email protected]>
Co-authored-by: Devin Krizwold <[email protected]>
Co-authored-by: Matthew Arofin <[email protected]>
Co-authored-by: Jay Barbanel <[email protected]>
Co-authored-by: Jaret Balba <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Good for newcomers P-Feature: Join Page https://www.hackforla.org/join role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix misspelled word on join-us.html file from "non-profit" to "nonprofit"
5 participants