diff --git a/.gitignore b/.gitignore index 8fd765c..28000b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ test-results node_modules config.json +src/lib/data/tatort.db + # Output .output .vercel diff --git a/src/lib/config.ts b/src/lib/config.ts index 2e2bf34..0775514 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -1,3 +1,3 @@ import { readFileSync } from 'fs'; -export default JSON.parse(readFileSync('./config_prod.json').toString()); +export default JSON.parse(readFileSync('./config.json').toString()); diff --git a/src/lib/data/tatort.db b/src/lib/data/tatort.db index d881b8b..79e92c1 100644 Binary files a/src/lib/data/tatort.db and b/src/lib/data/tatort.db differ diff --git a/src/routes/(angemeldet)/list/+page.server.ts b/src/routes/(angemeldet)/list/+page.server.ts index 2ffaa7f..2053a67 100644 --- a/src/routes/(angemeldet)/list/+page.server.ts +++ b/src/routes/(angemeldet)/list/+page.server.ts @@ -1,10 +1,10 @@ -// import { getVorgaenge } from '$lib/server/vorgangService'; -// import type { PageServerLoad } from '../../(token-based)/view/$types'; +import { getVorgaenge } from '$lib/server/vorgangService'; +import type { PageServerLoad } from '../../(token-based)/view/$types'; -// export const load: PageServerLoad = async () => { -// const vorgangList = getVorgaenge(); +export const load: PageServerLoad = async () => { + const vorgangList = getVorgaenge(); -// return { -// vorgangList -// }; -// }; + return { + vorgangList + }; +}; diff --git a/src/routes/(angemeldet)/list/+page.svelte b/src/routes/(angemeldet)/list/+page.svelte index f4bd9f9..887096d 100644 --- a/src/routes/(angemeldet)/list/+page.svelte +++ b/src/routes/(angemeldet)/list/+page.svelte @@ -2,8 +2,10 @@ import Trash from '$lib/icons/Trash.svelte'; import Folder from '$lib/icons/Folder.svelte'; import EmptyList from '$lib/components/EmptyList.svelte'; + import type { PageData } from '../$types'; - let { data } = $props(); + // let { data } = $props(); + export let data: PageData; let vorgangList = data.vorgangList; let isEmptyList = vorgangList.length === 0; diff --git a/src/routes/(angemeldet)/list/+page.ts b/src/routes/(angemeldet)/list/+page.ts index 9d71305..4b9f323 100644 --- a/src/routes/(angemeldet)/list/+page.ts +++ b/src/routes/(angemeldet)/list/+page.ts @@ -1,12 +1,12 @@ -export async function load({fetch}){ - const vorgangResponse = await fetch(`/api/list`); - const vorgangList = await vorgangResponse.json(); +// export async function load({fetch}){ +// const vorgangResponse = await fetch(`/api/list`); +// const vorgangList = await vorgangResponse.json(); - return { +// return { - vorgangList, +// vorgangList, - } -} +// } +// } diff --git a/src/routes/(token-based)/list/[vorgang]/+page.svelte b/src/routes/(token-based)/list/[vorgang]/+page.svelte index 8b50966..b825977 100644 --- a/src/routes/(token-based)/list/[vorgang]/+page.svelte +++ b/src/routes/(token-based)/list/[vorgang]/+page.svelte @@ -16,7 +16,6 @@ //Seite für die Tatort-Liste let { data } = $props(); - console.log('tatorte: debug ', data); interface ListItem { //sollte Typ Vorgang sein, aber der einfachheit ist es noch ListItem, damit die Komponente NameItemEditor für Vorgang und Tatort eingesetzt werden kann name: string; @@ -31,7 +30,6 @@ let crimesList: ListItem[] = $state(data.crimesList); const vorgangPIN: string = data.vorgang.vorgangPIN; let vorgangToken: string = data.vorgang.vorgangToken; - //crimesList = []; let isEmptyList = $derived(crimesList.length === 0); //Variablen für Modal