From e1435874047ada8c9f05ed74eee40bc0f2d441cd Mon Sep 17 00:00:00 2001 From: haetae Date: Mon, 22 Sep 2025 16:50:13 -0400 Subject: [PATCH] fix admin --- db/seed.ts | 8 ++++---- src/pages/guestbook/admin.astro | 6 ++++-- src/utils/formatDate.ts | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/db/seed.ts b/db/seed.ts index 3b5e337..003e458 100644 --- a/db/seed.ts +++ b/db/seed.ts @@ -1,9 +1,9 @@ -import { db, Guestbook } from 'astro:db'; +import { db } from "db"; +import { guestbookTable } from "./schema"; -// https://astro.build/db/seed export default async function seed() { - await db.insert(Guestbook).values([ - { id: 1, username: "test user", message: "this is a message!", published: new Date("2025-05-01") }, + await db.insert(guestbookTable).values([ + { id: 1, username: "test user", message: "this is a message!" }, { id: 2, username: "heylo", website: "https://world.org", message: "hiii!!" }, ]); } diff --git a/src/pages/guestbook/admin.astro b/src/pages/guestbook/admin.astro index de9bf71..56bdcea 100644 --- a/src/pages/guestbook/admin.astro +++ b/src/pages/guestbook/admin.astro @@ -3,7 +3,9 @@ export const prerender = false; import { Font } from "astro:assets"; import { actions } from "astro:actions"; -import { db, desc, Guestbook } from "astro:db"; +import { desc } from "drizzle-orm"; +import { db } from "db"; +import { guestbookTable } from "db/schema"; import Layout from "@/layouts/Layout.astro"; import formatDate from "@/utils/formatDate"; @@ -14,7 +16,7 @@ if (!import.meta.env.DEV) { return Astro.redirect("/guestbook"); } -const entries = await db.select().from(Guestbook).orderBy(desc(Guestbook.published)); +const entries = await db.select().from(guestbookTable).orderBy(desc(guestbookTable.published)); --- diff --git a/src/utils/formatDate.ts b/src/utils/formatDate.ts index 08c9a58..c345be7 100644 --- a/src/utils/formatDate.ts +++ b/src/utils/formatDate.ts @@ -3,7 +3,7 @@ import utc from "dayjs/plugin/utc"; dayjs.extend(utc); -export default function (date: string, iso = false, format?: string) { +export default function (date: Date | string, iso = false, format?: string) { if (iso) { return dayjs(date).utc(true).toISOString(); } else {