diff --git a/prisma/migrations/20220513132026_auto_excerpt/migration.sql b/prisma/migrations/20220513132026_auto_excerpt/migration.sql deleted file mode 100644 index 3f6573a3..00000000 --- a/prisma/migrations/20220513132026_auto_excerpt/migration.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* - Warnings: - - - Added the required column `autoExcerpt` to the `pages` table without a default value. This is not possible if the table is not empty. - -*/ --- AlterTable -ALTER TABLE "pages" ADD COLUMN "autoExcerpt" TEXT NOT NULL, -ALTER COLUMN "excerpt" DROP NOT NULL; diff --git a/prisma/migrations/20220513133748_auto_excerpt/migration.sql b/prisma/migrations/20220513133748_auto_excerpt/migration.sql new file mode 100644 index 00000000..087c4607 --- /dev/null +++ b/prisma/migrations/20220513133748_auto_excerpt/migration.sql @@ -0,0 +1,3 @@ +-- AlterTable +ALTER TABLE "pages" ADD COLUMN "autoExcerpt" TEXT, +ALTER COLUMN "excerpt" DROP NOT NULL; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d306424a..a3cc0817 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -112,7 +112,7 @@ model Page { title String content String excerpt String? - autoExcerpt String + autoExcerpt String? format String @default("markdown") slug String site Site @relation(name: "SitePages", fields: [siteId], references: [id], onDelete: Cascade) diff --git a/src/components/site/SiteHome.tsx b/src/components/site/SiteHome.tsx index d91e49f0..0dacdf96 100644 --- a/src/components/site/SiteHome.tsx +++ b/src/components/site/SiteHome.tsx @@ -9,6 +9,7 @@ export const SiteHome: React.FC<{ return (
{posts.nodes.map((post) => { + const excerpt = post.excerpt || post.autoExcerpt return (

@@ -20,8 +21,8 @@ export const SiteHome: React.FC<{ {formatDate(post.publishedAt)}

- {post.excerpt || post.autoExcerpt} - {"..."} + {excerpt} + {excerpt && "..."}
) diff --git a/src/lib/types.ts b/src/lib/types.ts index e5c5e391..ef1b0361 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -29,7 +29,7 @@ export type PostOnSiteHome = { id: string title: string excerpt?: string | null - autoExcerpt: string + autoExcerpt?: string | null slug: string publishedAt: string | Date } diff --git a/src/router/site.ts b/src/router/site.ts index 9bdb46bc..44eff261 100644 --- a/src/router/site.ts +++ b/src/router/site.ts @@ -80,7 +80,7 @@ export const siteRouter = createRouter() published: z.boolean(), slug: z.string(), excerpt: z.string().nullable(), - autoExcerpt: z.string(), + autoExcerpt: z.string().nullable(), }) ), total: z.number(), @@ -102,7 +102,7 @@ export const siteRouter = createRouter() title: z.string(), content: z.string(), excerpt: z.string().nullable(), - autoExcerpt: z.string(), + autoExcerpt: z.string().nullable(), published: z.boolean(), publishedAt: z.date().transform((v) => v.toISOString()), slug: z.string(),