🐛 Fix Error

piro-hiroki · Mar 9, 2024 · 94dbf50 · 94dbf50
1 parent 0e16400
commit 94dbf50
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 26 deletions.
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
@@ -4,7 +4,7 @@ import type { CollectionEntry } from "astro:content";
 
 export interface Props {
   href?: string;
-  frontmatter: CollectionEntry<"blog">["data"];
+  frontmatter: CollectionEntry<"blog" | "policies">["data"];
   secHeading?: boolean;
 }
 

diff --git a/src/components/Search.tsx b/src/components/Search.tsx
@@ -6,7 +6,7 @@ import type { CollectionEntry } from "astro:content";
 export type SearchItem = {
   title: string;
   description: string;
-  data: CollectionEntry<"blog">["data"];
+  data: CollectionEntry<"blog" | "policies">["data"];
   slug: string;
 };
 
@@ -83,9 +83,9 @@ export default function SearchBar({ searchList }: Props) {
           <span className="sr-only">Search</span>
         </span>
         <input
-          className="block w-full rounded border border-skin-fill 
+          className="block w-full rounded border border-skin-fill
         border-opacity-40 bg-skin-fill py-3 pl-10
-        pr-3 placeholder:italic placeholder:text-opacity-75 
+        pr-3 placeholder:italic placeholder:text-opacity-75
         focus:border-skin-accent focus:outline-none"
           placeholder="Search for anything..."
           type="text"

diff --git a/src/layouts/Policies.astro b/src/layouts/Policies.astro
@@ -11,7 +11,7 @@ import { SITE } from "@config";
 export interface Props {
   currentPage: number;
   totalPages: number;
-  paginatedPosts: CollectionEntry<"blog">[];
+  paginatedPosts: CollectionEntry<"blog" | "policies">[];
 }
 
 const { currentPage, totalPages, paginatedPosts } = Astro.props;

diff --git a/src/layouts/PolicyDetails.astro b/src/layouts/PolicyDetails.astro
@@ -1,15 +1,12 @@
 ---
 import Layout from "@layouts/Layout.astro";
-import Footer from "@components/Footer.astro";
-import Tag from "@components/Tag.astro";
 import Datetime from "@components/Datetime";
 import type { CollectionEntry } from "astro:content";
 import { slugifyStr } from "@utils/slugify";
-import ShareLinks from "@components/ShareLinks.astro";
 import { SITE } from "@config";
 
 export interface Props {
-  post: CollectionEntry<"blog">;
+  post: CollectionEntry<"blog" | "policies">;
 }
 
 const { post } = Astro.props;

diff --git a/src/layouts/PostDetails.astro b/src/layouts/PostDetails.astro
@@ -10,7 +10,7 @@ import ShareLinks from "@components/ShareLinks.astro";
 import { SITE } from "@config";
 
 export interface Props {
-  post: CollectionEntry<"blog">;
+  post: CollectionEntry<"blog" | "policies">;
 }
 
 const { post } = Astro.props;

diff --git a/src/layouts/Posts.astro b/src/layouts/Posts.astro
@@ -11,7 +11,7 @@ import { SITE } from "@config";
 export interface Props {
   currentPage: number;
   totalPages: number;
-  paginatedPosts: CollectionEntry<"blog">[];
+  paginatedPosts: CollectionEntry<"blog" | "policies">[];
 }
 
 const { currentPage, totalPages, paginatedPosts } = Astro.props;

diff --git a/src/layouts/TagPosts.astro b/src/layouts/TagPosts.astro
@@ -11,7 +11,7 @@ import { SITE } from "@config";
 export interface Props {
   currentPage: number;
   totalPages: number;
-  paginatedPosts: CollectionEntry<"blog">[];
+  paginatedPosts: CollectionEntry<"blog" | "policies">[];
   tag: string;
   tagName: string;
 }

diff --git a/src/pages/posts/[slug]/index.astro b/src/pages/posts/[slug]/index.astro
@@ -7,7 +7,7 @@ import getPageNumbers from "@utils/getPageNumbers";
 import getPagination from "@utils/getPagination";
 
 export interface Props {
-  post: CollectionEntry<"blog">;
+  post: CollectionEntry<"blog" | "policies">;
 }
 
 export async function getStaticPaths() {

diff --git a/src/pages/posts/[slug]/index.png.ts b/src/pages/posts/[slug]/index.png.ts
@@ -15,6 +15,9 @@ export async function getStaticPaths() {
 }
 
 export const GET: APIRoute = async ({ props }) =>
-  new Response(await generateOgImageForPost(props as CollectionEntry<"blog">), {
-    headers: { "Content-Type": "image/png" },
-  });
+  new Response(
+    await generateOgImageForPost(props as CollectionEntry<"blog" | "policies">),
+    {
+      headers: { "Content-Type": "image/png" },
+    }
+  );
diff --git a/src/pages/privacy-policies/[slug]/index.png.ts b/src/pages/privacy-policies/[slug]/index.png.ts
@@ -15,6 +15,9 @@ export async function getStaticPaths() {
 }
 
 export const GET: APIRoute = async ({ props }) =>
-  new Response(await generateOgImageForPost(props as CollectionEntry<"blog">), {
-    headers: { "Content-Type": "image/png" },
-  });
+  new Response(
+    await generateOgImageForPost(props as CollectionEntry<"blog" | "policies">),
+    {
+      headers: { "Content-Type": "image/png" },
+    }
+  );
diff --git a/src/pages/tags/[tag]/[page].astro b/src/pages/tags/[tag]/[page].astro
@@ -7,7 +7,7 @@ import getPageNumbers from "@utils/getPageNumbers";
 import getPagination from "@utils/getPagination";
 
 export interface Props {
-  post: CollectionEntry<"blog">;
+  post: CollectionEntry<"blog" | "policies">;
   tag: string;
   tagName: string;
 }

diff --git a/src/utils/generateOgImages.tsx b/src/utils/generateOgImages.tsx
@@ -48,7 +48,9 @@ function svgBufferToPngBuffer(svg: string) {
   return pngData.asPng();
 }
 
-export async function generateOgImageForPost(post: CollectionEntry<"blog">) {
+export async function generateOgImageForPost(
+  post: CollectionEntry<"blog" | "policies">
+) {
   const svg = await satori(postOgImage(post), options);
   return svgBufferToPngBuffer(svg);
 }

diff --git a/src/utils/getPostsByTag.ts b/src/utils/getPostsByTag.ts
@@ -2,7 +2,10 @@ import type { CollectionEntry } from "astro:content";
 import getSortedPosts from "./getSortedPosts";
 import { slugifyAll } from "./slugify";
 
-const getPostsByTag = (posts: CollectionEntry<"blog">[], tag: string) =>
+const getPostsByTag = (
+  posts: CollectionEntry<"blog" | "policies">[],
+  tag: string
+) =>
   getSortedPosts(
     posts.filter(post => slugifyAll(post.data.tags).includes(tag))
   );

diff --git a/src/utils/getSortedPosts.ts b/src/utils/getSortedPosts.ts
@@ -1,7 +1,7 @@
 import type { CollectionEntry } from "astro:content";
 import postFilter from "./postFilter";
 
-const getSortedPosts = (posts: CollectionEntry<"blog">[]) => {
+const getSortedPosts = (posts: CollectionEntry<"blog" | "policies">[]) => {
   if (!posts) return [];
 
   return posts

diff --git a/src/utils/getUniqueTags.ts b/src/utils/getUniqueTags.ts
@@ -7,7 +7,7 @@ interface Tag {
   tagName: string;
 }
 
-const getUniqueTags = (posts: CollectionEntry<"blog">[]) => {
+const getUniqueTags = (posts: CollectionEntry<"blog" | "policies">[]) => {
   const tags: Tag[] = posts
     .filter(postFilter)
     .flatMap(post => post.data.tags)

diff --git a/src/utils/og-templates/post.tsx b/src/utils/og-templates/post.tsx
@@ -1,7 +1,7 @@
 import { SITE } from "@config";
 import type { CollectionEntry } from "astro:content";
 
-export default (post: CollectionEntry<"blog">) => {
+export default (post: CollectionEntry<"blog" | "policies">) => {
   return (
     <div
       style={{

diff --git a/src/utils/postFilter.ts b/src/utils/postFilter.ts
@@ -1,7 +1,7 @@
 import { SITE } from "@config";
 import type { CollectionEntry } from "astro:content";
 
-const postFilter = ({ data }: CollectionEntry<"blog">) => {
+const postFilter = ({ data }: CollectionEntry<"blog" | "policies">) => {
   const isPublishTimePassed =
     Date.now() >
     new Date(data.pubDatetime).getTime() - SITE.scheduledPostMargin;