10 Commits

46 changed files with 653 additions and 750 deletions

View File

@@ -1,6 +0,0 @@
import { expect, test } from '@playwright/test';
test('home page has expected h1', async ({ page }) => {
await page.goto('/');
await expect(page.locator('h1')).toBeVisible();
});

View File

@@ -20,7 +20,21 @@ export default ts.config(
languageOptions: {
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'],

801
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,31 +13,31 @@
"format": "prettier --write .",
"lint": "prettier --check . && eslint .",
"test:unit": "vitest",
"test": "npm run test:unit -- --run && npm run test:e2e",
"test:e2e": "playwright test"
"test": "npm run test:unit -- --run && npm run test:e2e"
},
"devDependencies": {
"@eslint/compat": "^1.2.5",
"@eslint/compat": "^1.2.9",
"@eslint/js": "^9.18.0",
"@playwright/test": "^1.49.1",
"@sveltejs/adapter-auto": "^4.0.0",
"@sveltejs/kit": "^2.16.0",
"@sveltejs/vite-plugin-svelte": "^5.0.0",
"@sveltejs/kit": "^2.21.3",
"@sveltejs/vite-plugin-svelte": "^5.1.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.4",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-svelte": "^3.0.0",
"globals": "^16.0.0",
"jsdom": "^26.0.0",
"prettier": "^3.4.2",
"prettier-plugin-svelte": "^3.3.3",
"svelte": "^5.0.0",
"svelte-check": "^4.0.0",
"typescript": "^5.0.0",
"typescript-eslint": "^8.20.0",
"vite": "^6.2.5",
"vitest": "^3.0.0"
"@testing-library/svelte": "^5.2.8",
"@tsconfig/svelte": "^5.0.4",
"@types/jsonwebtoken": "^9.0.9",
"eslint": "^9.28.0",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-svelte": "^3.9.2",
"globals": "^16.2.0",
"jsdom": "^26.1.0",
"prettier": "^3.5.3",
"prettier-plugin-svelte": "^3.4.0",
"svelte": "^5.33.18",
"svelte-check": "^4.2.1",
"typescript": "^5.8.3",
"typescript-eslint": "^8.34.0",
"vite": "^6.3.5",
"vitest": "^3.2.3"
},
"dependencies": {
"@google/model-viewer": "^4.1.0",
@@ -46,8 +46,7 @@
"autoprefixer": "^10.4.21",
"jsonwebtoken": "^9.0.2",
"minio": "^8.0.5",
"postcss": "^8.5.3",
"svelte-cubed": "^0.2.1",
"postcss": "^8.5.4",
"tailwindcss": "^3.4.17"
}
}

View File

@@ -1,11 +0,0 @@
/** @type {import('@playwright/test').PlaywrightTestConfig} */
const config = {
webServer: {
command: 'npm run build && npm run preview',
port: 4173
},
testDir: 'tests',
testMatch: /(.+\.)?(test|spec)\.[jt]s/
};
export default config;

View File

@@ -1,9 +0,0 @@
import { defineConfig } from '@playwright/test';
export default defineConfig({
webServer: {
command: 'npm run build && npm run preview',
port: 4173
},
testDir: 'e2e'
});

View File

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

View File

@@ -46,7 +46,7 @@
}
</style>
<script>
<script lang="ts">
export let type = 'info';
let classNames = '';
export { classNames as class };

View File

@@ -173,7 +173,7 @@
}
</style>
<script>
<script lang="ts">
export let href = null;
export let type = 'button';
export let size = 'md';

View File

@@ -11,7 +11,7 @@
}
</style>
<script>
<script lang="ts">
import { page } from '$app/stores';
import Trash from '$lib/icons/Trash.svelte';
import Panel from '$lib/components/ui/Panel.svelte';

View File

@@ -41,7 +41,7 @@
}
</style>
<script>
<script lang="ts">
import { fade } from 'svelte/transition';
export let size = 'xl'; // https://tailwindcss.com/docs/max-width#class-reference
export let open = false;

View File

