Merge branch 'main' into patch-1

2024-10-15 12:06:27 +02:00 · 2023-11-09 14:32:52 +03:00 · 2023-11-09 14:32:52 +03:00 · c60dae6974
commit c60dae6974
parent 5791b2f667 e7050e45de
4 changed files with 45 additions and 30 deletions
--- a/README.md
+++ b/README.md
@ -31,26 +31,25 @@ research and community of [Web3Privacy Now](https://web3privacy.info).

 (in chronologic order)

-| type | # id | date | location | 👥  | coincidence | dri | links |
+| type | # id | date | location | 🎰 | coincidence | dri | links |
 | --- | --- | --- | --- | --- | --- | --- | --- |
-| summit | `s1` | **2023-06-05** | 🇨🇿 Prague | 180 | [PBW](https://prgblockweek.com/)+[ETHPrague](https://ethprague.com/) | Tree | [web](https://prague.web3privacy.info/), [git](https://github.com/web3privacy/w3ps1) |
-| meetup | `rom1` | **2023-10-05** | 🇮🇹 Rome | 139 | [ETHRome](https://ethrome.org/) | PG | [web](https://lu.ma/web3privacynow_rome) |
-| meetup | `prg1` | **2023-11-14** | 🇨🇿 Prague | - | [DCxPrague](https://dcxprague.org/) | Tree | [web](https://lu.ma/w3pm-prg1) |
-| meetup | `ist1` | 2023/Nov | 🇹🇷 Istanbul | - | [Devconnect IST](https://devconnect.org/) | - |  |
-| meetup | `bcn1` | 2024/Q1 | 🇪🇸 Barcelona | - |  | Tree |  |
-| meetup | `itxx` | 2024/Q1 | 🇮🇹 Italy (TBD) | - |  | PG |  |
-| meetup | `lib1` | 2024/Mar | 🇨🇿 Liberec | - | [ETHBohemia](https://ethbohemia.ethevents.club/) | Tree |  |
-| meetup | `ams1` | 2024/Apr | 🇳🇱 Amsterdam | - | [ETHDam 2024](https://www.ethdam.com/) | - |  |
-| meetup | `ber1` | 2024/May | 🇩🇪 Berlin | - | ETHBerlin 4 | Tree |  |
-| summit | `s2` | 2024/Jun | 🇨🇿 Prague | - | ETHPrague 2024 | Tree |  |
-| hackathon | `h1` | 2024/Jun | 🇸🇮 Bled | - |  | Tree |  |
-| meetup | `lju1` | 2024/Jun | 🇸🇮 Ljubljana | - | W3PN Hackathon | Tree |  |
-| meetup | `bcn2` | 2024/Jul | 🇪🇸 Barcelona | - | ETHBarcelona (?) | - |  |
-| meetup | `bru1` | 2024/Jul | 🇧🇪 Brussels | - | [EthCC 7](https://www.ethcc.io/) | - |  |
-| meetup | `waw1` | 2024/Sep | 🇵🇱 Warsaw | - | ETHWarsaw (?) | Tree |  |
-| meetup | `rom2` | 2024/Oct | 🇮🇹 Rome | - | ETHRome 2024 | PG |  |
-| summit | `s3` | 2024/Nov | 🇨🇿 Brno | - | ETHBrno 2024 | Tree |  |
-| meetup | `dvc1` | 2024/Q4 | 🏴‍☠️ SE Asia | - | [Devcon 7](https://devcon.org/) | - |  |
+| summit | `s1` | **2023-06-05** | 🇨🇿 Prague | 16 | [PBW](https://prgblockweek.com/)+[ETHPrague](https://ethprague.com/) | Tree | [web](https://prague.web3privacy.info/), [git](https://github.com/web3privacy/w3ps1) |
+| meetup | `rom1` | **2023-10-05** | 🇮🇹 Rome | 10 | [ETHRome](https://ethrome.org/) | PG | [web](https://lu.ma/web3privacynow_rome) |
+| meetup | `prg1` | **2023-11-14** | 🇨🇿 Prague | 5 | [DCxPrague](https://dcxprague.org/) | Tree | [web](https://lu.ma/w3pm-prg1) |
+| meetup | `bcn1` | 2024/Q1 | 🇪🇸 Barcelona | 3 |  | Tree |  |
+| meetup | `itxx` | 2024/Q1 | 🇮🇹 Italy (TBD) | 3 |  | PG |  |
+| meetup | `lib1` | 2024/Mar | 🇨🇿 Liberec | 3 | [ETHBohemia](https://ethbohemia.ethevents.club/) | Tree |  |
+| meetup | `ams1` | 2024/Apr | 🇳🇱 Amsterdam | 3 | [ETHDam 2024](https://www.ethdam.com/) | - |  |
+| meetup | `ber1` | 2024/May | 🇩🇪 Berlin | 3 | ETHBerlin 4 | Tree |  |
+| summit | `s2` | 2024/Jun | 🇨🇿 Prague | 16 | ETHPrague 2024 | Tree |  |
+| hackathon | `h1` | 2024/Jun | 🇸🇮 Bled | 10 |  | Tree |  |
+| meetup | `lju1` | 2024/Jun | 🇸🇮 Ljubljana | 5 | W3PN Hackathon | Tree |  |
+| meetup | `bcn2` | 2024/Jul | 🇪🇸 Barcelona | 3 | ETHBarcelona (?) | - |  |
+| meetup | `bru1` | 2024/Jul | 🇧🇪 Brussels | 3 | [EthCC 7](https://www.ethcc.io/) | - |  |
+| meetup | `waw1` | 2024/Sep | 🇵🇱 Warsaw | 3 | ETHWarsaw (?) | Tree |  |
+| meetup | `rom2` | 2024/Oct | 🇮🇹 Rome | 5 | ETHRome 2024 | PG |  |
+| summit | `s3` | 2024/Nov | 🇨🇿 Brno | 16 | ETHBrno 2024 | Tree |  |
+| meetup | `dc1` | 2024/Q4 | 🏴‍☠️ SE Asia | 5 | [Devcon 7](https://devcon.org/) | - |  |

 [Source file](./events/events.yaml)

--- a/README.tpl.eta
+++ b/README.tpl.eta
@ -24,10 +24,10 @@ research and community of [Web3Privacy Now](https://web3privacy.info).

 (in chronologic order)

-| type | # id | date | location | 👥  | coincidence | dri | links |
+| type | # id | date | location | 🎰 | coincidence | dri | links |
 | --- | --- | --- | --- | --- | --- | --- | --- |
 <% it.events.forEach(function(event, i){ %>
-| <%= event.type %> | `<%= event.id.replace("w3pm-", "").replace(/^w3p/, '') %>` | <%= event.date.match(/^\d{4}-\d{2}-\d{2}$/) ? `**${event.date}**` : event.date %> | <%= it.getFlagEmoji(event.country) %> <%= event.city %> | <%= event.visitors || '-' %> | <%= event.coincidence %> | <%= event.lead || "-" %> | <%= (event.links && Object.keys(event.links).map(k => `[${k}](${event.links[k]})`).join(", ")) || "" %> |
+| <%= event.type %> | `<%= event.id.replace("w3pm-", "").replace(/^w3p/, '') %>` | <%= event.date.match(/^\d{4}-\d{2}-\d{2}$/) ? `**${event.date}**` : event.date %> | <%= it.getFlagEmoji(event.country) %> <%= event.city %> | <%= event.slots || '-' %> | <%= event.coincidence %> | <%= event.lead || "-" %> | <%= (event.links && Object.keys(event.links).map(k => `[${k}](${event.links[k]})`).join(", ")) || "" %> |
 <% }) %>

 [Source file](./events/events.yaml)
--- a/events/events.yaml
+++ b/events/events.yaml
@ -5,6 +5,7 @@
  country: cz
  coincidence: "[PBW](https://prgblockweek.com/)+[ETHPrague](https://ethprague.com/)"
  lead: Tree
+  slots: 16
  visitors: 180
  links:
    web: https://prague.web3privacy.info/
@ -17,6 +18,7 @@
  country: it
  coincidence: "[ETHRome](https://ethrome.org/)"
  lead: PG
+  slots: 10
  visitors: 139
  links:
    web: https://lu.ma/web3privacynow_rome
@ -28,16 +30,10 @@
  country: cz
  coincidence: "[DCxPrague](https://dcxprague.org/)"
  lead: Tree
+  slots: 5
  links:
    web: https://lu.ma/w3pm-prg1

- id: w3pm-ist1
-  type: meetup
-  date: "2023/Nov"
-  city: Istanbul
-  country: tr
-  coincidence: "[Devconnect IST](https://devconnect.org/)"
-
 - id: w3pm-bcn1
  type: meetup
  date: "2024/Q1"
@ -45,6 +41,7 @@
  country: es
  coincidence: ""
  lead: Tree
+  slots: 3

 - id: w3pm-itxx
  type: meetup
@ -53,6 +50,7 @@
  country: it
  coincidence: ""
  lead: PG
+  slots: 3

 - id: w3pm-lib1
  type: meetup
@ -61,6 +59,7 @@
  country: cz
  coincidence: "[ETHBohemia](https://ethbohemia.ethevents.club/)"
  lead: Tree
+  slots: 3

 - id: w3pm-ams1
  type: meetup
@ -69,6 +68,7 @@
  country: nl
  # ETHDam 2024 - April 12-14 2024
  coincidence: "[ETHDam 2024](https://www.ethdam.com/)"
+  slots: 3

 - id: w3pm-ber1
  type: meetup
@ -78,6 +78,7 @@
  # ETHBerlin 5 - May 24-26, 2024
  coincidence: "ETHBerlin 5"
  lead: Tree
+  slots: 3

 - id: w3ps2
  type: summit
@ -86,14 +87,17 @@
  country: cz
  coincidence: "ETHPrague 2024"
  lead: Tree
+  slots: 16

 - id: w3ph1
  type: hackathon
  date: "2024/Jun"
+  days: 7
  city: Bled
  country: si
  coincidence: ""
  lead: Tree
+  slots: 10

 - id: w3pm-lju1
  type: meetup
@ -102,6 +106,7 @@
  country: si
  coincidence: "W3PN Hackathon"
  lead: Tree
+  slots: 5

 - id: w3pm-bcn2
  type: meetup
@ -109,13 +114,16 @@
  city: Barcelona
  country: es
  coincidence: "ETHBarcelona (?)"
+  slots: 3

 - id: w3pm-bru1
  type: meetup
  date: "2024/Jul"
  city: Brussels
  country: be
+  # EthCC 7 - July 8-11, 2024
  coincidence: "[EthCC 7](https://www.ethcc.io/)"
+  slots: 3

 - id: w3pm-waw1
  type: meetup
@ -124,6 +132,7 @@
  country: pl
  coincidence: "ETHWarsaw (?)"
  lead: Tree
+  slots: 3

 - id: w3pm-rom2
  type: meetup
@ -132,6 +141,7 @@
  country: it
  coincidence: "ETHRome 2024"
  lead: PG
+  slots: 5

 - id: w3ps3
  type: summit
@ -140,10 +150,12 @@
  country: cz
  coincidence: "ETHBrno 2024"
  lead: Tree
+  slots: 16

- id: w3pm-dvc1
+- id: w3pm-dc1
  type: meetup
  date: "2024/Q4"
  city: SE Asia
  country: xx
  coincidence: "[Devcon 7](https://devcon.org/)"
+  slots: 5
--- a/schema.yaml
+++ b/schema.yaml
@ -19,6 +19,8 @@ $defs:
          - hackathon
      date:
        type: string
+      days:
+        type: number
      city:
        type: string
      country:
@ -28,6 +30,8 @@ $defs:
        type: string
      lead:
        type: string
+      slots:
+        type: number
      visitors:
        type: number
      links: