diff --git a/content/meta.json b/content/meta.json index 928c26d4d15..da5b8e84216 100644 --- a/content/meta.json +++ b/content/meta.json @@ -1,10 +1,15 @@ { - "title": "Einundzwanzig", + "title": "Einundzwanzig, der Bitcoin Podcast", "description": "Toximalistisches Infotainment für bullishe Bitcoiner.", "keywords": "Bitcoin,Podcast,Lightning Network", "themeColor": "#FFFFFF", - "cardImage": "img/card.png", + "cardImage": "/img/card.png", "twitterUrl": "https://twitter.com/_einundzwanzig_", "telegramUrl": "https://t.me/einundzwanzigpodcast", - "shoutoutUrl": "https://tallyco.in/s/zfxqtu/" + "shoutoutUrl": "https://tallyco.in/s/zfxqtu/", + "spotifyUrl": "https://open.spotify.com/show/10408JFbE1n8MexfrBv33r", + "appleUrl": "https://podcasts.apple.com/de/podcast/einundzwanzig-der-bitcoin-podcast/id1488229907", + "overcastUrl": "https://overcast.fm/itunes1488229907/einundzwanzig-der-bitcoin-podcast", + "anchorUrl": "https://anchor.fm/einundzwanzig", + "feedUrl": "https://anchor.fm/s/d8d3c38/podcast/rss" } diff --git a/pug.config.js b/pug.config.js index f51fe00f6b8..a58350f80cb 100644 --- a/pug.config.js +++ b/pug.config.js @@ -11,7 +11,10 @@ const assetPath = path => { return `${(revs && revs[path]) || path}` } const assetUrl = (path, protocol = 'https') => { - return `${protocol}://einundzwanzig.space/${assetPath(path)}` + const base = path.startsWith('http') ? '' : `${protocol}://einundzwanzig.space` + let url = `${base}${assetPath(path)}` + if (!url.startsWith(`${protocol}:`)) url = url.replace(/^.*:/, `${protocol}:`) + return url } module.exports = { diff --git a/src/category.pug b/src/category.pug index eae8766dbe0..1ff2b6ca04f 100644 --- a/src/category.pug +++ b/src/category.pug @@ -1,8 +1,11 @@ extends /template.pug -block main +block vars - const current = episodes.shift() + - const title = categoryName + - const description = 'Wir bringen dir die Bitcoin-News der Woche, sowie zusätzlich Interviews und die besten Artikel als Lesestunde. Außerdem erfährst du in "Der Weg" wie andere Leute zu Bitcoin gekommen sind.' +block main #podcast.wrap section h1= categoryName diff --git a/src/css/base/elements.css b/src/css/base/elements.css index 266c1868541..b7152651cb3 100644 --- a/src/css/base/elements.css +++ b/src/css/base/elements.css @@ -40,7 +40,6 @@ h4, h5, h6 { line-height: 1; - color: var(--color-secondary); & a { color: inherit; @@ -49,11 +48,13 @@ h6 { } h1 { - font-size: var(--font-size-xxl); + font-size: var(--font-size-xxxl); + font-weight: var(--font-weight-regular); } h2 { font-size: var(--font-size-xl); + color: var(--color-secondary); } h3 { diff --git a/src/css/sections/podcast.css b/src/css/sections/podcast.css index de79f6386c6..468b327aea1 100644 --- a/src/css/sections/podcast.css +++ b/src/css/sections/podcast.css @@ -3,7 +3,7 @@ display: inline-flex; flex-wrap: wrap; list-style: none; - margin: 0; + margin: 0 0 var(--space-l) 0; & li { margin: 0 var(--space-m) var(--space-m) 0; diff --git a/src/episode.pug b/src/episode.pug index f8ffbf4852c..3a23882e305 100644 --- a/src/episode.pug +++ b/src/episode.pug @@ -1,5 +1,22 @@ extends /template.pug +block vars + - const title = episode.title + - const description = episode.contentSnippet + - const cardImage = episode.image + - const cardSize = 3000 + +block og + meta(property="og:type" content="article") + meta(property="og:url" content=`https://einundzwanzig.space/podcast/${episode.slug}/`) + meta(property="og:audio" content=assetUrl(episode.enclosure.url, "http")) + meta(property="og:audio:secure_url" content=assetUrl(episode.enclosure.url, "https")) + meta(property="og:audio:type" content=episode.enclosure.type) + meta(property="article:section" content="Technology") + meta(property="article:published_time" content=episode.date) + meta(property="article:author" content=site.meta.twitterUrl) + meta(property="twitter:creator" content=site.meta.twitterUrl.replace('https://twitter.com/', '')) + block main #episode.wrap section diff --git a/src/includes/template.pug b/src/includes/template.pug index 7768153569e..0daff8ece61 100644 --- a/src/includes/template.pug +++ b/src/includes/template.pug @@ -2,10 +2,11 @@ include mixins block vars -- const pageTitle = title ? `${title} · ${site.title}` : site.meta.title +- const pageTitle = title ? `${title} · ${site.meta.title}` : site.meta.title - const pageDescription = description || site.meta.description - const pageKeywords = keywords || site.meta.keywords - const pageCard = cardImage || site.meta.cardImage +- const pageCardSize = cardSize || 1402 - const themeColor = '#FFFFFF' @@ -20,15 +21,17 @@ html(lang="en") meta(property="og:site_name" content=site.title) meta(property="og:title" content=pageTitle) meta(property="og:description" content=pageDescription) - meta(property="og:type" content="website") meta(property="og:image" content=assetUrl(pageCard, "http")) meta(property="og:image:secure_url" content=assetUrl(pageCard)) - meta(property="og:image:width" content=1402) - meta(property="og:image:height" content=1402) + meta(property="og:image:width" content=pageCardSize) + meta(property="og:image:height" content=pageCardSize) + block og + meta(property="og:type" content="website") meta(property="twitter:card" content="summary") meta(property="twitter:title" content=pageTitle) meta(property="twitter:description" content=pageDescription) meta(property="twitter:image" content=assetUrl(pageCard)) + meta(name="msapplication-TileColor" content=themeColor) meta(name="theme-color" content=themeColor) link(rel="preload" as="font" crossorigin href=assetPath("/fonts/inconsolata-400.woff2")) diff --git a/src/podcast.pug b/src/podcast.pug index 423af72674b..d489be69dac 100644 --- a/src/podcast.pug +++ b/src/podcast.pug @@ -1,27 +1,35 @@ extends /template.pug -block main +block vars - const current = episodes.shift() + - const title = 'Podcast' + - const description = 'Wir bringen dir die Bitcoin-News der Woche, sowie zusätzlich Interviews und die besten Artikel als Lesestunde. Außerdem erfährst du in "Der Weg" wie andere Leute zu Bitcoin gekommen sind.' +block main #podcast.wrap section - h1 Podcast - :markdown-it(html linkify typographer) - Du findest uns auf - [Spotify](https://open.spotify.com/show/10408JFbE1n8MexfrBv33r), - [Apple Podcasts](https://podcasts.apple.com/de/podcast/einundzwanzig-der-bitcoin-podcast/id1488229907), - [Overcast](https://overcast.fm/itunes1488229907/einundzwanzig-der-bitcoin-podcast) und - [Anchor](https://anchor.fm/einundzwanzig). - a.button(href="https://anchor.fm/s/d8d3c38/podcast/rss") Jetzt abonnieren - - section - h2 Kategorien + h1= title + p= description ul.categories li: a(href="/podcast/news/") News li: a(href="/podcast/interviews/") Interviews li: a(href="/podcast/lesestunde/") Lesestunde li: a(href="/podcast/der-weg/") Der Weg li: a(href="/podcast/verschiedenes/") Verschiedenes + + p + | Du findest uns auf + = " " + a(href=site.meta.spotifyUrl) Spotify + = ", " + a(href=site.meta.appleUrl) Apple Podcasts + = ", " + a(href=site.meta.overcastUrl) Overcast + = " und " + a(href=site.meta.anchorUrl) Anchor + = "." + a.button(href=site.meta.feedUrl) Jetzt abonnieren + section h2 Aktuelle Episode .current diff --git a/src/team.pug b/src/team.pug index 29a927087ad..d021ddc3e1d 100644 --- a/src/team.pug +++ b/src/team.pug @@ -1,9 +1,13 @@ 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.' + block main #team.wrap section - h1 Team + h1= title ul.members(data-shuffle) each m in shuffle(team) li.member diff --git a/tasks/fetch_feed.js b/tasks/fetch_feed.js index 214d110da50..ba688e105ef 100644 --- a/tasks/fetch_feed.js +++ b/tasks/fetch_feed.js @@ -34,6 +34,7 @@ const parseInfo = e => { const episodes = feed.items.map(e => ({ title: e.title.trim(), content: e.content.trim(), + contentSnippet: e.contentSnippet.trim(), anchor: e.link, date: e.isoDate, enclosure: e.enclosure,