From 1c9e271d7db7ae36992515c84fedc46ef630cdab Mon Sep 17 00:00:00 2001 From: tree Date: Fri, 23 Feb 2024 16:30:51 +0100 Subject: [PATCH 01/11] raise version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 122f65b..75f80c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "w3pn-web", "type": "module", - "version": "1.1.0", + "version": "1.2.0", "scripts": { "dev": "astro dev", "start": "astro dev", From 7b60d82c0c89cae4516732ed30a570a1091bf4a7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:44:42 +0000 Subject: [PATCH 02/11] Commit from GitHub Actions (Synchronize data) --- src/contributors.json | 2 +- src/core.json | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/contributors.json b/src/contributors.json index 9bbe7e2..059a7a5 100644 --- a/src/contributors.json +++ b/src/contributors.json @@ -58,7 +58,7 @@ "received_events_url": "https://api.github.com/users/burningtree/received_events", "type": "User", "site_admin": false, - "contributions": 686 + "contributions": 688 }, { "login": "EclecticSamurai", diff --git a/src/core.json b/src/core.json index b3a071a..7b8c74e 100644 --- a/src/core.json +++ b/src/core.json @@ -295,6 +295,16 @@ }, "imageUrl": "https://data.web3privacy.info/img/people/afri-schoedon.jpg" }, + { + "id": "pavol-luptak", + "name": "Pavol Lupták", + "nickname": "wilder", + "caption": "Perpetual traveler focused on technology and society hacking ([Nethemba](https://nethemba.com/), [Liberation Travel](https://www.liberationtravel.com/))", + "refs": { + "twitter": "wilderko" + }, + "imageUrl": "https://data.web3privacy.info/img/people/pavol-luptak.jpeg" + }, { "id": "andrea-togni", "name": "Andrea Togni", @@ -746,8 +756,9 @@ "rsvp": "https://lu.ma/w3pn-summit-prague2" }, "speakers": [ - "mykola-siusko", - "gabari" + "pavol-luptak", + "gabari", + "mykola-siusko" ] }, { From f76b358530970acac2e888fc7e2b6bad2275bb62 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 21:11:23 +0000 Subject: [PATCH 03/11] Commit from GitHub Actions (Synchronize data) --- src/contributors.json | 2 +- src/core.json | 1 + src/events-ext.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/contributors.json b/src/contributors.json index 059a7a5..cca7e0c 100644 --- a/src/contributors.json +++ b/src/contributors.json @@ -58,7 +58,7 @@ "received_events_url": "https://api.github.com/users/burningtree/received_events", "type": "User", "site_admin": false, - "contributions": 688 + "contributions": 692 }, { "login": "EclecticSamurai", diff --git a/src/core.json b/src/core.json index 7b8c74e..236c6c5 100644 --- a/src/core.json +++ b/src/core.json @@ -6,6 +6,7 @@ "docs": "https://docs.web3privacy.info/", "manifesto": "https://docs.web3privacy.info/manifesto", "github": "https://github.com/web3privacy", + "git": "https://git.web3privacy.info", "twitter": "https://twitter.com/web3privacy", "matrix": "https://matrix.web3privacy.info", "bluesky": "https://bsky.app/profile/web3privacy.info", diff --git a/src/events-ext.json b/src/events-ext.json index 5653224..73ff88d 100644 --- a/src/events-ext.json +++ b/src/events-ext.json @@ -17,7 +17,7 @@ "2024-04-11T17:00:00.000Z" ], "coverUrl": "https://images.lumacdn.com/event-covers/pq/73637b17-538e-44fa-a75a-5da505ba9d47", - "guestCount": 24 + "guestCount": 25 }, { "url": "w3pn-meetup-tallinn1", From db2641162d0b9f5cbb5e9391d762ed917669cb88 Mon Sep 17 00:00:00 2001 From: tree Date: Fri, 23 Feb 2024 23:30:55 +0100 Subject: [PATCH 04/11] community footer: add core team and speakers --- src/components/AboutFooter.astro | 53 ++++++++++++++++++++++++++++++-- src/core.json | 28 +++++++++++------ 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/components/AboutFooter.astro b/src/components/AboutFooter.astro index e1eb195..64c5d7f 100644 --- a/src/components/AboutFooter.astro +++ b/src/components/AboutFooter.astro @@ -4,6 +4,30 @@ import * as config from '../config.yaml'; import core from '../core.json'; import contributors from '../contributors.json'; +function findPerson(src) { + const p = core.people.find(p => src.refs?.twitter ? p.refs?.twitter === src.refs.twitter : (src.refs?.bsky ? p.refs.bsky === src.refs.bsky : {})) + if (p) { + p.ct = src + } + return p +} + +function personLink(person) { + return person.refs?.twitter ? `https://twitter.com/${person.refs.twitter}` : (person.refs?.bsky ? `https://bsky.app/profile/${person.refs.bsky}` : '#') +} + +function coreTeamGithubLink(person) { + return `https://github.com/${person.ct.refs.github}` +} + +function filterCoreTeam(person) { + if (person.login) { + return !(core['core-team'].find(ctm => ctm.refs.github.toLowerCase() === person.login.toLowerCase())) + } + const res = core['core-team'].find(ctm => ctm.refs.twitter ? ctm.refs.twitter?.toLowerCase() === person.refs?.twitter?.toLowerCase() : ctm.refs?.bsky?.toLowerCase() === person.refs?.bsky?.toLowerCase()) + return !res +} + ---
@@ -34,9 +58,32 @@ import contributors from '../contributors.json';

Join the Community

{config.landing.community}
-
- {contributors.items.map((contrib) => ( -
+

Core Team

+
+ {core['core-team'].map(findPerson).map((person) => ( +
+ + + +
+ ))} +
+ +

Speakers

+
+ {core.people.filter(filterCoreTeam).filter(p => p.imageUrl).map((person) => ( +
+ + + +
+ ))} +
+ +

Git Contributors

+
+ {contributors.items.filter(filterCoreTeam).map((contrib) => ( +
))}
diff --git a/src/core.json b/src/core.json index 236c6c5..03d8724 100644 --- a/src/core.json +++ b/src/core.json @@ -18,6 +18,14 @@ "telegram": "https://t.me/web3privacynow" }, "core-team": [ + { + "name": "Mykola", + "refs": { + "github": "msiusko", + "twitter": "nicksvyaznoy", + "matrix": "k1983:matrix.org" + } + }, { "name": "Tree", "refs": { @@ -27,14 +35,6 @@ "matrix": "tree:gwei.cz" } }, - { - "name": "Mykola", - "refs": { - "github": "msiusko", - "twitter": "nicksvyaznoy", - "matrix": "k1983:matrix.org" - } - }, { "name": "PG", "refs": { @@ -47,7 +47,8 @@ "name": "Coinmandeer", "refs": { "github": "coinmandeer", - "matrix": "coinmandeer:matrix.org" + "matrix": "coinmandeer:matrix.org", + "twitter": "KeenOfCoin" } } ], @@ -132,6 +133,15 @@ } ], "people": [ + { + "id": "coinmandeer", + "name": "Coinmandeer", + "refs": { + "twitter": "KeenOfCoin", + "github": "coinmandeer" + }, + "imageUrl": "https://data.web3privacy.info/img/people/coinmandeer.png" + }, { "id": "jaromil", "name": "Denis Roio", From c56b924856b2265581c3df91921639139ed59b3b Mon Sep 17 00:00:00 2001 From: tree Date: Fri, 23 Feb 2024 23:33:56 +0100 Subject: [PATCH 05/11] disable ipfs deploy --- .github/workflows/ipfs-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ipfs-deploy.yml b/.github/workflows/ipfs-deploy.yml index eec67de..c07e99e 100644 --- a/.github/workflows/ipfs-deploy.yml +++ b/.github/workflows/ipfs-deploy.yml @@ -3,8 +3,8 @@ name: Deploy to IPFS on: # Trigger the workflow every time you push to the `main` branch # Using a different branch name? Replace `main` with your branch’s name - push: - branches: [ beta ] + #push: + # branches: [ beta ] # Allow this job to clone the repo and create a page deployment permissions: From fb7b4d070c1cfe131c7d8fcc28f41ff365ffdca4 Mon Sep 17 00:00:00 2001 From: tree Date: Fri, 23 Feb 2024 23:51:00 +0100 Subject: [PATCH 06/11] community footer: add speakers cfp link --- src/components/AboutFooter.astro | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/AboutFooter.astro b/src/components/AboutFooter.astro index 64c5d7f..bf16091 100644 --- a/src/components/AboutFooter.astro +++ b/src/components/AboutFooter.astro @@ -58,7 +58,7 @@ function filterCoreTeam(person) {

Join the Community

{config.landing.community}
-

Core Team

+

Speakers

-
+
{core.people.filter(filterCoreTeam).filter(p => p.imageUrl).map((person) => ( +
+ + +
+

Git Contributors

-
+
{contributors.items.filter(filterCoreTeam).map((contrib) => (
))}
-
+
From 92812342159e8cbc434dbfd69a20934a1ea54600 Mon Sep 17 00:00:00 2001 From: tree Date: Sat, 24 Feb 2024 02:12:40 +0100 Subject: [PATCH 07/11] event details --- src/components/EventItem.astro | 127 ++----------------------------- src/components/SpeakerList.astro | 29 +++++++ src/layouts/base.astro | 4 +- src/lib/events.js | 99 ++++++++++++++++++++++++ src/pages/event/[id].astro | 82 ++++++++++++++++++++ src/pages/events.astro | 3 + src/styles/base.css | 4 + 7 files changed, 227 insertions(+), 121 deletions(-) create mode 100644 src/components/SpeakerList.astro create mode 100644 src/lib/events.js create mode 100644 src/pages/event/[id].astro diff --git a/src/components/EventItem.astro b/src/components/EventItem.astro index 732cb65..1b35f0e 100644 --- a/src/components/EventItem.astro +++ b/src/components/EventItem.astro @@ -1,104 +1,13 @@ --- const { item } = Astro.props; -import { format, compareAsc, addDays, isFuture } from 'date-fns'; import { marked } from 'marked'; import EventsExt from '../events-ext.json'; import core from "../core.json"; -import { imageMetadata } from 'astro/assets/utils'; - -function findExt () { - let slug = null - if (item.links?.web && item.links.web.match(/^https:\/\/lu.ma\//)) { - slug = item.links.web.match(/^https:\/\/lu.ma\/(.+)$/)[1] - } - if (item.links?.rsvp && item.links.rsvp.match(/^https:\/\/lu.ma\//)) { - slug = item.links.rsvp.match(/^https:\/\/lu.ma\/(.+)$/)[1] - } - if (!slug) { - return null - } - return EventsExt.find(ex => ex.url === slug) -} - -function getSpeaker (id) { - return core.people.find(p => p.id === id) -} - -const ext = findExt() - - -const isDate = item.date.match(/^\d{4}-\d{2}-\d{2}$/) -const future = isDate && !isFuture(new Date(item.date)); -const dateMatch = item.date.match(/^(\d{4})/) -const year = dateMatch ? dateMatch[1] : null - -function dateFormat (str) { - if (str.match(/^\d{4}-\d{2}-\d{2}$/)) { - return format(new Date(str), 'MMM d, yyyy') - } - const qm = str.match(/^(\d{4})\/(\w+)$/) - if (qm) { - return `${qm[2]}, ${qm[1]}` - } - return str -} - -function nameRenderer (item) { - let num; - let ccm = item.coincidence?.match(/\[(\w+)\]/) - let cc = ccm && ccm[1] ? ccm[1] : (item.coincidence ? item.coincidence : null) - switch (item.type) { - case 'summit': - num = item.id.match(/^w3ps(\d+)$/)[1] - return `W3PN Summmit #${num} ${item.city}`// + (cc ? ` @ ${cc}` : '') - break; - case 'meetup': - num = item.id.match(/(\d+)$/) - return `W3PN Meetup ${item.city} #${num ? num[1] : 'TBD'}`// + (cc ? ` @ ${cc}` : '') - break; - case 'hackathon': - num = item.id.match(/^w3ph(\d+)$/)[1] - return `W3PN Hackathon #${num} ${item.city}`// + (cc ? ` @ ${cc}` : '') - break; - case 'privacy-corner': - return `Privacy Corner at `+ (item.coincidenceFull ? item.coincidenceFull : `${item.coincidence} ${year}`) - break; - } -} - -function ccRenderer (item) { - let ccm = item.coincidence?.match(/\[(\w+)\]/) - let cc = ccm && ccm[1] ? ccm[1] : (item.coincidence ? item.coincidence : null) - return cc -} - -function dateEnd(str, days) { - return format(addDays(new Date(str), days-1), 'yyyy-MM-dd'); -} - -const statuses = { - preregistration: { - title: 'Pre-registration', - color: 'text-orange-500', - }, - unconfirmed: { - title: 'Planned', - color: '' - }, - confirmed: { - title: 'Confirmed', - color: 'text-green-500', - }, - past: { - title: 'Already happened', - color: 'text-green-800', - } -} - -const status = item.confirmed - ? (future ? statuses.past : statuses.confirmed) - : (item.links?.rsvp ? statuses.preregistration : statuses.unconfirmed); +import { dateFormat, dateInfo, dateEnd, nameRenderer, ccRenderer, eventStatus, getSpeaker, findExt } from '../lib/events.js'; +import SpeakerList from './SpeakerList.astro'; +const ext = findExt(EventsExt, item) +const status = eventStatus(item) ---
@@ -112,7 +21,7 @@ const status = item.confirmed
- {nameRenderer(item)} + {nameRenderer(item)}
{item.type === "hackathon" && HACKATHON} {item.type === "summit" && SUMMIT} @@ -135,7 +44,7 @@ const status = item.confirmed
{item.speakers &&
- {item.speakers.map(spId => getSpeaker(spId)).slice(0,7).map((speaker) => ( + {item.speakers.map(spId => getSpeaker(core, spId)).slice(0,7).map((speaker) => (
))} {item.speakers.length > 7 && @@ -169,7 +78,7 @@ const status = item.confirmed
Date: {dateFormat(item.date)} {item.days ? ' - ' + dateFormat(dateEnd(item.date, item.days)) + ` (${item.days} days)` : ''}
- Place: {item.place && || "TBD"} + Venue: {item.place && || "TBD"} {item.place && item['place-address'] && @ {item['place-address']} @@ -187,27 +96,7 @@ const status = item.confirmed }
- {item.speakers && -
-

Speakers ({item.speakers.length})

-
- {item.speakers.map(spId => getSpeaker(spId)).map((speaker) => ( -
-
-
-
- {speaker.name} - {speaker.refs?.twitter && - (@{speaker.refs.twitter}) - } -
-
-
-
- ))} -
-
- } +
\ No newline at end of file diff --git a/src/components/SpeakerList.astro b/src/components/SpeakerList.astro new file mode 100644 index 0000000..e2178e5 --- /dev/null +++ b/src/components/SpeakerList.astro @@ -0,0 +1,29 @@ +--- +import { marked, } from 'marked'; +const { item, thumbSize } = Astro.props; +import { getSpeaker } from '../lib/events.js'; +import core from "../core.json"; + +--- + +{item.speakers && +
+

Speakers ({item.speakers.length})

+
+ {item.speakers.map(spId => getSpeaker(core, spId)).map((speaker) => ( +
+
+
+
+ {speaker.name} + {speaker.refs?.twitter && + (@{speaker.refs.twitter}) + } +
+
+
+
+ ))} +
+
+} \ No newline at end of file diff --git a/src/layouts/base.astro b/src/layouts/base.astro index 41363cf..8819af5 100644 --- a/src/layouts/base.astro +++ b/src/layouts/base.astro @@ -5,7 +5,7 @@ import * as config from '../config.yaml'; import * as pkg from '../../package.json'; import core from '../core.json'; import '../styles/base.css'; -const {banner, title, description} = Astro.props; +const {banner, title, metaTitle, description} = Astro.props; import cfonts from 'cfonts'; @@ -21,7 +21,7 @@ function genHeading(str) { - {title ? title + ' | ' + config.title : config.title} + {(metaTitle || title) ? ((metaTitle || title) + ' | ' + config.title) : config.title} p.id === id) +} + +export function findExt (eventsExt, item) { + let slug = null + if (item.links?.web && item.links.web.match(/^https:\/\/lu.ma\//)) { + slug = item.links.web.match(/^https:\/\/lu.ma\/(.+)$/)[1] + } + if (item.links?.rsvp && item.links.rsvp.match(/^https:\/\/lu.ma\//)) { + slug = item.links.rsvp.match(/^https:\/\/lu.ma\/(.+)$/)[1] + } + if (!slug) { + return null + } + return eventsExt.find(ex => ex.url === slug) +} \ No newline at end of file diff --git a/src/pages/event/[id].astro b/src/pages/event/[id].astro new file mode 100644 index 0000000..2a842a8 --- /dev/null +++ b/src/pages/event/[id].astro @@ -0,0 +1,82 @@ +--- + +import BaseLayout from '../../layouts/base.astro'; +import SpeakerList from '../../components/SpeakerList.astro'; +import core from '../../core.json'; +import EventsExt from '../../events-ext.json'; +import { dateFormat, dateInfo, dateEnd, nameRenderer, ccRenderer, eventStatus, findExt } from '../../lib/events.js'; +import { marked } from 'marked'; + +const { id } = Astro.params; + +export async function getStaticPaths() { + return core.events.map(event => ({ params: { id: event.id }})); +} + +const item = core.events.find(event => event.id === id) +const status = eventStatus(item) +const ext = findExt(EventsExt, item) +--- + + + +
+ +
+
+

W3PN {nameRenderer(item, true)}

+ +
+ +
+ {item.city}, {item.country.toUpperCase()} + {item.coincidence && +  - {ccRenderer(item)} + } +
+
+ +
+
Date: {dateFormat(item.date)} {item.days ? ' - ' + dateFormat(dateEnd(item.date, item.days)) + ` (${item.days} days)` : ''}
+
+ Venue: {item.place && || "TBD"} + {item.place && item['place-address'] && + @ + {item['place-address']} + } +
+
Status: ● {status.title}
+
Visitors: + {item.visitors && + {item.visitors} people + } + {!item.visitors && ext && + {ext.guestCount > 0 ? (ext.guestCount + ' people') : 'n/a'} {status.title === 'Pre-registration' ? 'pre-registered' : 'registered'} + } + {!item.visitors && !ext && + n/a + } +
+
Lead: {item.lead || 'n/a'}
+ +
+ {item.links?.rsvp && + + } + {item.links?.web && + + } +
+
+
+
+ {ext && +
+ } +
+
+ + +
+ + \ No newline at end of file diff --git a/src/pages/events.astro b/src/pages/events.astro index 56ad358..2888dc2 100644 --- a/src/pages/events.astro +++ b/src/pages/events.astro @@ -69,6 +69,9 @@ for (const year of pastYears.reverse()) { if (ev.target.tagName === "BUTTON") { return false; } + if (ev.target.tagName === "A") { + return false; + } const detail = el.parentElement.parentElement.querySelector('.detail') document.querySelectorAll('.detail:not(.hidden)').forEach(e => (detail !== e ? e.classList.add('hidden') : null)); detail.classList.toggle('hidden'); diff --git a/src/styles/base.css b/src/styles/base.css index c1eec7f..692be5a 100644 --- a/src/styles/base.css +++ b/src/styles/base.css @@ -193,6 +193,10 @@ @apply mb-4; } + .w3pn-speaker-list a { + @apply hover:text-white; + } + .icon { @apply inline-block w-12 h-12; } From 54f805e5278fa1d1985d5e31a20d0e9d005e3698 Mon Sep 17 00:00:00 2001 From: tree Date: Sat, 24 Feb 2024 02:24:55 +0100 Subject: [PATCH 08/11] event detail responsivity fixes --- src/components/SpeakerList.astro | 2 +- src/pages/event/[id].astro | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/SpeakerList.astro b/src/components/SpeakerList.astro index e2178e5..0f7c8b2 100644 --- a/src/components/SpeakerList.astro +++ b/src/components/SpeakerList.astro @@ -12,7 +12,7 @@ import core from "../core.json";
{item.speakers.map(spId => getSpeaker(core, spId)).map((speaker) => (
-
+
{speaker.name} diff --git a/src/pages/event/[id].astro b/src/pages/event/[id].astro index 2a842a8..6c82f46 100644 --- a/src/pages/event/[id].astro +++ b/src/pages/event/[id].astro @@ -22,7 +22,10 @@ const ext = findExt(EventsExt, item)
-
+
+
+
+

W3PN {nameRenderer(item, true)}

@@ -69,11 +72,6 @@ const ext = findExt(EventsExt, item)
-
- {ext && -
- } -
From 295282695f7ac8910b05535a289d6ef43b4588d3 Mon Sep 17 00:00:00 2001 From: tree Date: Sat, 24 Feb 2024 03:07:17 +0100 Subject: [PATCH 09/11] update event detail --- src/components/AboutFooter.astro | 2 +- src/components/SpeakerList.astro | 17 ++++++++++++++++- src/core.json | 25 ++++++++++++++++++++++--- src/pages/event/[id].astro | 16 ++++++++++++++-- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/components/AboutFooter.astro b/src/components/AboutFooter.astro index bf16091..14fc72f 100644 --- a/src/components/AboutFooter.astro +++ b/src/components/AboutFooter.astro @@ -81,7 +81,7 @@ function filterCoreTeam(person) {
- +
diff --git a/src/components/SpeakerList.astro b/src/components/SpeakerList.astro index 0f7c8b2..24b270c 100644 --- a/src/components/SpeakerList.astro +++ b/src/components/SpeakerList.astro @@ -7,7 +7,7 @@ import core from "../core.json"; --- {item.speakers && -
+

Speakers ({item.speakers.length})

{item.speakers.map(spId => getSpeaker(core, spId)).map((speaker) => ( @@ -25,5 +25,20 @@ import core from "../core.json";
))}
+ +
+ +
+
+} +{!item.speakers && +
+

Speakers (0)

+ +
Stay tuned. Speakers coming :-)
+ +
+ +
} \ No newline at end of file diff --git a/src/core.json b/src/core.json index 03d8724..60d8f5c 100644 --- a/src/core.json +++ b/src/core.json @@ -15,7 +15,8 @@ "forum": "https://forum.web3privacy.info", "explorer": "https://explorer.web3privacy.info", "news": "https://news.web3privacy.info", - "telegram": "https://t.me/web3privacynow" + "telegram": "https://t.me/web3privacynow", + "cfp": "https://cfp.web3privacy.info" }, "core-team": [ { @@ -639,6 +640,7 @@ }, { "id": "w3pm-ath1", + "issue": 22, "type": "meetup", "date": "2024/Mar", "city": "Athens", @@ -654,6 +656,7 @@ }, { "id": "w3pm-buc1", + "issue": 8, "type": "meetup", "date": "2024-03-28", "city": "Bucharest", @@ -676,6 +679,7 @@ }, { "id": "w3pm-ams1", + "issue": 9, "type": "meetup", "date": "2024-04-11", "city": "Amsterdam", @@ -699,6 +703,7 @@ }, { "id": "w3pm-tal1", + "issue": 10, "type": "meetup", "date": "2024-04-18", "city": "Tallinn", @@ -713,6 +718,7 @@ }, { "id": "w3pm-por1", + "issue": 21, "type": "meetup", "date": "2024/May", "city": "Porto", @@ -726,6 +732,7 @@ }, { "id": "w3pm-ber1", + "issue": 6, "type": "meetup", "tags": [ "sfe" @@ -751,6 +758,7 @@ }, { "id": "w3ps3", + "issue": 11, "type": "summit", "date": "2024-05-30", "city": "Prague", @@ -774,6 +782,7 @@ }, { "id": "w3ph1", + "issue": 7, "type": "hackathon", "date": "2024-06-19", "days": 7, @@ -803,6 +812,7 @@ }, { "id": "w3pm-lju1", + "issue": 12, "type": "meetup", "date": "2024-06-21", "city": "Ljubljana", @@ -824,6 +834,7 @@ }, { "id": "w3pm-bcn1", + "issue": 20, "type": "meetup", "date": "2024/Jul", "city": "Barcelona", @@ -834,6 +845,7 @@ }, { "id": "w3pm-bru1", + "issue": 16, "type": "meetup", "date": "2024-07-12", "city": "Brussels", @@ -853,6 +865,7 @@ }, { "id": "w3pm-waw1", + "issue": 19, "type": "meetup", "date": "2024/Sep", "city": "Warsaw", @@ -864,6 +877,7 @@ }, { "id": "w3pm-cph1", + "issue": 18, "type": "meetup", "date": "2024/Sep", "city": "Copenhagen", @@ -878,6 +892,7 @@ }, { "id": "w3pm-rom2", + "issue": 13, "type": "meetup", "date": "2024-10-04", "city": "Rome", @@ -898,17 +913,19 @@ }, { "id": "pc-rome-2024", + "issue": 23, "type": "privacy-corner", "date": "2024-10-04", "days": 3, - "city": "Brno", - "country": "cz", + "city": "Rome", + "country": "it", "coincidence": "ETHRome", "coincidenceFull": "ETHRome 2024", "lead": "Tree" }, { "id": "w3ps4", + "issue": 14, "type": "summit", "date": "2024-10-24", "city": "Brno", @@ -932,6 +949,7 @@ }, { "id": "pc-brno-2024", + "issue": 24, "type": "privacy-corner", "date": "2024-10-25", "days": 3, @@ -943,6 +961,7 @@ }, { "id": "w3pm-dc1", + "issue": 15, "type": "meetup", "date": "2024-11-11", "city": "Bangkok", diff --git a/src/pages/event/[id].astro b/src/pages/event/[id].astro index 6c82f46..e2a3d05 100644 --- a/src/pages/event/[id].astro +++ b/src/pages/event/[id].astro @@ -60,8 +60,6 @@ const ext = findExt(EventsExt, item) n/a }
-
Lead: {item.lead || 'n/a'}
-
{item.links?.rsvp && @@ -74,6 +72,20 @@ const ext = findExt(EventsExt, item)
+
+
ID: {item.id}
+
Lead: {item.lead || 'n/a'}
+
+ {item.links?.rsvp && + Lu.ma + } + {item.issue && + PM + } + Source +
+
+
From 34d4215847c412ce993188ac23425f380fcbd72c Mon Sep 17 00:00:00 2001 From: tree Date: Sat, 24 Feb 2024 03:18:30 +0100 Subject: [PATCH 10/11] fix events nameRenderer --- src/core.json | 42 +++++++++++++++++++++--------------------- src/lib/events.js | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/core.json b/src/core.json index 60d8f5c..51eb66e 100644 --- a/src/core.json +++ b/src/core.json @@ -540,7 +540,7 @@ ], "events": [ { - "id": "w3ps1", + "id": "s23prg", "type": "summit", "date": "2023-06-05", "city": "Prague", @@ -582,7 +582,7 @@ ] }, { - "id": "w3ps2", + "id": "s23rom", "type": "summit", "date": "2023-10-05", "city": "Rome", @@ -617,7 +617,7 @@ ] }, { - "id": "w3pm-prg1", + "id": "m23prg", "type": "meetup", "date": "2023-11-14", "city": "Prague", @@ -639,7 +639,7 @@ ] }, { - "id": "w3pm-ath1", + "id": "m24ath", "issue": 22, "type": "meetup", "date": "2024/Mar", @@ -655,7 +655,7 @@ ] }, { - "id": "w3pm-buc1", + "id": "m24buc", "issue": 8, "type": "meetup", "date": "2024-03-28", @@ -678,7 +678,7 @@ ] }, { - "id": "w3pm-ams1", + "id": "m24ams", "issue": 9, "type": "meetup", "date": "2024-04-11", @@ -702,7 +702,7 @@ ] }, { - "id": "w3pm-tal1", + "id": "m24tll", "issue": 10, "type": "meetup", "date": "2024-04-18", @@ -717,7 +717,7 @@ } }, { - "id": "w3pm-por1", + "id": "m24opo", "issue": 21, "type": "meetup", "date": "2024/May", @@ -731,7 +731,7 @@ ] }, { - "id": "w3pm-ber1", + "id": "m24ber", "issue": 6, "type": "meetup", "tags": [ @@ -757,7 +757,7 @@ } }, { - "id": "w3ps3", + "id": "s24prg", "issue": 11, "type": "summit", "date": "2024-05-30", @@ -781,7 +781,7 @@ ] }, { - "id": "w3ph1", + "id": "h24ble", "issue": 7, "type": "hackathon", "date": "2024-06-19", @@ -811,7 +811,7 @@ ] }, { - "id": "w3pm-lju1", + "id": "m24lju", "issue": 12, "type": "meetup", "date": "2024-06-21", @@ -833,7 +833,7 @@ ] }, { - "id": "w3pm-bcn1", + "id": "m24bcn", "issue": 20, "type": "meetup", "date": "2024/Jul", @@ -844,7 +844,7 @@ "optional": true }, { - "id": "w3pm-bru1", + "id": "m24bru", "issue": 16, "type": "meetup", "date": "2024-07-12", @@ -864,7 +864,7 @@ ] }, { - "id": "w3pm-waw1", + "id": "m24waw", "issue": 19, "type": "meetup", "date": "2024/Sep", @@ -876,7 +876,7 @@ "optional": true }, { - "id": "w3pm-cph1", + "id": "m24cph", "issue": 18, "type": "meetup", "date": "2024/Sep", @@ -891,7 +891,7 @@ ] }, { - "id": "w3pm-rom2", + "id": "m24rom", "issue": 13, "type": "meetup", "date": "2024-10-04", @@ -912,7 +912,7 @@ ] }, { - "id": "pc-rome-2024", + "id": "pc24rom", "issue": 23, "type": "privacy-corner", "date": "2024-10-04", @@ -924,7 +924,7 @@ "lead": "Tree" }, { - "id": "w3ps4", + "id": "s24brn", "issue": 14, "type": "summit", "date": "2024-10-24", @@ -948,7 +948,7 @@ ] }, { - "id": "pc-brno-2024", + "id": "pc24brn", "issue": 24, "type": "privacy-corner", "date": "2024-10-25", @@ -960,7 +960,7 @@ "lead": "Tree" }, { - "id": "w3pm-dc1", + "id": "m24dc", "issue": 15, "type": "meetup", "date": "2024-11-11", diff --git a/src/lib/events.js b/src/lib/events.js index 8d93dc6..1aad46e 100644 --- a/src/lib/events.js +++ b/src/lib/events.js @@ -31,15 +31,15 @@ export function nameRenderer (item, full = false) { const date = dateInfo(item) switch (item.type) { case 'summit': - num = item.id.match(/^w3ps(\d+)$/)[1] + //num = item.id.match(/^w3ps(\d+)$/)[1] return `Summmit ${item.city}` + (full ? ` ${date.year}`: '')// + (cc ? ` @ ${cc}` : '') break; case 'meetup': - num = item.id.match(/(\d+)$/) + //num = item.id.match(/(\d+)$/) return `Meetup ${item.city}` + (full ? ` ${date.year}`: '')// + (cc ? ` @ ${cc}` : '') break; case 'hackathon': - num = item.id.match(/^w3ph(\d+)$/)[1] + //num = item.id.match(/^w3ph(\d+)$/)[1] return `Hackathon ${item.city}` + (full ? ` ${date.year}`: '')// + (cc ? ` @ ${cc}` : '') break; case 'privacy-corner': From 6056f3ddbef40658754e947a60b9e2906c85a227 Mon Sep 17 00:00:00 2001 From: tree Date: Sat, 24 Feb 2024 03:44:17 +0100 Subject: [PATCH 11/11] sync --- src/contributors.json | 2 +- src/core.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/contributors.json b/src/contributors.json index cca7e0c..ab23ad6 100644 --- a/src/contributors.json +++ b/src/contributors.json @@ -58,7 +58,7 @@ "received_events_url": "https://api.github.com/users/burningtree/received_events", "type": "User", "site_admin": false, - "contributions": 692 + "contributions": 699 }, { "login": "EclecticSamurai", diff --git a/src/core.json b/src/core.json index 51eb66e..d88f28c 100644 --- a/src/core.json +++ b/src/core.json @@ -912,7 +912,7 @@ ] }, { - "id": "pc24rom", + "id": "c24rom", "issue": 23, "type": "privacy-corner", "date": "2024-10-04", @@ -948,7 +948,7 @@ ] }, { - "id": "pc24brn", + "id": "c24brn", "issue": 24, "type": "privacy-corner", "date": "2024-10-25",