各記事でdescriptionが正しく設定されるように

tunamaguro · May 5, 2023 · e0f8630 · e0f8630
1 parent e843bc7
commit e0f8630
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/app/src/layouts/BaseLayout.astro b/app/src/layouts/BaseLayout.astro
@@ -2,14 +2,21 @@
 import { Layout } from "@/components/Layout";
 import Seo from "@/components/Seo/index.astro";
 
+interface Props {
+  title?: string;
+  description?: string;
+}
+
+const { description, title } = Astro.props;
+
 const siteTitle = "tunamaguro's blog";
 const author = "tunamaguro";
 ---
 
 <!DOCTYPE html>
 <html lang="ja">
   <head>
-    <Seo />
+    <Seo title={title} description={description} />
   </head>
   <body>
     <Layout siteTitle={siteTitle} author={author}>

diff --git a/app/src/layouts/MdLayout.astro b/app/src/layouts/MdLayout.astro
@@ -1,16 +1,20 @@
 ---
+import type { MDXLayoutProps, MarkdownLayoutProps } from "astro";
 import type { CollectionEntry } from "astro:content";
-type Props = {
-  frontmatter: CollectionEntry<"article">["data"];
-};
+
+type Props = MarkdownLayoutProps<CollectionEntry<"article">["data"]>;
 
 import BaseLayout from "./BaseLayout.astro";
 import { MdDetail } from "@/components/MdDetail";
+import { getMarkdownExcerpt } from "@/server/getMarkdownExcerpt";
+
+const { frontmatter, rawContent } = Astro.props;
 
-const { frontmatter } = Astro.props;
+// もしrawContentがなかったデフォルトのdescriptionを使用する
+const description = getMarkdownExcerpt(rawContent?.() ?? "") || undefined;
 ---
 
-<BaseLayout>
+<BaseLayout title={frontmatter.title} description={description}>
   <MdDetail
     title={frontmatter.title}
     emoji={frontmatter.emoji}