diff --git a/astro.config.mjs b/astro.config.mjs index 4fb7ef5c..f8b8e685 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -29,11 +29,11 @@ export default defineConfig({ label: 'About us', items: [ // Each item here is one entry in the navigation menu. - { label: 'Manifesto', link: '/manifesto' }, - { label: 'Roadmap', link: '/roadmap' }, - { label: 'History', link: '/history' }, - { label: 'Brand', link: '/brand' }, - { label: 'Contact us', link: '/contacts' }, + { label: 'Manifesto', link: '/about-us/manifesto' }, + { label: 'Roadmap', link: '/about-us/roadmap' }, + { label: 'History', link: '/about-us/history' }, + { label: 'Brand', link: '/about-us/brand' }, + { label: 'Contact us', link: '/about-us/contact-us' }, ], }, { @@ -56,26 +56,32 @@ export default defineConfig({ { label: 'Privacy Academy πŸ‘©β€πŸ«', link: '/projects/privacy-academy' }, ], }, + { + label: 'Get Involved', + items: [ + // Each item here is one entry in the navigation menu. + { label: 'Introduction', link: '/get-involved/index' }, + { label: 'Partnerships', link: '/get-involved/partnership' }, + { label: 'Organisational benefits', link: '/get-involved/org-benefits' }, + { label: 'Personal benefits', link: '/get-involved/personal-benefits' }, + { label: 'Onboarding', link: '/get-involved/onboarding' }, + { label: 'Donate', link: '/get-involved/donate' }, + ], + }, { label: 'Ecosystem', items: [ - { label: 'Follow us', link: '/follow-us' }, - { label: 'Get involved', link: '/get-involved' }, - { label: 'Donate', link: '/donate' }, - { - label: 'Partnerships', - link: '/partnerships', - }, - { label: 'Communication tools', link: '/communication' }, - { label: 'Code of conduct', link: '/code-of-conduct' }, + { label: 'Follow us', link: '/ecosystem/follow-us' }, + { label: 'Communication tools', link: '/ecosystem/communication' }, + { label: 'Code of conduct', link: '/ecosystem/code-of-conduct' }, ] }, { label: 'For contributors', items: [ - { label: 'Contributors guide', link: '/contributors' }, - { label: 'Workgroups', link: '/workgroups' }, - { label: 'Git repositories', link: '/git' }, + { label: 'Contributors guide', link: '/contributors/index' }, + { label: 'Workgroups', link: '/contributors/workgroups' }, + { label: 'Git repositories', link: '/contributors/git' }, { label: 'Guide: how to deploy event website', link: '/contributors/deploy-event-website' }, ] }, @@ -97,12 +103,17 @@ export default defineConfig({ { label: 'Governance', items: [ - { label: 'Structure', link: '/governance' }, - { label: 'Core Team', link: '/core-team' }, - { label: 'Core Contributors', link: '/core-contributors' }, - { label: 'Treasury', link: '/treasury' }, + { label: 'Structure', link: '/governance/governance' }, + { label: 'Core Team', link: '/governance/core-team' }, + { label: 'Core Contributors', link: '/governance/core-contributors' }, + { label: 'Treasury', link: '/governance/treasury' }, ] - } + }, + { + label: 'News', + collapsed: true, + autogenerate: { directory: 'news' }, + }, ], }), ], diff --git a/src/content/docs/brand.md b/src/content/docs/about-us/brand.md similarity index 100% rename from src/content/docs/brand.md rename to src/content/docs/about-us/brand.md diff --git a/src/content/docs/contacts.md b/src/content/docs/about-us/contact-us.md similarity index 92% rename from src/content/docs/contacts.md rename to src/content/docs/about-us/contact-us.md index 99fca0f1..b7d2df60 100644 --- a/src/content/docs/contacts.md +++ b/src/content/docs/about-us/contact-us.md @@ -4,7 +4,7 @@ title: Contact us For any questions, requests, or feedback, please feel free to contact us via: -- e-mail: * web3privacynow@protonmail.com +- e-mail: web3privacynow@protonmail.com - 𝕏/Twitter: [@web3privacy](https://twitter.com/web3privacy) And/or join the conversation on: diff --git a/src/content/docs/history.md b/src/content/docs/about-us/history.md similarity index 100% rename from src/content/docs/history.md rename to src/content/docs/about-us/history.md diff --git a/src/content/docs/manifesto.md b/src/content/docs/about-us/manifesto.md similarity index 100% rename from src/content/docs/manifesto.md rename to src/content/docs/about-us/manifesto.md diff --git a/src/content/docs/roadmap.md b/src/content/docs/about-us/roadmap.md similarity index 92% rename from src/content/docs/roadmap.md rename to src/content/docs/about-us/roadmap.md index 2c2cc05c..ce40875b 100644 --- a/src/content/docs/roadmap.md +++ b/src/content/docs/about-us/roadmap.md @@ -18,7 +18,7 @@ _via_ | | 2024 Roadmap | | --- | --- | -| βš™οΈ Core Initiative | β€’ [Association](/association/) (legal entity)
β€’ [Partners](/partners/) (incl. [Privacy Survival Kit](/partners/survival-kit)) | +| βš™οΈ Core Initiative | β€’ [Partnership](/partnership/) & [Core team](/governance/core-team)) | | πŸ”¬ [Research](/research/) | Upcoming reports:
β€’ [Privacy Guides for the general public](https://github.com/web3privacy/grants/blob/main/README.md#-privacy-guides)
β€’ [Scoring Model v2.0](https://github.com/web3privacy/grants/blob/main/README.md#-privacy-beat)
β€’ [Hackathon Curation Pack](https://github.com/web3privacy/grants/blob/main/README.md#-hackathon-curation-pack)
β€’ [Ethereum Privacy Ecosystem](https://docs.web3privacy.info/research/ethereum-privacy-ecosystem) | | πŸ“… [Events](/events/) | 2024 Season:
β€’ 17 events in 14 countries
β€’ 1 hackathon, 2 summits, 14 meetups | | πŸ‘οΈ [Privacy Explorer](/projects/privacy-explorer) | [v2.0](/projects/privacy-explorer#milestones) upgrade | diff --git a/src/content/docs/git.md b/src/content/docs/contributors/git.md similarity index 100% rename from src/content/docs/git.md rename to src/content/docs/contributors/git.md diff --git a/src/content/docs/contributors/index.md b/src/content/docs/contributors/index.md index 6627f3fc..7e8defdf 100644 --- a/src/content/docs/contributors/index.md +++ b/src/content/docs/contributors/index.md @@ -1,5 +1,8 @@ --- title: Contributors Guide +sidebar: + order: 0 + label: Contributors Guide --- ## Who is a contributor? @@ -8,7 +11,7 @@ A *contributor* is anyone who helps us with the realization of our [Projects](#p Contributors are often grouped by their skills and interest in different Workgroups. -Frequent contributors have the opportunity to become [Core Contributors](https://docs.web3privacy.info/core-contributors/) and be rewarded for their contributions to open source. +Frequent contributors have the opportunity to become [Core Contributors](/governance/core-contributors/) and be rewarded for their contributions to open source. ## Projects diff --git a/src/content/docs/contributors/workgroups.md b/src/content/docs/contributors/workgroups.md new file mode 100644 index 00000000..997c6f98 --- /dev/null +++ b/src/content/docs/contributors/workgroups.md @@ -0,0 +1,29 @@ +--- +title: Workgroups +--- + +All our activities are divided into many *working groups*. Internal working groups take care of the basic needs of the whole organization and serve as a key support for the teams of individual specific projects. + +Here you will find an overview of all the workgroups together with the people involved and links to the main tools. + +## Internal + +| Name | Lead | Members | Links | +| --- | --- | --- | --- | +| [**Core Team**](/core-team) | Mykola, PG, Coinmandeer, niclaz | [PM](https://github.com/orgs/web3privacy/projects/8), πŸ”’ [GitHub](https://github.com/web3privacy/core-internal), πŸ”’ Matrix | +| **Marketing & Outreach** | Mykola | PG | +| **Partnerships** | PG | Mykola | πŸ”’ [PM](https://github.com/orgs/web3privacy/projects/10), πŸ”’ Matrix | +| **IT Operation** | niclaz | || +| **Design department** | Coinmandeer | || + +πŸ”’ - private tool (non-public) + +## Project-specific + +| Name | Lead | Members | Links | +| --- | --- | --- | --- | +| **[Research](/research)** | Mykola | PG | [Matrix](https://matrix.to/#/#w3p-research:gwei.cz) | +| **[Events](/events)** | - | PG, Coinmandeer, Mykola | [PM](https://github.com/orgs/web3privacy/projects/7), [GitHub](https://github.com/web3privacy/events), [Matrix](https://matrix.to/#/#w3p-events:gwei.cz) | +| **[Privacy Explorer](/projects/privacy-explorer)** | Coinmandeer | Mykola | [GitHub](https://github.com/web3privacy/explorer), [Matrix](https://matrix.to/#/#w3p-explorer:gwei.cz) | +| **[Week in the Privacy News](/news/week-in-the-privacy)** | - | Mykola, PG | [GitHub](https://github.com/web3privacy/news), [Matrix](https://matrix.to/#/#w3p-news:gwei.cz) | +| **[Privacy Tech Awards](/projects/privacy-tech-awards)** | - | PG, Mykola | [Matrix](https://matrix.to/#/#w3p-awards:gwei.cz) | diff --git a/src/content/docs/code-of-conduct.md b/src/content/docs/ecosystem/code-of-conduct.md similarity index 99% rename from src/content/docs/code-of-conduct.md rename to src/content/docs/ecosystem/code-of-conduct.md index ab5b3f99..395a2c00 100644 --- a/src/content/docs/code-of-conduct.md +++ b/src/content/docs/ecosystem/code-of-conduct.md @@ -36,4 +36,4 @@ If you are subject to or witness unacceptable behavior, or have any other concer --- -Code of conduct adopted from [ETHBerlin3](https://ethberlin.ooo/code-of-conduct/) and [EEG](https://docs.ethevents.club/en/code-of-conduct/). Thank you! \ No newline at end of file +Code of conduct adopted from [ETHBerlin3](https://ethberlin.ooo/code-of-conduct/) and [EEG](https://docs.ethevents.club/en/code-of-conduct/). Thank you! diff --git a/src/content/docs/communication.mdx b/src/content/docs/ecosystem/communication.mdx similarity index 99% rename from src/content/docs/communication.mdx rename to src/content/docs/ecosystem/communication.mdx index d4f329b2..70847430 100644 --- a/src/content/docs/communication.mdx +++ b/src/content/docs/ecosystem/communication.mdx @@ -39,4 +39,3 @@ DM us on [X](https://x.com/web3privacy) or drop an [email](mailto:web3privacynow - diff --git a/src/content/docs/follow-us.md b/src/content/docs/ecosystem/follow-us.md similarity index 92% rename from src/content/docs/follow-us.md rename to src/content/docs/ecosystem/follow-us.md index f6bd0847..20e4425d 100644 --- a/src/content/docs/follow-us.md +++ b/src/content/docs/ecosystem/follow-us.md @@ -1,5 +1,8 @@ --- title: Follow us +sidebar: + order: 0 + label: Follow us --- ## Enjoy Web3Privacy Now Community! diff --git a/src/content/docs/congress.md b/src/content/docs/events/congress.md similarity index 56% rename from src/content/docs/congress.md rename to src/content/docs/events/congress.md index b841265b..dd610471 100644 --- a/src/content/docs/congress.md +++ b/src/content/docs/events/congress.md @@ -4,7 +4,7 @@ title: Congress The main governance body of the whole organisation, which decides on the most important issues by voting. -The Congress is held once a year and is organized by [Association](/association). +The Congress is held once a year. | Congress | Date | Location | | --- | --- | --- | @@ -15,9 +15,9 @@ The Congress is held once a year and is organized by [Association](/association) * a vote on the long-term direction of the initiative * approval of the financial plan for the following year -* election of [Core Team](/core-team) members (3 year election period) -* election of members of the executive body of the [Association](/association) (*Association Committee*) (5 year election period) +* election of [Core Team](governance/core-team) members (3 year election period) +* election of members of the executive body of the *Association Committee* (5 year election period) ## Who makes the decisions -* our [Partners](/partners) with a voting rights +* our [Members](/partnership) with a voting rights diff --git a/src/content/docs/donate.md b/src/content/docs/get-involved/donate.md similarity index 100% rename from src/content/docs/donate.md rename to src/content/docs/get-involved/donate.md diff --git a/src/content/docs/get-involved.md b/src/content/docs/get-involved/index.md similarity index 90% rename from src/content/docs/get-involved.md rename to src/content/docs/get-involved/index.md index 98de8da8..755bd193 100644 --- a/src/content/docs/get-involved.md +++ b/src/content/docs/get-involved/index.md @@ -1,7 +1,11 @@ --- -title: Get involved +title: Get Involved +sidebar: + order: 0 + label: Introduction --- + ## You wish to become a contributor to the Web3Privacy Now Ecosystem? ### Let’s make sure we are on the same page about what our work is all about. @@ -25,4 +29,4 @@ Our ultimate goal is to empower individuals to take control of their digital pri _Co-edit research and publications, update project's data throught pull requests, give us structured feedbacks, volunteer at events, or start a new project._ -To understand how to become a contributor, what projects you can help with, how to start a new one, visit [Contributors Guide](https://docs.web3privacy.info/contributors/). +To understand how to become a contributor, what projects you can help with, how to start a new one, visit [Contributors Guide](/contributors/index). diff --git a/src/content/docs/partnerships/onboarding.md b/src/content/docs/get-involved/onboarding.md similarity index 100% rename from src/content/docs/partnerships/onboarding.md rename to src/content/docs/get-involved/onboarding.md diff --git a/src/content/docs/membership/org-benefits.md b/src/content/docs/get-involved/org-benefits.md similarity index 100% rename from src/content/docs/membership/org-benefits.md rename to src/content/docs/get-involved/org-benefits.md diff --git a/src/content/docs/partnerships/index.md b/src/content/docs/get-involved/partnership.md similarity index 98% rename from src/content/docs/partnerships/index.md rename to src/content/docs/get-involved/partnership.md index ce499da4..54ac17bc 100644 --- a/src/content/docs/partnerships/index.md +++ b/src/content/docs/get-involved/partnership.md @@ -1,5 +1,5 @@ --- -title: Partnerships +title: Partnership --- # MEMBERS @@ -31,4 +31,3 @@ They support our mission by contributing to all our activities, whether it's a r [Open Observatory of Network Interference](https://ooni.org/) | [LunarDAO](https://lunardao.net/) | [CryptoCanal](https://lu.ma/cryptocanal) | [MolochDAO](https://molochdao.com/) | [Urbe](https://linktr.ee/urbe.eth) | [PrivacyGuardians](http://privacyguardians.io/) | [MoneroKon](https://monerokon.org/) | [Gwei](https://gwei.cz/) | [ETHRome](https://www.ethrome.org) | [ETHBarcelona](https://www.ethbarcelona.com/) | [ETHBrno](https://ethbrno.cz/) | [Hopr](https://hoprnet.org/) | [UkraineDAO](https://ukrainedao.love/) - diff --git a/src/content/docs/membership/personal-benefits.md b/src/content/docs/get-involved/personal-benefits.md similarity index 66% rename from src/content/docs/membership/personal-benefits.md rename to src/content/docs/get-involved/personal-benefits.md index e711ded9..bbc0ac4c 100644 --- a/src/content/docs/membership/personal-benefits.md +++ b/src/content/docs/get-involved/personal-benefits.md @@ -10,7 +10,7 @@ title: Personal benefits ### ✦ "Privacy Survival Kit" swag bundle -Collect your [Privacy Survival Kit](/partners/survival-kit) once a year [Pick up at our [events](/events/) (for free) or by delivery (extra fee)] +Collect your Privacy Survival Kit once a year [Pick up at our [events](/events/) (for free) or by delivery (extra fee)] ### ✦ Access to special members-only events @@ -20,7 +20,7 @@ For example: Web3Privacy Now Congress (upcoming) and special educational seminar ### ✦ Special chat group access -Private chat for all members where you can communicate directly with the [Core Team](/core-team) and connect with each other. +Private chat for all members where you can communicate directly with the [Core Team](/governance/core-team) and connect with each other. ### ✦ Access to special deals of our partners @@ -30,8 +30,6 @@ Special discounts and offers from our member organisations. ### ✦ Voting rights in our association -For members who want to be more involved in the governance of our initiative, we offer the opportunity to become a *voting member* of our [association](/association). As a *voting member*, you will have the opportunity to participate in the decisions of our Congress once a year by voting on our plans and other topics. To become a *voting member*, you must fill out a special form (upcoming) and be approved by the [association](/association/) comittee. - ### ✦ Opportunity to vote in a special category at the Privacy Tech Awards We are planning a special category in the [Privacy Tech Awards](/projects/privacy-tech-awards) where only our members will be able to vote. diff --git a/src/content/docs/core contributors.md b/src/content/docs/governance/core-contributors.md similarity index 99% rename from src/content/docs/core contributors.md rename to src/content/docs/governance/core-contributors.md index 3cf7ae91..a95e7dbf 100644 --- a/src/content/docs/core contributors.md +++ b/src/content/docs/governance/core-contributors.md @@ -23,4 +23,3 @@ Any contribution that has a practical impact on the ecosystem (e.g. completing a In order to become a core contributor, it is necessary to have already contributed to our projects on an ongoing basis, to have cultivated a direct relationship with at least one of the core team and to be willing to carry out one or more projects, or at least part of them on a more or less continuous basis. - diff --git a/src/content/docs/core-team/index.md b/src/content/docs/governance/core-team.md similarity index 66% rename from src/content/docs/core-team/index.md rename to src/content/docs/governance/core-team.md index 017b7bcd..5f18b815 100644 --- a/src/content/docs/core-team/index.md +++ b/src/content/docs/governance/core-team.md @@ -4,15 +4,15 @@ title: Core Team The Core Team is the team of people who manage this initiative. -Core Team members are elected by decision of the [Congress](/congress) for a term of 5 years. It is also exceptionally possible to recall or elect a new member by majority decision of the Core Team itself. +Core Team members are elected by decision of the [Congress](/events/congress) for a term of 5 years. It is also exceptionally possible to recall or elect a new member by majority decision of the Core Team itself. ## Purpose * handle daily decision-making of initiative -* communicates with the general public ([Contact us](/contacts)) -* oversees and guides the [Association](/association) -* may extraordinarily elect or recall members of the [Association](/association) Committee +* communicates with the general public ([Contact us](/about-us/contact-us)) +* oversees and guides the Association +* may extraordinarily elect or recall members of the Association Committee * control access to basic infrastructure (domains, service accounts etc.) -* control on-chain treasury ([Multi-sig wallet](/core-team/multisig)) +* control on-chain treasury Multi-sig wallet * hosts weekly Core Team calls ## Members @@ -39,12 +39,12 @@ Core Team members are elected by decision of the [Congress](/congress) for a ter | Name | Description | | --- | --- | | **Core Team** πŸ”’ | Main channel - general Core Team discussion | -| **Asssociation** πŸ”’ | Internal discussion about [Association](/association/) | +| **Asssociation** πŸ”’ | Internal discussion about Association | | **Partnership** πŸ”’ | Partnership workstream discussion | ## Contact ### Email -* web3privacynow@skiff.com +* web3privacynow@protonmail.com or [contact us](/about-us/contact-us) via other methods -Note: If you use Skiff/Proton Mail you can make the communication E2E encrypted. +Note: If you use Proton Mail you can make the communication E2E encrypted between accounts diff --git a/src/content/docs/governance.mdx b/src/content/docs/governance/governance.mdx similarity index 59% rename from src/content/docs/governance.mdx rename to src/content/docs/governance/governance.mdx index 7d3eac66..a3ab851e 100644 --- a/src/content/docs/governance.mdx +++ b/src/content/docs/governance/governance.mdx @@ -1,5 +1,8 @@ --- title: Governance +sidebar: + order: 0 + label: Structure --- import { LinkCard } from '@astrojs/starlight/components'; @@ -8,20 +11,20 @@ Over the past two years, we have experimented with different governance models. Below, we share our insights, highlighting our missteps to inspire others. ## 2024 - +d ![Governance Structure](./assets/gov-stru.png) Anyone who assists in the completion of our projects and activities is considered a contributor. Frequent contributors have the chance to become [Core Contributors](https://docs.web3privacy.info/core-contributors/) and receive rewards for their contributions to open source. ### Proof of Care - *become a Core Contributor* -The transition from contributors to [Core Contributors](https://docs.web3privacy.info/core-contributors/) occurs through a Proof of Care: through continuous or substantial involvement, contributors demonstrate their interest and dedication to our [mission](https://docs.web3privacy.info/manifesto/). +The transition from contributors to [Core Contributors](/governance/core-contributors/) occurs through a Proof of Care: through continuous or substantial involvement, contributors demonstrate their interest and dedication to our [mission](/about-us/manifesto/). Core Contributors get rewarded for their contributions to open source - by the whole Web3Privacy Ecosystem. ### Proof of Soul - *enter the Core Team* -To join the [Core Team](https://docs.web3privacy.info/core-team/), a Proof of Soul is required. Through closer interaction with the core team, the most active core contributors who are committed to supporting the organization's values and advancing its mission can gradually become part of the decision-making process as they earn the credibility and trust of all core team members. +To join the [Core Team](/governance/core-team/), a Proof of Soul is required. Through closer interaction with the core team, the most active core contributors who are committed to supporting the organization's values and advancing its mission can gradually become part of the decision-making process as they earn the credibility and trust of all core team members. ## 2023 @@ -67,14 +70,14 @@ Sorted by competencies - from least to most. | Role name | Competences | Transparency | | --- | --- | --- | | Guest / Visitor | none | πŸ”’ private | -| [Partners](/partners) | none | πŸ”’ private | -| [Partners](/partners) with voting rights | voting on the [congress](/congress) | πŸ”’ private | -| [Workgroup](/workgroups) member (*contributor*) | decision-making within the working group | πŸ”’ private | -| [Contributors Guild](/guild) member* | receives financial compensation | πŸ₯· pseudonym (name, link) | -| [Association](/association) Committee member* | operate with finances and curate [Contributors Guild](/guild) | πŸ‘οΈ public | -| [Core Team](/core-team) member* | decides on the most important issues, controls [Association](/association) | πŸ₯· pseudonym (name, link) | +| [Members](/get-involved/partnership) | none | πŸ”’ private | +| [Members](/get-involved/partnership) with voting rights | voting on the [congress](/congress) | πŸ”’ private | +| [Workgroup](/get-involved/workgroups) member (*contributor*) | decision-making within the working group | πŸ”’ private | +| [Contributors Guild](/contributors/index) member* | receives financial compensation | πŸ₯· pseudonym (name, link) | +| Association Committee member* | operate with finances and curate [Contributors Guild](/contributors/index) | πŸ‘οΈ public | +| [Core Team](/governance/core-team) member* | decides on the most important issues, controls Association | πŸ₯· pseudonym (name, link) | -\* - People with these roles automatically become [Members](/membership) with voting rights: +\* - People with these roles automatically become [Members](/get-involved/partnership) with voting rights: - Contributors Guild members - Association Committee members - Core Team members diff --git a/src/content/docs/governance/treasury.md b/src/content/docs/governance/treasury.md new file mode 100644 index 00000000..f8b792e1 --- /dev/null +++ b/src/content/docs/governance/treasury.md @@ -0,0 +1,15 @@ +--- +title: Treasury +--- + +The Treasury is our main financial instrument that receives all of our income (from [Membership fees](/get-involved/partnership) or [private donations](/get-involved/donate)) and redistributes these funds within our initiative. + +The on-chain portion of the funds is managed through Multi-sig wallet, but Treasury also holds funds off-chain in fiat through the Association. + +Treasury management is the responsibility of the [Core Team](/core-team). + +## Distribution +* 30% automatically goes to [Contributors Guild](/contributors/index), eq. directly to contributors +* the remaining 70% is distributed through [Funding Requests](/resources/funding#funding-requests) to specific projects or Workgroups + +![Treasury flow](./assets/treasury-flow.png) diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx index 3727954f..458e530f 100644 --- a/src/content/docs/index.mdx +++ b/src/content/docs/index.mdx @@ -12,7 +12,7 @@ Whether you're new to *Web3Privacy Now* or looking to deepen your involvement, y ## What is *Web3Privacy Now*? -[Web3Privacy Now](https://web3privacy.info/) (W3PN) is an independent, non-profit and community-based initiative to research and popularize privacy-enhancing services within web3 industry. You can read our [Manifesto](/manifesto). +[Web3Privacy Now](https://web3privacy.info/) (W3PN) is an independent, non-profit and community-based initiative to research and popularize privacy-enhancing services within web3 industry. You can read our [Manifesto](/about-us/manifesto). ## Our projects @@ -52,7 +52,7 @@ Whether you're new to *Web3Privacy Now* or looking to deepen your involvement, y ## History & Roadmap -A summary of what we have already accomplished can be found on the [History](/history) page. +A summary of what we have already accomplished can be found on the [History](/about-us/history) page. @@ -62,12 +62,12 @@ A summary of what we have already accomplished can be found on the [History](/hi ## Become part of the community - - + + - - + + @@ -76,30 +76,30 @@ A summary of what we have already accomplished can be found on the [History](/hi ## For contributors -We use various [Communication tools](/communication). For our work we use different [Git repositories](/git), and for organizational purposes our effort is divided into several [Workgroups](/workgroups). +We use various [Communication tools](/ecosystem/communication). For our work we use different [Git repositories](/contributors/git), and for organizational purposes our effort is divided into several [Workgroups](/contributors/workgroups). - - + + - + ## Governance -The initiative is managed by a [Core Team](/core-team) of four people who take care of operations. We are also in the process of creating [Association](/association) as legal entity for our activities. +The initiative is managed by a [Core Team](/governance/core-team) of four people who take care of operations. We are also in the process of creating Association as legal entity for our activities. - + - - + + - - + + ## We are very open πŸ’› -All our activities are public and fully [open-source](/git). Feel free to [contribute](/get-involved)! +All our activities are public and fully [open-source](/contributors/git). Feel free to [contribute](/contributors/index)! diff --git a/src/content/docs/membership/survival-kit.md b/src/content/docs/membership/survival-kit.md deleted file mode 100644 index f9db5888..00000000 --- a/src/content/docs/membership/survival-kit.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Privacy Survival Kit ---- - -A package of items for our [Members, Sponsors and Community Partners](/partnerships) that they receive for free each year as a gift for their contribution. - -## 2024 Edition - -:::note - -Work in progress. The final contents of the kit not yet confirmed. - -::: - -* 1x W3PN bag -* 1x W3PN t-shirt - multiple designs (depends on availability), sizes XS-XXL -* 10x W3PN stickers - multiple designs and sizes -* 1x W3PN notebook camera cover (cap) -* other useful items from our organizational members diff --git a/src/content/docs/core-team/multisig.md b/src/content/docs/multisig.md similarity index 100% rename from src/content/docs/core-team/multisig.md rename to src/content/docs/multisig.md diff --git a/src/content/docs/contributors/weekly/24-30 June.md b/src/content/docs/news/weekly/24-30 June.md similarity index 100% rename from src/content/docs/contributors/weekly/24-30 June.md rename to src/content/docs/news/weekly/24-30 June.md diff --git a/src/content/docs/treasury.md b/src/content/docs/treasury.md deleted file mode 100644 index a3a9a4fe..00000000 --- a/src/content/docs/treasury.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Treasury ---- - -The Treasury is our main financial instrument that receives all of our income (from [Partner fees](/partners) or [private donations](/donate)) and redistributes these funds within our initiative. - -The on-chain portion of the funds is managed through [Multi-sig wallet](/core-team/multisig), but Treasury also holds funds off-chain in fiat through the [Association](/association). - -Treasury management is the responsibility of the [Core Team](/core-team). - -## Distribution -* 30% automatically goes to [Contributors Guild](/guild), eq. directly to contributors -* the remaining 70% is distributed through [Funding Requests](/resources/funding#funding-requests) to specific projects or Workgroups - -![Treasury flow](./assets/treasury-flow.png) diff --git a/src/content/docs/workgroups.md b/src/content/docs/workgroups.md deleted file mode 100644 index c8b57bda..00000000 --- a/src/content/docs/workgroups.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: Workgroups ---- - -All our activities are divided into many *working groups*. Internal working groups take care of the basic needs of the whole organization and serve as a key support for the teams of individual specific projects. - -Here you will find an overview of all the workgroups together with the people involved and links to the main tools. - -## Internal - -| Name | Lead | Members | Links | -| --- | --- | --- | --- | -| [**Association**](/association/) | Mykola, Tree | | πŸ”’ Matrix | -| [**Core Team**](/core-team) | Mykola | PG, Coinmandeer, Tree | [PM](https://github.com/orgs/web3privacy/projects/8), πŸ”’ [GitHub](https://github.com/web3privacy/core-internal), πŸ”’ Matrix | -| **Marketing & Outreach** | Mykola | PG | -| **Partnerships** | PG | Mykola | πŸ”’ [PM](https://github.com/orgs/web3privacy/projects/10), πŸ”’ Matrix | -| **IT Operation** | Tree | || -| **Design department** | Coinmandeer | || - -πŸ”’ - private tool (non-public) - -## Project-specific - -| Name | Lead | Members | Links | -| --- | --- | --- | --- | -| **[Research](/research)** | Mykola | PG | [Matrix](https://matrix.to/#/#w3p-research:gwei.cz) | -| **[Events](/events)** | Tree | PG, Coinmandeer, Mykola | [PM](https://github.com/orgs/web3privacy/projects/7), [GitHub](https://github.com/web3privacy/events), [Matrix](https://matrix.to/#/#w3p-events:gwei.cz) | -| **[Privacy Explorer](/projects/privacy-explorer)** | Coinmandeer | Mykola, Tree | [GitHub](https://github.com/web3privacy/explorer), [Matrix](https://matrix.to/#/#w3p-explorer:gwei.cz) | -| **[Week in the Privacy News](/news/week-in-the-privacy)** | Tree | Mykola, PG | [GitHub](https://github.com/web3privacy/news), [Matrix](https://matrix.to/#/#w3p-news:gwei.cz) | -| **[Privacy Tech Awards](/projects/privacy-tech-awards)** | Tree | PG, Mykola | [Matrix](https://matrix.to/#/#w3p-awards:gwei.cz) |