innohub/tatort
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some type errors

Browse Source
This commit is contained in:
Jared
2025-06-10 14:07:40 +02:00
parent 841446082e
commit d58be34fe5
22 changed files with 266 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eslint.config.js
View File

@@ -20,7 +20,21 @@ export default ts.config(
languageOptions: { languageOptions: {
globals: { ...globals.browser, ...globals.node } globals: { ...globals.browser, ...globals.node }
}, },
rules: { 'no-undef': 'off' } rules: {
'no-undef': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
args: 'all',
argsIgnorePattern: '^_',
caughtErrors: 'all',
caughtErrorsIgnorePattern: '^_',
destructuredArrayIgnorePattern: '^_',
varsIgnorePattern: '^_',
ignoreRestSiblings: true
}
]
}
}, },
{ {
files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'], files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],

36
package-lock.json generated
View File

@@ -26,6 +26,7 @@
"@testing-library/jest-dom": "^6.6.3", "@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.8", "@testing-library/svelte": "^5.2.8",
"@tsconfig/svelte": "^5.0.4", "@tsconfig/svelte": "^5.0.4",
"@types/jsonwebtoken": "^9.0.9",
"eslint": "^9.28.0", "eslint": "^9.28.0",
"eslint-config-prettier": "^10.1.5", "eslint-config-prettier": "^10.1.5",
"eslint-plugin-svelte": "^3.9.2", "eslint-plugin-svelte": "^3.9.2",
@@ -1659,6 +1660,34 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/jsonwebtoken": {
"version": "9.0.9",
"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.9.tgz",
"integrity": "sha512-uoe+GxEuHbvy12OUQct2X9JenKM3qAscquYymuQN4fMWG9DBQtykrQEFcAbVACF7qaLw9BePSodUL0kquqBJpQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/ms": "*",
"@types/node": "*"
}
},
"node_modules/@types/ms": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
"integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/node": {
"version": "24.0.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.0.tgz",
"integrity": "sha512-yZQa2zm87aRVcqDyH5+4Hv9KYgSdgwX1rFnGvpbzMaC7YAljmhBET93TPiTd3ObwTL+gSpIzPKg5BqVxdCvxKg==",
"devOptional": true,
"license": "MIT",
"dependencies": {
"undici-types": "~7.8.0"
}
},
"node_modules/@types/resolve": { "node_modules/@types/resolve": {
"version": "1.20.2", "version": "1.20.2",
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
@@ -6085,6 +6114,13 @@
"typescript": ">=4.8.4 <5.9.0" "typescript": ">=4.8.4 <5.9.0"
} }
}, },
"node_modules/undici-types": {
"version": "7.8.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
"integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
"devOptional": true,
"license": "MIT"
},
"node_modules/update-browserslist-db": { "node_modules/update-browserslist-db": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",

1
package.json
View File

@@ -24,6 +24,7 @@
"@testing-library/jest-dom": "^6.6.3", "@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.8", "@testing-library/svelte": "^5.2.8",
"@tsconfig/svelte": "^5.0.4", "@tsconfig/svelte": "^5.0.4",
"@types/jsonwebtoken": "^9.0.9",
"eslint": "^9.28.0", "eslint": "^9.28.0",
"eslint-config-prettier": "^10.1.5", "eslint-config-prettier": "^10.1.5",
"eslint-plugin-svelte": "^3.9.2", "eslint-plugin-svelte": "^3.9.2",

8
src/hooks.server.ts
View File

@@ -1,15 +1,15 @@
import { decryptToken } from '$lib/auth'; import { decryptToken } from '$lib/auth';
import type { Handle } from '@sveltejs/kit';
/** @type {import('@sveltejs/kit').Handle} */ export const handle: Handle = ({ event, resolve }) => {
export async function handle({ event, resolve }) {
const jwt = event.cookies.get('session'); const jwt = event.cookies.get('session');
try { try {
if (jwt) { if (jwt) {
event.locals.user = decryptToken(jwt); event.locals.user = decryptToken(jwt);
return resolve(event); return resolve(event);
} }
} catch (err) { } catch (_) {
await event.cookies.delete('session'); event.cookies.delete('session', {path: '/'});
event.locals.user = null; event.locals.user = null;
} }
return resolve(event); return resolve(event);

4
src/lib/helper/caseNumberOccupied.ts
View File

@@ -5,10 +5,10 @@ import { client } from '$lib/minio';
* @param {string} caseNumber * @param {string} caseNumber
* @returns {Promise<boolean} * @returns {Promise<boolean}
*/ */
export default async function caseNumberOccupied(caseNumber) { export default async function caseNumberOccupied(caseNumber: string) {
const prefix = `${caseNumber}/config.json`; const prefix = `${caseNumber}/config.json`;
const promise = new Promise((resolve) => { const promise = new Promise((resolve) => {
let stream = client.listObjectsV2('tatort', prefix, false, ''); const stream = client.listObjectsV2('tatort', prefix, false, '');
stream.on('data', () => { stream.on('data', () => {
stream.destroy(); stream.destroy();
resolve(true); resolve(true);

2
src/lib/helper/shortenFileSize.ts
View File

@@ -7,7 +7,7 @@ const GIGA = MEGA * KILO;
* @param {number} size * @param {number} size
* @returns{string} * @returns{string}
*/ */
export default function shortenFileSize(size) { export default function shortenFileSize(size: number) {
const giga = Math.floor(size / GIGA); const giga = Math.floor(size / GIGA);
let remainder = size % GIGA; let remainder = size % GIGA;
const mega = Math.floor(remainder / MEGA); const mega = Math.floor(remainder / MEGA);

2
src/lib/helper/timeElapsed.ts
View File

@@ -9,7 +9,7 @@ const MONTH = YEAR / 12;
* @param {Date} date * @param {Date} date
* @returns string * @returns string
*/ */
export default function timeElapsed(date) { export default function timeElapsed(date: Date) {
const now = new Date(); const now = new Date();
const age = Math.floor((now.getTime() - date.getTime()) / 1000); const age = Math.floor((now.getTime() - date.getTime()) / 1000);

6
src/routes/(angemeldet)/+layout.server.ts
View File

@@ -1,7 +1,7 @@
import { redirect } from '@sveltejs/kit'; import { redirect, type ServerLoadEvent } from '@sveltejs/kit';
import type { PageServerLoad } from './view/[vorgang]/[tatort]/$types';
/** @type {import('./$types').PageServerLoad} */ export const load: PageServerLoad = (event: ServerLoadEvent) => {
export function load(event) {
if (!event.locals.user && event.url.pathname !== '/anmeldung') throw redirect(303, '/anmeldung'); if (!event.locals.user && event.url.pathname !== '/anmeldung') throw redirect(303, '/anmeldung');
return { return {
user: event.locals.user user: event.locals.user

39
src/routes/(angemeldet)/list/+page.svelte
View File

@@ -1,9 +1,3 @@
<style>
ul {
min-width: 24rem;
}
</style>
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
@@ -36,25 +30,25 @@
}); });
async function delete_item(ev: Event) { async function delete_item(ev: Event) {
let delete_item = window.confirm("Bist du sicher?"); let delete_item = window.confirm('Bist du sicher?');
if (delete_item) { if (delete_item) {
const target = ev.currentTarget as HTMLElement | null; const target = ev.currentTarget as HTMLElement | null;
if (!target) return; if (!target) return;
let filename = target.id.split('del__')[1] let filename = target.id.split('del__')[1];
// delete request // delete request
// -------------- // --------------
let url = `/api/list/${filename}` let url = `/api/list/${filename}`;
console.log(`--- ${filename} + ${url}`) console.log(`--- ${filename} + ${url}`);
try { try {
const response = await fetch(url, const response = await fetch(url, { method: 'DELETE' });
{method: 'DELETE'}
)
if (response.status == 204) { if (response.status == 204) {
setTimeout(() => {window.location.reload()}, 500) setTimeout(() => {
window.location.reload();
}, 500);
} }
} catch (error) { } catch (error) {
if (error instanceof Error) { if (error instanceof Error) {
@@ -63,9 +57,7 @@
console.log(error); console.log(error);
} }
} }
} }
} }
</script> </script>
@@ -102,8 +94,13 @@
on:click|preventDefault={delete_item} on:click|preventDefault={delete_item}
aria-label="Vorgang {item.name} löschen" aria-label="Vorgang {item.name} löschen"
> >
<svg <svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg> ><path
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
fill="#373737"
transform="translate(1 1)"
/></svg
>
</button> </button>
</div> </div>
</div> </div>
@@ -116,3 +113,9 @@
</ul> </ul>
</div> </div>
</div> </div>
<style>
ul {
min-width: 24rem;
}
</style>

130
src/routes/(angemeldet)/list/[vorgang]/+page.svelte
View File

@@ -1,9 +1,3 @@
<style>
ul {
min-width: 24rem;
}
</style>
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import shortenFileSize from '$lib/helper/shortenFileSize'; import shortenFileSize from '$lib/helper/shortenFileSize';
@@ -18,7 +12,6 @@
import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte'; import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte'; import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
/** @type {import('./$types').PageData} */
/** export let data; */ /** export let data; */
interface ListItem { interface ListItem {
@@ -65,7 +58,7 @@
list = list.map((item) => { list = list.map((item) => {
item.show_button = true; item.show_button = true;
return item; return item;
}) });
} }
}); });
@@ -75,12 +68,12 @@
} }
function defocus_element(i: number) { function defocus_element(i: number) {
let item = list[i] let item = list[i];
let text_field_id = `label__${item.name}` let text_field_id = `label__${item.name}`;
let text_field = document.getElementById(text_field_id) let text_field = document.getElementById(text_field_id);
if (text_field) { if (text_field) {
text_field.setAttribute("contenteditable", "false") text_field.setAttribute('contenteditable', 'false');
text_field.textContent = item.name; text_field.textContent = item.name;
} }
@@ -90,25 +83,26 @@
} }
async function handle_input(ev: KeyboardEvent, i: number) { async function handle_input(ev: KeyboardEvent, i: number) {
let item = list[i] let item = list[i];
if (ev.key == "Escape") { if (ev.key == 'Escape') {
let text_field_id = `label__${item.name}` let text_field_id = `label__${item.name}`;
let text_field = document.getElementById(text_field_id) let text_field = document.getElementById(text_field_id);
if (text_field) { if (text_field) {
text_field.setAttribute("contenteditable", "false"); text_field.setAttribute('contenteditable', 'false');
text_field.textContent = item.name; text_field.textContent = item.name;
} }
// reshow button // reshow button
item.show_button = true item.show_button = true;
return; return;
} }
if (ev.key == "Enter") { if (ev.key == 'Enter') {
console.log('--- hitted') console.log('--- hitted');
let name_field = ev.currentTarget as HTMLElement | null; let name_field = ev.currentTarget as HTMLElement | null;
let new_name = name_field ? (name_field.textContent || (name_field as any).innerText || '') : ''; let new_name = name_field
? name_field.textContent || (name_field as any).innerText || ''
: '';
if (new_name == '') { if (new_name == '') {
alert('Bitte einen gültigen Namen eingeben.'); alert('Bitte einen gültigen Namen eingeben.');
@@ -123,34 +117,36 @@
ev.preventDefault(); ev.preventDefault();
// construct PUT URL // construct PUT URL
const url = $page.url const url = $page.url;
console.log(url); console.log(url);
let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' }; let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' };
data_obj["new_name"] = new_name data_obj['new_name'] = new_name;
data_obj["old_name"] = ev.currentTarget && (ev.currentTarget as HTMLElement).id ? (ev.currentTarget as HTMLElement).id.split('__')[1] : '' data_obj['old_name'] =
ev.currentTarget && (ev.currentTarget as HTMLElement).id
? (ev.currentTarget as HTMLElement).id.split('__')[1]
: '';
open = true; open = true;
inProgress = true; inProgress = true;
const response = await fetch(url, const response = await fetch(url, { method: 'PUT', body: JSON.stringify(data_obj) });
{method: 'PUT', body: JSON.stringify( data_obj )
})
inProgress = false; inProgress = false;
if (!response.ok) { if (!response.ok) {
err = true; err = true;
if (response.status == 400) { if (response.status == 400) {
let json_res = await response.json() let json_res = await response.json();
// alert(json_res['msg']) // alert(json_res['msg'])
return; return;
} }
throw new Error(`Fehlgeschlagen: ${response.status}`) throw new Error(`Fehlgeschlagen: ${response.status}`);
} else { } else {
uploadSuccessful(); uploadSuccessful();
setTimeout(() => {window.location.reload()}, 500) setTimeout(() => {
window.location.reload();
}, 500);
} }
// --- upload finished --- // --- upload finished ---
@@ -158,7 +154,6 @@
return; return;
} }
} }
</script> </script>
<div class="-z-10 bg-white"> <div class="-z-10 bg-white">
@@ -193,20 +188,19 @@
style="display: inline-block; min-width: 5px;" style="display: inline-block; min-width: 5px;"
id="label__{item.name}" id="label__{item.name}"
class="text-sm font-semibold leading-6 text-gray-900" class="text-sm font-semibold leading-6 text-gray-900"
contenteditable={! item.show_button} contenteditable={!item.show_button}
role="textbox" role="textbox"
tabindex="0" tabindex="0"
aria-label="Dateiname bearbeiten" aria-label="Dateiname bearbeiten"
on:focusout={() => { on:focusout={() => {
defocus_element(i); defocus_element(i);
}} }}
on:keydown|stopPropagation={ on:keydown|stopPropagation={// event needed to identify ID
// event needed to identify ID
// TO-DO: check if event is needed or if index is sufficient // TO-DO: check if event is needed or if index is sufficient
async (ev) => {handle_input(ev, i)} async (ev) => {
} handle_input(ev, i);
}}>{item.name}</span
>{item.name}</span> >
<!-- https://iconduck.com/icons/192863/edit-rename --> <!-- https://iconduck.com/icons/192863/edit-rename -->
{#if item.show_button} {#if item.show_button}
@@ -215,67 +209,74 @@
id="edit__{item.name}" id="edit__{item.name}"
aria-label="Datei umbenennen" aria-label="Datei umbenennen"
on:click|preventDefault={(ev) => { on:click|preventDefault={(ev) => {
let text_field_id = `label__${item.name}` let text_field_id = `label__${item.name}`;
let text_field = document.getElementById(text_field_id) let text_field = document.getElementById(text_field_id);
if (text_field) { if (text_field) {
text_field.setAttribute("contenteditable", "true"); text_field.setAttribute('contenteditable', 'true');
text_field.focus(); text_field.focus();
text_field.textContent = ''; text_field.textContent = '';
} }
// hide button // hide button
item.show_button = false item.show_button = false;
}} }}
> >
<svg <svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z" fill="#373737" transform="translate(1 1)"/></svg> ><path
d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z"
fill="#373737"
transform="translate(1 1)"
/></svg
>
</button> </button>
{/if} {/if}
<button <button
style="padding: 2px" style="padding: 2px"
id="del__{item.name}" id="del__{item.name}"
on:click|preventDefault={async (ev) => { on:click|preventDefault={async (ev) => {
let delete_item = window.confirm("Bist du sicher?"); let delete_item = window.confirm('Bist du sicher?');
if (delete_item) { if (delete_item) {
// bucket: tatort, name: <vorgang>/item-name // bucket: tatort, name: <vorgang>/item-name
let vorgang = $page.params.vorgang let vorgang = $page.params.vorgang;
let filename = ''; let filename = '';
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) { if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1]; filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
} }
// delete request // delete request
// -------------- // --------------
let url = new URL($page.url); let url = new URL($page.url);
url.pathname += `/${filename}`; url.pathname += `/${filename}`;
console.log(`--- ${vorgang} + ${filename} + ${url}`) console.log(`--- ${vorgang} + ${filename} + ${url}`);
try { try {
const response = await fetch(url, const response = await fetch(url, { method: 'DELETE' });
{method: 'DELETE'}
)
if (response.status == 204) { if (response.status == 204) {
setTimeout(() => {window.location.reload()}, 500) setTimeout(() => {
window.location.reload();
}, 500);
} }
} catch (error) { } catch (error) {
if (error instanceof Error) { if (error instanceof Error) {
console.log(error.message) console.log(error.message);
} else { } else {
console.log(error) console.log(error);
} }
} }
} }
}} }}
aria-label="Datei löschen" aria-label="Datei löschen"
> >
<svg <svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg> ><path
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
fill="#373737"
transform="translate(1 1)"
/></svg
>
</button> </button>
<p class="mt-1 truncate text-xs leading-5 text-gray-500"> <p class="mt-1 truncate text-xs leading-5 text-gray-500">
{shortenFileSize(item.size)} {shortenFileSize(item.size)}
@@ -296,7 +297,7 @@
</ul> </ul>
</div> </div>
<Modal {open} <Modal {open}
><ModalTitle>Umbenennen</ModalTitle><ModalContent> ><ModalTitle>Umbenennen</ModalTitle><ModalContent>
{#if inProgress} {#if inProgress}
<p class="py-2 mb-1">Vorgang läuft...</p> <p class="py-2 mb-1">Vorgang läuft...</p>
@@ -307,5 +308,10 @@
</ModalContent> </ModalContent>
<ModalFooter><Button disabled={inProgress} on:click={uploadSuccessful}>Ok</Button></ModalFooter> <ModalFooter><Button disabled={inProgress} on:click={uploadSuccessful}>Ok</Button></ModalFooter>
</Modal> </Modal>
</div> </div>
<style>
ul {
min-width: 24rem;
}
</style>

16
src/routes/(angemeldet)/list/[vorgang]/+server.ts
View File

@@ -3,25 +3,25 @@ import { json } from '@sveltejs/kit';
// rename operation // rename operation
export async function PUT({ request }) { export async function PUT({ request }: {request: Request}) {
const data = await request.json(); const data = await request.json();
console.log(`--- ${request.url.split('/').at(-1)} +++ ${JSON.stringify(data)}`); console.log(`--- ${request.url.split('/').at(-1)} +++ ${JSON.stringify(data)}`);
// Vorgang // Vorgang
let vorgang = request.url.split('/').at(-1) const vorgang = request.url.split('/').at(-1);
// prepare copy, incl. check if new name exists already // prepare copy, incl. check if new name exists already
let old_name = data["old_name"] const old_name = data["old_name"];
let src_full_path = `/tatort/${vorgang}/${old_name}` const src_full_path = `/tatort/${vorgang}/${old_name}`;
let new_name = `${vorgang}/${data["new_name"]}` const new_name = `${vorgang}/${data["new_name"]}`;
try { try {
let file_stats = await client.statObject('tatort', new_name) await client.statObject('tatort', new_name);
return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 }) return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 });
} catch (error) { } catch (error) {
// continue operation // continue operation
console.log('continue operation') console.log(error, 'continue operation');
} }
// actual copy operation // actual copy operation

13
src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.ts
View File

@@ -1,12 +1,11 @@
import { client } from '$lib/minio'; import { client } from '$lib/minio';
export async function DELETE({ request }) { export async function DELETE({ request }: { request: Request }) {
const url_fragments = request.url.split('/');
const item = url_fragments.at(-1);
const vorgang = url_fragments.at(-2);
let url_fragments = request.url.split('/') await client.removeObject('tatort', `${vorgang}/${item}`);
let item = url_fragments.at(-1);
let vorgang = url_fragments.at(-2);
await client.removeObject('tatort', `${vorgang}/${item}`)
return new Response(null, { status: 204 }); return new Response(null, { status: 204 });
}; }

4
src/routes/(angemeldet)/tatorte/+page.server.ts
View File

@@ -5,7 +5,7 @@ import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
/** @type {import('./$types').Actions} */ /** @type {import('./$types').Actions} */
export const actions = { export const actions = {
default: async ({ request }) => { default: async ({ request }: {request: Request}) => {
const data = await request.formData(); const data = await request.formData();
const caseNumber = data.get('caseNumber'); const caseNumber = data.get('caseNumber');
const description = data.get('description'); const description = data.get('description');
@@ -28,7 +28,7 @@ export const actions = {
const config = `${JSON.stringify({ caseNumber, description, version: 1 })}\n`; const config = `${JSON.stringify({ caseNumber, description, version: 1 })}\n`;
await client.putObject('tatort', `${caseNumber}/config.json`, config, { await client.putObject('tatort', `${caseNumber}/config.json`, config, undefined, {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}); });

14
src/routes/(angemeldet)/upload/+page.server.ts
View File

@@ -2,7 +2,7 @@ import { Readable } from 'stream';
import { client } from '$lib/minio'; import { client } from '$lib/minio';
import { fail } from '@sveltejs/kit'; import { fail } from '@sveltejs/kit';
function isRequiredFieldValid(value) { const isRequiredFieldValid = (value: unknown) => {
if (value == null) return false; if (value == null) return false;
if (typeof value === 'string' || value instanceof String) return value.trim() !== ''; if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
@@ -12,7 +12,7 @@ function isRequiredFieldValid(value) {
/** @type {import('./$types').Actions} */ /** @type {import('./$types').Actions} */
export const actions = { export const actions = {
url: async ({ request }) => { url: async ({ request }: {request: Request}) => {
const data = await request.formData(); const data = await request.formData();
const vorgang = data.get('vorgang'); const vorgang = data.get('vorgang');
const name = data.get('name'); const name = data.get('name');
@@ -25,20 +25,20 @@ export const actions = {
if (!objectName.endsWith('.png')) objectName += '.png'; if (!objectName.endsWith('.png')) objectName += '.png';
break; break;
case '': case '':
if (fileName.endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb'; if (fileName?.toString().endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb';
} }
const url = await client.presignedPutObject('tatort', objectName); const url = await client.presignedPutObject('tatort', objectName);
return { url }; return { url };
}, },
validate: async ({ request }) => { validate: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const vorgang = data.vorgang; const vorgang = data.vorgang;
const name = data.name; const name = data.name;
let success = true; let success = true;
let err = {}; const err = {};
if (isRequiredFieldValid(vorgang)) err.vorgang = null; if (isRequiredFieldValid(vorgang)) err.vorgang = null;
else { else {
@@ -57,7 +57,7 @@ export const actions = {
return fail(400, err); return fail(400, err);
}, },
upload: async ({ request }) => { upload: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const vorgang = data.vorgang; const vorgang = data.vorgang;
@@ -69,7 +69,7 @@ export const actions = {
console.log('O:', url); console.log('O:', url);
return { url }; return { url };
}, },
upload3: async ({ request }) => { upload3: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const name = data.name; const name = data.name;

9
src/routes/(angemeldet)/upload/+page.svelte
View File

@@ -15,10 +15,8 @@
let inProgress = false; let inProgress = false;
let vorgang = ''; let vorgang = '';
let name = ''; let name = '';
/** @type {?string}*/ let etag: string | null = null;
let etag = null; let files: FileList | null = null;
/** @type {?FileList} */
let files = null;
$: inProgress = form === null; $: inProgress = form === null;
@@ -71,8 +69,7 @@
return null; return null;
} }
/** @param {MouseEvent} event*/ async function buttonClick(event: MouseEvent) {
async function buttonClick(event) {
if (!(await validateForm())) { if (!(await validateForm())) {
event.preventDefault(); event.preventDefault();
return; return;

4
src/routes/(angemeldet)/view/+page.server.ts
View File

@@ -3,7 +3,7 @@ import { fail, redirect } from '@sveltejs/kit';
/** @type {import('./$types').Actions} */ /** @type {import('./$types').Actions} */
export const actions = { export const actions = {
default: async ({ request }) => { default: async ({ request }: {request: Request}) => {
const data = await request.formData(); const data = await request.formData();
const caseNumber = data.get('caseNumber'); const caseNumber = data.get('caseNumber');
@@ -15,7 +15,7 @@ export const actions = {
}); });
} }
if (!(await caseNumberOccupied(caseNumber))) { if (typeof caseNumber === 'string' && !(await caseNumberOccupied(caseNumber))) {
return fail(400, { return fail(400, {
success: false, success: false,
caseNumber, caseNumber,

3
src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.server.ts
View File

@@ -1,7 +1,8 @@
import { client } from '$lib/minio'; import { client } from '$lib/minio';
import type { PageServerLoad } from './$types';
/** @type {import('./$types').PageServerLoad} */ /** @type {import('./$types').PageServerLoad} */
export async function load({ params }) { export const load: PageServerLoad = async ({ params }) => {
const { vorgang, tatort } = params; const { vorgang, tatort } = params;
const url = await client.presignedUrl('GET', 'tatort', `${vorgang}/${tatort}`); const url = await client.presignedUrl('GET', 'tatort', `${vorgang}/${tatort}`);
return { url }; return { url };

9
src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte
View File

@@ -19,18 +19,11 @@
let cameraAzimuth = 0; let cameraAzimuth = 0;
let cameraPolar = 0; let cameraPolar = 0;
let frontView = cameraAzimuth === 0 && cameraPolar === 0 ? true : false;
let topView = cameraAzimuth === 0 && cameraPolar === 90 ? true : false;
let cameraZoom = 100; let cameraZoom = 100;
let xRotation = 0; let xRotation = 0;
let yRotation = 0; let yRotation = 0;
let zRotation = 0; let zRotation = 0;
/**
* @type {any}
*/
let modelViewer; let modelViewer;
$: style = `width: ${progress}%`; $: style = `width: ${progress}%`;
@@ -38,7 +31,7 @@
/** /**
* @param {any} detail * @param {any} detail
*/ */
function onProgress({ detail }) { const onProgress = ({ detail }) => {
progress = Math.ceil(detail.totalProgress * 100.0); progress = Math.ceil(detail.totalProgress * 100.0);
if (progress == 100) { if (progress == 100) {
setTimeout(() => { setTimeout(() => {

7
src/routes/anmeldung/+page.server.ts
View File

@@ -1,12 +1,13 @@
import { dev } from '$app/environment'; import { dev } from '$app/environment';
import { fail, redirect } from '@sveltejs/kit'; import { fail, redirect, type Cookies } from '@sveltejs/kit';
import { authenticate } from '$lib/auth'; import { authenticate } from '$lib/auth';
import type { RequestEvent } from '../(angemeldet)/$types';
const COOKIE_NAME = 'session'; const COOKIE_NAME = 'session';
/** @type {import('./$types').Actions} */ /** @type {import('./$types').Actions} */
export const actions = { export const actions = {
login: async ({ request, cookies }) => { login: async ({ request, cookies }: {request: Request, cookies: Cookies}) => {
const data = await request.formData(); const data = await request.formData();
const user = data.get('user'); const user = data.get('user');
const password = data.get('password'); const password = data.get('password');
@@ -23,7 +24,7 @@ export const actions = {
}); });
throw redirect(303, '/'); throw redirect(303, '/');
}, },
logout: async (event) => { logout: async (event: RequestEvent) => {
event.cookies.delete(COOKIE_NAME, {path: '/'}); event.cookies.delete(COOKIE_NAME, {path: '/'});
event.locals.user = null; event.locals.user = null;
return { success: true }; return { success: true };

2
src/routes/api/list/[[vorgang]]/+server.ts
View File

@@ -3,7 +3,7 @@ import { client } from '$lib/minio';
/** @type {import('./$types').RequestHandler} */ /** @type {import('./$types').RequestHandler} */
export async function GET({ params }) { export async function GET({ params }) {
const prefix = params.vorgang ? `${params.vorgang}/` : ''; const prefix = params.vorgang ? `${params.vorgang}/` : '';
let stream = client.listObjectsV2('tatort', prefix, false, ''); const stream = client.listObjectsV2('tatort', prefix, false, '');
const result = new ReadableStream({ const result = new ReadableStream({
start(controller) { start(controller) {
stream.on('data', (data) => { stream.on('data', (data) => {

3
src/routes/api/tatort/+server.ts
View File

@@ -1,8 +1,7 @@
import { client } from '$lib/minio'; import { client } from '$lib/minio';
/** @type {import('./$types').RequestHandler} */
export async function GET() { export async function GET() {
var stream = client.listObjectsV2('tatort', '', true); const stream = client.listObjectsV2('tatort', '', true);
const result = new ReadableStream({ const result = new ReadableStream({
start(controller) { start(controller) {
stream.on('data', (data) => { stream.on('data', (data) => {

4
src/routes/api/upload/+server.ts
View File

@@ -1,5 +1,5 @@
import type { RequestHandler } from "@sveltejs/kit";
/** @type {import('./$types').RequestHandler} */ export async function GET(params: RequestHandler) {
export async function GET(params) {
console.log('GET', params); console.log('GET', params);
} }