From f15e653fb658f5c6ff40d4bbf9054e33c5cb2a53 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 19 Apr 2022 12:58:22 +0200 Subject: [PATCH] Unite team and crew files --- content/crew.json | 66 ------------------------------------- content/team.json | 64 +++++++++++++++++++++++++++++++++++ src/team.pug | 4 ++- tasks/generate_pages.js | 3 +- tasks/generate_site_data.js | 3 +- 5 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 content/crew.json diff --git a/content/crew.json b/content/crew.json deleted file mode 100644 index a5675a6d3ad..00000000000 --- a/content/crew.json +++ /dev/null @@ -1,66 +0,0 @@ -[ - { - "name": "Patrick", - "twitter": "PatrickZGW", - "github": "PatrickZGW", - "text": "Gewinnt als Argumentations-Bazooka jedes Diskussionduell und ist Gastgeber des [Zeit, Geld & Wirtschaft](https://wavve.link/zgw-podcast) Podcasts ⌚₿\uD83D\uDCC8", - "image": "/img/team/patrick.jpg" - }, - { - "name": "Egge", - "twitter": "egge24_", - "github": "Egge7", - "text": "Die [Mempool-Wetterfee](https://t.me/BlockReportDisc) der die Nodes vertrauen 🌈", - "image": "/img/team/egge.jpg" - }, - { - "name": "Joko", - "twitter": "jokoono", - "url": "https://btc21.de", - "text": "Der Tulpenhändler deines Vertrauens 🌷 hat auch immer die neueste [BTC21](https://btc21.de) Ausgabe auf dem Tresen 📰", - "image": "/img/team/joko.png" - }, - { - "name": "Kemal", - "twitter": "_pretyflaco", - "url": "https://ideasarelikeflames.com/", - "text": "Verbindet Bitcoin und [Bikini](https://bitcoin-turm.de/bturm26/) 👙 und berichtet als Türkei-Korrespondent über Geld in der ganzen Welt 🇹🇷", - "image": "/img/team/kemal.jpg" - }, - { - "name": "Lassmiranda", - "twitter": "Lassmiranda21", - "text": "Dennsiewillja! Rundum coole Socke 🧦 Wenn er nicht grade bei [Moe](https://www.youtube.com/watch?v=PGvwVo3rR8U) anruft, managed er unseren [YouTube-Kanal](https://www.youtube.com/c/EinundzwanzigPodcast) 📺", - "image": "/img/team/lassmiranda.jpg" - }, - { - "name": "Jeff", - "twitter": "fulmolightning", - "url": "https://fulmo.org/", - "text": "[Potzblitz!](https://www.youtube.com/c/FulmoLightning/videos) ⚡️ Ein fulmonantes Organisationstalent und Lightning Network-Urgestein 🦸‍♂️", - "image": "/img/team/jeff.jpg" - }, - { - "name": "Moritz", - "twitter": "MWietersheim", - "github": "cryptoadvance", - "url": "https://specter.solutions", - "text": "Ein Gespenst geht um die Welt 👻 und Moritz trägt es im [Specter-Koffer](https://specter.solutions/#enterprise) immer bei sich 🧳", - "image": "/img/team/moritz.jpg" - }, - { - "name": "Ole", - "twitter": "DerCheapi", - "url": "https://medium.com/@dercheapi", - "text": "Kinderzimmerökonom und Junior-Shitposter 💁‍♂️ Senkt unsere Boomer-Quote und findet die [Easter-Eggs](/podcast/der-weg-31-bitcoin-ist-ein-easter-egg/) 🥚", - "image": "/img/team/ole.jpg" - }, - { - "name": "Cerca", - "twitter": "cercatrova_21", - "github": "cercatrova21", - "url": "https://bitcoin-mentoring.me", - "text": "Der Quoten-Schweizer! 🇨🇭🧀 Sagt jedem zentral gesteuerten Geldinstitut den Kampf an und hilft dir jeden Scammer zu scammen", - "image": "/img/team/cercatrova.jpg" - } -] diff --git a/content/team.json b/content/team.json index 01661cd5e2a..085bc058ce6 100644 --- a/content/team.json +++ b/content/team.json @@ -38,5 +38,69 @@ "twitter": "danielwingen", "text": "Kennt den [Value Of Bitcoin](https://valueofbitcoin.com/) 🧊 und ist daher nicht nur Sound Money Maximalist, sondern auch Fiat Minimalist 💸", "image": "/img/team/daniel.jpg" + }, + { + "name": "Patrick", + "twitter": "PatrickZGW", + "github": "PatrickZGW", + "text": "Gewinnt als Argumentations-Bazooka jedes Diskussionduell und ist Gastgeber des [Zeit, Geld & Wirtschaft](https://wavve.link/zgw-podcast) Podcasts ⌚₿\uD83D\uDCC8", + "image": "/img/team/patrick.jpg" + }, + { + "name": "Egge", + "twitter": "egge24_", + "github": "Egge7", + "text": "Die [Mempool-Wetterfee](https://t.me/BlockReportDisc) der die Nodes vertrauen 🌈", + "image": "/img/team/egge.jpg" + }, + { + "name": "Joko", + "twitter": "jokoono", + "url": "https://btc21.de", + "text": "Der Tulpenhändler deines Vertrauens 🌷 hat auch immer die neueste [BTC21](https://btc21.de) Ausgabe auf dem Tresen 📰", + "image": "/img/team/joko.png" + }, + { + "name": "Kemal", + "twitter": "_pretyflaco", + "url": "https://ideasarelikeflames.com/", + "text": "Verbindet Bitcoin und [Bikini](https://bitcoin-turm.de/bturm26/) 👙 und berichtet als Türkei-Korrespondent über Geld in der ganzen Welt 🇹🇷", + "image": "/img/team/kemal.jpg" + }, + { + "name": "Lassmiranda", + "twitter": "Lassmiranda21", + "text": "Dennsiewillja! Rundum coole Socke 🧦 Wenn er nicht grade bei [Moe](https://www.youtube.com/watch?v=PGvwVo3rR8U) anruft, managed er unseren [YouTube-Kanal](https://www.youtube.com/c/EinundzwanzigPodcast) 📺", + "image": "/img/team/lassmiranda.jpg" + }, + { + "name": "Jeff", + "twitter": "fulmolightning", + "url": "https://fulmo.org/", + "text": "[Potzblitz!](https://www.youtube.com/c/FulmoLightning/videos) ⚡️ Ein fulmonantes Organisationstalent und Lightning Network-Urgestein 🦸‍♂️", + "image": "/img/team/jeff.jpg" + }, + { + "name": "Moritz", + "twitter": "MWietersheim", + "github": "cryptoadvance", + "url": "https://specter.solutions", + "text": "Ein Gespenst geht um die Welt 👻 und Moritz trägt es im [Specter-Koffer](https://specter.solutions/#enterprise) immer bei sich 🧳", + "image": "/img/team/moritz.jpg" + }, + { + "name": "Ole", + "twitter": "DerCheapi", + "url": "https://medium.com/@dercheapi", + "text": "Kinderzimmerökonom und Junior-Shitposter 💁‍♂️ Senkt unsere Boomer-Quote und findet die [Easter-Eggs](/podcast/der-weg-31-bitcoin-ist-ein-easter-egg/) 🥚", + "image": "/img/team/ole.jpg" + }, + { + "name": "Cerca", + "twitter": "cercatrova_21", + "github": "cercatrova21", + "url": "https://bitcoin-mentoring.me", + "text": "Der Quoten-Schweizer! 🇨🇭🧀 Sagt jedem zentral gesteuerten Geldinstitut den Kampf an und hilft dir jeden Scammer zu scammen", + "image": "/img/team/cercatrova.jpg" } ] diff --git a/src/team.pug b/src/team.pug index ee7ef13765c..5cdb9ad77ac 100644 --- a/src/team.pug +++ b/src/team.pug @@ -3,6 +3,8 @@ extends /template.pug block vars - const title = 'Team' - const description = 'Einmal die Woche sitzen diese Jungs zusammen und besprechen die aktuellen Geschehnisse in Bitcoin und der Welt.' + - const core = team.slice(0, 5) + - const crew = team.slice(5) block main #team.wrap @@ -18,7 +20,7 @@ block main h2 Core ul.members(data-shuffle) - each m in shuffle(team) + each m in shuffle(core) +member(m) section h2 Crew diff --git a/tasks/generate_pages.js b/tasks/generate_pages.js index e2ce0996fb7..14d54b2c182 100644 --- a/tasks/generate_pages.js +++ b/tasks/generate_pages.js @@ -9,7 +9,6 @@ const spendenregister = require('../generated/spendenregister.json') const spendenuebersicht = require('../content/spendenuebersicht.json') const participants = require('../generated/participants.json') const team = require('../content/team.json') -const crew = require('../content/crew.json') const meetups = require('../content/meetups.json') const soundboard = require('../content/soundboard.json') const adventskalender = require('../content/adventskalender.json') @@ -33,7 +32,7 @@ const meetupsSorted = meetups.sort((a, b) => { renderPage('index', 'index', { navCurrent: 'index', currentEpisode: episodes[0] }) renderPage('podcast', 'podcast', { navCurrent: 'podcast', episodes: [...episodes] }) -renderPage('team', 'team', { navCurrent: 'team', team, crew }) +renderPage('team', 'team', { navCurrent: 'team', team }) renderPage('meetups', 'meetups', { navCurrent: 'meetups', meetups: meetupsSorted }) renderPage('spenden', 'spenden', { navCurrent: 'spenden', spendenregister, spendenuebersicht }) renderPage('media', 'media', { navCurrent: 'media' }) diff --git a/tasks/generate_site_data.js b/tasks/generate_site_data.js index bdb8dd153d4..75954a7f925 100644 --- a/tasks/generate_site_data.js +++ b/tasks/generate_site_data.js @@ -4,7 +4,6 @@ const request = require('sync-request') const meta = require('../content/meta.json') const team = require('../content/team.json') -const crew = require('../content/crew.json') const meetups = require('../content/meetups.json') const soundboard = require('../content/soundboard.json') @@ -25,7 +24,7 @@ const date = (new Date()).toJSON().split('T')[0] writeJSON(dir('generated', 'site-data.json'), { date, block, meta }) // Participants -const participants = team.concat(crew).reduce((result, person) => Object.assign(result, { [person.name]: person }), {}) +const participants = team.reduce((result, person) => Object.assign(result, { [person.name]: person }), {}) writeJSON(dir('generated', 'participants.json'), participants) // Meetups