diff --git a/content/nodes.json b/content/nodes.json deleted file mode 100644 index a1b30fdb84f..00000000000 --- a/content/nodes.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "dennis": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "1M1LbWGzwPE2qViFPG34" - }, - "fab": { - "address": "03f14237bb08f0afcb1ea07eff6b0b41e79294e66888971cccf1f585f5e21bf8f9" - }, - "gigi": { - "address": "02e12fea95f576a680ec1938b7ed98ef0855eadeced493566877d404e404bfbf52" - }, - "markus": { - "address": "0286e50ebeaafdf7dc321f6c8cb7e964e236b03ed67494b6337215c5c3c42252f2" - }, - "daniel": { - "address": "0201d14101401add234ebe3bc0e3020a39726daadf82bc3fa6b9871c4f5b17ab3f" - }, - "egge": { - "address": "02283e063b3121177fe8ed0c88806fe05b38cf5e192ff8c89e3bdc9b4df05dde21" - }, - "joko": { - "address": "03f51df0183b2083d678d867d7441ba7e8dbf1bfdd23729d702b81a8b128e3e876" - }, - "kemal": { - "address": "02e01367e1d7818a7e9a0e8a52badd5c32615e07568dbe0497b6a47f9bef89d6af" - }, - "ole": { - "address": "03686128db3100e8a66caa3a50943aa72b80c00b3f8700ec01f3bf2e3657d69d54" - }, - "lassmiranda": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "yy4ODIV8ThEKGJw8NknL" - }, - "cercatrova": { - "address": "02e1f391c9f3420fcaf65d45b615ab53034bd4a090036ddfb5703f6825b3b2bb4c" - }, - "tanksen": { - "address": "03d07c6075d640e680d54bd5201df087bc1fc56cbc084ab3aed54c3d96a486a919" - }, - "gmblr247": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "V1OvXEGj8Dn2pbLtGaog" - }, - "ben": { - "address": "02b1278809d2853516d30b9af8d7bb3b1845d1beeed18ee22a9ccaddfe7f30a794" - }, - "molo": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "MvJVAFYbDTN3K6gvvGhj" - }, - "zerofeerouting": { - "address": "038fe1bd966b5cb0545963490c631eaa1924e2c4c0ea4e7dcb5d4582a1e7f2f1a5" - }, - "quillie": { - "address": "0356cf6646a8022cdddee51204415161cb8c2f1a47d3429ebaaa1a2691e09e9c17" - }, - "paddepadde": { - "address": "0384d37ce01a3950be609156dcbd3ebcad6a8107b11d796890521fde06508dfc4d" - }, - "chris": { - "address": "03aa66e2a8ff6da4e9f431bbd89585ef564835a0d977b40955a92a68235e4f09e1" - }, - "fichte": { - "address": "022bd2b6d8798587b54b3a12a9051aed7ecd3caaa24cb8155b4d0e3ea4ab031c57" - }, - "el bitcoin ambassador": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "n034BHJnap8E2ab1phMS" - }, - "benmitfleck": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "FEdg3yD1HsyTbFUIjVHh" - }, - "tobo": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "QgZTULTtllSKL3W3E6mY" - }, - "sirius": { - "address": "02926b19109c70bc8dafa980fd65a1bff673d3a52603b816aa80d27f7961dfa945" - }, - "flashman": { - "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", - "customKey": "696969", - "customValue": "9Ra8pecnRoS3sMQ3PQAc" - } -} diff --git a/content/team.json b/content/team.json index d6c840c6cb4..adb34c25da0 100644 --- a/content/team.json +++ b/content/team.json @@ -5,7 +5,10 @@ "nostr": "npub17fqtu2mgf7zueq2kdusgzwr2lqwhgfl2scjsez77ddag2qx8vxaq3vnr8y", "github": "MarkusTurm", "text": "Bester Mann. Toxic ☣️ aber fair. Sorgt für die Bitcoin Mass-Adoption \"one [Currywurstbude](http://www.curry-alm.info/) at a time\" 🌭", - "image": "/img/team/markus.jpg" + "image": "/img/team/markus.jpg", + "v4v": { + "address": "0286e50ebeaafdf7dc321f6c8cb7e964e236b03ed67494b6337215c5c3c42252f2" + } }, "gigi": { "name": "Gigi", @@ -14,7 +17,10 @@ "github": "dergigi", "url": "https://dergigi.com", "text": "Der Gigi leiht dir seine Taschenlampe 🔦 solltest du dich auf deinem Weg im [Kaninchenbau](https://21lessons.com/) mal verlaufen 🕳🐇", - "image": "/img/team/gigi.jpg" + "image": "/img/team/gigi.jpg", + "v4v": { + "address": "02e12fea95f576a680ec1938b7ed98ef0855eadeced493566877d404e404bfbf52" + } }, "fab": { "name": "Fab", @@ -22,23 +28,33 @@ "nostr": "npub1gxdaxg7prcvgcs4pvlr8vac9a93t6uhph0wfuvpjm28q087n5y9qzx69d4", "url": "http://fabthefox.com", "text": "The Fox 🦊 verbreitet mit seinem Verlag Aprycot das Bitcoin-Wissen und ist der Wirt an der [Media-Theke](https://aprycot.media/thek/) 📙", - "image": "/img/team/fab.jpg" + "image": "/img/team/fab.jpg", + "v4v": { + "address": "03f14237bb08f0afcb1ea07eff6b0b41e79294e66888971cccf1f585f5e21bf8f9" + } }, "dennis": { "name": "Dennis", - "twitter": "_d11n_", "nostr": "npub14j7wc366rf8efqvnnm8m68pazy04kkj8fgu6uqumh3eqlhfst0kqrngtpf", "github": "dennisreimann", "url": "https://d11n.net", "text": "Mag Open Source und [BTCPay Server](https://btcpayserver.org/) 💚 und schreibt lieber Software als Texte über sich selbst 👨🏻‍💻", - "image": "/img/team/dennis.jpg" + "image": "/img/team/dennis.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "1M1LbWGzwPE2qViFPG34" + } }, "daniel": { "name": "Daniel", "twitter": "danielwingen", "nostr": "npub1xv4z0eswam7k2zfytsm09mfaxv8a2dugtk566hvp45keysmeezgsqu47m5", "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" + "image": "/img/team/daniel.jpg", + "v4v": { + "address": "0201d14101401add234ebe3bc0e3020a39726daadf82bc3fa6b9871c4f5b17ab3f" + } }, "patrick": { "name": "Patrick", @@ -53,7 +69,10 @@ "nostr": "npub1gvyhrc9pe745xnqyn9309jgg5yqeunfv2fyfhnjvzlj6dkzvqdcsj38j8a", "github": "Egge7", "text": "Die [Mempool-Wetterfee](https://t.me/BlockReportDisc) der die Nodes vertrauen 🌈", - "image": "/img/team/egge.jpg" + "image": "/img/team/egge.jpg", + "v4v": { + "address": "02283e063b3121177fe8ed0c88806fe05b38cf5e192ff8c89e3bdc9b4df05dde21" + } }, "joko": { "name": "Joko", @@ -61,7 +80,10 @@ "nostr": "npub1edej30zsgmmla78cmd8q7k4x8ff22ny8w8pvzqln6q0h2h9udneq32fwey", "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" + "image": "/img/team/joko.png", + "v4v": { + "address": "03f51df0183b2083d678d867d7441ba7e8dbf1bfdd23729d702b81a8b128e3e876" + } }, "kemal": { "name": "Kemal", @@ -70,14 +92,22 @@ "nostr": "npub1flac02t5hw6jljk8x7mec22uq37ert8d3y3mpwzcma726g5pz4lsmfzlk6", "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" + "image": "/img/team/kemal.jpg", + "v4v": { + "address": "02e01367e1d7818a7e9a0e8a52badd5c32615e07568dbe0497b6a47f9bef89d6af" + } }, "lassmiranda": { "name": "Lassmiranda", "twitter": "Lassmiranda21", "nostr": "npub1pzptxv5nwqnr8mvz88ll6sq3hwq2c3yv439pr9puguzvwn5qz8jsj3ax2p", "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" + "image": "/img/team/lassmiranda.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "yy4ODIV8ThEKGJw8NknL" + } }, "jeff": { "name": "Jeff", @@ -100,7 +130,10 @@ "nostr": "npub17xc6v7ynma3cw0gq372q6y78zmekyvpkwqpuzuqm8zpydg5m4pkq8v2sts", "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" + "image": "/img/team/ole.jpg", + "v4v": { + "address": "03686128db3100e8a66caa3a50943aa72b80c00b3f8700ec01f3bf2e3657d69d54" + } }, "cercatrova": { "name": "Cerca", @@ -109,13 +142,138 @@ "nostr": "npub1nxzp3zn90r44z07aeajc7wyah4fju49c9d3g45mxvmm64rmnrdusffch7m", "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" + "image": "/img/team/cercatrova.jpg", + "v4v": { + "address": "02e1f391c9f3420fcaf65d45b615ab53034bd4a090036ddfb5703f6825b3b2bb4c" + } }, "tanksen": { "name": "Tanksen", "twitter": "tanksen_f", "nostr": "npub1umpg95dp5x7uwf2trd5n9hejc5t29al3qdk3nxehh8snz2dr4unqcjw9r5", "text": "Unser Wegbegleiter, Tippspiel-Buchmacher, Afrika-Korrespondent und Fußball-Aficionado ⚽", - "image": "/img/team/tanksen.jpg" + "image": "/img/team/tanksen.jpg", + "v4v": { + "address": "03d07c6075d640e680d54bd5201df087bc1fc56cbc084ab3aed54c3d96a486a919" + } + }, + "gmblr247": { + "name": "Gambler", + "twitter": "gmblr247", + "nostr": "npub10t8npnmqhpwx9w8k232kess7gqtdlr6kqjemdzf8jnughwqd0gwsez0924", + "image": "/img/team/gmblr247.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "V1OvXEGj8Dn2pbLtGaog" + } + }, + "ben": { + "name": "Ben", + "twitter": "webdiverblue", + "nostr": "npub1nkvn9xl8pzklk24777uvzlxvsuzn9hvhuuqjlmfce9h2xxkvutusxl5a52", + "image": "/img/team/ben.jpg", + "v4v": { + "address": "02b1278809d2853516d30b9af8d7bb3b1845d1beeed18ee22a9ccaddfe7f30a794" + } + }, + "molo": { + "name": "Molo", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "MvJVAFYbDTN3K6gvvGhj" + } + }, + "zerofeerouting": { + "name": "zerofeerouting", + "twitter": "zerofeerouting", + "nostr": "npub1mc6arvz2ll8m26f75wj4d2w89ygq229t8h7m6cpfu0lqqa4l5hasp49pnw", + "image": "/img/team/zerofeerouting.jpg", + "v4v": { + "address": "038fe1bd966b5cb0545963490c631eaa1924e2c4c0ea4e7dcb5d4582a1e7f2f1a5" + } + }, + "quillie": { + "name": "Quillie", + "twitter": "quilloughbee", + "nostr": "npub1dskk3wspds53g9larr48cp4hxlkpg0ma2mtclh2y5key3pr9yhkqjvjuc2", + "image": "/img/team/quillie.jpg", + "v4v": { + "address": "0356cf6646a8022cdddee51204415161cb8c2f1a47d3429ebaaa1a2691e09e9c17" + } + }, + "paddepadde": { + "name": "Paddepadde", + "twitter": "paddepadde", + "nostr": "npub1gvqkjccl9urg93svaw60jqkk3ux8r3ycl5t3rlvc9uzjeu0agfuss8x8qy", + "image": "/img/team/paddepadde.jpg", + "v4v": { + "address": "0384d37ce01a3950be609156dcbd3ebcad6a8107b11d796890521fde06508dfc4d" + } + }, + "chris": { + "name": "Chris", + "v4v": { + "address": "03aa66e2a8ff6da4e9f431bbd89585ef564835a0d977b40955a92a68235e4f09e1" + } + }, + "fichte": { + "name": "Fichte", + "twitter": "fichte42", + "nostr": "npub1pzmcx6c5z77r6zf9rf7xlj3kp9mt8wk29snuphdzu7ezzl97kqrsacns7v", + "image": "/img/team/fichte42.jpg", + "v4v": { + "address": "022bd2b6d8798587b54b3a12a9051aed7ecd3caaa24cb8155b4d0e3ea4ab031c57" + } + }, + "el bitcoin ambassador": { + "name": "El Bitcoin Ambassador", + "twitter": "elbitcoinamb", + "nostr": "npub184842f0yqe7ee9kra6ufsmddmxs6q2cl5jutp3qns2a62t99na6s4n7t00", + "image": "/img/team/elbitcoinamb.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "n034BHJnap8E2ab1phMS" + } + }, + "benmitfleck": { + "name": "BenMitFleck", + "twitter": "BenMitFleck", + "image": "/img/team/benmitfleck.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "FEdg3yD1HsyTbFUIjVHh" + } + }, + "tobo": { + "name": "Tobo", + "nostr": "npub1rnm4dq7s9d8vp2jdyynl73wnxhlzaadgsj6hj3m46cyt4nsqdgtqxsu0lw", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "QgZTULTtllSKL3W3E6mY" + } + }, + "sirius": { + "name": "Sirius", + "twitter": "SiriusLightning", + "nostr": "npub1v4lgwjv7qfn3t7qjscpsgz9vqvspf6hecdp2ckgp0dz89uqn5slsgrhw3p", + "image": "/img/team/sirius.jpg", + "v4v": { + "address": "02926b19109c70bc8dafa980fd65a1bff673d3a52603b816aa80d27f7961dfa945" + } + }, + "flashman": { + "name": "Flashman", + "twitter": "FlashmanBTC", + "image": "/img/team/flashman.jpg", + "v4v": { + "address": "030a58b8653d32b99200a2334cfe913e51dc7d155aa0116c176657a4f1722677a3", + "customKey": "696969", + "customValue": "9Ra8pecnRoS3sMQ3PQAc" + } } } diff --git a/helpers.js b/helpers.js index ed8e482bd24..4e4a4a58a7a 100644 --- a/helpers.js +++ b/helpers.js @@ -36,9 +36,8 @@ const truncate = (str, wordCount) => { return [head, tail] } -const nostrUrl = pubkey => pubkey - ? `https://snort.social/p/${pubkey}` - : null +const memberUrl = member => + member.url || member.nostr ? `https://snort.social/p/${member.nostr}` : `https://twitter.com/${member.twitter}` module.exports = { markdown: mdTransformer.render, @@ -46,5 +45,5 @@ module.exports = { slugify, stripHTML, truncate, - nostrUrl + memberUrl } diff --git a/src/episode.pug b/src/episode.pug index a31e406129b..4c7b4ca0fa2 100644 --- a/src/episode.pug +++ b/src/episode.pug @@ -34,7 +34,7 @@ block main - const member = team[participant.toLowerCase()] li if member - a(href=`/team/#${member.name}`) + a(href=memberUrl(member)) img.avatar(src=assetPath(member.image || "/img/avatar.svg") alt=member.name) = member.name else diff --git a/src/includes/_footer.pug b/src/includes/_footer.pug index 6564e8ad876..8c34675655d 100644 --- a/src/includes/_footer.pug +++ b/src/includes/_footer.pug @@ -18,7 +18,7 @@ footer#footer.footer +sprite("instagram") a(href=site.meta.sphinxUrl rel="me nofollow noopener" target="_blank" title="Sphinx") +sprite("sphinx") - a(href=nostrUrl(site.meta.nostr) rel="me nofollow noopener" target="_blank" title="Nostr") + a(href=`https://snort.social/p/${site.meta.nostr}` rel="me nofollow noopener" target="_blank" title="Nostr") +sprite("nostr") a(href=site.meta.soundcloudUrl rel="me nofollow noopener" target="_blank" title="Soundcloud") +sprite("soundcloud") diff --git a/src/includes/mixins.pug b/src/includes/mixins.pug index 66bc047097e..045f6167b18 100644 --- a/src/includes/mixins.pug +++ b/src/includes/mixins.pug @@ -13,18 +13,18 @@ mixin categories(current) mixin member(m) li.member(id=m.name) - img(src=assetPath(m.image) alt=m.name loading="lazy") + img(src=assetPath(m.image || "/img/avatar.svg") alt=m.name loading="lazy") header h2=m.name .links if m.nostr - a(href=nostrUrl(m.nostr) target="_blank" rel="nofollow noopener" title=`${m.name} on Nostr`) + a(href=`https://snort.social/p/${m.nostr}` target="_blank" rel="nofollow noopener" title=`${m.name} on Nostr`) +sprite("nostr") if m.twitter - a(href=(m.twitter.startsWith('https://') ? m.twitter : `https://twitter.com/${m.twitter}`) target="_blank" rel="nofollow noopener" title=`${m.name} on Twitter`) + a(href=`https://twitter.com/${m.twitter}` target="_blank" rel="nofollow noopener" title=`${m.name} on Twitter`) +sprite("twitter") if m.github - a(href=(m.github.startsWith('https://') ? m.github : `https://github.com/${m.github}`) target="_blank" rel="nofollow noopener" title=`${m.name} on GitHub`) + a(href=`https://github.com/${m.github}` target="_blank" rel="nofollow noopener" title=`${m.name} on GitHub`) +sprite("github") if m.url a(href=m.url target="_blank" rel="nofollow noopener") diff --git a/src/includes/template.pug b/src/includes/template.pug index 3502c0c1679..e92839846f6 100644 --- a/src/includes/template.pug +++ b/src/includes/template.pug @@ -37,7 +37,6 @@ html(lang="de") .more a(href="/media/" class=(navCurrent === 'media' && 'current')) Media a(href="/soundboard/" class=(navCurrent === 'soundboard' && 'current')) Sounds - a(href="/team/" class=(navCurrent === 'team' && 'current')) Team a(href="/verein/" class=(navCurrent === 'verein' && 'current')) Verein a(href="/kontakt/" class=(navCurrent === 'kontakt' && 'current')) Kontakt button(type="button").theme diff --git a/src/index.pug b/src/index.pug index 7a2a9a29c10..9a335aa14b5 100644 --- a/src/index.pug +++ b/src/index.pug @@ -20,7 +20,7 @@ block main [Bitcoin](https://bitcoin.org/bitcoin.pdf), und sonst nichts. Einmal die Woche sitzen die Jungs zusammen und besprechen die aktuellen Geschehnisse in Bitcoin und der Welt. - [Wir](/team/) bringen dir die [News](/podcast/news/) der Woche, sowie zusätzlich [Interviews](/podcast/interviews/) und + Wir bringen dir die [News](/podcast/news/) der Woche, sowie zusätzlich [Interviews](/podcast/interviews/) und die besten Artikel als [Lesestunde](/podcast/lesestunde/). Außerdem erfährst du in [Der Weg](/podcast/der-weg/) wie andere Leute zu Bitcoin gekommen sind. +subscribe() diff --git a/src/team.pug b/src/team.pug deleted file mode 100644 index 89fe67f43a9..00000000000 --- a/src/team.pug +++ /dev/null @@ -1,30 +0,0 @@ -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 members = Object.values(team) - - const core = members.slice(0, 5) - - const crew = members.slice(5) - -block main - #team.wrap - section - h1= title - - :markdown-it(html linkify typographer) - Einmal die Woche sitzen die Jungs zusammen und besprechen die aktuellen Geschehnisse in Bitcoin und der Welt. - - [Wir](/team/) bringen dir die [News](/podcast/news/) der Woche, sowie zusätzlich [Interviews](/podcast/interviews/) und - die besten Artikel als [Lesestunde](/podcast/lesestunde/). - Außerdem erfährst du in [Der Weg](/podcast/der-weg/) wie andere Leute zu Bitcoin gekommen sind. - - h2 Core - ul.members(data-shuffle) - each m in shuffle(core) - +member(m) - section - h2 Crew - ul.members(data-shuffle) - each m in shuffle(crew) - +member(m) diff --git a/src/verein.pug b/src/verein.pug index 7e30a618f1f..f3fcde67a19 100644 --- a/src/verein.pug +++ b/src/verein.pug @@ -14,7 +14,7 @@ block main ## Gründungsgeschichte Gestartet wurde EINUNDZWANZIG 2019 als Podcast durch den weltbekannten Bitcoin Prediger Gigi - zusammen mit dem heiligen Markus im Turm. Fab, Dennis und Daniel ergänzten [das Team](/team/) + zusammen mit dem heiligen Markus im Turm. Fab, Dennis und Daniel ergänzten das Team und EINUNDZWANZIG entwickelte sich zur wichtigsten deutschsprachigen Anlaufstelle für Bitcoin. Es musste eine Gesellschaftsform her, bei der nicht das Kapital, sondern der Mensch zählt und die dabei so sozial inklusive wie möglich ist – ein Verein. diff --git a/static/img/team/ben.jpg b/static/img/team/ben.jpg new file mode 100644 index 00000000000..b0ed0ea3cb9 Binary files /dev/null and b/static/img/team/ben.jpg differ diff --git a/static/img/team/benmitfleck.jpg b/static/img/team/benmitfleck.jpg new file mode 100644 index 00000000000..47a03f47049 Binary files /dev/null and b/static/img/team/benmitfleck.jpg differ diff --git a/static/img/team/elbitcoinamb.jpg b/static/img/team/elbitcoinamb.jpg new file mode 100644 index 00000000000..70e3ebb3618 Binary files /dev/null and b/static/img/team/elbitcoinamb.jpg differ diff --git a/static/img/team/fichte42.jpg b/static/img/team/fichte42.jpg new file mode 100644 index 00000000000..d421cfe8b3e Binary files /dev/null and b/static/img/team/fichte42.jpg differ diff --git a/static/img/team/flashman.jpg b/static/img/team/flashman.jpg new file mode 100644 index 00000000000..c84e6fdac98 Binary files /dev/null and b/static/img/team/flashman.jpg differ diff --git a/static/img/team/gmblr247.jpg b/static/img/team/gmblr247.jpg new file mode 100644 index 00000000000..4a39c72831d Binary files /dev/null and b/static/img/team/gmblr247.jpg differ diff --git a/static/img/team/paddepadde.jpg b/static/img/team/paddepadde.jpg new file mode 100644 index 00000000000..59d89c5c715 Binary files /dev/null and b/static/img/team/paddepadde.jpg differ diff --git a/static/img/team/quillie.jpg b/static/img/team/quillie.jpg new file mode 100644 index 00000000000..74268c4107f Binary files /dev/null and b/static/img/team/quillie.jpg differ diff --git a/static/img/team/sirius.jpg b/static/img/team/sirius.jpg new file mode 100644 index 00000000000..72b2b1500a6 Binary files /dev/null and b/static/img/team/sirius.jpg differ diff --git a/static/img/team/zerofeerouting.jpg b/static/img/team/zerofeerouting.jpg new file mode 100644 index 00000000000..6d8c0ca7df3 Binary files /dev/null and b/static/img/team/zerofeerouting.jpg differ diff --git a/tasks/fetch_feed.js b/tasks/fetch_feed.js index b6af8418c3c..86ffcdeca5e 100644 --- a/tasks/fetch_feed.js +++ b/tasks/fetch_feed.js @@ -1,9 +1,8 @@ const { writeFileSync } = require('fs') const { join, resolve } = require('path') -const { replacements, slugify, stripHTML } = require('../helpers') +const { replacements, slugify, stripHTML, memberUrl } = require('../helpers') const { masterFeedUrl, publicFeedUrl } = require('../content/meta.json') const team = require('../content/team.json') -const nodes = require('../content/nodes.json') const request = require('sync-request') const { XMLParser, XMLBuilder, XMLValidator } = require('fast-xml-parser') const xmlFormat = require('xml-formatter') @@ -104,11 +103,11 @@ const parseEpisode = e => { const _noParticipants = [], _noNode = [] const members = [ - { name: 'Dennis', ...nodes.dennis }, - { name: 'Fab', ...nodes.fab }, - { name: 'Gigi', ...nodes.gigi }, - { name: 'Markus', ...nodes.markus }, - { name: 'Daniel', ...nodes.daniel } + { name: 'Dennis', ...team.dennis.v4v }, + { name: 'Fab', ...team.fab.v4v }, + { name: 'Gigi', ...team.gigi.v4v }, + { name: 'Markus', ...team.markus.v4v }, + { name: 'Daniel', ...team.daniel.v4v } ] // remove invalid tag @@ -158,9 +157,9 @@ const parseEpisode = e => { const value = episode.participants.reduce((result, name) => { const id = name.toLowerCase() - const node = nodes[id] - if (node) { - result.push({ name, ...node }) + const v4v = team[id] && team[id].v4v + if (v4v) { + result.push({ name, ...v4v }) } else if (debug) { _noNode.push({ episode: episode.slug, name }) } @@ -198,10 +197,9 @@ const parseEpisode = e => { updated['podcast:person'] = [] people.forEach(p => { + const href = p.url || p.nostr ? `https://snort.social/p/${p.nostr}` : `https://twitter.com/${p.twitter}` updated['podcast:person'].push({ - __attr: { - href: `https://twitter.com/${p.twitter}` - }, + __attr: { href }, '#text': p.name }) }) diff --git a/tasks/generate_pages.js b/tasks/generate_pages.js index a7c37c39e69..14c0dde6ddf 100644 --- a/tasks/generate_pages.js +++ b/tasks/generate_pages.js @@ -32,7 +32,6 @@ const meetupsSorted = site.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 }) renderPage('meetups', 'meetups', { navCurrent: 'meetups', meetups: meetupsSorted }) renderPage('kurse', 'kurse', { navCurrent: 'kurse', kurse }) renderPage('spenden', 'spenden', { navCurrent: 'spenden', spendenregister, spendenuebersicht })