diff --git a/docs/assets/intro-cover.jpeg b/docs/assets/intro-cover.jpeg
new file mode 100644
index 00000000..43b5fa87
Binary files /dev/null and b/docs/assets/intro-cover.jpeg differ
diff --git a/docs/association/index.md b/docs/association/index.md
new file mode 100644
index 00000000..245e8244
--- /dev/null
+++ b/docs/association/index.md
@@ -0,0 +1,7 @@
+# Association
+
+We are [in the process](https://github.com/web3privacy/association) of creating a non-profit legal entity in the Czech Republic.
+
+## Web3Privacy Now z.s.
+
+TBA
\ No newline at end of file
diff --git a/docs/communication.md b/docs/communication.md
index 680cd861..18df5f7f 100644
--- a/docs/communication.md
+++ b/docs/communication.md
@@ -2,13 +2,7 @@
We use different platforms for communication:
-## Forum
-
-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/)
-
-## Matrix
+## Matrix (chat)
[Matrix Protocol](https://matrix.org/) is our main real-time communication tool within the community.
@@ -23,4 +17,10 @@ Our self-hosted [Discourse](https://www.discourse.org/) community forum where yo
| **Events** | [#w3p-events:gwei.cz](https://matrix.to/#/#w3p-events:gwei.cz) | Everything around our [Events](/events/) |
| **Explorer** | [#w3p-explorer:gwei.cz](https://matrix.to/#/#w3p-explorer:gwei.cz) | [Privacy Explorer](/projects/privacy-explorer) project |
| **News** | [#w3p-news:gwei.cz](https://matrix.to/#/#w3p-news:gwei.cz) | [Week in the Privacy News](/news/week-in-the-privacy) project |
-| **Awards** | [#w3p-awards:gwei.cz](https://matrix.to/#/#w3p-awards:gwei.cz) | [Privacy Tech Awards](/projects/privacy-tech-awards) project |
\ No newline at end of file
+| **Awards** | [#w3p-awards:gwei.cz](https://matrix.to/#/#w3p-awards:gwei.cz) | [Privacy Tech Awards](/projects/privacy-tech-awards) project |
+
+## Forum
+
+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
diff --git a/docs/core-team.md b/docs/core-team/index.md
similarity index 65%
rename from docs/core-team.md
rename to docs/core-team/index.md
index b5d12d46..74a94d60 100644
--- a/docs/core-team.md
+++ b/docs/core-team/index.md
@@ -2,6 +2,12 @@
The Core Team is the team of people who manage this organization.
+## Email
+
+* web3privacynow@skiff.com
+
+Note: If you use Skiff/Proton Mail you can make the communication E2E encrypted.
+
## Members
* Lead: **Mykola**
@@ -13,8 +19,10 @@ The Core Team is the team of people who manage this organization.
| PG | [@EclecticSamurai](https://github.com/EclecticSamurai) | [@pg_cdg:matrix.org](https://matrix.to/#/@pg_cdg:matrix.org) |
| Coinmandeer | [@coinmandeer](https://github.com/coinmandeer) | [@coinmandeer:matrix.org](https://matrix.to/#/@coinmandeer:matrix.org) |
-## Email
+## Git repositories
-* web3privacynow@skiff.com
-
-Note: If you use Skiff/Proton Mail you can make the communication E2E encrypted.
\ No newline at end of file
+| Repository | Description |
+| --- | --- |
+| [@web3privacy/pm-internal](https://github.com/web3privacy/pm-internal) 🔒 | Core team internals (private) |
+| [@web3privacy/dns-zones](https://github.com/web3privacy/dns-zones) 🔒 | Our DNS zones (private) |
+| [@web3privacy/sysop-info](https://github.com/web3privacy/sysop-info) 🔒 | Basic sysop info (private) |
\ No newline at end of file
diff --git a/docs/governance/multisig.md b/docs/core-team/multisig.md
similarity index 100%
rename from docs/governance/multisig.md
rename to docs/core-team/multisig.md
diff --git a/docs/git.md b/docs/git.md
index 67ff237f..acf13dd9 100644
--- a/docs/git.md
+++ b/docs/git.md
@@ -4,7 +4,7 @@ All our projects are open-source and distributed across many Git repositories. P
## List of repos
-### Core
+### General
| Repository | Description |
| --- | --- |
@@ -14,9 +14,6 @@ All our projects are open-source and distributed across many Git repositories. P
| [@web3privacy/docs](https://github.com/web3privacy/docs) | Source code of this documentation |
| [@web3privacy/web](https://github.com/web3privacy/web) | Source-code of our website ([web3privacy.info](https://web3privacy.info)) |
| [@web3privacy/brand](https://github.com/web3privacy/brand) | Brand assets (logos and other visual) |
-| [@web3privacy/pm-internal](https://github.com/web3privacy/pm-internal) 🔒 | Core team internals (private) |
-| [@web3privacy/dns-zones](https://github.com/web3privacy/dns-zones) 🔒 | Our DNS zones (private) |
-| [@web3privacy/sysop-info](https://github.com/web3privacy/sysop-info) 🔒 | Basic sysop info (private) |
### Projects-related
diff --git a/docs/governance/pm.md b/docs/governance/pm.md
deleted file mode 100644
index 1a2ce0ae..00000000
--- a/docs/governance/pm.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Project management
-
-We use [GitHub Projects](https://github.com/orgs/web3privacy/projects/8) for coordination & project management and do weekly alignement on Jitsi every Thursday.
diff --git a/docs/news/week-in-the-privacy.md b/docs/news/week-in-the-privacy.md
index 8244bc9c..2cc9c7e9 100644
--- a/docs/news/week-in-the-privacy.md
+++ b/docs/news/week-in-the-privacy.md
@@ -1,3 +1,7 @@
+---
+sidebar_label: Week in the Privacy
+---
+
# Week in the Privacy News
Weekly newsletter with round-up of the most important news happening around privacy in Web3.
diff --git a/docs/research/index.md b/docs/research/index.md
new file mode 100644
index 00000000..d9c6d729
--- /dev/null
+++ b/docs/research/index.md
@@ -0,0 +1,7 @@
+---
+sidebar_position: 0
+---
+
+# Research Introduction
+
+TODO
\ No newline at end of file
diff --git a/docs/welcome.md b/docs/welcome.md
index 7ec6581c..0ff93629 100644
--- a/docs/welcome.md
+++ b/docs/welcome.md
@@ -3,12 +3,41 @@ sidebar_position: 1
slug: /
---
-# Welcome
+# Introduction
+
+![Welcome to Web3Privacy Now Documentation](./assets/intro-cover.jpeg)
+
This documentation aims to provide a comprehensive overview of our motivations, activities, and the various ways in which you can contribute.
-Whether you're new to Web3Privacy Now or looking to deepen your involvement, you'll find valuable insights and directions.
+Whether you're new to *Web3Privacy Now* or looking to deepen your involvement, you'll find valuable insights and directions.
+## What is *Web3Privacy Now*?
+[Web3Privacy Now](https://web3privacy.info/) 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).
+## Our activities
-![1500x500](https://github.com/web3privacy/w3pn-docs/assets/101947219/a7a8866a-7a0e-44b0-b2fe-0ccd6a1e1e93)
+| | Description |
+| --- | --- |
+| 🔬 [Research](/research) | analyzing the ecosystem, creating reports |
+| 📅 [Events](/events) | organizing events such as meetups, summits or hackathons |
+| 👁️ [Privacy Explorer](/projects/privacy-explorer) | the most extensive database of privacy-enhancing solutions |
+| 📰 [Week in the Privacy News](/news/week-in-the-privacy) | weekly newsletter with round-up of the most important news |
+| 🏆 [Privacy Tech Awards](/projects/privacy-tech-awards) | annual vote of most popular and interesting privacy projects (concept) |
+## History & Roadmap
+
+A summary of what we have already accomplished can be found on the [History](/history) page. For those interested in our future plans, there is a [Roadmap](/roadmap) page.
+
+## Become part of the community
+
+* [Follow us](/follow-us)
+* [Get involved](/get-involved)
+* [Donate](/donate)
+
+## Governance
+
+The initiative is managed by a [Core Team](/core-team) of four people who take care of operations.
+
+## We are very open 💛
+
+All our activities are public and fully [open-source](/git). Feel free to [contribute](/get-involved)!
diff --git a/docs/workgroups.md b/docs/workgroups.md
index cd92be93..2c9642a0 100644
--- a/docs/workgroups.md
+++ b/docs/workgroups.md
@@ -1,20 +1,26 @@
-# Workgroups overview
+# 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, Tree | [PM](https://github.com/orgs/web3privacy/projects/8) |
+| [**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/pm-internal), 🔒 Matrix |
| **Marketing & Outreach** | Mykola | PG |
-| **Fundraising** | PG | Mykola |
-| **IT Operation** | Tree | |
+| **Partnerships** | PG | Mykola | 🔒 [PM](https://github.com/orgs/web3privacy/projects/10) |
+| **IT Operation** | Tree | ||
+| **Design department** | Coinmandeer | ||
-## Project-related
+## Project-specific
| Name | Lead | Members | Links |
| --- | --- | --- | --- |
-| **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), [Git](https://github.com/web3privacy/events), [Matrix](https://matrix.to/#/#w3p-events:gwei.cz) |
-| **[Privacy Explorer](/projects/privacy-explorer)** | Coinmandeer | Mykola, Tree | [Git](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 | [Git](https://github.com/web3privacy/news), [Matrix](https://matrix.to/#/#w3p-news:gwei.cz) |
+| **[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) |
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 37eeaad2..e9beccaa 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -57,6 +57,7 @@ const config = {
{
redirects: [
{ from: '/research/Ethereum Privacy Ecosystem', to: '/research/ethereum-privacy-ecosystem' },
+ { from: '/governance/multi-sig', to: '/core-team/multi-sig' },
],
}
]
diff --git a/sidebars.js b/sidebars.js
index 312b0ffb..cae020ae 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -19,6 +19,7 @@ const sidebars = {
// But you can create a sidebar manually
tutorialSidebar: [
+ 'welcome',
{
type: "html",
value: '',
@@ -29,7 +30,6 @@ const sidebars = {
value: "About Web3Privacy Now",
defaultStyle: true,
},
- 'welcome',
'manifesto',
'roadmap',
'history',
@@ -46,6 +46,7 @@ const sidebars = {
{
type: "category",
label: "Research",
+ link: { type: 'doc', id: 'research/index'},
items: [{type: 'autogenerated', dirName: 'research'}],
},
{
@@ -55,17 +56,31 @@ const sidebars = {
items: [{type: 'autogenerated', dirName: 'events'}],
},
'projects/privacy-explorer',
- {
+ /*{
type: "category",
label: "Privacy News",
link: {type: 'doc', id: 'news/week-in-the-privacy'},
items: [{type: 'autogenerated', dirName: 'news'}],
- },
+ },*/
+ 'news/week-in-the-privacy',
'projects/privacy-tech-awards',
{
type: "html",
value: '',
},
+ {
+ type: "html",
+ className: "sidebar-title",
+ value: "Tools",
+ defaultStyle: true,
+ },
+ 'git',
+ 'communication',
+ 'workgroups',
+ {
+ type: "html",
+ value: '',
+ },
{
type: "html",
className: "sidebar-title",
@@ -75,7 +90,6 @@ const sidebars = {
'follow-us',
'get-involved',
'donate',
- 'communication',
'contacts',
'code-of-conduct',
{
@@ -88,12 +102,16 @@ const sidebars = {
value: "Governance",
defaultStyle: true,
},
- 'core-team',
- 'workgroups',
- 'governance/pm',
- 'git',
- 'governance/multisig',
+ 'association/index',
{
+ type: "category",
+ label: "Core Team",
+ link: {type: 'doc', id: 'core-team/index'},
+ items: [
+ 'core-team/multisig'
+ ],
+ },
+ /*{
type: "html",
value: '',
},
@@ -103,7 +121,7 @@ const sidebars = {
value: "Others",
defaultStyle: true,
},
- 'funding-requests',
+ 'funding-requests',*/
],
};