Merge pull request #505 from traumschule/governance

move governance files

README.md

@@ -1,31 +1,8 @@
-<img style="align:center" src="img/community.png" alt="Joystream Community Repository for reports, researches, tools and other community contributions." />
+<img style="align:center" src="contributions/creative/community-repo_banners/traumschule/community.png" alt="Joystream Community Repository for reports, researches, tools and other community contributions." />
 
 <div align="center">
   <h4>
-    <a href="/council/reports">
-    Council Reports
-    </a>
-	  <span> | </span>
-    <a href="/contributions">
-    Community Contributions
-    </a>
-	  <span> | </span>
-    <a href="/governance">
-    Documentation
-    </a>
-	  <span> | </span>
-    <a href="/council/submission-log/submission-log.md">
-    Submission Log
-    </a>
-    <span> | </span>
-    <a href="/tokenomics">
-    Tokenomics Reports
-  </a>
-     <span> | </span>
-    <a href="/working-groups">
-    Working group Reports
-  </a>
-   <span> | </span>
+    <a href="/council">Council Reports</a> | <a href="/governance">Documentation</a> | <a href="/working-groups">WG Reports</a> | <a href="/bounties">Bounties</a> |  <a href="/contributions/research">Research</a> | <a href="/contributions/tech">Scripts</a>
   </h4>
 </div>
 
