diff --git a/web/src/Routes.js b/web/src/Routes.js index cfc8ce2..d978544 100644 --- a/web/src/Routes.js +++ b/web/src/Routes.js @@ -32,6 +32,7 @@ const Routes = () => { ) return ( + diff --git a/web/src/components/LoginModal/LoginModal.js b/web/src/components/LoginModal/LoginModal.js index b0080eb..6b37808 100644 --- a/web/src/components/LoginModal/LoginModal.js +++ b/web/src/components/LoginModal/LoginModal.js @@ -70,6 +70,7 @@ const LoginModal = ({ open, onClose, shouldStartWithSignup = false }) => { onSubmitSignUp={onSubmitSignUp} checkBox={checkBox} setCheckBox={setCheckBox} + onClose={onClose} /> ) : ( @@ -133,7 +134,7 @@ const SignInForm = ({ onSubmitSignIn }) => ( ) -const SignUpForm = ({ onSubmitSignUp, checkBox, setCheckBox }) => ( +const SignUpForm = ({ onSubmitSignUp, checkBox, setCheckBox, onClose }) => (
( ) newsletter
+ + Use of CadHub requires you to abide by our{' '} + + Code of Conduct + +
diff --git a/web/src/layouts/MainLayout/MainLayout.js b/web/src/layouts/MainLayout/MainLayout.js index 5444ea6..1b985c4 100644 --- a/web/src/layouts/MainLayout/MainLayout.js +++ b/web/src/layouts/MainLayout/MainLayout.js @@ -222,6 +222,9 @@ const MainLayout = ({ children }) => { Logout + +
Code of Conduct
+ )} diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.js b/web/src/pages/CodeOfConductPage/CodeOfConductPage.js new file mode 100644 index 0000000..0e2b2bc --- /dev/null +++ b/web/src/pages/CodeOfConductPage/CodeOfConductPage.js @@ -0,0 +1,197 @@ +import MainLayout from 'src/layouts/MainLayout' +import Seo from 'src/components/Seo/Seo' +import OutBound from 'src/components/OutBound' +import { Link, routes } from '@redwoodjs/router' + +const Li = ({ children }) => ( +
  • {children}
    • +) + +const P = ({ children }) =>

    {children}

    + +const CodeOfConductPage = () => { + return ( + + +
    +

    What's Required

    +
      +
    • + We are committed to providing a friendly, safe and welcoming + environment for all, regardless of any morally irrelevant attributes + (level of experience, gender identity and expression, sexual + orientation, disability, personal appearance, body size, race, + ethnicity, age, religion, nationality, or other similar + characteristic). +
      • +
    • + Please avoid using overtly sexual parts, title, usernames or other + user-creatable content that might detract from a friendly, safe and + welcoming environment for all. +
      • +
    • + Please be kind and courteous. There’s no need to be mean or rude. +
      • +
    • + Respect that people have differences of opinion and that every + design or implementation choice carries a trade-off and numerous + costs. There is seldom a right answer. +
      • +
    • Please keep unstructured critique to a minimum.
      • +
    • + We will exclude you from interaction if you insult, demean or harass + anyone. That is not welcome behavior. We interpret the term + “harassment” as including the definition in the{' '} + + Citizen Code of Conduct + + ; if you have any lack of clarity about what might be included in + that concept, please read their definition. +
      • +
    • + Private harassment is also unacceptable. No matter who you are, if + you feel you have been or are being harassed or made uncomfortable + by a community member, please contact the{' '} + + CadHub moderation team + {' '} + immediately. We care about making this community a safe place for + you and we’ve got your back. +
      • +
    • + Likewise any spamming, trolling, flaming, baiting or other + attention-stealing behavior is not welcome. +
      • +
    + +

    Moderation

    +
    +

    + These are the policies for upholding our community’s standards of + conduct. +

    +
      +
    1. + Remarks that violate the CadHub standards of conduct, including + hateful, hurtful, oppressive, or exclusionary remarks, are not + allowed. (Cursing is allowed, but never targeting another user, + and never in a hateful manner.) +
      2. +
    2. + Remarks that moderators find inappropriate, whether listed in the + code of conduct or not, are also not allowed. +
      3. +
    3. + Moderators will first respond to such remarks with a warning. +
      4. +
    4. + If the warning is unheeded, the user will be “kicked,” i.e., + kicked out of the communication channel to cool off. +
      5. +
    5. + If the user comes back and continues to make trouble, they will be + banned, i.e., indefinitely excluded. +
      6. +
    6. + Moderators may choose at their discretion to un-ban the user if it + was a first offense and they offer the offended party a genuine + apology. +
      7. +
    7. + If a moderator bans someone and you think it was unjustified, + please take it up with that moderator, or with a different + moderator, in private. Complaints about bans + in-channel are not allowed. +
      8. +
    8. + Moderators are held to a higher standard than other community + members. If a moderator creates an inappropriate situation, they + should expect less leeway than others. +
      9. +
    +

    + In the CadHub community we strive to go the extra step to look out + for each other. Don’t just aim to be technically unimpeachable, try + to be your best self. In particular, avoid flirting with offensive + or sensitive issues, particularly if they’re off-topic; this all too + often leads to unnecessary fights, hurt feelings, and damaged trust; + worse, it can drive people away from the community entirely. +

    +

    + And if someone takes issue with something you said or did, resist + the urge to be defensive. Just stop doing what it was they + complained about and apologize. Even if you feel you were + misinterpreted or unfairly accused, chances are good there was + something you could’ve communicated better. Everyone wants to get + along and we are all here first and foremost because we want to talk + about cool technology. You will find that people will be eager to + assume good intent and forgive as long as you earn their trust. +

    +

    + The enforcement policies listed above apply to all official CadHub + venues; including{' '} + + Discord channels + + ,{' '} + + GitHub + {' '} + and{' '} + + CadHub + + . Please contact the maintainers of those projects for enforcement. + If you wish to use this code of conduct for your own project, + consider explicitly mentioning your moderation policy or making a + copy with your own moderation policy so as to avoid confusion. +

    +

    + + Adapted from{' '} + + Node.js Policy on Trolling + + ,{' '} + + Contributor Covenant v1.3.0 + {' '} + and{' '} + + Rust Code of Conduct + + . + +

    +
    +
    +     + ) +} + +export default CodeOfConductPage diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js b/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js new file mode 100644 index 0000000..26a75f9 --- /dev/null +++ b/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js @@ -0,0 +1,7 @@ +import CodeOfConductPage from './CodeOfConductPage' + +export const generated = () => { + return +} + +export default { title: 'Pages/CodeOfConductPage' } diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js b/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js new file mode 100644 index 0000000..56aaed8 --- /dev/null +++ b/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js @@ -0,0 +1,11 @@ +import { render } from '@redwoodjs/testing' + +import CodeOfConductPage from './CodeOfConductPage' + +describe('CodeOfConductPage', () => { + it('renders successfully', () => { + expect(() => { + render() + }).not.toThrow() + }) +})