diff --git a/astro.config.mjs b/astro.config.mjs index 5a27887b..9be05a7e 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -55,18 +55,12 @@ export default defineConfig({ { label: '🏆 Privacy Tech Awards', link: '/projects/privacy-tech-awards' }, ], }, - /*{ - label: 'Future concepts', - items: [ - { label: 'Privacy Tech Awards', link: '/projects/privacy-tech-awards' } - ] - },*/ { label: 'Community', items: [ { label: 'Follow us', link: '/follow-us' }, { label: 'Get involved', link: '/get-involved' }, - { label: 'Contributors guide', link: '/contributors' }, + { label: 'Donate', link: '/donate' }, { label: 'Membership', link: '/membership', @@ -74,16 +68,31 @@ export default defineConfig({ { label: 'Personal benefits', link: '/membership/personal-benefits' } ] }, - { label: 'Donate', link: '/donate' }, + { label: 'Communication tools', link: '/communication' }, { label: 'Code of conduct', link: '/code-of-conduct' }, ] }, { - label: 'Tools', + label: 'For contributors', items: [ + { label: 'Contributors guide', link: '/contributors' }, + { label: 'Workgroups', link: '/workgroups' }, { label: 'Git repositories', link: '/git' }, - { label: 'Communication tools', link: '/communication' }, - { label: 'Workgroups', link: '/workgroups' } + ] + }, + { + label: 'Shared resources', + collapsed: true, + badge: { text: 'wip' }, + items: [ + { label: 'Developers', link: '/resources/developers' }, + { label: 'Community outreach', link: '/resources/outreach' }, + { label: 'Funding', link: '/resources/funding' }, + { label: 'Design', link: '/resources/design' }, + { label: 'IT Infrastructure', link: '/resources/it-infrastructure' }, + { label: 'Partners', link: '/resources/partners' }, + { label: 'Training and Education', link: '/resources/training-education' }, + { label: 'Legal assistance', link: '/resources/legal-assistance' }, ] }, { @@ -93,6 +102,7 @@ export default defineConfig({ { label: 'Congress', link: '/congress' }, { label: 'Core Team', link: '/core-team' }, { label: 'Association', link: '/association' }, + { label: 'Treasury', link: '/treasury' }, { label: 'Contributors Guild', link: '/guild' }, ] } diff --git a/src/content/docs/assets/treasury-flow.png b/src/content/docs/assets/treasury-flow.png new file mode 100644 index 00000000..9f6fdc29 Binary files /dev/null and b/src/content/docs/assets/treasury-flow.png differ diff --git a/src/content/docs/association/index.md b/src/content/docs/association/index.md index 283cbfb0..1098048a 100644 --- a/src/content/docs/association/index.md +++ b/src/content/docs/association/index.md @@ -4,7 +4,9 @@ title: Association :::note -We are [currently working](https://github.com/web3privacy/association) on the creation of this association. The likely date of establishment is March 2024. +We are [currently working](https://github.com/web3privacy/association) on the creation of this association. + +The likely date of establishment is April 2024. ::: diff --git a/src/content/docs/communication.md b/src/content/docs/communication.mdx similarity index 83% rename from src/content/docs/communication.md rename to src/content/docs/communication.mdx index 12b59b63..5e7dafe7 100644 --- a/src/content/docs/communication.md +++ b/src/content/docs/communication.mdx @@ -2,13 +2,15 @@ title: Communication tools --- +import { LinkCard } from '@astrojs/starlight/components'; + We use different platforms for communication: ## Matrix (chat) [Matrix Protocol](https://matrix.org/) is our main real-time communication tool within the community. -* Matrix Space: [#web3privacy:gwei.cz](https://matrix.to/#/#web3privacy:gwei.cz) + ### Matrix channels @@ -25,4 +27,4 @@ We use different platforms for communication: Our self-hosted [Discourse](https://www.discourse.org/) community forum where you can post your suggestions and participate in the wider discussion: -* [forum.web3privacy.info](https://forum.web3privacy.info/) \ No newline at end of file + \ No newline at end of file diff --git a/src/content/docs/events/index.mdx b/src/content/docs/events/index.mdx index c5a163ce..e2de5753 100644 --- a/src/content/docs/events/index.mdx +++ b/src/content/docs/events/index.mdx @@ -19,8 +19,9 @@ We aim to produce high quality events that bring a very similar atmosphere and c ## List of events -* [web3privacy.info/events](https://web3privacy.info/events) + +
![](../assets/events-list.png) ## Structured data source diff --git a/src/content/docs/governance.md b/src/content/docs/governance.md index 18c93cd0..a2c08ba0 100644 --- a/src/content/docs/governance.md +++ b/src/content/docs/governance.md @@ -19,6 +19,7 @@ In this section you will find a detailed description of how *Web3Privacy Now* go | Name | Purpose | Control | | --- | --- | --- | +| [Treasury](/treasury) | funds management | [Core Team](/core-team) | | [Contributors Guild](/guild) | group of members receiving incentives | [Association](/association) | | Marketing & Outreach | marketing and social networks | autonomous | | Partnerships | recruitment of new (organizational) members | autonomous | diff --git a/src/content/docs/resources/design.md b/src/content/docs/resources/design.md new file mode 100644 index 00000000..e5f96e95 --- /dev/null +++ b/src/content/docs/resources/design.md @@ -0,0 +1,5 @@ +--- +title: Design +--- + +If you need help with the visual side of your project, then you can use our pre-made templates (TODO) or contact our [Design workgroup](/workgroups#internal). \ No newline at end of file diff --git a/src/content/docs/resources/developers.mdx b/src/content/docs/resources/developers.mdx new file mode 100644 index 00000000..11b1d209 --- /dev/null +++ b/src/content/docs/resources/developers.mdx @@ -0,0 +1,18 @@ +--- +title: Developers +--- + +import { LinkCard } from '@astrojs/starlight/components'; + +If you're looking for developers who can help you build your privacy-related project, then the Web3Privacy Now community is the perfect place where to start. + +Most of the developers can be found in the [Devs channel](https://matrix.to/#/%23w3p-devs:gwei.cz) on our [Matrix](/communication/#matrix-chat) chat. + + + +## Available skills + +* web development - HTML/CSS +* full-stack development - Javascript/TypeScript +* backend development - Rust/Go +* smart-contract development - Solidity \ No newline at end of file diff --git a/src/content/docs/resources/funding.md b/src/content/docs/resources/funding.md new file mode 100644 index 00000000..c75db188 --- /dev/null +++ b/src/content/docs/resources/funding.md @@ -0,0 +1,19 @@ +--- +title: Funding +--- + +If you need some money for paying expenses of your privacy-related project, then we can help you with that too. + +We are developing a transparent grant system that will serve as the main way to redistribute the majority of our income to (our) projects. + +## Scope of funding + +* cost of equipment and necessary tools +* operating costs +* marketing and promotional expenses + +## Funding Requests (FR) + +Funding requests is a transparent application process to receive money from our [Treasury](/treasury). + +All funding requests are handled through Issues in the [`@web3privacy/funding`](https://github.com/web3privacy/funding) repository. \ No newline at end of file diff --git a/src/content/docs/resources/it-infrastructure.md b/src/content/docs/resources/it-infrastructure.md new file mode 100644 index 00000000..28a8f824 --- /dev/null +++ b/src/content/docs/resources/it-infrastructure.md @@ -0,0 +1,18 @@ +--- +title: IT Infrastructure +--- + +Our initiative operates various shared IT services that are available to all our contributors and projects. + +If you are interested in using any of our shared IT infrastructure, please contact the [IT Operation Workgroup](/workgroups#internal) members. + +## General overview + +* self-hosted servers +* virtual servers (VPS) +* full-node access (Bitcoin, Ethereum, ..) +* self-hosted services + +## Self-hosted services + +* DevOps platform (gitea) - [git.web3privacy.info](https://git.web3privacy.info) diff --git a/src/content/docs/resources/legal-assistance.md b/src/content/docs/resources/legal-assistance.md new file mode 100644 index 00000000..4fe42341 --- /dev/null +++ b/src/content/docs/resources/legal-assistance.md @@ -0,0 +1,9 @@ +--- +title: Legal assistance +--- + +Legal assistance is provided through our [Association](/association). This is particularly useful for physical activities such as [Events](/events) where formal official communication or contracts is required. + +## What we can do +- taking over the responsibility for contracts with suppliers +- official acceptance of donations \ No newline at end of file diff --git a/src/content/docs/resources/outreach.md b/src/content/docs/resources/outreach.md new file mode 100644 index 00000000..8208a903 --- /dev/null +++ b/src/content/docs/resources/outreach.md @@ -0,0 +1,5 @@ +--- +title: Community outreach +--- + +TODO \ No newline at end of file diff --git a/src/content/docs/resources/partners.md b/src/content/docs/resources/partners.md new file mode 100644 index 00000000..b08998fe --- /dev/null +++ b/src/content/docs/resources/partners.md @@ -0,0 +1,5 @@ +--- +title: Partners +--- + +TODO \ No newline at end of file diff --git a/src/content/docs/resources/training-education.md b/src/content/docs/resources/training-education.md new file mode 100644 index 00000000..2fc5e16a --- /dev/null +++ b/src/content/docs/resources/training-education.md @@ -0,0 +1,5 @@ +--- +title: Training and Education +--- + +Education is very important to us, which is why we run various educational programs and workshops, both for our contributors and the wider community as part of our [Membership](/membership) program. \ No newline at end of file diff --git a/src/content/docs/treasury.md b/src/content/docs/treasury.md new file mode 100644 index 00000000..03b78aa9 --- /dev/null +++ b/src/content/docs/treasury.md @@ -0,0 +1,15 @@ +--- +title: Treasury +--- + +The Treasury is our main financial instrument that receives all of our income (from [membership fees](/membership) or [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](http://localhost:4322/resources/funding#funding-requests-fr) to specific projects or Workgroups + +![Treasury flow](./assets/treasury-flow.png) \ No newline at end of file