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.

Sign up for GitHub

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

Jump to bottom

feature: code of conduct #313

Merged
merged 2 commits into from
Mar 27, 2019
Merged

feature: code of conduct #313

merged 2 commits into from
Mar 27, 2019

Conversation

corinneling
Copy link

@corinneling corinneling commented Mar 24, 2019 •
edited
Loading

Details

Description

  • Adds a code of conduct to the website
  • Updates footer styling to prevent 'scroll to top arrow' overlapping links

Steps to QA

  • Scroll to the bottom of the page
  • Test that all other footer links work
    • T&C
    • Privacy
    • Cookies
  • Test that the Code of Conduct Modal works

Note:

  • I used [names] as a placeholder for the names of the Coding Coach team that users can contact if they need to report any form of harassment - this will need to be updated
  • And I am not sure what we will use to let users report anonymously so I left a placeholder for that as well - this will need to be updated

Issue

#310

@corinneling corinneling changed the title Feature/code of conduct feature: code of conduct Mar 25, 2019
@corinneling corinneling mentioned this pull request Mar 25, 2019
Closed
@devictoribero devictoribero requested review from devictoribero, crysfel and emmabostian and removed request for devictoribero March 25, 2019 16:19
devictoribero
devictoribero reviewed Mar 25, 2019
View reviewed changes
Copy link
Contributor

@devictoribero devictoribero left a comment

Choose a reason for hiding this comment

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

It looks good to me! I'll download the PR later and try it on my computer.

Good gob and thank you for contributing 🤗

src/config/i18n/es/messages.json Outdated
@@ -17,6 +17,7 @@
"dashboard.navigation.tab.mentorships": "Mentores",
"dashboard.navigation.tab.messages": "Mensajes",
"dashboard.navigation.tab.settings": "Ajustes",
"footer.legal.conduct": "",
Copy link
Contributor

Choose a reason for hiding this comment

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

Spanish translation 🇪🇸 : Código de conducta

Copy link
Author

Choose a reason for hiding this comment

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

Thank you! 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Your welcome 😄

devictoribero
devictoribero previously approved these changes Mar 25, 2019
View reviewed changes
Copy link
Contributor

@devictoribero devictoribero left a comment

Choose a reason for hiding this comment

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

I've tried it on my computer in different resolutions and it looks good!

Thank you and good job! 😄

crysfel
crysfel previously approved these changes Mar 26, 2019
View reviewed changes
Copy link
Member

@crysfel crysfel left a comment

Choose a reason for hiding this comment

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

Looking really good, thanks for contributing!

src/pages/static/CodeOfConduct.md Outdated

Members who violate this code of conduct will be approached by someone of the Coding Coach leadership team and asked to stop immediately. Members may also be banned from the Coding Coach slack, blocked on social media, and removed from the website.

If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible. To report an incident of harassment you can either directly message one of leadership team, _[names]_, on slack. If you would rather rename anonymous please fill out _[our report form]_.
Copy link
Member

Choose a reason for hiding this comment

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

I think we should use google docs for anonymous reports, maybe later we can build something else but for now that should be more then enough

Copy link
Collaborator

Choose a reason for hiding this comment

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

Love the idea! I'll set it up!

Copy link
Collaborator

Choose a reason for hiding this comment

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

Here is the link to report an incident: https://forms.gle/bcSWqNNcsdo3zDD17

@emmabostian
Copy link
Collaborator

I added a link to the Google Form where users can report abuse: https://forms.gle/bcSWqNNcsdo3zDD17

emmabostian
emmabostian requested changes Mar 26, 2019
View reviewed changes
Copy link
Collaborator

@emmabostian emmabostian left a comment

Choose a reason for hiding this comment

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

Please add the link to the Google Form (https://forms.gle/bcSWqNNcsdo3zDD17) but I love this thanks so much!

@corinneling corinneling dismissed stale reviews from crysfel and devictoribero via 286612e March 27, 2019 01:26
@corinneling
Copy link
Author

Awesome! thanks 😊
I've added a link to the form you made @emmawedekind. Let me know if there is anything else

crysfel
crysfel previously approved these changes Mar 27, 2019
View reviewed changes
Copy link
Member

@crysfel crysfel left a comment

Choose a reason for hiding this comment

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

LGTM

devictoribero
devictoribero previously approved these changes Mar 27, 2019
View reviewed changes
Copy link
Contributor

@devictoribero devictoribero left a comment

Choose a reason for hiding this comment

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

🎉

emmabostian
emmabostian previously approved these changes Mar 27, 2019
View reviewed changes
Copy link
Collaborator

@emmabostian emmabostian left a comment

Choose a reason for hiding this comment

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

Thank you!

@emmabostian
Copy link
Collaborator

If you can please rebase against develop we will be good to go! Thanks so much!

corinne added 2 commits March 27, 2019 10:39
fix: scroll to top arrow overlapping links
0da5116 
increase tablet left and right margin
add desktop left and right margin
feat: add code of conduct to footer
efebc15 
- add CoC js and md file
- update footer test
- add spanish translation for CoC link
- add link to harrassment report form
crysfel
crysfel approved these changes Mar 27, 2019
View reviewed changes
Copy link
Member

@crysfel crysfel left a comment

Choose a reason for hiding this comment

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

Thanks for contributing

@crysfel crysfel merged commit d300869 into Coding-Coach:develop Mar 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crysfel crysfel crysfel approved these changes

@emmabostian emmabostian emmabostian left review comments

@devictoribero devictoribero devictoribero left review comments

Assignees

@corinneling corinneling

Labels
Ready for review Status
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@corinneling @emmabostian @crysfel @devictoribero