@@ -15,7 +15,7 @@
}
</style>
<script>
<script lang="ts">
export let scroll = true;
export let padding = true;

View File

@@ -1,4 +1,4 @@
<script>
<script lang="ts">
export let title = 'Erfolgreich';
export let show = false;

View File

@@ -5,7 +5,7 @@
}
</style>
<script>
<script lang="ts">
export let padding = 'p-6';
export let shadow = true;
let classNames = '';

View File

@@ -6,7 +6,7 @@
}
</style>
<script>
<script lang="ts">
import { clickOutside } from '$lib/helpers/clickOutside.js';
import Check from '$lib/icons/Check.svelte';
import Selector from '$lib/icons/Selector.svelte';

View File

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

View File

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

View File

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

View File

@@ -1,9 +0,0 @@
import { redirect } from '@sveltejs/kit';
/** @type {import('./$types').PageServerLoad} */
export function load(event) {
if (!event.locals.user && event.url.pathname !== '/anmeldung') throw redirect(303, '/anmeldung');
return {
user: event.locals.user
};
}

View File

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

View File

@@ -1,6 +1,5 @@
<script>
<script lang="ts">
import Chevron from '$lib/icons/Chevron-right.svelte';
import Login from '$lib/icons/Login.svelte';
export let data;
</script>

View File

@@ -1,8 +1,7 @@
<style>
</style>
<script>
import Panel from '$lib/components/ui/Panel.svelte';
<script lang="ts">
export let data;
</script>

View File

