diff --git a/astro.config.mjs b/astro.config.mjs index e3301a10..4fb7ef5c 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -76,7 +76,7 @@ export default defineConfig({ { label: 'Contributors guide', link: '/contributors' }, { label: 'Workgroups', link: '/workgroups' }, { label: 'Git repositories', link: '/git' }, - { label: 'Guide: how to deploy event website', link: '/deploy-event-website' }, + { label: 'Guide: how to deploy event website', link: '/contributors/deploy-event-website' }, ] }, { diff --git a/src/content/docs/assets/Explorer privacy dashboard (jun 24).png b/src/content/docs/assets/Explorer-privacy-dashboard-jun-24.png similarity index 100% rename from src/content/docs/assets/Explorer privacy dashboard (jun 24).png rename to src/content/docs/assets/Explorer-privacy-dashboard-jun-24.png diff --git a/src/content/docs/association/index.md b/src/content/docs/association/index.md index 1098048a..5291e76b 100644 --- a/src/content/docs/association/index.md +++ b/src/content/docs/association/index.md @@ -20,7 +20,7 @@ Registered entity representing our initiative in communication with authorities ### Non-financial - officially representing our initiative and our projects -- operates our [Membership](/membership) program +- operates our [Partners](/partners) program - curates the [Contributors Guild](/guild) members & their weight (quarterly) - organises [Congress](/congress) (once a year) @@ -45,4 +45,4 @@ The members of the Committee are elected by the [Congress](/congress) for a peri ## Statues -TODO \ No newline at end of file +TODO diff --git a/src/content/docs/congress.md b/src/content/docs/congress.md index 67a141ce..b841265b 100644 --- a/src/content/docs/congress.md +++ b/src/content/docs/congress.md @@ -20,4 +20,4 @@ The Congress is held once a year and is organized by [Association](/association) ## Who makes the decisions -* our [Members](/membership) with a voting rights \ No newline at end of file +* our [Partners](/partners) with a voting rights diff --git a/src/content/docs/contributors/deploy-event-website.md b/src/content/docs/contributors/deploy-event-website.md index e3cd1d00..95fb899c 100644 --- a/src/content/docs/contributors/deploy-event-website.md +++ b/src/content/docs/contributors/deploy-event-website.md @@ -4,30 +4,29 @@ title: How to deploy a W3PN events website ## Preamble -The purpose of this Guide is to help you deploy a unique website for a W3PN event that is larger than a meetup (example: Summit and Congress) via Github Pages +The purpose of this Guide is to help you deploy a unique website for a W3PN event that is larger than a meetup via Github Pages (example websites: [Summit](https://summit.web3privacy.info/) or [Congress](https://congress.web3privacy.info/)). The cost for us to deploy a new website is basically zero (aside from contributor time), and requires a little coordination but can be completed in few hours. -NOTE: If you have already deployed the website code via Github Pages for testing purposes, consider unpublishing the website via the Deployments tab before following through with the process outlined below. Sometimes conflicts can appear within Github Pages when there are too many concurrent deployments. - ## Pre-requisites -- production-ready website code forked from htttps://github.com/web3privacy/events_web -- maintainer/owner role within the new project code repository +- production-ready website code forked from [https://github.com/web3privacy/events_web](https://github.com/web3privacy/events_web) +- have maintainer/owner role within the new project code repository - access to the domain management portal Porkbun to create DNS records (can be delegated) -- some knowledge of domain management and DNS. +- some knowledge of domain management and DNS ## Step-by-step Guide + ### Part 1: Github Pages -- [ ] Navigate to the project repository main page (example: github.com/web3privacy/c24bkk) +- [ ] Navigate to the project repository main page (example: [https://github.com/web3privacy/c24bkk](https://github.com/web3privacy/c24bkk)) - [ ] Deploy the project to Github Pages by selecting 'Settings' in the top menu bar - [ ] Page loads, see the left hand menu bar, under the section 'Code and Automation' select 'Pages' - [ ] In the main window, under the 'Source' section, ensure 'Deploy from Branch' option is selected in the dropdown menu - [ ] Underneith it in the 'Branch' section, use the dropdown and select 'main' (next to it the '/root' option will autoselect itself) - [ ] In this section 'Branch', click on the 'Save' button, the webpage will reload -- [ ] After a few minutes Github Pages will deploy your code online, go to the Deployments section of your project (Example: github.com/web3privacy/c24bkk/deployments/github-pages) +- [ ] After a few minutes Github Pages will deploy your code online, go to the Deployments section of your project (Example: [https://github.com/web3privacy/c24bkk/deployments/github-pages](https://github.com/web3privacy/c24bkk/deployments/github-pages)) - [ ] Here you can see the current deployments, their URL, a button to visit the site, and also where the option to Unpublish it is available ### Part 2: Porkbun @@ -44,7 +43,7 @@ NOTE: If you have already deployed the website code via Github Pages for testing ### Part 3: Testing - [ ] Wait 2-5 minutes (really, this can take some time to update) - [ ] Use a different browser or clear your browser cache and cookies -- [ ] navigate to your project Github Pages URL (example: web3privacy.github.io/c24bkk) +- [ ] navigate to your project Github Pages URL (example: [https://web3privacy.github.io/c24bkk](https://web3privacy.github.io/c24bkk)) - [ ] If all is working then the domain within your browser bar should change to the subdomain of repository (example: c24bkk.web3privacy.info) @@ -52,7 +51,8 @@ NOTE: If you have already deployed the website code via Github Pages for testing - Your browser will probably show a warning of an 'insecure connection' to the website, this is because the TLS/SSL certificate will be updated automatically but can take 1-2 days for this to happen (no action necessary on your part, just a common 'error' people see) - If you wish to force a specific subdomain to the project that is not the repository name (example: c24bkk) then you will need to created a file within the main folder of the repository. name this file 'CNAME' all in capitals, and add only one line to the file (example: congress.web3privacy.info) -- Ask in W3PN chats for support or help +- If you have already deployed the website code via Github Pages for testing purposes, consider unpublishing the website via the Deployments tab before following through with the process outlined below. Sometimes conflicts can appear within Github Pages when there are too many concurrent deployments. If problems persist, consider starting from scratch again. +- Ask in W3PN chats for support or help ### External resources diff --git a/src/content/docs/governance.mdx b/src/content/docs/governance.mdx index f60515da..7d3eac66 100644 --- a/src/content/docs/governance.mdx +++ b/src/content/docs/governance.mdx @@ -67,8 +67,8 @@ Sorted by competencies - from least to most. | Role name | Competences | Transparency | | --- | --- | --- | | Guest / Visitor | none | 🔒 private | -| [Member](/membership) | none | 🔒 private | -| [Member](/membership) with voting rights | voting on the [congress](/congress) | 🔒 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 | diff --git a/src/content/docs/membership/personal-benefits.md b/src/content/docs/membership/personal-benefits.md index d204c43c..e711ded9 100644 --- a/src/content/docs/membership/personal-benefits.md +++ b/src/content/docs/membership/personal-benefits.md @@ -10,7 +10,7 @@ title: Personal benefits ### ✦ "Privacy Survival Kit" swag bundle -Collect your [Privacy Survival Kit](/membership/survival-kit) once a year [Pick up at our [events](/events/) (for free) or by delivery (extra fee)] +Collect your [Privacy Survival Kit](/partners/survival-kit) once a year [Pick up at our [events](/events/) (for free) or by delivery (extra fee)] ### ✦ Access to special members-only events diff --git a/src/content/docs/membership/survival-kit.md b/src/content/docs/membership/survival-kit.md index b9d2260a..f9db5888 100644 --- a/src/content/docs/membership/survival-kit.md +++ b/src/content/docs/membership/survival-kit.md @@ -2,7 +2,7 @@ title: Privacy Survival Kit --- -A package of items for our [members](/membership) that they receive for free each year as a gift for their contribution. +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 @@ -16,4 +16,4 @@ Work in progress. The final contents of the kit not yet confirmed. * 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 \ No newline at end of file +* other useful items from our organizational members diff --git a/src/content/docs/projects/privacy-explorer.md b/src/content/docs/projects/privacy-explorer.md index 514b4be0..5a2ea05e 100644 --- a/src/content/docs/projects/privacy-explorer.md +++ b/src/content/docs/projects/privacy-explorer.md @@ -4,7 +4,7 @@ title: Privacy Explorer **3in1**: a ranking system, database & comprehensive profiling to empower the general public in discerning the privacy levels, security, and reliability of Web3 projects. -![alt text](https://github.com/web3privacy/docs/blob/main/src/content/docs/assets/Explorer%20privacy%20dashboard%20(jun%2024).png) +![privacy dashboard](../assets/Explorer-privacy-dashboard-jun-24.png) - Live demo [here](https://taikai.network/ethrome/hackathons/ethrome-23/projects/clng508ts00lswu01030hpfuq/idea) - Website is live [link](https://explorer.web3privacy.info) diff --git a/src/content/docs/resources/training-education.mdx b/src/content/docs/resources/training-education.mdx index 7d69e363..bc7f6de6 100644 --- a/src/content/docs/resources/training-education.mdx +++ b/src/content/docs/resources/training-education.mdx @@ -4,7 +4,7 @@ title: Training and Education import { LinkCard } from '@astrojs/starlight/components'; -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. +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 [Partners](/partners) program. ## W3PN Meta-hackathons @@ -12,4 +12,4 @@ An annual multi-day gathering of people around Web3Privacy Now, where we educate [Meta-hackathon](/events/types/#meta-hackathon) is an event organized by our [Events](/events) department. - \ No newline at end of file + diff --git a/src/content/docs/roadmap.md b/src/content/docs/roadmap.md index f75447ed..2c2cc05c 100644 --- a/src/content/docs/roadmap.md +++ b/src/content/docs/roadmap.md @@ -18,7 +18,7 @@ _via_ | | 2024 Roadmap | | --- | --- | -| ⚙️ Core Initiative | • [Association](/association/) (legal entity)
• [Membership](/membership/) (incl. [Privacy Survival Kit](/membership/survival-kit)) | +| ⚙️ Core Initiative | • [Association](/association/) (legal entity)
• [Partners](/partners/) (incl. [Privacy Survival Kit](/partners/survival-kit)) | | 🔬 [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/treasury.md b/src/content/docs/treasury.md index 5c6e58a0..a3a9a4fe 100644 --- a/src/content/docs/treasury.md +++ b/src/content/docs/treasury.md @@ -2,7 +2,7 @@ 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 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). @@ -12,4 +12,4 @@ Treasury management is the responsibility of the [Core Team](/core-team). * 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) \ No newline at end of file +![Treasury flow](./assets/treasury-flow.png)