Merge pull request #51 from 3DStreet/terms-conditions

kfarr · web-flow · commit 2581b2a6b6b4 · 2024-10-02T23:36:07.000-07:00
user content
diff --git a/docs/about-3dstreet/code-of-conduct.md b/docs/about-3dstreet/code-of-conduct.md
@@ -0,0 +1,134 @@
+# Code of Conduct
+
+Last updated: October 2nd, 2024
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/docs/about-3dstreet/terms-and-conditions.md b/docs/about-3dstreet/terms-and-conditions.md
@@ -1,6 +1,6 @@
 # Terms and Conditions
 
-Last updated: August 23, 2024
+Last updated: October 2nd, 2024
 
 Please read these terms and conditions carefully before using Our Service.
 
@@ -17,23 +17,13 @@ For the purposes of these Terms and Conditions:
 - __Application__ means the software program provided by the Company downloaded by You on any electronic device, named 3DStreet App
 - __Application Store__ means the digital distribution service operated and developed by Apple Inc. (Apple App Store) or Google Inc. (Google Play Store) in which the Application has been downloaded.
 - __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.
-
 - __Country__ refers to: California,  United States
 - __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to 3DStreet LLC, 320 Alabama St, San Francisco, CA 94110.
-
 - __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet.
-
-
-
-
-
-
-
 - __Service__ refers to the Application or the Website or both.
