diff --git a/src/assets/images/www-thumb.png b/src/assets/images/www-thumb.png new file mode 100644 index 00000000..ae9080a9 Binary files /dev/null and b/src/assets/images/www-thumb.png differ diff --git a/src/components/Podcast.astro b/src/components/Podcast.astro index 1ac76076..522f4564 100644 --- a/src/components/Podcast.astro +++ b/src/components/Podcast.astro @@ -56,6 +56,24 @@ function slugify(str) {
+ + { + podcast.link === 'https://chinchillasqueaks.substack.com/podcast' ? ( + + Chinchilla Squeaks + + ) : ( + + whisky, Words, & Wit + + ) + }

{ diff --git a/src/components/widgets/Content.astro b/src/components/widgets/Content.astro index 5ac4d1b9..372f7787 100644 --- a/src/components/widgets/Content.astro +++ b/src/components/widgets/Content.astro @@ -1,5 +1,5 @@ --- -import Icon from 'astro-icon/components'; +import { Icon } from 'astro-icon/components'; import { Image } from 'astro:assets'; // TODO: Is this used or can it be upgraded? @@ -21,9 +21,6 @@ export interface Props { } const { - title = await Astro.slots.render('title'), - subtitle = await Astro.slots.render('subtitle'), - highlight, content = await Astro.slots.render('content'), items = [], image = await Astro.slots.render('image'), @@ -32,31 +29,7 @@ const { } = Astro.props; --- -
-
- { - (title || subtitle || highlight) && ( -
- {highlight && ( -

- )} - {title && ( -

- )} - - {subtitle && ( -

- )} -

- ) - } -
+
@@ -65,17 +38,13 @@ const { { items && (
- {items.map(({ title: title2, description, icon }) => ( + {items.map(({ title: title2, link, icon }) => (
-
- +
+
-
- {title2 &&

{title2}

} - {description &&

} -

))}
diff --git a/src/components/widgets/Features.astro b/src/components/widgets/Features.astro index 7b229093..bb549fd9 100644 --- a/src/components/widgets/Features.astro +++ b/src/components/widgets/Features.astro @@ -1,17 +1,19 @@ --- import { Icon } from 'astro-icon/components'; +import { getPermalink } from '~/utils/permalinks'; interface Item { - title: string; - description: string; + title?: string; + description?: string; icon?: string; + permalink: string; } export interface Props { title?: string; subtitle?: string; highlight?: string; - items: Array>; + items: Array; } const { @@ -22,50 +24,27 @@ const { } = Astro.props; --- -
-
- { - (title || subtitle || highlight) && ( -
- {highlight && ( -

- )} - {title && ( -

- )} +
+
+
- {subtitle && ( -

- )} -

- ) - } -
- { - items.map((subitems) => ( -
- {subitems.map(({ title, description, icon }) => ( -
-
-
- {icon && } -
-
-
-

{title}

-

-

+
+ { + items.map(({ title, description, icon, permalink }) => ( +
+
+ +
{title}
- ))} -
- )) - } + {description &&

} + {title} +

+ )) + } +
diff --git a/src/pages/podcast/[...page].astro b/src/pages/podcast/[...page].astro index 7123bc3c..f8354c95 100644 --- a/src/pages/podcast/[...page].astro +++ b/src/pages/podcast/[...page].astro @@ -40,7 +40,7 @@ const { page } = Astro.props; const meta = { title: 'Podcasts', description: - 'My pre-eminent podcast, Chinchilla Squeaks, has run for nearly eight years and taken me all over the globe. I have dabbled in other shows. They will be listed here again in the near future.', + 'Hear me ramble. Hear me roar! Drink whisky, cover the news, and more.', // canonical: post.canonical || url, // image: await findImage(post.image), // noindex: BLOG?.post?.noindex, @@ -53,6 +53,7 @@ const meta = { {meta.title} +
    { page.data.map((episode) => ( diff --git a/src/pages/podcast/chinchillasqueaks/[...page].astro b/src/pages/podcast/chinchillasqueaks/[...page].astro index 82fbb5ef..e49e7b99 100644 --- a/src/pages/podcast/chinchillasqueaks/[...page].astro +++ b/src/pages/podcast/chinchillasqueaks/[...page].astro @@ -30,7 +30,7 @@ const { page } = Astro.props; const meta = { title: 'Podcasts', description: - 'My pre-eminent podcast, Chinchilla Squeaks, has run for nearly eight years and taken me all over the globe. I have dabbled in other shows. They will be listed here again in the near future.', + 'My pre-eminent podcast, Chinchilla Squeaks, has run for nearly eight years and taken me all over the globe. It runs every other week as an interview with a tech or creative luminary and every other week featuring interesting links and news.', // canonical: post.canonical || url, // image: await findImage(post.image), // noindex: BLOG?.post?.noindex, diff --git a/src/pages/podcast/whiskeywordswit/[...page].astro b/src/pages/podcast/whiskywordswit/[...page].astro similarity index 70% rename from src/pages/podcast/whiskeywordswit/[...page].astro rename to src/pages/podcast/whiskywordswit/[...page].astro index adfa7453..10a60af7 100644 --- a/src/pages/podcast/whiskeywordswit/[...page].astro +++ b/src/pages/podcast/whiskywordswit/[...page].astro @@ -5,8 +5,10 @@ import { PODCAST } from '~/config.mjs'; import Podcast from '~/components/Podcast.astro'; import { XMLParser } from 'fast-xml-parser'; import { Pagination } from 'accessible-astro-components'; -// TODO: Feels odd to duplicate calls to API for generating each individual items and the pagination? +import Content from '~/components/widgets/Content.astro'; +import showImage from '../../../assets/images/www-thumb.png'; +// TODO: Feels odd to duplicate calls to API for generating each individual items and the pagination? export async function getStaticPaths({ paginate }) { const options = { ignoreAttributes: false, @@ -26,9 +28,9 @@ export async function getStaticPaths({ paginate }) { const { page } = Astro.props; const meta = { - title: 'Podcasts', + title: 'Whisky, Words, & Wit', description: - 'My pre-eminent podcast, Chinchilla Squeaks, has run for nearly eight years and taken me all over the globe. I have dabbled in other shows. They will be listed here again in the near future.', + "My podcast with Mustafa Keksin, where we get together, drink whisk(e)y and discuss life, writing, and the trials and tribulations of getting old. Along the way there's jokes, stories, and more.", // canonical: post.canonical || url, // image: await findImage(post.image), // noindex: BLOG?.post?.noindex, @@ -41,6 +43,28 @@ const meta = { {meta.title} + + +
    +
    +
    +
      { page.data.map((episode) => ( diff --git a/src/pages/podcast/whiskeywordswit/[...slug].astro b/src/pages/podcast/whiskywordswit/[...slug].astro similarity index 98% rename from src/pages/podcast/whiskeywordswit/[...slug].astro rename to src/pages/podcast/whiskywordswit/[...slug].astro index a2f678bb..578548ec 100644 --- a/src/pages/podcast/whiskeywordswit/[...slug].astro +++ b/src/pages/podcast/whiskywordswit/[...slug].astro @@ -1,6 +1,5 @@ --- import PodcastLayout from '~/layouts/PodcastLayout.astro'; -import Podcast from '~/components/Podcast.astro'; import { XMLParser } from 'fast-xml-parser'; import { getEntry } from 'astro:content';