From 131318da147633d5e5967c2be2bab2890f5b049e Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Wed, 21 May 2025 10:13:50 +0200 Subject: [PATCH 01/32] input field fuer Zugangscode beim Anlegen --- src/routes/(angemeldet)/tatorte/+page.svelte | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/routes/(angemeldet)/tatorte/+page.svelte b/src/routes/(angemeldet)/tatorte/+page.svelte index f7c5dbd..cf14e72 100644 --- a/src/routes/(angemeldet)/tatorte/+page.svelte +++ b/src/routes/(angemeldet)/tatorte/+page.svelte @@ -73,8 +73,24 @@

{form.error.description}

{/if} + + + +
+
+ +
+
+ +
{/if} - {#if data.user.admin} + {#if data.user.admin}
+
+ +
+
+ +
+
+ {#if formErrors?.vorgang} +

{formErrors.vorgang}

+ {/if} +
+
@@ -216,7 +240,9 @@
@@ -232,8 +258,8 @@ />
- {#if formErrors?.vorgang} -

{formErrors.vorgang}

+ {#if formErrors?.code} +

{formErrors.code}

{/if}
diff --git a/src/routes/(angemeldet)/view/+page.server.js b/src/routes/(angemeldet)/view/+page.server.js index 337f6e4..3adaae8 100644 --- a/src/routes/(angemeldet)/view/+page.server.js +++ b/src/routes/(angemeldet)/view/+page.server.js @@ -5,9 +5,11 @@ import { fail, redirect } from '@sveltejs/kit'; export const actions = { default: async ({ request }) => { const data = await request.formData(); + console.log(`--- ${Object.keys(data)}`) const caseNumber = data.get('caseNumber'); if (!caseNumber) { + console.log('^^^ here') return fail(400, { success: false, caseNumber, @@ -15,13 +17,20 @@ export const actions = { }); } + let res = (await caseNumberOccupied(caseNumber)) + console.log(`gibt es? ${res} + ${caseNumber}`) if (!(await caseNumberOccupied(caseNumber))) { + console.log('^^^ there') return fail(400, { success: false, caseNumber, error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' } }); } - throw redirect(303, `/list/${caseNumber}`); + else { + throw redirect(303, `/list/${caseNumber}`); + console.log(`---blabla ${caseNumber}`) + } + } }; From bebd226c80d88b7746ea008d7ec00d81badd1c04 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Thu, 22 May 2025 14:16:44 +0200 Subject: [PATCH 04/32] fixed fluechtigkeitsfehler --- src/lib/helper/caseNumberOccupied.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/helper/caseNumberOccupied.js b/src/lib/helper/caseNumberOccupied.js index 9f8a96c..50062e8 100644 --- a/src/lib/helper/caseNumberOccupied.js +++ b/src/lib/helper/caseNumberOccupied.js @@ -1,4 +1,4 @@ -limport { client } from '$lib/minio'; +import { client } from '$lib/minio'; /** * Check if caseNumber is used From 99a27fc079560e7f13e6fac3f51d81a4708a0434 Mon Sep 17 00:00:00 2001 From: mina Date: Thu, 22 May 2025 17:25:33 +0200 Subject: [PATCH 05/32] update frontend --- src/lib/helper/caseNumberOccupied.js | 2 +- .../(angemeldet)/list/[vorgang]/+page.svelte | 269 ++++++++++-------- .../view/[vorgang]/[tatort]/+page.svelte | 14 + 3 files changed, 163 insertions(+), 122 deletions(-) diff --git a/src/lib/helper/caseNumberOccupied.js b/src/lib/helper/caseNumberOccupied.js index 50062e8..a5f3934 100644 --- a/src/lib/helper/caseNumberOccupied.js +++ b/src/lib/helper/caseNumberOccupied.js @@ -3,7 +3,7 @@ import { client } from '$lib/minio'; /** * Check if caseNumber is used * @param {string} caseNumber - * @returns {Promise} */ export default async function caseNumberOccupied(caseNumber) { const prefix = `${caseNumber}/config.json`; diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte index 20008e9..51df692 100644 --- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte +++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte @@ -1,9 +1,3 @@ - -
@@ -191,94 +187,120 @@ />
- { - defocus_element(i); - }} - on:keydown|stopPropagation={ - // event needed to identify ID - // TO-DO: check if event is needed or if index is sufficient - async (ev) => {handle_input(ev, i)} - } - - >{item.name} - + {#if data.user.admin} + - {#if item.show_button} - + { + handle_input(ev, i); + }} + disabled={item.show_button} + bind:value={item.name} + id="label__{item.name}" + /> + + + {#if item.show_button} + + {/if} + + {:else} + {item.name} {/if} -

{shortenFileSize(item.size)}

@@ -298,7 +320,7 @@
-Umbenennen {#if inProgress}

Vorgang läuft...

@@ -309,5 +331,10 @@ -
+ + diff --git a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte index 64f4459..3ccbbd1 100644 --- a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte +++ b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte @@ -89,7 +89,10 @@
+ + + +
AR-Prompt
+ +
+ +
diff --git a/src/routes/(angemeldet)/view/+page.server.js b/src/routes/(angemeldet)/view/+page.server.js index 3adaae8..6d9df2d 100644 --- a/src/routes/(angemeldet)/view/+page.server.js +++ b/src/routes/(angemeldet)/view/+page.server.js @@ -5,11 +5,9 @@ import { fail, redirect } from '@sveltejs/kit'; export const actions = { default: async ({ request }) => { const data = await request.formData(); - console.log(`--- ${Object.keys(data)}`) const caseNumber = data.get('caseNumber'); if (!caseNumber) { - console.log('^^^ here') return fail(400, { success: false, caseNumber, @@ -17,20 +15,13 @@ export const actions = { }); } - let res = (await caseNumberOccupied(caseNumber)) - console.log(`gibt es? ${res} + ${caseNumber}`) if (!(await caseNumberOccupied(caseNumber))) { - console.log('^^^ there') return fail(400, { success: false, caseNumber, error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' } }); } - else { - throw redirect(303, `/list/${caseNumber}`); - console.log(`---blabla ${caseNumber}`) - } - + redirect(303, `/list/${caseNumber}`); } }; From b966d19792e75655ada0dc28e6870917de3b72da Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Mon, 26 May 2025 13:55:19 +0200 Subject: [PATCH 10/32] Ende des Tages 26.05. --- src/routes/(angemeldet)/upload/+page.server.js | 6 ++++++ src/routes/(angemeldet)/upload/+page.svelte | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/routes/(angemeldet)/upload/+page.server.js b/src/routes/(angemeldet)/upload/+page.server.js index 73bedd5..dffbea1 100644 --- a/src/routes/(angemeldet)/upload/+page.server.js +++ b/src/routes/(angemeldet)/upload/+page.server.js @@ -22,6 +22,7 @@ export const actions = { const vorgang = data.get('vorgang'); const name = data.get('name'); const type = data.get('type'); + const code = data.get('zugangscode'); const fileName = data.get('fileName'); let objectName = `${vorgang}/${name}`; @@ -35,6 +36,8 @@ export const actions = { const url = await client.presignedPutObject('tatort', objectName); + // enter code + return { url }; }, validate: async ({ request }) => { @@ -106,5 +109,8 @@ export const actions = { return { etag, error }; //await writeFile(filePath, Buffer.from(await data.file.arrayBuffer())); + }, + get_code: async ({ request }) => { + console.log('TO-DO'); } }; diff --git a/src/routes/(angemeldet)/upload/+page.svelte b/src/routes/(angemeldet)/upload/+page.svelte index aebb703..edd6a2d 100644 --- a/src/routes/(angemeldet)/upload/+page.svelte +++ b/src/routes/(angemeldet)/upload/+page.svelte @@ -15,7 +15,12 @@ let inProgress = false; let vorgang = ''; const code_len = 8; - let zugangscode = Math.random().toString(36).slice(2, 2+code_len); + let zugangscode = '' + let zugangscode_prev = ''; + + $: zugangscode = Math.random().toString(36).slice(2, 2+code_len); + + let case_existing = undefined; $: case_existing = false; @@ -65,6 +70,7 @@ let data = new FormData(); data.append('vorgang', vorgang); data.append('name', name); + data.append('zugangscode', zugangscode) if (files?.length === 1) { data.append('type', files[0].type); data.append('fileName', files[0].name); @@ -164,8 +170,10 @@ const res_json = await response.json(); const status = res_json.status; - + // aktualisiere Zugangscode mit if (status == 303) { + // TO-DO: check existing code + console.log(`+ existiert`) case_existing = true; return; @@ -215,9 +223,9 @@ {#if formErrors?.vorgang}

{formErrors.vorgang}

{/if} - {#if case_existing} + {#if case_existing && (vorgang.length > 0) } Datei wird zum existierenden Vorgang hinzugefügt. - {:else} + {:else if (vorgang.length > 0) } Neuer Vorgang wird angelegt. {/if}
From 0557d4220749729d9e22c0618c628734bfe38913 Mon Sep 17 00:00:00 2001 From: mina Date: Mon, 26 May 2025 14:11:01 +0200 Subject: [PATCH 11/32] temp Commit Mina --- config.json | 2 +- src/error.html | 4 + src/hooks.server.js | 2 +- src/lib/icons/Add-Process.svelte | 19 ++ src/lib/icons/Cube.svelte | 14 + src/lib/icons/Edit.svelte | 7 + src/lib/icons/File-rect.svelte | 35 +++ src/lib/icons/Folder.svelte | 14 + src/lib/icons/List-icon.svelte | 19 ++ src/lib/icons/Profile.svelte | 14 + src/routes/(angemeldet)/+layout.svelte | 18 +- src/routes/(angemeldet)/+page.svelte | 55 +--- src/routes/(angemeldet)/list/+page.svelte | 89 +++---- .../(angemeldet)/list/[vorgang]/+page.svelte | 252 ++++++++---------- src/routes/(angemeldet)/upload/+page.svelte | 50 ++-- static/1.svg | 14 + 16 files changed, 328 insertions(+), 280 deletions(-) create mode 100644 src/error.html create mode 100644 src/lib/icons/Add-Process.svelte create mode 100644 src/lib/icons/Cube.svelte create mode 100644 src/lib/icons/Edit.svelte create mode 100644 src/lib/icons/File-rect.svelte create mode 100644 src/lib/icons/Folder.svelte create mode 100644 src/lib/icons/List-icon.svelte create mode 100644 src/lib/icons/Profile.svelte create mode 100644 static/1.svg diff --git a/config.json b/config.json index 970af4c..8490de6 100644 --- a/config.json +++ b/config.json @@ -8,7 +8,7 @@ }, "jwt": { "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", - "expiresIn": 3600 + "expiresIn": 36000 }, "auth": { "admin": { "password": "A-InnoHUB_2025!", "admin": true }, diff --git a/src/error.html b/src/error.html new file mode 100644 index 0000000..73d0c64 --- /dev/null +++ b/src/error.html @@ -0,0 +1,4 @@ +

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/hooks.server.js b/src/hooks.server.js index 19b1bcc..5ef1fb4 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -12,5 +12,5 @@ export async function handle({ event, resolve }) { await event.cookies.delete('session'); event.locals.user = null; } - return resolve(event); + return await resolve(event); } diff --git a/src/lib/icons/Add-Process.svelte b/src/lib/icons/Add-Process.svelte new file mode 100644 index 0000000..4a5cebc --- /dev/null +++ b/src/lib/icons/Add-Process.svelte @@ -0,0 +1,19 @@ + + + diff --git a/src/lib/icons/Cube.svelte b/src/lib/icons/Cube.svelte new file mode 100644 index 0000000..4992960 --- /dev/null +++ b/src/lib/icons/Cube.svelte @@ -0,0 +1,14 @@ + + + diff --git a/src/lib/icons/Edit.svelte b/src/lib/icons/Edit.svelte new file mode 100644 index 0000000..10f6ddc --- /dev/null +++ b/src/lib/icons/Edit.svelte @@ -0,0 +1,7 @@ + diff --git a/src/lib/icons/File-rect.svelte b/src/lib/icons/File-rect.svelte new file mode 100644 index 0000000..f31a268 --- /dev/null +++ b/src/lib/icons/File-rect.svelte @@ -0,0 +1,35 @@ + + +{#if outline} + + + +{:else} + +{/if} diff --git a/src/lib/icons/Folder.svelte b/src/lib/icons/Folder.svelte new file mode 100644 index 0000000..6d20ec4 --- /dev/null +++ b/src/lib/icons/Folder.svelte @@ -0,0 +1,14 @@ + + + diff --git a/src/lib/icons/List-icon.svelte b/src/lib/icons/List-icon.svelte new file mode 100644 index 0000000..c851e89 --- /dev/null +++ b/src/lib/icons/List-icon.svelte @@ -0,0 +1,19 @@ + + + + + diff --git a/src/lib/icons/Profile.svelte b/src/lib/icons/Profile.svelte new file mode 100644 index 0000000..b3b6762 --- /dev/null +++ b/src/lib/icons/Profile.svelte @@ -0,0 +1,14 @@ + + + diff --git a/src/routes/(angemeldet)/+layout.svelte b/src/routes/(angemeldet)/+layout.svelte index a2c875c..c42aa61 100644 --- a/src/routes/(angemeldet)/+layout.svelte +++ b/src/routes/(angemeldet)/+layout.svelte @@ -1,6 +1,7 @@ @@ -59,20 +60,9 @@ href="/" class="px-4 py-1 -mr-4 flex items-center justify-center gap-x-2.5 text-sm font-semibold leading-6 text-gray-500 hover:bg-gray-200 hover:text-gray-700" > - - - + + + {data.user.id}
diff --git a/src/routes/(angemeldet)/+page.svelte b/src/routes/(angemeldet)/+page.svelte index 7693617..b9a4519 100644 --- a/src/routes/(angemeldet)/+page.svelte +++ b/src/routes/(angemeldet)/+page.svelte @@ -1,10 +1,11 @@ - -
- - - +
Liste @@ -72,20 +60,7 @@
- +
Hinzufügen @@ -98,20 +73,7 @@
- - - +
Ansicht @@ -121,3 +83,6 @@
+ + diff --git a/src/routes/(angemeldet)/list/+page.svelte b/src/routes/(angemeldet)/list/+page.svelte index 3f56b0b..a6dec78 100644 --- a/src/routes/(angemeldet)/list/+page.svelte +++ b/src/routes/(angemeldet)/list/+page.svelte @@ -1,12 +1,8 @@ - - @@ -80,32 +74,19 @@
  • - - - + +
    {item.name} + style="padding: 2px" + id="del__{item.name}" + on:click|preventDefault={delete_item} + aria-label="Vorgang {item.name} löschen" + > + +
    + + diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte index 51df692..0d3ef3a 100644 --- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte +++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte @@ -11,6 +11,9 @@ import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte'; import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte'; import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte'; + import Cube from '$lib/icons/Cube.svelte'; + import Edit from '$lib/icons/Edit.svelte'; + import Trash from '$lib/icons/Trash.svelte'; /** @type {import('./$types').PageData} */ export let data; @@ -167,154 +170,129 @@     diff --git a/src/routes/(angemeldet)/upload/+page.svelte b/src/routes/(angemeldet)/upload/+page.svelte index 2ffab96..e0d05e3 100644 --- a/src/routes/(angemeldet)/upload/+page.svelte +++ b/src/routes/(angemeldet)/upload/+page.svelte @@ -8,6 +8,7 @@ import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte'; import shortenFileSize from '$lib/helper/shortenFileSize.js'; import Exclamation from '$lib/icons/Exclamation.svelte'; + import FileRect from '$lib/icons/File-rect.svelte'; export let form; @@ -15,7 +16,9 @@ let inProgress = false; let vorgang = ''; const code_len = 8; - let zugangscode = Math.random().toString(36).slice(2, 2+code_len); + let zugangscode = Math.random() + .toString(36) + .slice(2, 2 + code_len); let case_existing = undefined; let name = ''; /** @type {?string}*/ @@ -32,7 +35,7 @@ let data = new FormData(); data.append('vorgang', vorgang); data.append('name', name); - data.append('zugangscode', zugangscode) + data.append('zugangscode', zugangscode); const response = await fetch('?/validate', { method: 'POST', body: data }); /** @type {import('@sveltejs/kit').ActionResult} */ const result = deserialize(await response.text()); @@ -111,54 +114,51 @@ function swap_endian(val) { // from https://www.geeksforgeeks.org/bit-manipulation-swap-endianness-of-a-number/ - let leftmost_byte = (val & eval(0x000000FF)) >> 0; - let left_middle_byte = (val & eval(0x0000FF00)) >> 8; - let right_middle_byte = (val & eval(0x00FF0000)) >> 16; - let rightmost_byte = (val & eval(0xFF000000)) >> 24; + let leftmost_byte = (val & eval(0x000000ff)) >> 0; + let left_middle_byte = (val & eval(0x0000ff00)) >> 8; + let right_middle_byte = (val & eval(0x00ff0000)) >> 16; + let rightmost_byte = (val & eval(0xff000000)) >> 24; leftmost_byte <<= 24; left_middle_byte <<= 16; right_middle_byte <<= 8; rightmost_byte <<= 0; - let res = (leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte) + let res = leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte; - return res + return res; } - async function check_valid_glb_file() { // GLD Header, magic value 0x46546C67, identifies data as binary glTF, 4 bytes // little endian! - const GLD_MAGIC = 0x46546C67; + const GLD_MAGIC = 0x46546c67; // big endian! let file = files[0]; - let file_header = file.slice(0, 4) - let header_bytes = await file_header.bytes() + let file_header = file.slice(0, 4); + let header_bytes = await file_header.bytes(); let file_header_hex = '0x' + header_bytes.toHex().toString(); - if (GLD_MAGIC == swap_endian(file_header_hex)) { return true; } else { return false; } - } // return true or false async function case_exists(case_no) { - console.log('--- fired') + console.log('--- fired'); // ping `/(angemeldet)/view` with caseNumber in POST body - let url = '/view' + let url = '/view'; let data = new FormData(); data.append('caseNumber', case_no); - const response = await fetch(url, { method: 'POST', body: data }) + const response = await fetch(url, { method: 'POST', body: data }); const code = response.status; - console.log(`+++ ${response.redirected}`) + console.log(`+++ ${response.redirected}`); if (code == 303) { return true; @@ -166,7 +166,6 @@ return false; } -
    @@ -275,18 +274,7 @@ class="mt-2 flex justify-center rounded-lg border border-dashed border-gray-900/25 px-6 py-10" >
    - +
    From db90bae19fd6b7ca0088fe86adbe52d880f6dcf6 Mon Sep 17 00:00:00 2001 From: mina Date: Mon, 2 Jun 2025 17:23:01 +0200 Subject: [PATCH 20/32] fix debug --- src/routes/(angemeldet)/view/+page.server.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/routes/(angemeldet)/view/+page.server.js b/src/routes/(angemeldet)/view/+page.server.js index d4e5129..a8bd2aa 100644 --- a/src/routes/(angemeldet)/view/+page.server.js +++ b/src/routes/(angemeldet)/view/+page.server.js @@ -32,7 +32,9 @@ export const actions = { // Jetzt prüfen, ob Code vorhanden ist und // dem eingegebenen Code entspricht - const token = await codex(caseNumber); +//Nur Abfrage,wenn user_token nicht false ist + if(user_token){ + const token = await codex(caseNumber); console.log(`xxx ${token}, ${user_token}`); if (token && token != user_token) { @@ -43,6 +45,7 @@ export const actions = { error: { token: 'Der Token ist falsch.' } }); } + } // if (token != -1 && user_token != token) { // console.log('ooo Fehler'); From 5ef5476d92bf2160f5259ea322efbb7d7dd6a1db Mon Sep 17 00:00:00 2001 From: mina Date: Mon, 2 Jun 2025 17:24:34 +0200 Subject: [PATCH 21/32] delete token --- src/routes/(angemeldet)/view/+page.svelte | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/routes/(angemeldet)/view/+page.svelte b/src/routes/(angemeldet)/view/+page.svelte index 50145bd..ea3b786 100644 --- a/src/routes/(angemeldet)/view/+page.svelte +++ b/src/routes/(angemeldet)/view/+page.svelte @@ -8,7 +8,6 @@ import Exclamation from '$lib/icons/Exclamation.svelte'; export let form; - let token = 'TOKEN-$$$';
    @@ -54,10 +53,7 @@
    Zugangscode
    {form.error.token}

    {/if}
    - -
    From c991e3d7789c789349dc75a373920fad4d9f0e33 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Thu, 5 Jun 2025 08:26:53 +0200 Subject: [PATCH 22/32] add token back --- src/routes/(angemeldet)/view/+page.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/(angemeldet)/view/+page.svelte b/src/routes/(angemeldet)/view/+page.svelte index ea3b786..17a121a 100644 --- a/src/routes/(angemeldet)/view/+page.svelte +++ b/src/routes/(angemeldet)/view/+page.svelte @@ -60,7 +60,6 @@ class="flex w-full rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600" > Date: Fri, 6 Jun 2025 08:27:32 +0200 Subject: [PATCH 23/32] insert token to overwrite entered code --- src/routes/(angemeldet)/view/+page.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/(angemeldet)/view/+page.svelte b/src/routes/(angemeldet)/view/+page.svelte index 17a121a..4ef2cc7 100644 --- a/src/routes/(angemeldet)/view/+page.svelte +++ b/src/routes/(angemeldet)/view/+page.svelte @@ -60,6 +60,7 @@ class="flex w-full rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600" > Date: Fri, 6 Jun 2025 11:42:37 +0200 Subject: [PATCH 24/32] fix permission code check --- src/routes/(angemeldet)/upload/+page.svelte | 39 +++++++++----------- src/routes/(angemeldet)/view/+page.server.js | 19 +--------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/src/routes/(angemeldet)/upload/+page.svelte b/src/routes/(angemeldet)/upload/+page.svelte index b639246..b898c10 100644 --- a/src/routes/(angemeldet)/upload/+page.svelte +++ b/src/routes/(angemeldet)/upload/+page.svelte @@ -158,42 +158,37 @@ } } - ///(angemeldet)/view return true or false + // `/(angemeldet)/view` return true or false async function case_exists(case_no) { - // ping `` with caseNumber in POST body + + if (case_no == '') { + zuganscode = zugangscode_old; + } + + // ping `/view` with caseNumber in POST body let url = '/view'; + let data = new FormData(); data.append('caseNumber', case_no); - console.log('--- case exist_func', case_no) - // fetch code in parallel - const code = get_code(case_no); + const code = await get_code(case_no); + if (code != -1) { + zugangscode = code; + case_existing = true; + return true + } const response = await fetch(url, { method: 'POST', body: data }); const res_json = await response.json(); - console.log(`+++ ${res_json.data}`) const status = res_json.status; - // aktualisiere Zugangscode mit - if (status == 303) { - case_existing = true; - - const res = await code; - - - if (res != -1) { - // Code vorhanden - zugangscode = res; - } - - return true; + if (status != 303) { + case_existing = false; + zugangscode = zugangscode_old; } - case_existing = false; - zugangscode = zugangscode_old; - return false; } diff --git a/src/routes/(angemeldet)/view/+page.server.js b/src/routes/(angemeldet)/view/+page.server.js index a8bd2aa..04579b1 100644 --- a/src/routes/(angemeldet)/view/+page.server.js +++ b/src/routes/(angemeldet)/view/+page.server.js @@ -32,11 +32,10 @@ export const actions = { // Jetzt prüfen, ob Code vorhanden ist und // dem eingegebenen Code entspricht -//Nur Abfrage,wenn user_token nicht false ist - if(user_token){ - const token = await codex(caseNumber); + const token = await codex(caseNumber); console.log(`xxx ${token}, ${user_token}`); + // token vorhanden, check ob gleich sind if (token && token != user_token) { console.log(`ooo token check`); return fail(400, { @@ -45,20 +44,6 @@ export const actions = { error: { token: 'Der Token ist falsch.' } }); } - } - - // if (token != -1 && user_token != token) { - // console.log('ooo Fehler'); - // redirect(303, `/view`); - // } - // if (token != -1 && user_token != token) { - // console.log('ooo Fehler'); - // return fail(400, { - // success: false, - // caseNumber, - // error: { token: 'Der Zugangscode ist falsch.' } - // }); - // } redirect(303, `/list/${caseNumber}`); } From d5b39575c74a182b17c5c3f44f4505d8d86fa003 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Fri, 6 Jun 2025 11:44:59 +0200 Subject: [PATCH 25/32] fix typo --- src/routes/(angemeldet)/upload/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(angemeldet)/upload/+page.svelte b/src/routes/(angemeldet)/upload/+page.svelte index b898c10..22b2bd3 100644 --- a/src/routes/(angemeldet)/upload/+page.svelte +++ b/src/routes/(angemeldet)/upload/+page.svelte @@ -162,7 +162,7 @@ async function case_exists(case_no) { if (case_no == '') { - zuganscode = zugangscode_old; + zugangscode = zugangscode_old; } // ping `/view` with caseNumber in POST body From 20c273407f52cdfab7bd2e5138b65be105ed1593 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Tue, 10 Jun 2025 07:58:35 +0200 Subject: [PATCH 26/32] remove config check --- src/lib/helper/caseNumberOccupied.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/helper/caseNumberOccupied.js b/src/lib/helper/caseNumberOccupied.js index a5f3934..e727abf 100644 --- a/src/lib/helper/caseNumberOccupied.js +++ b/src/lib/helper/caseNumberOccupied.js @@ -6,7 +6,7 @@ import { client } from '$lib/minio'; * @returns {Promise} */ export default async function caseNumberOccupied(caseNumber) { - const prefix = `${caseNumber}/config.json`; + const prefix = `${caseNumber}`; const promise = new Promise((resolve) => { let stream = client.listObjectsV2('tatort', prefix, false, ''); stream.on('data', () => { From c1958e848a438f43bb092fe2c179210bf501160c Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Tue, 10 Jun 2025 08:08:11 +0200 Subject: [PATCH 27/32] refactoring: rename code retrieval function --- src/routes/(angemeldet)/view/+page.server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(angemeldet)/view/+page.server.js b/src/routes/(angemeldet)/view/+page.server.js index 04579b1..323b0ac 100644 --- a/src/routes/(angemeldet)/view/+page.server.js +++ b/src/routes/(angemeldet)/view/+page.server.js @@ -32,7 +32,7 @@ export const actions = { // Jetzt prüfen, ob Code vorhanden ist und // dem eingegebenen Code entspricht - const token = await codex(caseNumber); + const token = await get_code_or_null(caseNumber); console.log(`xxx ${token}, ${user_token}`); // token vorhanden, check ob gleich sind @@ -51,7 +51,7 @@ export const actions = { // returns `code` oder `null` -async function codex(vorg) { +async function get_code_or_null(vorg) { const code_name = '__perm__'; const obj_path = `${vorg}/${code_name}`; From aeabbd6d1ffdd3c82e1d83e3e11c7756bee8bfbe Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Wed, 11 Jun 2025 08:18:28 +0200 Subject: [PATCH 28/32] disable/uncomment input field in vorgang list --- src/routes/(angemeldet)/list/[vorgang]/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte index 7c397bc..fbe5362 100644 --- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte +++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte @@ -195,7 +195,7 @@ }}>{item.name} - + />--> From 5ce5c78698887c13fd9d3d15b731eee7e1cc5e5b Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Wed, 11 Jun 2025 09:25:33 +0200 Subject: [PATCH 29/32] fix layout by reordering anker element --- src/routes/(angemeldet)/list/[vorgang]/+page.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte index fbe5362..5a489ee 100644 --- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte +++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte @@ -168,14 +168,15 @@
      {#each list as item, i}
    • -
      +
      + - +
      {#if data.user.admin}

      +
      • {/each}
    From fd8298906a89c36e9884aa5c7a9b3049a7f3f9d7 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Wed, 11 Jun 2025 09:55:00 +0200 Subject: [PATCH 30/32] formatting --- .../(angemeldet)/list/[vorgang]/+page.svelte | 199 +++++++++--------- 1 file changed, 99 insertions(+), 100 deletions(-) diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte index 5a489ee..ec6be17 100644 --- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte +++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte @@ -168,35 +168,34 @@ From 03a304f6fe720cea3d313e4eec35452425441ae1 Mon Sep 17 00:00:00 2001 From: Jared Date: Thu, 12 Jun 2025 13:02:23 +0200 Subject: [PATCH 31/32] fixed some error from merge request --- src/hooks.server.ts | 2 +- src/routes/(angemeldet)/+layout.svelte | 1 + src/routes/(angemeldet)/+page.svelte | 36 +++---------------- src/routes/(angemeldet)/list/+page.svelte | 15 +------- .../code/{+server.js => +server.ts} | 3 -- 5 files changed, 8 insertions(+), 49 deletions(-) rename src/routes/api/list/[[vorgang]]/code/{+server.js => +server.ts} (83%) diff --git a/src/hooks.server.ts b/src/hooks.server.ts index ee11e72..db05fa8 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,7 +1,7 @@ import { decryptToken } from '$lib/auth'; import type { Handle } from '@sveltejs/kit'; -export const handle: Handle = ({ event, resolve }) => { +export const handle: Handle = async ({ event, resolve }) => { const jwt = event.cookies.get('session'); try { if (jwt) { diff --git a/src/routes/(angemeldet)/+layout.svelte b/src/routes/(angemeldet)/+layout.svelte index 7e8ee15..00beb40 100644 --- a/src/routes/(angemeldet)/+layout.svelte +++ b/src/routes/(angemeldet)/+layout.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(angemeldet)/+page.svelte b/src/routes/(angemeldet)/+page.svelte index 54d2c70..89dd1fa 100644 --- a/src/routes/(angemeldet)/+page.svelte +++ b/src/routes/(angemeldet)/+page.svelte @@ -1,7 +1,8 @@ - -