From d2f2c12064f0bed73987402351919b7fd43db753 Mon Sep 17 00:00:00 2001
From: Ciffelia <mc.prince.0203@gmail.com>
Date: Thu, 7 Dec 2023 20:42:34 +0900
Subject: [PATCH] =?UTF-8?q?=E8=91=97=E8=80=85=E3=81=A8=E3=82=BF=E3=82=B0?=
 =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AE=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BF=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=8C=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E3=81=AB=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=82=8A=E5=AD=98=E5=9C=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=82=8A?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/blog/icon/AuthorIcon.astro     |  3 ++-
 src/components/blog/icon/TagIcon.astro        | 23 ++++++++++++-------
 src/components/blog/tag/TagListItemCard.astro |  2 +-
 src/components/blog/tag/TagSmallList.astro    |  2 +-
 src/pages/blog/tags/[slug]/index.astro        |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/blog/icon/AuthorIcon.astro b/src/components/blog/icon/AuthorIcon.astro
index 2e93e91..d848f8f 100644
--- a/src/components/blog/icon/AuthorIcon.astro
+++ b/src/components/blog/icon/AuthorIcon.astro
@@ -21,7 +21,7 @@ const image =
   image.type === 'svg' ? (
     <Icon
       name={image.name}
-      alt={`${image.name} のアイコン`}
+      alt={`${author.name} のアイコン`}
       class="aspect-square rounded-full"
       height={size}
       width={size}
@@ -30,6 +30,7 @@ const image =
   ) : image.type === 'external-url' ? (
     <img
       src={image.url}
+      alt={`${author.name} のアイコン`}
       height={size}
       width={size}
       class="aspect-square rounded-full"
diff --git a/src/components/blog/icon/TagIcon.astro b/src/components/blog/icon/TagIcon.astro
index 61b560f..4f2c368 100644
--- a/src/components/blog/icon/TagIcon.astro
+++ b/src/components/blog/icon/TagIcon.astro
@@ -2,27 +2,34 @@
 import Icon from '@/components/common/Icon.astro'
 import { unreachable } from '@/utils/unreachable'
 import type { CollectionEntry } from 'astro:content'
+
 interface Props {
-  tagImage: CollectionEntry<'tags'>['data']['image']
+  tag: CollectionEntry<'tags'>['data']
   size: number
 }
 
-const { tagImage, size } = Astro.props
+const { tag, size } = Astro.props
 ---
 
 {
-  tagImage.type === 'svg' ? (
+  tag.image.type === 'svg' ? (
     <Icon
-      name={tagImage.name}
-      alt={`${tagImage.name} のアイコン`}
+      name={tag.image.name}
+      alt={`${tag.name} のアイコン`}
       class="aspect-square"
       width={size}
       height={size}
       isBlog
     />
-  ) : tagImage.type === 'external-url' ? (
-    <img src={tagImage.url} height={size} width={size} class="aspect-square" />
+  ) : tag.image.type === 'external-url' ? (
+    <img
+      src={tag.image.url}
+      alt={`${tag.name} のアイコン`}
+      height={size}
+      width={size}
+      class="aspect-square"
+    />
   ) : (
-    unreachable(tagImage)
+    unreachable(tag.image)
   )
 }
diff --git a/src/components/blog/tag/TagListItemCard.astro b/src/components/blog/tag/TagListItemCard.astro
index daa0daa..c804b9a 100644
--- a/src/components/blog/tag/TagListItemCard.astro
+++ b/src/components/blog/tag/TagListItemCard.astro
@@ -13,7 +13,7 @@ const { id, articleCount, ...tag } = Astro.props
   class="block sm:basis-[calc((100%-0.75rem)/2)] bg-white rounded-xl border space-y-1 group"
 >
   <a class="w-full h-full p-4 flex items-center" href={`/blog/tags/${id}`}>
-    <TagIcon tagImage={tag.image} size={40} />
+    <TagIcon tag={tag} size={40} />
     <div class="px-2">
       <h2 class="text-xl font-bold line-clamp-1 group-hover:underline">
         {tag.name}
diff --git a/src/components/blog/tag/TagSmallList.astro b/src/components/blog/tag/TagSmallList.astro
index 7155fef..b7146c5 100644
--- a/src/components/blog/tag/TagSmallList.astro
+++ b/src/components/blog/tag/TagSmallList.astro
@@ -16,7 +16,7 @@ const { tags } = Astro.props
           href={`/blog/tags/${tag.id}`}
           class="flex items-center gap-1 bg-gray-100 hover:bg-gray-200 text-sm text-justify p-1 rounded-full"
         >
-          <TagIcon tagImage={tag.data.image} size={18} />
+          <TagIcon tag={tag.data} size={18} />
           <p>{tag.data.name}</p>
         </a>
       </li>
diff --git a/src/pages/blog/tags/[slug]/index.astro b/src/pages/blog/tags/[slug]/index.astro
index 9420589..83c20b9 100644
--- a/src/pages/blog/tags/[slug]/index.astro
+++ b/src/pages/blog/tags/[slug]/index.astro
@@ -33,7 +33,7 @@ const isShowAbout = tag.description || tag.site || tag.document || tag.github
   summarySize="summary"
 >
   <BlogTitle title={tag.name} background="white">
-    <Fragment slot="icon"><TagIcon tagImage={tag.image} size={80} /></Fragment>
+    <Fragment slot="icon"><TagIcon tag={tag} size={80} /></Fragment>
   </BlogTitle>
   <main class="flex flex-col h-full">
     {isShowAbout && <TagAboutSection tag={tag} />}