update frontend to use sveltekit env module

pull/3/head
TZGyn 2 years ago
parent 86cb005ab1
commit 7d35e8d641
Signed by: TZGyn
GPG Key ID: 122EAF77AE81FD4A

@ -1,6 +1,7 @@
import { drizzle } from 'drizzle-orm/postgres-js' import { drizzle } from 'drizzle-orm/postgres-js'
import postgres from 'postgres' import postgres from 'postgres'
import * as schema from './schema' import * as schema from './schema'
import { env } from '$env/dynamic/private'
const client = postgres(Bun.env.DATABASE_URL ?? '') const client = postgres(env.DATABASE_URL)
export const db = drizzle(client, { schema }) export const db = drizzle(client, { schema })

@ -1,8 +0,0 @@
import { z } from 'zod'
const envSchema = z.object({
DATABASE_URL: z.string().url(),
PUBLIC_SHORTENER_URL: z.string(),
})
export const env = envSchema.parse(process.env)

@ -1,3 +1,4 @@
import { env } from '$env/dynamic/public'
import type { LayoutServerLoad } from './$types' import type { LayoutServerLoad } from './$types'
export const load = (async (event) => { export const load = (async (event) => {
@ -8,7 +9,7 @@ export const load = (async (event) => {
const page_title = 'Home' const page_title = 'Home'
return { return {
shortener_url: Bun.env.PUBLIC_SHORTENER_URL ?? '', shortener_url: env.PUBLIC_SHORTENER_URL,
user: user, user: user,
breadcrumbs, breadcrumbs,
page_title, page_title,

@ -7,6 +7,7 @@ import { db } from '$lib/db'
import { user as userSchema } from '$lib/db/schema' import { user as userSchema } from '$lib/db/schema'
import { eq } from 'drizzle-orm' import { eq } from 'drizzle-orm'
import { lucia } from '$lib/server/auth' import { lucia } from '$lib/server/auth'
import { env } from '$env/dynamic/private'
export const load = (async (event) => { export const load = (async (event) => {
return { return {
@ -44,7 +45,7 @@ export const actions: Actions = {
event.cookies.set(sessionCookie.name, sessionCookie.value, { event.cookies.set(sessionCookie.name, sessionCookie.value, {
...sessionCookie.attributes, ...sessionCookie.attributes,
path: '/', path: '/',
secure: Bun.env.APP_ENV === 'prod', secure: env.APP_ENV === 'prod',
}) })
return { return {

@ -7,6 +7,7 @@ import { db } from '$lib/db'
import { user as userSchema } from '$lib/db/schema' import { user as userSchema } from '$lib/db/schema'
import { eq } from 'drizzle-orm' import { eq } from 'drizzle-orm'
import { lucia } from '$lib/server/auth' import { lucia } from '$lib/server/auth'
import { env } from '$env/dynamic/private'
export const load = (async (event) => { export const load = (async (event) => {
return { return {
@ -53,7 +54,7 @@ export const actions: Actions = {
event.cookies.set(sessionCookie.name, sessionCookie.value, { event.cookies.set(sessionCookie.name, sessionCookie.value, {
...sessionCookie.attributes, ...sessionCookie.attributes,
path: '/', path: '/',
secure: Bun.env.APP_ENV === 'prod', secure: env.APP_ENV === 'prod',
}) })
return { return {

@ -1,3 +1,4 @@
import { env } from '$env/dynamic/private'
import { lucia } from '$lib/server/auth' import { lucia } from '$lib/server/auth'
import type { RequestHandler } from './$types' import type { RequestHandler } from './$types'
@ -19,7 +20,7 @@ export const POST: RequestHandler = async (event) => {
event.cookies.set(sessionCookie.name, sessionCookie.value, { event.cookies.set(sessionCookie.name, sessionCookie.value, {
...sessionCookie.attributes, ...sessionCookie.attributes,
path: '/', path: '/',
secure: Bun.env.APP_ENV === 'prod', secure: env.APP_ENV === 'prod',
}) })
return new Response(JSON.stringify({ success: true })) return new Response(JSON.stringify({ success: true }))
} }

@ -4,8 +4,9 @@ import { eq } from 'drizzle-orm'
import type { RequestHandler } from './$types' import type { RequestHandler } from './$types'
import QRCode from 'qrcode' import QRCode from 'qrcode'
import { redirect } from '@sveltejs/kit' import { redirect } from '@sveltejs/kit'
import { env } from '$env/dynamic/private'
const shortenerUrl = Bun.env.PUBLIC_SHORTENER_URL ?? '' const shortenerUrl = env.PUBLIC_SHORTENER_URL
export const GET: RequestHandler = async (event) => { export const GET: RequestHandler = async (event) => {
const shortenerId = event.params.id const shortenerId = event.params.id

Loading…
Cancel
Save