fixup! fixup! Switch from Gatsby to Astro

john-kurkowski · May 2, 2024 · 246197c · 246197c
1 parent 0ad25b6
commit 246197c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/src/components/layouts/Seo.astro b/src/components/layouts/Seo.astro
@@ -1,16 +1,18 @@
 ---
-const { page, siteMetadata } = Astro.props
+const { frontmatter, siteMetadata } = Astro.props
 
 let title: string
-if (page.title && page.title.includes(siteMetadata.title)) {
-  title = page.title
-} else if (page.title) {
-  title = `${page.title} - ${siteMetadata.title}`
+if (frontmatter.title?.includes(siteMetadata.title)) {
+  title = frontmatter.title
+} else if (frontmatter.title) {
+  title = `${frontmatter.title} - ${siteMetadata.title}`
 } else {
   title = siteMetadata.title
 }
 
-const description = page.description || siteMetadata.description
+const date = frontmatter.date ? new Date(frontmatter.date) : null
+
+const description = frontmatter.description || siteMetadata.description
 ---
 
 <title>{title}</title>
@@ -22,7 +24,7 @@ const description = page.description || siteMetadata.description
 <meta name='description' content={description} />
 <meta name='twitter:description' content={description} />
 
-{page.dateForMeta && <meta httpEquiv='date' content={page.dateForMeta} />}
+{date && <meta httpEquiv='date' content={date} />}
 
 <meta charset='utf-8' />
 <meta content='John' key='profile:first_name' property='profile:first_name' />

diff --git a/src/components/layouts/base.astro b/src/components/layouts/base.astro
@@ -5,7 +5,7 @@ import Footer from './Footer.astro'
 import Nav from './Nav.astro'
 import Seo from './Seo.astro'
 
-const page = Astro.props
+const frontmatter = Astro.props.frontmatter || {}
 
 const siteMetadata = {
   description:
@@ -16,7 +16,7 @@ const siteMetadata = {
 ---
 
 <html class='bg-secondary' lang='en-US'>
-  <Seo page={page} siteMetadata={siteMetadata} />
+  <Seo frontmatter={frontmatter} siteMetadata={siteMetadata} />
   <body>
     <div class='flex min-h-full flex-col content-between font-serif'>
       <div class='flex-grow bg-background'>

diff --git a/src/components/layouts/page.astro b/src/components/layouts/page.astro
@@ -4,7 +4,7 @@ import Layout from './base.astro'
 const { frontmatter } = Astro.props
 ---
 
-<Layout>
+<Layout frontmatter={frontmatter}>
   <article>
     <header class='post'>
       <h2>{frontmatter.title}</h2>

diff --git a/src/components/layouts/post.astro b/src/components/layouts/post.astro
@@ -11,7 +11,7 @@ const DATE_DISPLAY_FORMAT = new Intl.DateTimeFormat('en-GB', {
 })
 ---
 
-<Layout>
+<Layout frontmatter={frontmatter}>
   <div class='text-sm'>
     <a class='link' href='/posts'> ↩ to Articles </a>
   </div>

diff --git a/src/pages/posts/index.astro b/src/pages/posts/index.astro
@@ -20,11 +20,15 @@ export function slugify(entry: CollectionEntry) {
   return filenameNoDateNoExt
 }
 
+const frontmatter = {
+  title: 'Articles',
+}
+
 const posts = await getCollection('posts')
 posts.reverse()
 ---
 
-<Layout>
+<Layout frontmatter={frontmatter}>
   <section class=''>
     <h2 class='heading text-3xl'>Articles</h2>