From e077eb7cbb13caf7eb8621bcb7b331d804da9bd1 Mon Sep 17 00:00:00 2001 From: tree Date: Wed, 9 Nov 2022 17:34:39 +0100 Subject: [PATCH 1/3] Update schedule --- data/data.yaml | 1 + src/lib/data.json | 80 +++++++++++++++++++++----------- src/routes/schedule/+page.js | 3 +- src/routes/schedule/+page.svelte | 50 +++++++++++++------- static/data.json | 80 +++++++++++++++++++++----------- 5 files changed, 141 insertions(+), 73 deletions(-) diff --git a/data/data.yaml b/data/data.yaml index 3df08fa..849b606 100644 --- a/data/data.yaml +++ b/data/data.yaml @@ -313,6 +313,7 @@ contributors: twitter: vorcigernix bio: Website, community calls | Zitrone founder, member of Developer DAO and Forefront roles: [ team ] + pretalxId: 18 - id: hedvika name: Hedvika diff --git a/src/lib/data.json b/src/lib/data.json index e8aed62..b239ca3 100644 --- a/src/lib/data.json +++ b/src/lib/data.json @@ -38,7 +38,8 @@ "bio": "Hackoholic Cryptonaut - Early Ethereum dev and blockchain pioneer", "roles": [ "speaker" - ] + ], + "pretalxId": 45 }, { "id": "rachel-oleary", @@ -68,7 +69,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 47 }, { "id": "pavol-luptak", @@ -79,7 +81,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 5 }, { "id": "dcbuilder", @@ -110,7 +113,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 41 }, { "id": "william-mitsuda", @@ -120,7 +124,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 10 }, { "id": "vojtech-simetka", @@ -140,7 +145,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 15 }, { "id": "radek-svarz", @@ -149,7 +155,8 @@ "bio": "dCZK, Apus.finance", "roles": [ "speaker" - ] + ], + "pretalxId": 2 }, { "id": "lauri-peltonen", @@ -159,7 +166,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 4 }, { "id": "jakub-jedlinsky", @@ -168,7 +176,8 @@ "bio": "Macroeconomist and analyst - Altlift.cz, lecturer at KMEV VŠE", "roles": [ "speaker" - ] + ], + "pretalxId": 21 }, { "id": "steffen-kux", @@ -177,7 +186,8 @@ "bio": "Co-founder, researcher, and developer at corpus.ventures", "roles": [ "speaker" - ] + ], + "pretalxId": 17 }, { "id": "max-hampshire", @@ -187,7 +197,8 @@ "bio": "Developer Relations for Nym, previously a smart contract developer and researcher", "roles": [ "speaker" - ] + ], + "pretalxId": 11 }, { "id": "danish-shabbir", @@ -196,7 +207,8 @@ "bio": "Privacy researcher and a fiction writer", "roles": [ "speaker" - ] + ], + "pretalxId": 12 }, { "id": "jan-zibner", @@ -205,7 +217,8 @@ "bio": "Lawyer specialising in intellectual property law and digital trends @ Artiffine", "roles": [ "speaker" - ] + ], + "pretalxId": 22 }, { "id": "dhadrien", @@ -215,7 +228,8 @@ "remote": true, "roles": [ "speaker" - ] + ], + "pretalxId": 25 }, { "id": "chris-blec", @@ -225,7 +239,8 @@ "remote": true, "roles": [ "speaker" - ] + ], + "pretalxId": 38 }, { "id": "six", @@ -235,7 +250,8 @@ "roles": [ "speaker", "judge" - ] + ], + "pretalxId": 6 }, { "id": "nikete", @@ -245,7 +261,8 @@ "roles": [ "mentor", "speaker" - ] + ], + "pretalxId": 27 }, { "id": "mykola-siusko", @@ -254,7 +271,8 @@ "bio": "Web3 fixer | Curing surveillance capitalism", "roles": [ "speaker" - ] + ], + "pretalxId": 28 }, { "id": "roman-mazur", @@ -263,7 +281,8 @@ "bio": "CEO & Co-founder @ Wido", "roles": [ "speaker" - ] + ], + "pretalxId": 37 }, { "id": "kurt-opsahl", @@ -273,7 +292,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 3 }, { "id": "robert-de-groot", @@ -283,7 +303,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 29 }, { "id": "anirudha-bose", @@ -292,7 +313,8 @@ "bio": "Wallet Engineer at Brave", "roles": [ "speaker" - ] + ], + "pretalxId": 33 }, { "id": "felix-leupold", @@ -302,7 +324,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 39 }, { "id": "luca", @@ -312,7 +335,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 40 }, { "id": "mario-havel", @@ -342,7 +366,8 @@ "roles": [ "advisor", "judge" - ] + ], + "pretalxId": 48 }, { "id": "gabari", @@ -408,7 +433,8 @@ "bio": "Website, community calls | Zitrone founder, member of Developer DAO and Forefront", "roles": [ "team" - ] + ], + "pretalxId": 18 }, { "id": "hedvika", @@ -501,6 +527,6 @@ "url": "https://worldcoin.org/" } ], - "time": "2022-11-09T15:43:11.590Z", + "time": "2022-11-09T16:32:04.176Z", "version": "v2022-10-16" } \ No newline at end of file diff --git a/src/routes/schedule/+page.js b/src/routes/schedule/+page.js index 430a6f1..1e3b6f3 100644 --- a/src/routes/schedule/+page.js +++ b/src/routes/schedule/+page.js @@ -1,8 +1,9 @@ /** @type {import('./$types').PageLoad} */ import events from '$lib/events.json'; +import { contributorTypes, contributors } from '$lib/data.json'; export const prerender = true; export async function load() { - return { events }; + return { events, contributors }; } diff --git a/src/routes/schedule/+page.svelte b/src/routes/schedule/+page.svelte index 1b25366..52c98ef 100644 --- a/src/routes/schedule/+page.svelte +++ b/src/routes/schedule/+page.svelte @@ -1,4 +1,7 @@ @@ -84,25 +97,26 @@

