diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index bd5535a..0000000 --- a/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -pnpm-lock.yaml diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index e170e21..0000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "tabWidth": 2, - "trailingComma": "es5", - "printWidth": 100, - "semi": true, - "singleQuote": false -} diff --git a/app/.env.example b/app/.env.example index e963dd3..822b4f7 100644 --- a/app/.env.example +++ b/app/.env.example @@ -16,8 +16,8 @@ AUTH_SECRET="" GOOGLE_CLIENT_ID="" GOOGLE_CLIENT_SECRET="" -PUBLIC_SUPABASE_URL="" -PUBLIC_SUPABASE_KEY="" +SUPABASE_URL="" +SUPABASE_KEY="" SUPABASE_CONNECTION_STRING="" SMTP_HOST="" diff --git a/app/.prettierignore b/app/.prettierignore index f4401a3..a3be346 100644 --- a/app/.prettierignore +++ b/app/.prettierignore @@ -6,3 +6,7 @@ node_modules .env .env.* !.env.example +pnpm-lock.yaml +sanity.model.ts +kysely.model.ts +database.model.ts diff --git a/app/src/components/shared/EventInfoBox.svelte b/app/src/components/shared/EventInfoBox.svelte index efdf839..b7c0f28 100644 --- a/app/src/components/shared/EventInfoBox.svelte +++ b/app/src/components/shared/EventInfoBox.svelte @@ -7,7 +7,7 @@
@@ -23,7 +23,7 @@
- {formatTime(event.start)} - {formatTime(event.end)} + {formatTime(event.start)} - {formatTime(event.end)}
diff --git a/app/src/components/shared/Footer.svelte b/app/src/components/shared/Footer.svelte index 0b2ba61..1fe7f4a 100644 --- a/app/src/components/shared/Footer.svelte +++ b/app/src/components/shared/Footer.svelte @@ -20,31 +20,31 @@
Sertifiseringer
Miljøfyrtårn-sertifisering - DNV-sertifisering - + DNV-sertifisering +
- Capra-logo - + Capra-logo + - Liflig-logo - + Liflig-logo + - Fryde-logo - + Fryde-logo +
diff --git a/app/src/lib/actions/external/action.ts b/app/src/lib/actions/external/action.ts index 1c72d3d..7708c69 100644 --- a/app/src/lib/actions/external/action.ts +++ b/app/src/lib/actions/external/action.ts @@ -141,7 +141,7 @@ export const submitRegistrationExternal: Actions["submitRegistrationExternal"] = } if (foodPreference) { - await insertEventFoodPreference(transaction, { event_id, text: foodPreference }); + await insertEventFoodPreference(transaction, { event_id, value: foodPreference }); } }); } catch (error) { diff --git a/app/src/lib/server/supabase/api.ts b/app/src/lib/server/supabase/api.ts index b443ea4..79b0b2d 100644 --- a/app/src/lib/server/supabase/api.ts +++ b/app/src/lib/server/supabase/api.ts @@ -1,4 +1,4 @@ -import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_KEY } from "$env/static/public"; +import { SUPABASE_URL, SUPABASE_KEY } from "$env/static/private"; export function assertEnvVar(value: T | undefined, name: string): T { if (value === undefined) { @@ -7,5 +7,5 @@ export function assertEnvVar(value: T | undefined, name: string): T { return value; } -export const supabaseUrl = assertEnvVar(PUBLIC_SUPABASE_URL, "PUBLIC_SUPABASE_URL"); -export const supabaseKey = assertEnvVar(PUBLIC_SUPABASE_KEY, "PUBLIC_SUPABASE_KEY"); +export const supabaseUrl = assertEnvVar(SUPABASE_URL, "SUPABASE_URL"); +export const supabaseKey = assertEnvVar(SUPABASE_KEY, "SUPABASE_KEY"); diff --git a/package.json b/package.json deleted file mode 100644 index 1076702..0000000 --- a/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "capra-web", - "version": "1.0.0", - "description": "Capra, Liflig og Fryde Arrangementer", - "private": true, - "scripts": { - "dev": "pnpm -r dev", - "build": "pnpm -r build" - }, - "packageManager": "pnpm@9.0.6" -} diff --git a/studio/.prettierignore b/studio/.prettierignore index 94c4814..f7a5d25 100644 --- a/studio/.prettierignore +++ b/studio/.prettierignore @@ -4,4 +4,7 @@ dist .sanity .env .env.* -!.env.example \ No newline at end of file +!.env.example +pnpm-lock.yaml +sanity.model.ts +database.model.ts diff --git a/studio/actions/delete-event.tsx b/studio/actions/delete-event.tsx index 4de9acd..4629c39 100644 --- a/studio/actions/delete-event.tsx +++ b/studio/actions/delete-event.tsx @@ -4,7 +4,7 @@ import { Card, Stack, Text, Button, useToast } from "@sanity/ui"; import { useState } from "react"; export function createExtendedEventDeleteAction(originalDeleteAction: DocumentActionComponent) { - const EventDeleteAction = (props: DocumentActionProps) => { + const EventDeleteAction: DocumentActionComponent = (props: DocumentActionProps) => { const toast = useToast(); const originalResult = originalDeleteAction(props); const operation = useDocumentOperation(props.id, props.type);