@@ -40,12 +17,6 @@ Table of Contents
     - [Individual Submissions](#individual-submissions)
     - [Jsgenesis Submissions](#jsgenesis-submissions)
     - [Revisions & Improvements of Submissions](#revisions--improvements-of-submissions)
-  - [Current Directories](#current-directories)
-    - [`council-reports`](#council-reports)
-    - [`community-contributions`](#community-contributions)
-    - [`tokenomics-reports`](#tokenomics-reports)
-    - [`workinggroup-reports`](#workinggroup-reports)
-    - [`submission-log`](#submission-log)
 <!-- TOC END -->
 
 # Overview
@@ -56,20 +27,12 @@ If a KPI requires submitting a deliverable, eg. reports or some code, it is expe
 
 Although the community is meant to control the repo, Jsgenesis will approve and merge any pull requests for now. Note that the repo is licensed under [GPLv3](/LICENSE).
 
-## Community Bounties
-
-Community Bounties are bounties made available for the community to work on, with a reward available for completing some or all of the work for each bounty. Bounties are created by Jsgenesis and managed by the council. The bounties can be for a variety of tasks including coding, producing documentation or producing media content. Community Bounties are submitted via a proposal on the platform and may also include a Pull Request within this repo.
-
-The forum is the primary place for discussion of bounties, and you can look through the "Joystream Bounties" forum category for more details about current bounties. Each time a new bounty is added there will be a forum thread created for discussion of the bounty: https://testnet.joystream.org/#/forum/categories/10
-
-If you have questions about a bounty or want to apply for a bounty, you should primarily use the forum. but you can also ask on Telegram. If you plan to work on a bounty, you should let others know this via the forum so that multiple people do not work on the same thing.
-
-You can read more about Community Bounties on the Joystream Helpdesk repo: https://github.com/Joystream/helpdesk/tree/master/roles/builders#community-bounties
 
 ## Workflow
 
 The workflow for changing the repo depends on the reason and purpose behind the change.
 A consistent part is for the contributor to fork the repo, and create a pull request to the applicable branch.
+All changes need to be approved with a proposal, except for selected [files](governance/Files_and_Folders_Naming_Rules.md).
 
 ### KPI Related Submissions
 When a KPI requires a deliverable to be successful, the following steps must be made:
@@ -104,21 +67,3 @@ If a member of the Jsgenesis team wants to make changes to the repo, the followi
 * In the event of some highly important change, a proposal could be made so that the matter is addressed more quickly than waiting for a rolling update
 * If users want to be paid for updates or corrections, then they should open a PR (or multiple PRs) and link to it in a spending proposal, when this is approved it would have the same effect as approving the PR (which still has to be reviewed by Jsgenesis)
 * As an example, if a user wants to add functionality to the telegram bot and be paid for it, they can open a PR and create a spending proposal linking to the PR
-
-## Current Directories
-### `council-reports`
-This folder can be used for creating council reports. The council reports submitted should be formatted in the following way:
-`Council Round #n - DD/MM/YYYY - Council Report.md`
-### `community-contributions`
-This folder can be used for community coded bots and projects and anything that doesn't fit elsewhere. Each submission should be in a unique folder within this directory.
-### `documentation`
-This folder can be used for documentation.
-### `submission-log`
-This folder can be used for maintaining a log of submissions. If the testnet is started from fresh, a new file should be made.
-Each entry in the log should include the Joystream username of the submission, a link to the proposal, a link to the PR and the amount of tokens awarded to the user (if applicable).
-`#1 - Rome Testnet - Community Repo Submission Log.md`
-### `tokenomics-reports`
-This folder can be used for creating tokenomics reports, tokenomics reports are to be submitted during each `Council Round`. The tokenomics reports submitted should be formatted in the following way:
-`Council Round #n - DD/MM/YYYY - Tokenomics Report.md`
-### `workinggroup-reports`
-This folder can be used for creating reports specific to working groups like the storage or curator working groups.

bounties/README.md

@@ -1,5 +1,15 @@
 <p align="center"><img src="/img/bounties_new.svg"></p>
 
+## Community Bounties
+
+Community Bounties are bounties made available for the community to work on, with a reward available for completing some or all of the work for each bounty. Bounties are created by Jsgenesis and managed by the council. The bounties can be for a variety of tasks including coding, producing documentation or producing media content. Community Bounties are submitted via a proposal on the platform and may also include a Pull Request within this repo.
+
+The forum is the primary place for discussion of bounties, and you can look through the "Joystream Bounties" forum category for more details about current bounties. Each time a new bounty is added there will be a forum thread created for discussion of the bounty: https://testnet.joystream.org/#/forum/categories/10
+
+If you have questions about a bounty or want to apply for a bounty, you should primarily use the forum. but you can also ask on Telegram. If you plan to work on a bounty, you should let others know this via the forum so that multiple people do not work on the same thing.
+
+You can read more about Community Bounties on the Joystream Helpdesk repo: https://github.com/Joystream/helpdesk/tree/master/roles/builders#community-bounties
+
 ## Bounty Status
 
 | ID | Title                                  | Issue | Opened     | Reward        | Forum Thread                                                              | Status/Grading                   | PR                                                                                                                                                                                         | Proposal                                                        |

council/README.md

@@ -0,0 +1,21 @@
+[The Joystream Code](https://pioneer.joystreamstats.live/#/forum/threads/595)
+
+proposal_guidelines.md
+Files_and_Folders_Naming_Rules.md
+continuously_updated_files.md
+
+Please follow the [community etiquette](community_etiquette.md).
+
+Guides
+- joystream_intro.md
+- Global_objectives.md
+- roles_and_responsibilities.md - rename, include in README?
+- the_future_and_beyond.md - mainnet ideas
+
+No rules
+- Communication_between_JSG_and_community
+- spending_proposal_categories.csv -> council
+- spending_proposal_categories.json -> council
+- community_survey_march_2021.md -> contributions/research
+- jsg_requests.md - still relevant?
+- state_of_joystream_template.md

council/rules/Files_and_Folders_Naming_Rules.md

@@ -0,0 +1,36 @@
+# Community Repo Files and folders naming rules
+
+v1.0
+
+## Folders
+
+Folders should generally be named in lower case characters, with '-' as words separator. In other words, in lower kebab case: `example-folder-in-lower-kebab-case`
+
+### `council-reports`
+This folder can be used for creating council reports. The council reports submitted should be formatted in the following way:
+`Council Round #n - DD/MM/YYYY - Council Report.md`
+### `community-contributions`
+This folder can be used for community coded bots and projects and anything that doesn't fit elsewhere. Each submission should be in a unique folder within this directory.
+### `documentation`
+This folder can be used for documentation.
+### `submission-log`
+This folder can be used for maintaining a log of submissions. If the testnet is started from fresh, a new file should be made.
+Each entry in the log should include the Joystream username of the submission, a link to the proposal, a link to the PR and the amount of tokens awarded to the user (if applicable).
+`#1 - Rome Testnet - Community Repo Submission Log.md`
+### `tokenomics-reports`
+This folder can be used for creating tokenomics reports, tokenomics reports are to be submitted during each `Council Round`. The tokenomics reports submitted should be formatted in the following way:
+`Council Round #n - DD/MM/YYYY - Tokenomics Report.md`
+### `workinggroup-reports`
+This folder can be used for creating reports specific to working groups like the storage or curator working groups.
+
+## Files
+
+For regular files, the general rule should be to use lower snake case: `lower_Snake_Case`. Uppercase is allowed, as well as numbers.
+
+Not recommended to use:
+1. Spaces
+2. Non-English characters
+3. Characters used in URLs: #, &, ?, :, /
+
+
+These naming conventions can be overruled by the specific requirements dictated by respective software tools or libraries that a contributor choses to use for their coding contributions.

governance/Files_and_Folders_Naming_Rules.md

@@ -1,21 +0,0 @@
-
-# Community Repo Files and folders naming rules
-
-v1.0
-
-## Folders
-
-Folders should generally be named in lower case characters, with '-' as words separator. In other words, in lower kebab case: `example-folder-in-lower-kebab-case`
-
-
-## Files
-
-For regular files, the general rule should be to use lower snake case: `lower_Snake_Case`. Uppercase is allowed, as well as numbers.
-
-Not recommended to use:
-1. Spaces
-2. Non-English characters
-3. Characters used in URLs: #, &, ?, :, /
-
-
-These naming conventions can be overruled by the specific requirements dictated by respective software tools or libraries that a contributor choses to use for their coding contributions.

working-groups/README.md

@@ -0,0 +1,8 @@
+Groups
+- [curators](curator-group)
+- [storage](storage-group)
+- [operations](operations-group)
+
+Rules
+- [Warnings & Slashes](../council/rules/Warn-Slash-Fire_rules_for_leads.md)
+- [Lead term limits](../council/rules/WG_Lead_Term_Limits.md)