From 0b4d189439858a60bd9d910df42de841bec47225 Mon Sep 17 00:00:00 2001 From: mina Date: Thu, 10 Jul 2025 10:24:57 +0200 Subject: [PATCH] =?UTF-8?q?=C3=BCberarbeitung=20edit=20tatort=20funktionie?= =?UTF-8?q?rt,=20edit=20vorgang=20bis=20api=20auch,=20aber=20dann=20hakt?= =?UTF-8?q?=20es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/error.html | 11 ++ src/routes/(angemeldet)/list/+page.server.ts | 10 -- src/routes/(angemeldet)/list/+page.svelte | 47 +++--- src/routes/(angemeldet)/list/+page.ts | 24 ++++ .../list/[vorgang]/+page.server.ts | 15 -- .../(token-based)/list/[vorgang]/+page.svelte | 37 ++--- .../(token-based)/list/[vorgang]/+page.ts | 34 +++++ .../(token-based)/list/[vorgang]/+server.ts | 3 +- src/routes/api/list/+server.ts | 27 ++++ src/routes/api/list/[vorgang]/+server.ts | 134 +++++++++++------- .../api/list/[vorgang]/[tatort]/+server.ts | 39 +++++ src/routes/api/user/+server.ts | 10 ++ 12 files changed, 270 insertions(+), 121 deletions(-) delete mode 100644 src/routes/(angemeldet)/list/+page.server.ts create mode 100644 src/routes/(angemeldet)/list/+page.ts delete mode 100644 src/routes/(token-based)/list/[vorgang]/+page.server.ts create mode 100644 src/routes/(token-based)/list/[vorgang]/+page.ts create mode 100644 src/routes/api/list/+server.ts create mode 100644 src/routes/api/user/+server.ts diff --git a/src/error.html b/src/error.html index 73d0c64..e2222c7 100644 --- a/src/error.html +++ b/src/error.html @@ -1,4 +1,15 @@ + + + + + + + + +

Du wurdest automatisch ausgeloggt

Lösche deine Cookies aus dem Browser und logge dich neu ein

Code %sveltekit.status%

%sveltekit.error.message%

+ + diff --git a/src/routes/(angemeldet)/list/+page.server.ts b/src/routes/(angemeldet)/list/+page.server.ts deleted file mode 100644 index 4d78120..0000000 --- a/src/routes/(angemeldet)/list/+page.server.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { getListOfVorgänge } from '$lib/server/vorgangService'; -import type { PageServerLoad } from '../../(token-based)/view/$types'; - -export const load: PageServerLoad = async () => { - const caseList = await getListOfVorgänge(); - - return { - caseList - }; -}; diff --git a/src/routes/(angemeldet)/list/+page.svelte b/src/routes/(angemeldet)/list/+page.svelte index ab4dc3b..f17c9e0 100644 --- a/src/routes/(angemeldet)/list/+page.svelte +++ b/src/routes/(angemeldet)/list/+page.svelte @@ -11,11 +11,12 @@ let { data } = $props(); - const caseList: ListItem[] = data.caseList; + const caseList: ListItem[] = $state(data.caseList); //Variabeln für EditableItem let names: string[] = $state(caseList.map((l) => l.name)); let editedName: string = $state(''); + let currentName: string = $state(''); async function delete_item(ev: Event) { let delete_item = window.confirm('Bist du sicher?'); @@ -47,7 +48,7 @@ } } - async function handleSave(newName: string, oldName: string) { + async function handleUpdateCase(newName: string, oldName: string) { console.log('Eltern, speichern erfolgreich', newName, oldName); try { const res = await fetch(`/api/list/${oldName}`, { @@ -60,9 +61,11 @@ if (!res.ok) { const msg = await res.text(); - console.error('❌ Fehler beim Speichern:', msg); + console.error('❌ Fehler beim Speichern Update:', msg); } else { console.log('✅ Erfolgreich gespeichert:', newName); + await invalidate(''); + currentName = newName; } } catch (err) { console.error('⚠️ Netzwerkfehler:', err); @@ -84,13 +87,7 @@ const msg = await res.text(); console.error('❌ Fehler beim Löschen:', msg); } else { - setTimeout(() => { - window.location.reload(); - }, 500); - //await invalidate('/api/list'); - console.log('🗑️ Erfolgreich gelöscht:', vorgang); - await invalidate('/api/list'); // funktioniert nicht vernünftig } } catch (err) { console.error('⚠️ Netzwerkfehler beim Löschen:', err); @@ -109,24 +106,26 @@
- -
- -
- + {#if data.user.admin} +
+ +
+ {:else} + + {/if}
{/each} diff --git a/src/routes/(angemeldet)/list/+page.ts b/src/routes/(angemeldet)/list/+page.ts new file mode 100644 index 0000000..dc69c36 --- /dev/null +++ b/src/routes/(angemeldet)/list/+page.ts @@ -0,0 +1,24 @@ + +export async function load({ fetch, url }) { + +//const caseToken = url.searchParams.get('token'); + const adminRes = await fetch(`/api/user`) +const user = await adminRes.json() + +console.log("load Vorgang; ", user); + const res = await fetch(`/api/list`, { +/* headers: { + Authorization: `Bearer ${caseToken}` + } */ +}); + + const data = await res.json(); + + const caseList = data.caseList +console.log("load Vorgang; ", caseList, user); + + return { + caseList, + user + }; +}; diff --git a/src/routes/(token-based)/list/[vorgang]/+page.server.ts b/src/routes/(token-based)/list/[vorgang]/+page.server.ts deleted file mode 100644 index 0bc3081..0000000 --- a/src/routes/(token-based)/list/[vorgang]/+page.server.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { getVorgangByCaseId } from '$lib/server/vorgangService'; -import type { PageServerLoad } from './$types'; - -export const load: PageServerLoad = async ({ params, url }) => { - const caseId = params.vorgang; - const caseToken = url.searchParams.get('token'); - - const crimesList = await getVorgangByCaseId(caseId); - - return { - caseId, - crimesList, - caseToken - }; -}; diff --git a/src/routes/(token-based)/list/[vorgang]/+page.svelte b/src/routes/(token-based)/list/[vorgang]/+page.svelte index b749c7a..526130b 100644 --- a/src/routes/(token-based)/list/[vorgang]/+page.svelte +++ b/src/routes/(token-based)/list/[vorgang]/+page.svelte @@ -1,5 +1,4 @@