@@ -1,12 +1,5 @@
<style>
ul {
min-width: 24rem;
}
</style>
<script lang="ts">
import { onMount } from 'svelte';
import { page } from '$app/stores';
/**
* @type any[]
@@ -31,42 +24,39 @@
.filter((i) => i.length > 0)
.map((i) => JSON.parse(i));
console.log(objs);
list = list.concat(objs);
}
});
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) {
const target = ev.currentTarget as HTMLElement | null;
if (!target) return;
let filename = target.id.split('del__')[1]
const target = ev.currentTarget as HTMLElement | null;
if (!target) return;
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}`)
try {
const response = await fetch(url,
{method: 'DELETE'}
)
if (response.status == 204) {
setTimeout(() => {window.location.reload()}, 500)
}
} catch (error) {
if (error instanceof Error) {
console.log(error.message);
} else {
console.log(error);
}
console.log(`--- ${filename} + ${url}`);
try {
const response = await fetch(url, { method: 'DELETE' });
if (response.status == 204) {
setTimeout(() => {
window.location.reload();
}, 500);
}
} catch (error) {
if (error instanceof Error) {
console.log(error.message);
} else {
console.log(error);
}
}
}
}
</script>
@@ -98,14 +88,19 @@
<span class="text-sm font-semibold leading-6 text-gray-900">{item.name}</span>
<!-- Delete button -->
<button
style="padding: 2px"
id="del__{item.name}"
on:click|preventDefault={delete_item}
aria-label="Vorgang {item.name} löschen"
>
<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>
</button>
style="padding: 2px"
id="del__{item.name}"
on:click|preventDefault={delete_item}
aria-label="Vorgang {item.name} löschen"
>
<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
>
</button>
</div>
</div>
<div class="hidden sm:flex sm:flex-col sm:items-end">
@@ -117,3 +112,9 @@
</ul>
</div>
</div>
<style>
ul {
min-width: 24rem;
}
</style>

View File

@@ -1,11 +1,5 @@
<style>
ul {
min-width: 24rem;
}
</style>
<script lang="ts">
import { onMount, tick } from 'svelte';
import { onMount } from 'svelte';
import shortenFileSize from '$lib/helper/shortenFileSize';
import { page } from '$app/stores';
@@ -18,7 +12,6 @@
import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
/** @type {import('./$types').PageData} */
/** export let data; */
interface ListItem {
@@ -59,13 +52,12 @@
.filter((i) => i.length > 0)
.map((i) => JSON.parse(i));
console.log(objs);
list = list.concat(objs);
list = list.map((item) => {
item.show_button = true;
return item;
})
});
}
});
@@ -75,12 +67,12 @@
}
function defocus_element(i: number) {
let item = list[i]
let text_field_id = `label__${item.name}`
let item = list[i];
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) {
text_field.setAttribute("contenteditable", "false")
text_field.setAttribute('contenteditable', 'false');
text_field.textContent = item.name;
}
@@ -90,25 +82,26 @@
}
async function handle_input(ev: KeyboardEvent, i: number) {
let item = list[i]
if (ev.key == "Escape") {
let text_field_id = `label__${item.name}`
let item = list[i];
if (ev.key == 'Escape') {
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) {
text_field.setAttribute("contenteditable", "false");
text_field.setAttribute('contenteditable', 'false');
text_field.textContent = item.name;
}
// reshow button
item.show_button = true
item.show_button = true;
return;
}
if (ev.key == "Enter") {
console.log('--- hitted')
if (ev.key == 'Enter') {
console.log('--- hitted');
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 == '') {
alert('Bitte einen gültigen Namen eingeben.');
@@ -123,34 +116,36 @@
ev.preventDefault();
// construct PUT URL
const url = $page.url
const url = $page.url;
console.log(url);
let data_obj: { new_name: string; old_name: string } = { new_name: '', old_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['new_name'] = new_name;
data_obj['old_name'] =
ev.currentTarget && (ev.currentTarget as HTMLElement).id
? (ev.currentTarget as HTMLElement).id.split('__')[1]
: '';
open = true;
inProgress = true;
const response = await fetch(url,
{method: 'PUT', body: JSON.stringify( data_obj )
})
const response = await fetch(url, { method: 'PUT', body: JSON.stringify(data_obj) });
inProgress = false;
if (!response.ok) {
err = true;
if (response.status == 400) {
let json_res = await response.json()
let json_res = await response.json();
// alert(json_res['msg'])
return;
}
throw new Error(`Fehlgeschlagen: ${response.status}`)
throw new Error(`Fehlgeschlagen: ${response.status}`);
} else {
uploadSuccessful();
setTimeout(() => {window.location.reload()}, 500)
setTimeout(() => {
window.location.reload();
}, 500);
}
// --- upload finished ---
@@ -158,7 +153,6 @@
return;
}
}
</script>
<div class="-z-10 bg-white">
@@ -190,93 +184,99 @@
</svg>
<div class="min-w-0 flex-auto">
<span
style="display: inline-block; min-width: 5px;"
id="label__{item.name}"
class="text-sm font-semibold leading-6 text-gray-900"
contenteditable={! item.show_button}
role="textbox"
tabindex="0"
aria-label="Dateiname bearbeiten"
on:focusout={() => {
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}</span>
style="display: inline-block; min-width: 5px;"
id="label__{item.name}"
class="text-sm font-semibold leading-6 text-gray-900"
contenteditable={!item.show_button}
role="textbox"
tabindex="0"
aria-label="Dateiname bearbeiten"
on:focusout={() => {
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}</span
>
<!-- https://iconduck.com/icons/192863/edit-rename -->
{#if item.show_button}
<button
style="padding: 2px"
id="edit__{item.name}"
aria-label="Datei umbenennen"
on:click|preventDefault={(ev) => {
let text_field_id = `label__${item.name}`
let text_field = document.getElementById(text_field_id)
if (text_field) {
text_field.setAttribute("contenteditable", "true");
text_field.focus();
text_field.textContent = '';
}
// hide button
item.show_button = false
}}
>
<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>
</button>
<button
style="padding: 2px"
id="edit__{item.name}"
aria-label="Datei umbenennen"
on:click|preventDefault={(ev) => {
let text_field_id = `label__${item.name}`;
let text_field = document.getElementById(text_field_id);
if (text_field) {
text_field.setAttribute('contenteditable', 'true');
text_field.focus();
text_field.textContent = '';
}
// hide button
item.show_button = false;
}}
>
<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
>
</button>
{/if}
<button
style="padding: 2px"
id="del__{item.name}"
on:click|preventDefault={async (ev) => {
let delete_item = window.confirm("Bist du sicher?");
if (delete_item) {
// bucket: tatort, name: <vorgang>/item-name
let vorgang = $page.params.vorgang
let filename = '';
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
}
// delete request
// --------------
let url = new URL($page.url);
url.pathname += `/${filename}`;
console.log(`--- ${vorgang} + ${filename} + ${url}`)
try {
const response = await fetch(url,
{method: 'DELETE'}
)
if (response.status == 204) {
setTimeout(() => {window.location.reload()}, 500)
}
} catch (error) {
if (error instanceof Error) {
console.log(error.message)
} else {
console.log(error)
}
}
}
}}
aria-label="Datei löschen"
>
<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>
</button>
style="padding: 2px"
id="del__{item.name}"
on:click|preventDefault={async (ev) => {
let delete_item = window.confirm('Bist du sicher?');
if (delete_item) {
// bucket: tatort, name: <vorgang>/item-name
let vorgang = $page.params.vorgang;
let filename = '';
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
}
// delete request
// --------------
let url = new URL($page.url);
url.pathname += `/${filename}`;
console.log(`--- ${vorgang} + ${filename} + ${url}`);
try {
const response = await fetch(url, { method: 'DELETE' });
if (response.status == 204) {
setTimeout(() => {
window.location.reload();
}, 500);
}
} catch (error) {
if (error instanceof Error) {
console.log(error.message);
} else {
console.log(error);
}
}
}
}}
aria-label="Datei löschen"
>
<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
>
</button>
<p class="mt-1 truncate text-xs leading-5 text-gray-500">
{shortenFileSize(item.size)}
</p>
@@ -296,7 +296,7 @@
</ul>
</div>
<Modal {open}
<Modal {open}
><ModalTitle>Umbenennen</ModalTitle><ModalContent>
{#if inProgress}
<p class="py-2 mb-1">Vorgang läuft...</p>
@@ -307,5 +307,10 @@
</ModalContent>
<ModalFooter><Button disabled={inProgress} on:click={uploadSuccessful}>Ok</Button></ModalFooter>
</Modal>
</div>
<style>
ul {
min-width: 24rem;
}
</style>

View File

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

View File

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

View File

@@ -0,0 +1,11 @@
import { client } from '$lib/minio';
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);
await client.removeObject('tatort', `${vorgang}/${item}`);
return new Response(null, { status: 204 });
}

View File

@@ -5,7 +5,7 @@ import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
/** @type {import('./$types').Actions} */
export const actions = {
default: async ({ request }) => {
default: async ({ request }: {request: Request}) => {
const data = await request.formData();
const caseNumber = data.get('caseNumber');
const description = data.get('description');
@@ -28,7 +28,7 @@ export const actions = {
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'
});

View File

@@ -1,4 +1,4 @@
<script>
<script lang="ts">
import Alert from '$lib/components/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte';

View File

@@ -1,13 +1,8 @@
import path from 'path';
import { writeFile } from 'fs/promises';
import { createReadStream } from 'fs';
/** import Minio from 'minio'; */
import { Readable } from 'stream';
/** const MINIO_ACCESS_KEY = 'tMhLrfog47lMm0HZ'; */
import { client } from '$lib/minio';
import { fail } from '@sveltejs/kit';
function isRequiredFieldValid(value) {
const isRequiredFieldValid = (value: unknown) => {
if (value == null) return false;
if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
@@ -17,7 +12,7 @@ function isRequiredFieldValid(value) {
/** @type {import('./$types').Actions} */
export const actions = {
url: async ({ request }) => {
url: async ({ request }: {request: Request}) => {
const data = await request.formData();
const vorgang = data.get('vorgang');
const name = data.get('name');
@@ -30,20 +25,20 @@ export const actions = {
if (!objectName.endsWith('.png')) objectName += '.png';
break;
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);
return { url };
},
validate: async ({ request }) => {
validate: async ({ request }: {request: Request}) => {
const requestData = await request.formData();
const data = Object.fromEntries(requestData);
const vorgang = data.vorgang;
const name = data.name;
let success = true;
let err = {};
const err = {};
if (isRequiredFieldValid(vorgang)) err.vorgang = null;
else {
@@ -62,7 +57,7 @@ export const actions = {
return fail(400, err);
},
upload: async ({ request }) => {
upload: async ({ request }: {request: Request}) => {
const requestData = await request.formData();
const data = Object.fromEntries(requestData);
const vorgang = data.vorgang;
@@ -74,7 +69,7 @@ export const actions = {
console.log('O:', url);
return { url };
},
upload3: async ({ request }) => {
upload3: async ({ request }: {request: Request}) => {
const requestData = await request.formData();
const data = Object.fromEntries(requestData);
const name = data.name;

View File

@@ -1,5 +1,5 @@
<script>
import { deserialize, enhance } from '$app/forms';
<script lang="ts">
import { deserialize } from '$app/forms';
import Alert from '$lib/components/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte';
@@ -15,10 +15,8 @@
let inProgress = false;
let vorgang = '';
let name = '';
/** @type {?string}*/
let etag = null;
/** @type {?FileList} */
let files = null;
let etag: string | null = null;
let files: FileList | null = null;
$: inProgress = form === null;
@@ -71,8 +69,7 @@
return null;
}
/** @param {MouseEvent} event*/
async function buttonClick(event) {
async function buttonClick(event: MouseEvent) {
if (!(await validateForm())) {
event.preventDefault();
return;

View File

@@ -3,7 +3,7 @@ import { fail, redirect } from '@sveltejs/kit';
/** @type {import('./$types').Actions} */
export const actions = {
default: async ({ request }) => {
default: async ({ request }: {request: Request}) => {
const data = await request.formData();
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, {
success: false,
caseNumber,

View File

@@ -1,10 +1,5 @@
<script>
import Alert from '$lib/components/ui/Alert.svelte';
<script lang="ts">
import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte';
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 Exclamation from '$lib/icons/Exclamation.svelte';
export let form;

View File

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

View File

@@ -1,4 +1,4 @@
<script>
<script lang="ts">
import Panel from '$lib/components/ui/Panel.svelte';
import { onMount } from 'svelte';
import Button from '$lib/components/ui/Button.svelte';
@@ -19,18 +19,11 @@
let cameraAzimuth = 0;
let cameraPolar = 0;
let frontView = cameraAzimuth === 0 && cameraPolar === 0 ? true : false;
let topView = cameraAzimuth === 0 && cameraPolar === 90 ? true : false;
let cameraZoom = 100;
let xRotation = 0;
let yRotation = 0;
let zRotation = 0;
/**
* @type {any}
*/
let modelViewer;
$: style = `width: ${progress}%`;
@@ -38,7 +31,7 @@
/**
* @param {any} detail
*/
function onProgress({ detail }) {
const onProgress = ({ detail }) => {
progress = Math.ceil(detail.totalProgress * 100.0);
if (progress == 100) {
setTimeout(() => {

View File

@@ -1,4 +1,4 @@
<script>
<script lang="ts">
import '../app.css';
</script>

View File

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

View File

@@ -1,9 +1,4 @@
<script>
import Panel from '$lib/components/ui/Panel.svelte';
import Button from '$lib/components/ui/Button.svelte';
import Alert from '$lib/components/ui/Alert.svelte';
import Login from '$lib/icons/Login.svelte';
<script lang="ts">
/** @type {import('./$types').ActionData} */
export let form;

View File

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

View File

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

View File

@@ -1,6 +0,0 @@
import { client } from '$lib/minio';
/** @type {import('./$types').RequestHandler} */
export async function GET(params) {
console.log('GET', params);
}

View File

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

View File

@@ -10,7 +10,9 @@
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
}
},
"include": ["src/**/*", "src/node_modules"],
"exclude": ["node_modules/*", "__sapper__/*", "public/*"]
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
//