diff --git a/content/meta.json b/content/meta.json index da5b8e84216..83f3631bcec 100644 --- a/content/meta.json +++ b/content/meta.json @@ -3,7 +3,7 @@ "description": "Toximalistisches Infotainment für bullishe Bitcoiner.", "keywords": "Bitcoin,Podcast,Lightning Network", "themeColor": "#FFFFFF", - "cardImage": "/img/card.png", + "cardImage": "/img/cover/news.png", "twitterUrl": "https://twitter.com/_einundzwanzig_", "telegramUrl": "https://t.me/einundzwanzigpodcast", "shoutoutUrl": "https://tallyco.in/s/zfxqtu/", diff --git a/package.json b/package.json index f3c8e59c0b5..0618f8045a2 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "build:styles": "postcss src/css/main.css --output dist/css/main.css", "optimize": "npm-run-all -p optimize:* -s rev", "optimize:styles": "csso dist/css/main.css --output dist/css/main.css", - "rev": "node-file-rev --manifest=generated/rev.json --root=dist dist/css/* dist/js/* dist/img/*.png dist/img/*.svg dist/img/team/*.jpg dist/img/team/*.png", + "rev": "node-file-rev --manifest=generated/rev.json --root=dist dist/css/* dist/js/* dist/img/*.svg dist/img/cover/*.png dist/img/team/*.jpg dist/img/team/*.png", "prod": "npm-run-all build optimize -s build:pages", "images": "node tasks/optimize_images.js" }, diff --git a/pug.config.js b/pug.config.js index a58350f80cb..d5ea6604fb1 100644 --- a/pug.config.js +++ b/pug.config.js @@ -6,6 +6,7 @@ const shuffle = arr => { for (let i = arr.length - 1; i > 0; i--) { const j = Ma const formatDate = date => (new Date(date)).toISOString().replace(/T.*/, '').split('-').reverse().join('.') const linkTarget = url => url.startsWith('http') ? '_blank' : null const assetPath = path => { + if (path.startsWith('http')) return path let revs try { revs = require('./generated/rev.json') } catch (error) { } return `${(revs && revs[path]) || path}` diff --git a/src/css/sections/podcast.css b/src/css/sections/podcast.css index 468b327aea1..8906ba331e5 100644 --- a/src/css/sections/podcast.css +++ b/src/css/sections/podcast.css @@ -121,13 +121,9 @@ min-width: 300px; max-width: 400px; } - @media (--M_and_up) { - } } -.player__cover { - display: block; - +.player__coverlink { @media (--up_to_M) { width: 100%; } @@ -136,6 +132,11 @@ } } +.player__cover { + display: block; + width: 100%; +} + .player__bottom { flex: 1; color: var(--color-body-text); diff --git a/src/episode.pug b/src/episode.pug index 3a23882e305..7dbe14c886a 100644 --- a/src/episode.pug +++ b/src/episode.pug @@ -4,7 +4,7 @@ block vars - const title = episode.title - const description = episode.contentSnippet - const cardImage = episode.image - - const cardSize = 3000 + - const cardSize = episode.image.match('cloudfront') ? 3000 : 1400 block og meta(property="og:type" content="article") diff --git a/src/includes/mixins.pug b/src/includes/mixins.pug index bbfa9c9e275..f34caa8914c 100644 --- a/src/includes/mixins.pug +++ b/src/includes/mixins.pug @@ -6,7 +6,7 @@ mixin episodeItem(e) article.episodeItem&attributes(attributes) a.plain(href=`/podcast/${e.slug}/`) .media - img(src=e.image alt=e.title loading="lazy") + img(src=assetPath(e.image) alt=e.title loading="lazy") .content .meta span= e.categoryName + (e.number ? ` #${e.number}` : '') @@ -15,7 +15,8 @@ mixin episodeItem(e) mixin episodePlayer(e) .player.player--single&attributes(attributes) - img.player__cover(src=imgLarge data-amplitude-song-info="cover_art_url" data-amplitude-main-song-info="true") + a.player__coverlink(href=`/podcast/${e.slug}/`) + img.player__cover(src=imgLarge data-amplitude-song-info="cover_art_url" data-amplitude-main-song-info="true") .player__bottom progress.player__progress.amplitude-song-played-progress(data-amplitude-main-song-played-progress="true") @@ -50,7 +51,7 @@ mixin episodePlayer(e) "artist": "Einundzwanzig", "album": "#{e.categoryName + (e.number ? ` #${e.number}` : '')}", "url": "#{e.enclosure.url}", - "cover_art_url": "#{e.image}" + "cover_art_url": "#{assetPath(e.image)}" } ] } diff --git a/src/includes/template.pug b/src/includes/template.pug index 0daff8ece61..cdd0c762da1 100644 --- a/src/includes/template.pug +++ b/src/includes/template.pug @@ -6,7 +6,7 @@ block vars - const pageDescription = description || site.meta.description - const pageKeywords = keywords || site.meta.keywords - const pageCard = cardImage || site.meta.cardImage -- const pageCardSize = cardSize || 1402 +- const pageCardSize = cardSize || 1400 - const themeColor = '#FFFFFF' diff --git a/src/index.pug b/src/index.pug index bcda607f9e0..41a5f9ae8e1 100644 --- a/src/index.pug +++ b/src/index.pug @@ -46,4 +46,4 @@ block main darüber abstimmen welches Bitcoin-Projekt aus Deutschland diese kostbaren Sats bekommen soll. Wenn du also einen Shoutout in unserem Podcast kaufst, unterstützt du damit auch ein Bitcoin Projekt. - a.button(href=site.meta,shoutoutUrl) Sende uns einen Shout-Out + a.button(href=site.meta.shoutoutUrl) Sende uns einen Shout-Out diff --git a/static/img/card.png b/static/img/card.png deleted file mode 100644 index 60bfcf5894d..00000000000 Binary files a/static/img/card.png and /dev/null differ diff --git a/static/img/cover/der-weg.png b/static/img/cover/der-weg.png new file mode 100644 index 00000000000..55676c71c0c Binary files /dev/null and b/static/img/cover/der-weg.png differ diff --git a/static/img/cover/interview.png b/static/img/cover/interview.png new file mode 100644 index 00000000000..ba93ce20841 Binary files /dev/null and b/static/img/cover/interview.png differ diff --git a/static/img/cover/lesestunde.png b/static/img/cover/lesestunde.png new file mode 100644 index 00000000000..eee60aa991a Binary files /dev/null and b/static/img/cover/lesestunde.png differ diff --git a/static/img/cover/news.png b/static/img/cover/news.png new file mode 100644 index 00000000000..10ec0e2251e Binary files /dev/null and b/static/img/cover/news.png differ diff --git a/static/img/einundzwanzig-square.svg b/static/img/einundzwanzig-square.svg index 8dd1beb234f..abff7b27119 100644 --- a/static/img/einundzwanzig-square.svg +++ b/static/img/einundzwanzig-square.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/img/favicon/android-chrome-192x192.png b/static/img/favicon/android-chrome-192x192.png index 0ca1811f3db..c2dbed4d441 100644 Binary files a/static/img/favicon/android-chrome-192x192.png and b/static/img/favicon/android-chrome-192x192.png differ diff --git a/static/img/favicon/android-chrome-512x512.png b/static/img/favicon/android-chrome-512x512.png index 5845f74c0bd..3fb477949de 100644 Binary files a/static/img/favicon/android-chrome-512x512.png and b/static/img/favicon/android-chrome-512x512.png differ diff --git a/static/img/favicon/apple-touch-icon.png b/static/img/favicon/apple-touch-icon.png index a5bdb7e094f..18664299931 100644 Binary files a/static/img/favicon/apple-touch-icon.png and b/static/img/favicon/apple-touch-icon.png differ diff --git a/static/img/favicon/favicon.svg b/static/img/favicon/favicon.svg index 8dd1beb234f..abff7b27119 100644 --- a/static/img/favicon/favicon.svg +++ b/static/img/favicon/favicon.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/img/favicon/mstile-144x144.png b/static/img/favicon/mstile-144x144.png index f65c53bebb4..97a2ef91423 100644 Binary files a/static/img/favicon/mstile-144x144.png and b/static/img/favicon/mstile-144x144.png differ diff --git a/static/img/favicon/mstile-150x150.png b/static/img/favicon/mstile-150x150.png index 8d4f94f463a..7a021b742a6 100644 Binary files a/static/img/favicon/mstile-150x150.png and b/static/img/favicon/mstile-150x150.png differ diff --git a/static/img/favicon/mstile-310x150.png b/static/img/favicon/mstile-310x150.png index 6d26cfbdf92..64e9f43e3ec 100644 Binary files a/static/img/favicon/mstile-310x150.png and b/static/img/favicon/mstile-310x150.png differ diff --git a/static/img/favicon/mstile-310x310.png b/static/img/favicon/mstile-310x310.png index 25f0227c760..17720d83a3d 100644 Binary files a/static/img/favicon/mstile-310x310.png and b/static/img/favicon/mstile-310x310.png differ diff --git a/static/img/favicon/mstile-70x70.png b/static/img/favicon/mstile-70x70.png index fc3ffddffd6..6d5acefcce7 100644 Binary files a/static/img/favicon/mstile-70x70.png and b/static/img/favicon/mstile-70x70.png differ diff --git a/static/img/favicon/safari-pinned-tab.svg b/static/img/favicon/safari-pinned-tab.svg index f2e9cbcadd7..51d0421f36a 100644 --- a/static/img/favicon/safari-pinned-tab.svg +++ b/static/img/favicon/safari-pinned-tab.svg @@ -1,60 +1 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/img/team/daniel.jpg b/static/img/team/daniel.jpg index 5648af0a2e9..d1d95e3c92b 100644 Binary files a/static/img/team/daniel.jpg and b/static/img/team/daniel.jpg differ diff --git a/static/img/team/dennis.png b/static/img/team/dennis.png index f4721fd4ee8..3961fd13b61 100644 Binary files a/static/img/team/dennis.png and b/static/img/team/dennis.png differ diff --git a/static/img/team/fab.jpg b/static/img/team/fab.jpg index cac56e03dd2..26b44982cda 100644 Binary files a/static/img/team/fab.jpg and b/static/img/team/fab.jpg differ diff --git a/static/img/team/gigi.jpg b/static/img/team/gigi.jpg index 1cdc89b4a0c..3ce0a0aeeb1 100644 Binary files a/static/img/team/gigi.jpg and b/static/img/team/gigi.jpg differ diff --git a/static/img/team/markus.jpg b/static/img/team/markus.jpg index 12ae2664469..ae1a9212266 100644 Binary files a/static/img/team/markus.jpg and b/static/img/team/markus.jpg differ diff --git a/tasks/fetch_feed.js b/tasks/fetch_feed.js index ba688e105ef..814ed094f2e 100644 --- a/tasks/fetch_feed.js +++ b/tasks/fetch_feed.js @@ -13,13 +13,11 @@ const slugify = str => str.toLowerCase() const parseInfo = e => { const titleMatch = e.title.match(/([\w\s]+?)?\s?#(\d+) - (.*)/) let [, categoryName = 'News', number, titlePlain] = titleMatch ? titleMatch : [,,,e.title] - if (!number) categoryName = 'Verschiedenes' const blockMatch = e.contentSnippet.match(/Blockzeit\s(\d+)/) const block = blockMatch ? parseInt(blockMatch[1]) : null const category = slugify(categoryName) const slug = slugify(`${categoryName} ${number || ''} ${titlePlain}`) - return { block, category, categoryName, number, titlePlain, slug } } @@ -31,20 +29,25 @@ const parseInfo = e => { write('feed', feed) // All episodes - 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, - duration: e.itunes.duration, - image: e.itunes.image, - season: e.itunes.season, - episode: e.itunes.episode, - guid: e.guid, - ...parseInfo(e) - })) + const episodes = feed.items.map(e => { + const info = parseInfo(e) + const image = info.category === 'interview' ? e.itunes.image : `/img/cover/${info.category}.png` + return { + title: e.title.trim(), + content: e.content.trim(), + contentSnippet: e.contentSnippet.trim(), + anchor: e.link, + date: e.isoDate, + enclosure: e.enclosure, + duration: e.itunes.duration, + season: e.itunes.season, + episode: e.itunes.episode, + guid: e.guid, + image, + originalImage: e.itunes.image, + ...info + } + }) write('episodes', episodes) })()