From 8a6823af194374f48dc5d7dc3644d1773a47bbae Mon Sep 17 00:00:00 2001 From: TZGyn Date: Sun, 14 Apr 2024 17:12:42 +0800 Subject: [PATCH] undo zod env due to stuff breaking --- frontend/src/lib/db/index.ts | 3 +-- frontend/src/lib/db/migrate.ts | 3 +-- frontend/src/routes/(app)/+layout.server.ts | 3 +-- frontend/src/routes/api/shortener/[id]/qr/+server.ts | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/src/lib/db/index.ts b/frontend/src/lib/db/index.ts index 693a1e6..6f55487 100644 --- a/frontend/src/lib/db/index.ts +++ b/frontend/src/lib/db/index.ts @@ -1,7 +1,6 @@ import { drizzle } from 'drizzle-orm/postgres-js' import postgres from 'postgres' import * as schema from './schema' -import { env } from '$lib/env' -const client = postgres(env.DATABASE_URL) +const client = postgres(Bun.env.DATABASE_URL ?? '') export const db = drizzle(client, { schema }) diff --git a/frontend/src/lib/db/migrate.ts b/frontend/src/lib/db/migrate.ts index 4745ecf..1c9ea4c 100644 --- a/frontend/src/lib/db/migrate.ts +++ b/frontend/src/lib/db/migrate.ts @@ -1,9 +1,8 @@ -import { env } from '$lib/env' import { drizzle } from 'drizzle-orm/postgres-js' import { migrate } from 'drizzle-orm/postgres-js/migrator' import postgres from 'postgres' -const sql = postgres(env.DATABASE_URL, { max: 1 }) +const sql = postgres(Bun.env.DATABASE_URL ?? '', { max: 1 }) const db = drizzle(sql) await migrate(db, { migrationsFolder: 'drizzle' }) diff --git a/frontend/src/routes/(app)/+layout.server.ts b/frontend/src/routes/(app)/+layout.server.ts index 74abd3a..53d0953 100644 --- a/frontend/src/routes/(app)/+layout.server.ts +++ b/frontend/src/routes/(app)/+layout.server.ts @@ -1,4 +1,3 @@ -import { env } from '$lib/env' import type { LayoutServerLoad } from './$types' export const load = (async (event) => { @@ -7,7 +6,7 @@ export const load = (async (event) => { const breadcrumbs = [{ name: 'Home', path: '/' }] return { - shortener_url: env.PUBLIC_SHORTENER_URL, + shortener_url: Bun.env.PUBLIC_SHORTENER_URL ?? '', user: user, breadcrumbs, } diff --git a/frontend/src/routes/api/shortener/[id]/qr/+server.ts b/frontend/src/routes/api/shortener/[id]/qr/+server.ts index e6b8ca4..2597c7a 100644 --- a/frontend/src/routes/api/shortener/[id]/qr/+server.ts +++ b/frontend/src/routes/api/shortener/[id]/qr/+server.ts @@ -4,9 +4,8 @@ import { eq } from 'drizzle-orm' import type { RequestHandler } from './$types' import QRCode from 'qrcode' import { redirect } from '@sveltejs/kit' -import { env } from '$lib/env' -const shortenerUrl = env.PUBLIC_SHORTENER_URL +const shortenerUrl = Bun.env.PUBLIC_SHORTENER_URL ?? '' export const GET: RequestHandler = async (event) => { const shortenerId = event.params.id