{evt.description}

-
-
Speakers
-
- {#each evt.speakers || [] as speaker} - {speaker.name} - {/each} - -

- {#each evt.speakers || [] as speaker} -

{speaker.name}

+ {#if evt.speakers && evt.speakers.length > 0} +
+
Speakers
+
+ {#each contributorsData(evt.speakers || []) as speaker} +
+ {#if speaker.id} + {speaker.name} + {/if} +

{speaker.name}

+
{/each} -

-
-
+ + + {/if} diff --git a/static/data.json b/static/data.json index e8aed62..b239ca3 100644 --- a/static/data.json +++ b/static/data.json @@ -38,7 +38,8 @@ "bio": "Hackoholic Cryptonaut - Early Ethereum dev and blockchain pioneer", "roles": [ "speaker" - ] + ], + "pretalxId": 45 }, { "id": "rachel-oleary", @@ -68,7 +69,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 47 }, { "id": "pavol-luptak", @@ -79,7 +81,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 5 }, { "id": "dcbuilder", @@ -110,7 +113,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 41 }, { "id": "william-mitsuda", @@ -120,7 +124,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 10 }, { "id": "vojtech-simetka", @@ -140,7 +145,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 15 }, { "id": "radek-svarz", @@ -149,7 +155,8 @@ "bio": "dCZK, Apus.finance", "roles": [ "speaker" - ] + ], + "pretalxId": 2 }, { "id": "lauri-peltonen", @@ -159,7 +166,8 @@ "roles": [ "speaker", "mentor" - ] + ], + "pretalxId": 4 }, { "id": "jakub-jedlinsky", @@ -168,7 +176,8 @@ "bio": "Macroeconomist and analyst - Altlift.cz, lecturer at KMEV VŠE", "roles": [ "speaker" - ] + ], + "pretalxId": 21 }, { "id": "steffen-kux", @@ -177,7 +186,8 @@ "bio": "Co-founder, researcher, and developer at corpus.ventures", "roles": [ "speaker" - ] + ], + "pretalxId": 17 }, { "id": "max-hampshire", @@ -187,7 +197,8 @@ "bio": "Developer Relations for Nym, previously a smart contract developer and researcher", "roles": [ "speaker" - ] + ], + "pretalxId": 11 }, { "id": "danish-shabbir", @@ -196,7 +207,8 @@ "bio": "Privacy researcher and a fiction writer", "roles": [ "speaker" - ] + ], + "pretalxId": 12 }, { "id": "jan-zibner", @@ -205,7 +217,8 @@ "bio": "Lawyer specialising in intellectual property law and digital trends @ Artiffine", "roles": [ "speaker" - ] + ], + "pretalxId": 22 }, { "id": "dhadrien", @@ -215,7 +228,8 @@ "remote": true, "roles": [ "speaker" - ] + ], + "pretalxId": 25 }, { "id": "chris-blec", @@ -225,7 +239,8 @@ "remote": true, "roles": [ "speaker" - ] + ], + "pretalxId": 38 }, { "id": "six", @@ -235,7 +250,8 @@ "roles": [ "speaker", "judge" - ] + ], + "pretalxId": 6 }, { "id": "nikete", @@ -245,7 +261,8 @@ "roles": [ "mentor", "speaker" - ] + ], + "pretalxId": 27 }, { "id": "mykola-siusko", @@ -254,7 +271,8 @@ "bio": "Web3 fixer | Curing surveillance capitalism", "roles": [ "speaker" - ] + ], + "pretalxId": 28 }, { "id": "roman-mazur", @@ -263,7 +281,8 @@ "bio": "CEO & Co-founder @ Wido", "roles": [ "speaker" - ] + ], + "pretalxId": 37 }, { "id": "kurt-opsahl", @@ -273,7 +292,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 3 }, { "id": "robert-de-groot", @@ -283,7 +303,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 29 }, { "id": "anirudha-bose", @@ -292,7 +313,8 @@ "bio": "Wallet Engineer at Brave", "roles": [ "speaker" - ] + ], + "pretalxId": 33 }, { "id": "felix-leupold", @@ -302,7 +324,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 39 }, { "id": "luca", @@ -312,7 +335,8 @@ "roles": [ "speaker" ], - "remote": true + "remote": true, + "pretalxId": 40 }, { "id": "mario-havel", @@ -342,7 +366,8 @@ "roles": [ "advisor", "judge" - ] + ], + "pretalxId": 48 }, { "id": "gabari", @@ -408,7 +433,8 @@ "bio": "Website, community calls | Zitrone founder, member of Developer DAO and Forefront", "roles": [ "team" - ] + ], + "pretalxId": 18 }, { "id": "hedvika", @@ -501,6 +527,6 @@ "url": "https://worldcoin.org/" } ], - "time": "2022-11-09T15:43:11.590Z", + "time": "2022-11-09T16:32:04.176Z", "version": "v2022-10-16" } \ No newline at end of file From 343bb639a2c5864940bf69ba92b97be33b84651e Mon Sep 17 00:00:00 2001 From: tree Date: Wed, 9 Nov 2022 17:38:44 +0100 Subject: [PATCH 2/3] Fix --- src/routes/schedule/+page.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/schedule/+page.svelte b/src/routes/schedule/+page.svelte index 3638de3..9868146 100644 --- a/src/routes/schedule/+page.svelte +++ b/src/routes/schedule/+page.svelte @@ -35,6 +35,7 @@ name: item ? item.name : contributor.name } }) + } function isPast(date) { return new Date() > new Date(date); From 3e0c6679abb8ed20c4af94ff96bf18b4deb1f92c Mon Sep 17 00:00:00 2001 From: tree Date: Wed, 9 Nov 2022 17:40:12 +0100 Subject: [PATCH 3/3] Update data.yaml --- data/data.yaml | 3 +++ src/lib/data.json | 11 +++++++---- static/data.json | 11 +++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/data/data.yaml b/data/data.yaml index 849b606..bb0adbf 100644 --- a/data/data.yaml +++ b/data/data.yaml @@ -294,12 +294,14 @@ contributors: twitter: treecz bio: Vision, content | Gwei.cz and BohemianDAO founder, Ethereum enthusiast roles: [ team ] + pretalxId: 1 - id: tereza name: Tereza twitter: terkastarostova bio: Production, sponsors | Holky v Kryptu co-founder, chairman of UTXO Foundation roles: [ team ] + pretalxId: 31 - id: exez name: Exez @@ -333,6 +335,7 @@ contributors: twitter: jacobjelen bio: Networking support roles: [ team ] + pretalxId: 24 - id: dominika name: Dominika diff --git a/src/lib/data.json b/src/lib/data.json index b239ca3..e99b8b3 100644 --- a/src/lib/data.json +++ b/src/lib/data.json @@ -405,7 +405,8 @@ "bio": "Vision, content | Gwei.cz and BohemianDAO founder, Ethereum enthusiast", "roles": [ "team" - ] + ], + "pretalxId": 1 }, { "id": "tereza", @@ -414,7 +415,8 @@ "bio": "Production, sponsors | Holky v Kryptu co-founder, chairman of UTXO Foundation", "roles": [ "team" - ] + ], + "pretalxId": 31 }, { "id": "exez", @@ -462,7 +464,8 @@ "bio": "Networking support", "roles": [ "team" - ] + ], + "pretalxId": 24 }, { "id": "dominika", @@ -527,6 +530,6 @@ "url": "https://worldcoin.org/" } ], - "time": "2022-11-09T16:32:04.176Z", + "time": "2022-11-09T16:39:58.580Z", "version": "v2022-10-16" } \ No newline at end of file diff --git a/static/data.json b/static/data.json index b239ca3..e99b8b3 100644 --- a/static/data.json +++ b/static/data.json @@ -405,7 +405,8 @@ "bio": "Vision, content | Gwei.cz and BohemianDAO founder, Ethereum enthusiast", "roles": [ "team" - ] + ], + "pretalxId": 1 }, { "id": "tereza", @@ -414,7 +415,8 @@ "bio": "Production, sponsors | Holky v Kryptu co-founder, chairman of UTXO Foundation", "roles": [ "team" - ] + ], + "pretalxId": 31 }, { "id": "exez", @@ -462,7 +464,8 @@ "bio": "Networking support", "roles": [ "team" - ] + ], + "pretalxId": 24 }, { "id": "dominika", @@ -527,6 +530,6 @@ "url": "https://worldcoin.org/" } ], - "time": "2022-11-09T16:32:04.176Z", + "time": "2022-11-09T16:39:58.580Z", "version": "v2022-10-16" } \ No newline at end of file