-
-
 - __Terms and Conditions__ (also referred as "Terms") mean these Terms and Conditions that form the entire agreement between You and the Company regarding the use of the Service. This Terms and Conditions agreement has been created with the help of the [Terms and Conditions Generator](https://www.termsfeed.com/terms-conditions-generator/).
 - __Third-party Social Media Service__ means any services or content (including data, information, products or services) provided by a third-party that may be displayed, included or made available by the Service.
+- __User Content__ refers to any content, including but not limited to text, images, designs, and other media, that is uploaded, posted, or otherwise made available by You on or through the Service.
 - __Website__ refers to 3DStreet Website and Docs, accessible from [https://www.3dstreet.org/](https://www.3dstreet.org/)
 - __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable.
 
@@ -45,30 +35,10 @@ Your access to and use of the Service is conditioned on Your acceptance of and c
 
 By accessing or using the Service You agree to be bound by these Terms and Conditions. If You disagree with any part of these Terms and Conditions then You may not access the Service.
 
-
 You represent that you are over the age of 18. The Company does not permit those under 18 to use the Service.
 
-
 Your access to and use of the Service is also conditioned on Your acceptance of and compliance with the Privacy Policy of the Company. Our Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your personal information when You use the Application or the Website and tells You about Your privacy rights and how the law protects You. Please read Our Privacy Policy carefully before using Our Service.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ## Links to Other Websites
 
 Our Service may contain links to third-party web sites or services that are not owned or controlled by the Company.
@@ -83,7 +53,6 @@ We may terminate or suspend Your access immediately, without prior notice or lia
 
 Upon termination, Your right to use the Service will cease immediately.
 
-
 ## Limitation of Liability
 
 Notwithstanding any damages that You might incur, the entire liability of the Company and any of its suppliers under any provision of this Terms and Your exclusive remedy for all of the foregoing shall be limited to the amount actually paid by You through the Service or 100 USD if You haven't purchased anything through the Service.
@@ -100,28 +69,50 @@ Without limiting the foregoing, neither the Company nor any of the company's pro
 
 Some jurisdictions do not allow the exclusion of certain types of warranties or limitations on applicable statutory rights of a consumer, so some or all of the above exclusions and limitations may not apply to You. But in such a case the exclusions and limitations set forth in this section shall be applied to the greatest extent enforceable under applicable law.
 
-## Governing Law
+## Use of Service Source Code
 
-The laws of the Country, excluding its conflicts of law rules, shall govern this Terms and Your use of the Service. Your use of the Application may also be subject to other local, state, national, or international laws.
+Some Service source code is made available under the AGPLv3 license. The AGPLv3 license is a strong "copyleft" license that requires any modified version of the software to be distributed under the same license terms, including when the software is run as a service over a network. This means that if you modify AGPLv3-licensed code and make it available to users over a network, you must also make your modifications publicly available under the AGPLv3 license.
 
-## Disputes Resolution
+The full license information for the primary Service repository can be found here: [LICENSE](https://github.com/3DStreet/3dstreet/blob/main/LICENSE).
 
-If You have any concern or dispute about the Service, You agree to first try to resolve the dispute informally by contacting the Company.
+## User Content
+By using the Service, You may create, submit, or share content, including but not limited to text, images, designs, and other media ("User Content"). You retain ownership of any intellectual property rights that You hold in Your User Content. However, by making Your User Content available on or through the Service, You grant the Company, as well as other users of the Service, a worldwide, non-exclusive, royalty-free, sublicensable, and transferable license to use, reproduce, distribute, modify, adapt, create derivative works from, publicly display, and perform Your User Content.
 
+### Public Nature of User Content
+Please note that all User Content uploaded or created on the Service is public by default. Your User Content may be viewed and used by other users, and may be subject to remixing or modification, similar to content shared in open-source platforms like GitHub. All such User Content will be governed by a Creative Commons Attribution License (CC BY), which allows others to remix, tweak, and build upon Your work, provided they give appropriate credit to You.
 
-## For European Union (EU) Users
+### No Sale of User Content Without Consent
+We do not sell Your User Content without your permission. The rights You grant through this license are provided to support the public sharing and creative collaboration that takes place within the Service. You acknowledge and agree that other users of the Service may use, modify, and distribute Your User Content, as long as they comply with the Creative Commons Attribution License terms.
 
-If You are a European Union consumer, you will benefit from any mandatory provisions of the law of the country in which You are resident.
+### User Content Representations and Warranties
+You represent that (i) any materials and content posted or otherwise submitted by you to the Service is original to you and that you have the right to grant us these rights, (ii) the posting and use of your materials and content on or through the Service does not violate, misappropriate or infringe on the rights of any third-party, including, without limitation, privacy rights, rights of publicity, copyrights, trademark and/or other intellectual property rights, and (iii) such posts and the content contained therein abide by these Terms of Use.
+
+### Contribution of Source Code
+Any source code contribution will be governed by the license terms stated on the Service's source code repository. We follow the GitHub Terms of Service for assigning your contributed code the same license as its respective repository, which may vary depending upon provenance and other factors. Those terms are pasted here for convenience, [here is a direct link to GitHub's terms](https://docs.github.com/en/site-policy/github-terms/github-terms-of-service#6-contributions-under-repository-license
+).
 
+> Whenever you make a contribution to a repository containing notice of a license, you license your contribution under the same terms, and you agree that you have the right to license your contribution under those terms. If you have a separate agreement to license your contributions under different terms, such as a contributor license agreement, that agreement will supersede.
 
+> Isn't this just how it works already? Yep. This is widely accepted as the norm in the open-source community; it's commonly referred to by the shorthand "inbound=outbound". We're just making it explicit.
 
 
 
+
+## Governing Law
+The laws of the great State of California and the United States, as applicable, will govern these Terms and Your use of the Service, without regard to conflict of law provisions. Any legal disputes relating to these Terms or the Service will be resolved in the state or federal courts located in San Francisco, California. Your use of the Service may also be subject to other local, state, national, or international laws.
+
+## Disputes Resolution
+
+If You have any concern or dispute about the Service, You agree to first try to resolve the dispute informally by contacting the Company.
+
+## For European Union (EU) Users
+
+If You are a European Union consumer, you will benefit from any mandatory provisions of the law of the country in which You are resident.
+
 ## United States Legal Compliance
 
 You represent and warrant that (i) You are not located in a country that is subject to the United States government embargo, or that has been designated by the United States government as a "terrorist supporting" country, and (ii) You are not listed on any United States government list of prohibited or restricted parties.
 
-
 ## Severability and Waiver
 
 ### Severability
diff --git a/docs/about-3dstreet/user-personas.md b/docs/about-3dstreet/user-personas.md
@@ -4,40 +4,14 @@ description: 3DStreet application users are Creators and Viewers. Within those b
 ---
 
 # User Personas
-We try to design 3DStreet to meet the needs of people aspiring to improve their community. To more easily plan for developing features that serve user needs it helps to formalize personas that represent these users which we do here on this page. These User Personas are imperfect definitions, don't take them too seriously and feel free to suggest new ones.
-
-## Creators and Viewers
-We separate our 3DStreet application user personas into 2 separate buckets depending on their primary job to be done:
+We try to design 3DStreet to meet the needs of people aspiring to improve communities. To more easily plan for developing features to serve user needs, a common exercise is to formalize personas. These User Personas are imperfect and simplistic definitions, don't take them too seriously and feel free to suggest new ones.
 
 ### Creator
 A creator makes content to share with others using 3DStreet. They may be importing a scene from Streetmix or generating one from scratch.
 
-3DStreet “Creator” personas exist on a spectrum from everyday community advocates to professional civil engineers. Our primary persona that we serve with 3DStreet is an Advocate Creator who is passionate and motivated to improve their local community but may not have professional urban planning or civil engineering experience.
+3DStreet “Creator” personas exist on a spectrum from everyday community advocates to professional civil engineers. Our primary Creator persona is an Advocate Creator who is passionate and motivated to improve their local community but may not have professional urban planning or civil engineering experience. A secondary Creator persona is a Professional Creator who has a strong background in urban planning and/or civil engineering.
 
 ### Viewer
 A viewer consumes content created by 3DStreet. They may be viewing a scene in the app directly, or more likely watching a video or seeing an image generated by 3DStreet.
 
-3DStreet “Viewer” personas exist on a spectrum from an everyday neighbor who lives near a proposed project to a city staff member or an elected official who may be asked to make decisions regarding the project. The Decisionmaker Viewer is 3DStreet’s secondary user persona (after Advocate Creators) whose professional role puts them in a position to approve, deny, change, or otherwise influence a proposed project.
-
-## All Personas
-Our 4 key personas, starting with highest priority, PLUS a NEW fifth developer support persona!
-
-#### Advocate (Creator)
-
-Example Roles: Advocate, non-profit staff, students, urban planning enthusiasts, amateur planners or engineers, players of other simulation video games
-
-#### Decision Maker (Viewer)
-
-Example Roles: Elected official, agency director, board member, political team staff
-
-#### General Public (Viewer)
-
-Example Roles: neighbor, community member, resident of the same metro area as creator
-
-#### Professional Engineer (Creator)
-
-Example Roles: Professional Engineer at an Agency, Planners, communications teams, research and graduate studies, other agency staff
-
-#### Developer
-
-Example Roles: Web developer, 3D technical artist, A-Frame or three.js library user, Blender artist, AR/VR/Geospatial developer, game developer, project contributor
+3DStreet “Viewer” personas exist on a spectrum from an everyday neighbor who lives near a proposed project, to a city staff member, or an elected official who may be asked to make decisions regarding the project. The Decisionmaker Viewer is 3DStreet’s secondary user persona (after Advocate Creators) whose professional role puts them in a position to approve, deny, change, or otherwise influence a proposed project.
