Merge pull request 'refactor-login-page' (#8) from refactor-login-page into development

Reviewed-on: #8

e2e/demo.test.ts

@@ -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();
-});

eslint.config.js

@@ -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'],

package.json

@@ -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": "npm run test:unit -- --run && npm run test:e2e"
-		"test:e2e": "playwright test"
 	},
 	"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/kit": "^2.21.3",
-		"@sveltejs/vite-plugin-svelte": "^5.0.0",
+		"@sveltejs/vite-plugin-svelte": "^5.1.0",
 		"@testing-library/jest-dom": "^6.6.3",
-		"@testing-library/svelte": "^5.2.4",
+		"@testing-library/svelte": "^5.2.8",
-		"eslint": "^9.18.0",
+		"@tsconfig/svelte": "^5.0.4",
-		"eslint-config-prettier": "^10.0.1",
+		"@types/jsonwebtoken": "^9.0.9",
-		"eslint-plugin-svelte": "^3.0.0",
+		"eslint": "^9.28.0",
-		"globals": "^16.0.0",
+		"eslint-config-prettier": "^10.1.5",
-		"jsdom": "^26.0.0",
+		"eslint-plugin-svelte": "^3.9.2",
-		"prettier": "^3.4.2",
+		"globals": "^16.2.0",
-		"prettier-plugin-svelte": "^3.3.3",
+		"jsdom": "^26.1.0",
-		"svelte": "^5.0.0",
+		"prettier": "^3.5.3",
-		"svelte-check": "^4.0.0",
+		"prettier-plugin-svelte": "^3.4.0",
-		"typescript": "^5.0.0",
+		"svelte": "^5.33.18",
-		"typescript-eslint": "^8.20.0",
+		"svelte-check": "^4.2.1",
-		"vite": "^6.2.5",
+		"typescript": "^5.8.3",
-		"vitest": "^3.0.0"
+		"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",
+		"postcss": "^8.5.4",
-		"svelte-cubed": "^0.2.1",
 		"tailwindcss": "^3.4.17"
 	}
 }

playwright.config.js

@@ -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;

playwright.config.ts

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

src/hooks.server.ts

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

src/lib/auth.ts

@@ -11,7 +11,7 @@ export function createToken(userData) {
 	return jwt.sign(userData, SECRET, { expiresIn: EXPIRES_IN });
 }
 
-export function decryptToken(token) {
+export function decryptToken(token: string) {
 	return jwt.verify(token, SECRET);
 }
 

src/lib/components/Alert.svelte

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

src/lib/components/BaseInputField.svelte

@@ -0,0 +1,32 @@
+<script lang="ts">
+	import Exclamation from '$lib/icons/Exclamation.svelte';
+
+	let { label = '', error = null, value, name, id, type = 'text'} = $props();
+</script>
+
+<div>
+	<label for={name} class="block text-sm font-medium leading-6 text-gray-900"
+		><span class="flex"
+			>{#if error}
+				<span class="inline-block mr-1"><Exclamation /></span>
+			{/if}
+			{label}</span
+		></label
+	>
+	<div class="mt-2">
+		<div
+			class="flex rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600"
+		>
+			<input
+				class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 text-sm leading-6"
+				bind:value
+				{type}
+				{name}
+				{id}
+			/>
+		</div>
+	</div>
+	{#if error}
+		<p class="block text-sm leading-6 text-red-900 mt-2">{error}</p>
+	{/if}
+</div>

src/lib/components/Button.svelte

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

src/lib/components/DeleteIconButton.svelte

@@ -11,11 +11,11 @@
 	}
 </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';
+	import Panel from '$lib/components/Panel.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
 	import { clickOutside } from '$lib/helpers/clickOutside.js';
 	const { adminMode, prediction, predictionRemove } = $page.data;
 

src/lib/components/Footer.svelte

@@ -0,0 +1,37 @@
+<script>
+	import Profile from "$lib/icons/Profile.svelte";
+
+    export let data;
+</script>
+
+	<div class="flex-none">
+			<footer class="justify-end">
+				<div class="bg-gray-100">
+					<div class="mx-auto max-w-7xl px-6 lg:px-8">
+						<div class="flex justify-between divide-x divide-gray-900/5 border-x border-gray-900/5">
+							<a
+								href="/list"
+								class="px-4 py-1 -ml-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"
+							>
+								&copy; 2023 Innovation Hub Niedersachen
+							</a>
+							<a
+								href="/"
+								class="px-4 py-1 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"
+							>
+								back
+							</a>
+							<a
+								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"
+							>
+								<!--icon-->
+								<Profile />
+
+								{data?.user?.id}
+							</a>
+						</div>
+					</div>
+				</div>
+			</footer>
+		</div>

src/lib/components/Header.svelte

@@ -0,0 +1,36 @@
+<script lang="ts">
+	import Chevron from '$lib/icons/Chevron-right.svelte';
+
+	export let data;
+</script>
+
+<div class="flex flex-col">
+	<header class="flex-none relative isolate z-10 bg-white px-8">
+		<nav
+			class="mx-auto flex max-w-7xl items-center justify-between p-6 lg:px-8"
+			aria-label="Global"
+		>
+			<div class="flex w-48">
+				<a href="/" class="-m-1.5 p-1.5 w-10">
+					<span class="sr-only">Tatort Niedersachen</span>
+					<img class="h-8 w-auto" src="/Landeswappen_NI.svg" alt="Landeswappen Niedersachsen" />
+				</a>
+			</div>
+			<h1 class="text-3xl text-slate-400 font-bold">Tatort</h1>
+			<div class="lg:flex lg:justify-end w-48">
+				{#if data.user}
+					<form method="POST" action="/anmeldung?/logout">
+						<input type="hidden" />
+						<button type="submit" class="text-sm font-semibold leading-6 text-gray-900"
+							><span
+								><span class="align-middle inline-block">Abmelden</span><span
+									class="align-middle inline-block"><Chevron /></span
+								></span
+							></button
+						>
+					</form>
+				{/if}
+			</div>
+		</nav>
+	</header>
+</div>

src/lib/components/Modal/Modal.svelte

@@ -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;

src/lib/components/Modal/ModalContent.svelte

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

src/lib/components/Notification.svelte

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

src/lib/components/Panel.svelte

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

src/lib/components/Select.svelte

@@ -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';

src/lib/config.js

@@ -1,3 +0,0 @@
-import { readFileSync } from 'fs';
-
-export default JSON.parse(readFileSync('./config.json'));

src/lib/config.ts

@@ -0,0 +1,3 @@
+import { readFileSync } from 'fs';
+
+export default JSON.parse(readFileSync('./config.json').toString());

src/lib/helper/caseNumberOccupied.js

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

src/lib/helper/caseNumberOccupied.ts

@@ -0,0 +1,17 @@
+import { client } from '$lib/minio';
+
+export default async function caseNumberOccupied (caseNumber: string): Promise<boolean> {
+	const prefix = `${caseNumber}`;
+	const promise: Promise<boolean> = new Promise((resolve) => {
+		const stream = client.listObjectsV2('tatort', prefix, false, '');
+		stream.on('data', () => {
+			stream.destroy();
+			resolve(true);
+		});
+		stream.on('end', () => {
+			resolve(false);
+		});
+	});
+
+	return promise;
+}

src/lib/helper/getCode.ts

@@ -0,0 +1,10 @@
+export default async function get_code(case_no) {
+	let url = `/api/list/${case_no}/code`;
+	const response = await fetch(url);
+
+	if (response.status == 200) {
+		return response.text();
+	} else {
+		return -1;
+	}
+}

src/lib/helper/shortenFileSize.ts

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

src/lib/helper/timeElapsed.ts

@@ -4,12 +4,7 @@ const DAY = 24 * HOUR;
 const YEAR = 365 * DAY;
 const MONTH = YEAR / 12;
 
-/**
+export default function timeElapsed(date: Date): string {
- * get readable string of time elapsed since date
- * @param {Date} date
- * @returns string
- */
-export default function timeElapsed(date) {
 	const now = new Date();
 	const age = Math.floor((now.getTime() - date.getTime()) / 1000);
 

src/lib/minio.ts

@@ -6,3 +6,5 @@ import config from '$lib/config';
 
 /** export const client = new Minio.Client(config.minio); */
 export const client = new Client(config.minio);
+
+export const BUCKET = 'tatort';

src/lib/server/authService.ts

@@ -0,0 +1,29 @@
+import { dev } from '$app/environment';
+import { fail, redirect, type Cookies, type RequestEvent } from '@sveltejs/kit';
+import { authenticate } from '$lib/auth';
+
+const COOKIE_NAME = 'session';
+
+export const loginUser = async ({ request, cookies }: { request: Request; cookies: Cookies }) => {
+	const data = await request.formData();
+	const user = data.get('user');
+	const password = data.get('password');
+
+	const token = authenticate(user, password);
+
+	if (!token) return fail(400, { user, incorrect: true });
+
+	cookies.set(COOKIE_NAME, token, {
+		path: '/',
+		httpOnly: true,
+		sameSite: 'strict',
+		secure: !dev
+	});
+	return redirect(303, '/');
+};
+
+export const logoutUser = async (event: RequestEvent) => {
+	event.cookies.delete(COOKIE_NAME, { path: '/' });
+	event.locals.user = null;
+	return { success: true };
+};

src/lib/server/s3ClientService.ts

@@ -0,0 +1,21 @@
+import { BUCKET, client } from '$lib/minio';
+
+
+export const checkIfExactDirectoryExists = (dir: string): Promise<boolean> => {
+	return new Promise<boolean>((resolve, reject) => {
+		const prefix = dir.endsWith('/') ? dir : `${dir}/`;
+
+		const stream = client.listObjectsV2(BUCKET, prefix, false, '');
+
+		stream.on('data', (obj) => {
+			if (obj.prefix === undefined && obj.name.startsWith(prefix)) {
+				stream.destroy();
+				resolve(true);
+			}
+		});
+
+		stream.on('error', (err) => reject(err));
+
+		stream.on('end', () => resolve(false));
+	});
+}

src/lib/server/vorgangService.ts

@@ -0,0 +1,97 @@
+import { fail, redirect } from '@sveltejs/kit';
+import { BUCKET, client } from '$lib/minio';
+import { checkIfExactDirectoryExists } from './s3ClientService';
+
+/**
+ * Checks if Vorgang exists and token is valid.
+ * @param request
+ * @returns redirect to /list/caseId or error
+ */
+export const redirectIfVorgangExists = async (request: Request) => {
+	const data = await request.formData();
+	const caseId = data.get('case-id');
+	const caseToken = data.get('case-token');
+
+	if (!caseId) {
+		return fail(400, {
+			success: false,
+			caseId,
+			error: { message: 'Die Vorgangsnummer darf nicht leer sein.' }
+		});
+	}
+
+	if (typeof caseId === 'string' && !(await checkIfExactDirectoryExists(caseId))) {
+		return fail(400, {
+			success: false,
+			caseId,
+			error: { message: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
+		});
+	}
+
+	const isTokenValid = await hasValidToken(caseId, caseToken);
+
+	if (!isTokenValid) {
+		return fail(400, {
+			success: false,
+			caseId,
+			error: { message: 'Der Token ist ungültig.' }
+		});
+	}
+
+	redirect(303, `/list/${caseId}`);
+};
+
+export const getVorgangByCaseId = ({ params }) => {
+	const prefix = params.vorgang ? `${params.vorgang}/` : '';
+	const stream = client.listObjectsV2(BUCKET, prefix, false, '');
+	const result = new ReadableStream({
+		start(controller) {
+			stream.on('data', (data) => {
+				if (prefix === '') {
+					if (data.prefix)
+						controller.enqueue(`${JSON.stringify({ ...data, name: data.prefix.slice(0, -1) })}\n`);
+					return;
+				}
+
+				const name = data.name.slice(prefix.length);
+				if (name === 'config.json') return;
+				// zugangscode datei
+				if (name === '__perm__') return;
+
+				controller.enqueue(`${JSON.stringify({ ...data, name, prefix })}\n`);
+			});
+			stream.on('end', () => {
+				controller.close();
+			});
+		},
+		cancel() {
+			stream.destroy();
+		}
+	});
+
+	return new Response(result, {
+		headers: {
+			'content-type': 'text/event-stream'
+		}
+	});
+};
+
+const hasValidToken = async (caseId: string, caseToken: string) => {
+	const tokenFileName = '__perm__';
+	const objPath = `${caseId}/${tokenFileName}`;
+
+	try {
+		if (!caseToken) return false;
+
+		const res = await client.getObject('tatort', objPath);
+
+		const savedToken = await new Response(res).text();
+
+		return savedToken === caseToken ? true : false;
+	} catch (error) {
+		if (error.name == 'S3Error') {
+			console.log(error);
+			return false;
+		}
+	}
+};

src/routes/(angemeldet)/+layout.server.js

@@ -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
-	};
-}

src/routes/(angemeldet)/+layout.server.ts

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

src/routes/(angemeldet)/+layout.svelte

@@ -1,74 +1,18 @@
-<script>
+<script lang="ts">
-	import Chevron from '$lib/icons/Chevron-right.svelte';
+	import Footer from '$lib/components/Footer.svelte';
-	import Login from '$lib/icons/Login.svelte';
+	import Header from '$lib/components/Header.svelte';
-	import Profile from '$lib/icons/Profile.svelte';
 
 	export let data;
 </script>
 
 <div class="h-screen v-screen flex flex-col">
 	<div class="flex flex-col h-full">
-		<header class="flex-none relative isolate z-10 bg-white px-8">
+		<Header {data}/>
-			<nav
+
-				class="mx-auto flex max-w-7xl items-center justify-between p-6 lg:px-8"
-				aria-label="Global"
-			>
-				<div class="flex w-48">
-					<a href="/" class="-m-1.5 p-1.5 w-10">
-						<span class="sr-only">Tatort Niedersachen</span>
-						<img class="h-8 w-auto" src="/Landeswappen_NI.svg" alt="Landeswappen Niedersachsen" />
-					</a>
-				</div>
-				<h1 class="text-3xl text-slate-400 font-bold">Tatort</h1>
-				<div class="lg:flex lg:justify-end w-48">
-					{#if data.user}
-						<form method="POST" action="/anmeldung?/logout">
-							<input type="hidden" />
-							<button type="submit" class="text-sm font-semibold leading-6 text-gray-900"
-								><span
-									><span class="align-middle inline-block">Abmelden</span><span
-										class="align-middle inline-block"><Chevron /></span
-									></span
-								></button
-							>
-						</form>
-					{/if}
-				</div>
-			</nav>
-		</header>
 		<div class="h-full grow overflow-scroll">
 			<slot />
 		</div>
-		<div class="flex-none">
+		<Footer {data}/>
-			<footer class="justify-end">
-				<div class="bg-gray-100">
-					<div class="mx-auto max-w-7xl px-6 lg:px-8">
-						<div class="flex justify-between divide-x divide-gray-900/5 border-x border-gray-900/5">
-							<a
-								href="/list"
-								class="px-4 py-1 -ml-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"
-							>
-								&copy; 2023 Innovation Hub Niedersachen
-							</a>
-							<a
-								href="/"
-								class="px-4 py-1 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"
-							>
-								back
-							</a>
-							<a
-								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"
-							>
-								<!--icon-->
-								<Profile />
 
-								{data.user.id}
-							</a>
-						</div>
-					</div>
-				</div>
-			</footer>
-		</div>
 	</div>
 </div>

src/routes/(angemeldet)/+page.svelte

@@ -1,9 +1,9 @@
-<script>
+<script lang="ts">
-	import Panel from '$lib/components/ui/Panel.svelte';
 	import AddProcess from '$lib/icons/Add-Process.svelte';
 	import FileRect from '$lib/icons/File-rect.svelte';
 	import ListIcon from '$lib/icons/List-icon.svelte';
 
+
 	export let data;
 	export let outline = true;
 </script>
@@ -28,33 +28,6 @@
 				</p>
 			</div>
 		{/if}
-		<!--{#if data.user.admin}
-			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
-				<div
-					class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						fill="none"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						class="w-6 h-6"
-					>
-						<path
-							stroke-linecap="round"
-							stroke-linejoin="round"
-							d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m3.75 9v6m3-3H9m1.5-12H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
-						/>
-					</svg>
-				</div>
-				<a href="/tatorte" class="mt-6 block font-semibold text-gray-900">
-					Neueer Vorgang
-					<span class="absolute inset-0"></span>
-				</a>
-				<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
-			</div>
-		{/if}-->
 		{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div
@@ -85,4 +58,4 @@
 </div>
 
 <style>
-</style>
+</style>

src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.js

@@ -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 });
-};

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

@@ -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'
 		});
 

src/routes/(angemeldet)/tatorte/+page.svelte

@@ -1,10 +1,10 @@
-<script>
+<script lang="ts">
-	import Alert from '$lib/components/ui/Alert.svelte';
+	import Alert from '$lib/components/Alert.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
-	import Modal from '$lib/components/ui/Modal/Modal.svelte';
+	import Modal from '$lib/components/Modal/Modal.svelte';
-	import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte';
+	import ModalTitle from '$lib/components/Modal/ModalTitle.svelte';
-	import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
+	import ModalContent from '$lib/components/Modal/ModalContent.svelte';
-	import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
+	import ModalFooter from '$lib/components/Modal/ModalFooter.svelte';
 	import Exclamation from '$lib/icons/Exclamation.svelte';
 
 	export let form;
@@ -55,22 +55,22 @@
 					<div>
 						<label for="description" class="block text-sm font-medium leading-6 text-gray-900"
 							><span class="flex"
-								>{#if form?.error?.description}
+								>{#if form?.description}
 									<span class="inline-block mr-1"><Exclamation /></span>
 								{/if} Beschreibung</span
 							></label
 						>
 						<div class="mt-2">
 							<textarea
-								value={form?.description ?? ''}
+								value={form?.description?.toString() ?? ''}
 								id="description"
 								name="description"
 								rows="3"
 								class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
 							></textarea>
 						</div>
-						{#if form?.error?.description}
+						{#if form?.error}
-							<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.description}</p>
+							<p class="block text-sm leading-6 text-red-900 mt-2">{form.description}</p>
 						{/if}
 					</div>
 

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

@@ -1,13 +1,9 @@
-import path from 'path';
+import { Buffer } from 'buffer';
-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() !== '';
@@ -15,13 +11,13 @@ function isRequiredFieldValid(value) {
 	return true;
 }
 
-/** @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');
 		const type = data.get('type');
+		const code = data.get('zugangscode');
 		const fileName = data.get('fileName');
 
 		let objectName = `${vorgang}/${name}`;
@@ -30,21 +26,29 @@ 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);
 
+		// store code in S3
+		// tatort/<vorgang>/__perm__
+		const code_filename = '__perm__';
+		const buf = Buffer.from(code, 'utf-8');
+		const code_stream = Readable.from(buf);
+		const code_path = `${vorgang}/${code_filename}`;
+		await client.putObject('tatort', code_path, code_stream);
+
 		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;
 		const zugangscode = data.zugangscode;
 		let success = true;
-		let err = {};
+		const err = {};
 
 		if (isRequiredFieldValid(vorgang)) err.vorgang = null;
 		else {
@@ -69,24 +73,21 @@ 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;
 		const name = data.name;
-		console.log('I:', vorgang, name);
 
 		const url = await client.presignedPutObject('tatort', `${vorgang}/${name}`, 60);
 
-		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;
 		const stream = data.file.stream();
-		console.log('Data:', stream);
 		const metaData = { 'Content-Type': 'model-gtlf-binary', 'X-VorgangsNr': '4711' };
 		const result = new Promise((resolve, reject) => {
 			client.putObject('tatort', name, Readable.from(stream), metaData, function (err, etag) {
@@ -98,13 +99,11 @@ export const actions = {
 		let error = null;
 		try {
 			etag = await result;
-			console.log(etag);
 		} catch (err) {
 			error = err;
 			console.log('Error:', err);
 		}
 
 		return { etag, error };
-		//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
 	}
 };

src/routes/(angemeldet)/upload/+page.svelte

@@ -1,11 +1,11 @@
-<script>
+<script lang="ts">
-	import { deserialize, enhance } from '$app/forms';
+	import { deserialize } from '$app/forms';
-	import Alert from '$lib/components/ui/Alert.svelte';
+	import Alert from '$lib/components/Alert.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
-	import Modal from '$lib/components/ui/Modal/Modal.svelte';
+	import Modal from '$lib/components/Modal/Modal.svelte';
-	import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte';
+	import ModalTitle from '$lib/components/Modal/ModalTitle.svelte';
-	import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
+	import ModalContent from '$lib/components/Modal/ModalContent.svelte';
-	import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
+	import ModalFooter from '$lib/components/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';
@@ -16,20 +16,27 @@
 	let inProgress = false;
 	let vorgang = '';
 	const code_len = 8;
-	let zugangscode = Math.random()
+
+	function generate_token() {
+		return Math.random()
 		.toString(36)
 		.slice(2, 2 + code_len);
+	}
+	let zugangscode = ''
+	let zugangscode_old = ''
+	$: zugangscode_old = generate_token();
+	$: zugangscode = zugangscode_old
+
 	let case_existing = undefined;
+	$: case_existing = false;
+
 	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;
 
-	/** @type {?Record<string,any>}*/
+	let formErrors: Record<string,any> | null;
-	let formErrors;
 
 	async function validateForm() {
 		let data = new FormData();
@@ -48,7 +55,6 @@
 			success = false;
 		}
 
-		console.log('File', files);
 		if (!files?.length) {
 			formErrors = { file: 'Sie haben keine Datei ausgewählt.', ...formErrors };
 			success = false;
@@ -66,6 +72,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);
@@ -78,14 +85,12 @@
 		return null;
 	}
 
-	/** @param {MouseEvent} event*/
+	async function buttonClick(event: MouseEvent) {
-	async function buttonClick(event) {
 		if (!(await validateForm())) {
 			event.preventDefault();
 			return;
 		}
 		const url = await getUrl();
-		console.log('URL', url);
 		open = true;
 		inProgress = true;
 
@@ -93,7 +98,6 @@
 			.then((response) => {
 				inProgress = false;
 				etag = '123';
-				console.log('SUCCESS', response);
 			})
 			.catch((err) => {
 				inProgress = false;
@@ -103,7 +107,6 @@
 	}
 
 	function uploadSuccessful() {
-		console.log('reset');
 		open = false;
 		vorgang = '';
 		name = '';
@@ -145,27 +148,57 @@
 		} else {
 			return false;
 		}
+		return true;
 	}
 
-	// return true or false
+	// `/(angemeldet)/view` return true or false
 	async function case_exists(case_no) {
-		console.log('--- fired');
+
-		// ping `/(angemeldet)/view` with caseNumber in POST body
+		if (case_no == '') {
+			zugangscode = zugangscode_old;
+		}
+
+		// ping `/view` with caseNumber in POST body
 		let url = '/view';
+
 		let data = new FormData();
 		data.append('caseNumber', case_no);
+
+		// fetch code in parallel
+		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 code = response.status;
+		const res_json = await response.json();
+		const status = res_json.status;
 
-		console.log(`+++ ${response.redirected}`);
+		if (status != 303) {
-
+			case_existing = false;
-		if (code == 303) {
+			zugangscode = zugangscode_old;
-			return true;
 		}
 
 		return false;
 	}
+
+	async function get_code(case_no) {
+
+		if (case_no == '') return;
+
+		let url = `/api/list/${case_no}/code`;
+		const response = await fetch(url);
+
+		if (response.status == 200) {
+			return response.text();
+		} else {
+			return -1;
+		}
+	}
+
 </script>
 
 <div class="mx-auto max-w-2xl">
@@ -207,12 +240,17 @@
 						{#if formErrors?.vorgang}
 							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
 						{/if}
+						{#if case_existing && vorgang.length > 0}
+							<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
+						{:else if vorgang.length > 0}
+							<span>Neuer Vorgang wird angelegt.</span>
+						{/if}
 					</div>
 
 					<div>
 						<label for="name" class="block text-sm font-medium leading-6 text-gray-900"
-							><span class="flex"
+						><span class="flex"
-								>{#if formErrors?.name}
+							>{#if formErrors?.name}
 									<span class="inline-block mr-1"><Exclamation /></span>
 								{/if} Name</span
 							></label
@@ -253,9 +291,18 @@
 									type="text"
 									name="zugangscode"
 									id="zugangscode"
+									on:input="{ (ev) => { zugangscode_old = ev.target.value }}"
 									class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
 								/>
+
 							</div>
+							<button
+							class="rounded-md bg-blue-500 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
+							on:click="{() => {
+							zugangscode = zugangscode_old = generate_token(); }}"
+							type="button">
+								Generiere Zugangscode
+							</button>
 						</div>
 						{#if formErrors?.code}
 							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.code}</p>

src/routes/(angemeldet)/view/+page.server.js

@@ -1,36 +0,0 @@
-import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
-import { fail, redirect } from '@sveltejs/kit';
-
-/** @type {import('./$types').Actions} */
-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,
-				error: { caseNumber: 'Die Vorgangsnummer darf nicht leer sein.' }
-			});
-		}
-
-		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}`)
-		}
-
-	}
-};

src/routes/(angemeldet)/view/+page.svelte

@@ -1,64 +0,0 @@
-<script>
-	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';
-	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;
-</script>
-
-<div class="mx-auto max-w-2xl">
-	<div class="flex flex-col items-center justify-center w-full">
-		<h1 class="text-xl">Vorgang ansehen</h1>
-	</div>
-
-	<form method="POST">
-		<div class="space-y-12">
-			<div class="border-b border-gray-900/10 pb-12">
-				<!-- <h2 class="text-base font-semibold leading-7 text-gray-900">Profile</h2> -->
-				<p class="mt-8 text-sm leading-6 text-gray-600">
-					Anhand der Vorgangsnummer werden Sie zu den Dateien des Vorgangs weitergeleitet und können
-					sich den Vorgang dann ansehen.
-				</p>
-
-				<div class="mt-10 grid grid-cols-1 gap-x-6 gap-y-8">
-					<div>
-						<label for="caseNumber" class="block text-sm font-medium leading-6 text-gray-900"
-							><span class="flex"
-								>{#if form?.error?.caseNumber}
-									<span class="inline-block mr-1"><Exclamation /></span>
-								{/if} Vorgangs-Nr.</span
-							></label
-						>
-						<div class="mt-2 w-full">
-							<div
-								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"
-							>
-								<input
-									value={form?.caseNumber ?? ''}
-									type="text"
-									name="caseNumber"
-									id="caseNumber"
-									class="block w-full flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
-								/>
-							</div>
-						</div>
-						{#if form?.error?.caseNumber}
-							<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.caseNumber}</p>
-						{/if}
-					</div>
-				</div>
-			</div>
-			<div class="mt-6 flex items-center justify-end gap-x-6">
-				<Button
-					type="submit"
-					class="rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
-					>Weiter</Button
-				>
-			</div>
-		</div>
-	</form>
-</div>

src/routes/(token-based)/+layout.server.ts

@@ -0,0 +1,10 @@
+import { type ServerLoadEvent } from '@sveltejs/kit';
+import type { PageServerLoad } from '../anmeldung/$types';
+
+export const load: PageServerLoad = (event: ServerLoadEvent) => {
+	if (event.locals.user) {
+		return {
+			user: event.locals.user
+		};
+	}
+};

src/routes/(token-based)/+layout.svelte

@@ -0,0 +1,16 @@
+<script lang="ts">
+	import Footer from '$lib/components/Footer.svelte';
+	import Header from '$lib/components/Header.svelte';
+
+	export let data;
+</script>
+
+<div class="h-screen v-screen flex flex-col">
+	<Header {data} />
+
+	<div class="mt-10 flex-grow items-center justify-center">
+		<slot />
+	</div>
+
+	<Footer {data} />
+</div>

src/routes/(token-based)/list/+page.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { page } from '$app/stores';
 	import Trash from '$lib/icons/Trash.svelte';
 	import Folder from '$lib/icons/Folder.svelte';
 
@@ -27,7 +26,6 @@
 				.filter((i) => i.length > 0)
 				.map((i) => JSON.parse(i));
 
-			console.log(objs);
 			list = list.concat(objs);
 		}
 	});
@@ -39,13 +37,12 @@
 			const target = ev.currentTarget as HTMLElement | null;
 			if (!target) return;
 			let filename = target.id.split('del__')[1];
-
+			
 			// delete request
 			// --------------
 
 			let url = `/api/list/${filename}`;
 
-			console.log(`--- ${filename} + ${url}`);
 			try {
 				const response = await fetch(url, { method: 'DELETE' });
 				if (response.status == 204) {

src/routes/(token-based)/list/[vorgang]/+page.svelte

@@ -1,25 +1,24 @@
 <script lang="ts">
-	import { onMount, tick } from 'svelte';
+	import { onMount } from 'svelte';
 	import shortenFileSize from '$lib/helper/shortenFileSize';
 	import { page } from '$app/stores';
 
 	import timeElapsed from '$lib/helper/timeElapsed';
 
-	import Alert from '$lib/components/ui/Alert.svelte';
+	import Alert from '$lib/components/Alert.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
-	import Modal from '$lib/components/ui/Modal/Modal.svelte';
+	import Modal from '$lib/components/Modal/Modal.svelte';
-	import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte';
+	import ModalTitle from '$lib/components/Modal/ModalTitle.svelte';
-	import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
+	import ModalContent from '$lib/components/Modal/ModalContent.svelte';
-	import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
+	import ModalFooter from '$lib/components/Modal/ModalFooter.svelte';
 	import Cube from '$lib/icons/Cube.svelte';
 	import Edit from '$lib/icons/Edit.svelte';
 	import Trash from '$lib/icons/Trash.svelte';
 
+	/** export let data; */
 	/** @type {import('./$types').PageData} */
 	export let data;
 
-	console.log(`--- ${data.user.admin}`);
-
 	interface ListItem {
 		name: string;
 		size: number;
@@ -58,7 +57,6 @@
 				.filter((i) => i.length > 0)
 				.map((i) => JSON.parse(i));
 
-			console.log(objs);
 			list = list.concat(objs);
 
 			list = list.map((item) => {
@@ -69,7 +67,6 @@
 	});
 
 	function uploadSuccessful() {
-		console.log('reset');
 		open = false;
 	}
 
@@ -104,7 +101,6 @@
 			return;
 		}
 		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 || ''
@@ -144,7 +140,6 @@
 				err = true;
 				if (response.status == 400) {
 					let json_res = await response.json();
-					// alert(json_res['msg'])
 					return;
 				}
 				throw new Error(`Fehlgeschlagen: ${response.status}`);
@@ -170,34 +165,33 @@
 		<ul class="divide-y divide-gray-100">
 			{#each list as item, i}
 				<li>
-					<div class=" flex gap-x-4">
+					<a
-						<a
+						href="/view/{$page.params.vorgang}/{item.name}"
-							href="/view/{$page.params.vorgang}/{item.name}"
+						class=" flex justify-between gap-x-6 py-5"
-							class=" flex justify-between gap-x-6 py-5"
+						aria-label="zum 3D-modell"
-							aria-label="zum 3D-modell"
+					>
-						>
+						<div class=" flex gap-x-4">
 							<Cube />
-						</a>
+							<div class="min-w-0 flex-auto">
-						<div class="min-w-0 flex-auto">
+								{#if data?.user?.admin}
-							{#if data.user.admin}
+									<span
-								<span
+										id="label__{item.name}"
-									id="label__{item.name}"
+										class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
-									class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
+										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={// event needed to identify ID
-									on:keydown|stopPropagation={// 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) => {
-									async (ev) => {
+											handle_input(ev, i);
-										handle_input(ev, i);
+										}}>{item.name}</span
-									}}>{item.name}</span
+									>
-								>
 
-								<input
+									<!--<input
 									class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
 									type="text"
 									name=""
@@ -208,91 +202,92 @@
 									}}
 									bind:value={item.name}
 									id="label__{item.name}"
-								/>
+								/>-->
-								<!-- disabled={item.show_button} -->
+									<!-- disabled={item.show_button} -->
-								<!-- https://iconduck.com/icons/192863/edit-rename -->
+									<!-- https://iconduck.com/icons/192863/edit-rename -->
 
-								{#if item.show_button}
+									{#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;
+											}}
+										>
+											<Edit />
+										</button>
+									{/if}
 									<button
 										style="padding: 2px"
-										id="edit__{item.name}"
+										id="del__{item.name}"
-										aria-label="Datei umbenennen"
+										on:click|preventDefault={async (ev) => {
-										on:click|preventDefault={(ev) => {
+											let delete_item = window.confirm('Bist du sicher?');
-											let text_field_id = `label__${item.name}`;
 
-											let text_field = document.getElementById(text_field_id);
+											if (delete_item) {
-											if (text_field) {
+												// bucket: tatort, name: <vorgang>/item-name
-												text_field.setAttribute('contenteditable', 'true');
+												let vorgang = $page.params.vorgang;
-												text_field.focus();
+												let filename = '';
-												text_field.textContent = '';
+												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);
+													}
+												}
 											}
-
-											// hide button
-											item.show_button = false;
 										}}
+										aria-label="Datei löschen"
 									>
-										<Edit />
+										<Trash />
 									</button>
+								{:else}
+									<span class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
+										>{item.name}</span
+									>
 								{/if}
-								<button
+								<p class="mt-1 truncate text-xs leading-5 text-gray-500">
-									style="padding: 2px"
+									{shortenFileSize(item.size)}
-									id="del__{item.name}"
+								</p>
-									on:click|preventDefault={async (ev) => {
+							</div>
-										let delete_item = window.confirm('Bist du sicher?');
+						</div>
-
+						<div class="hidden sm:flex sm:flex-col sm:items-end">
-										if (delete_item) {
+							<p class="text-sm leading-6 text-gray-900">3D Tatort</p>
-											// bucket: tatort, name: <vorgang>/item-name
+							<p class="mt-1 text-xs leading-5 text-gray-500">
-											let vorgang = $page.params.vorgang;
+								Zuletzt geändert <time datetime="2023-01-23T13:23Z"
-											let filename = '';
+									>{timeElapsed(new Date(item.lastModified))}</time
-											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"
 								>
-									<Trash />
-								</button>
-							{:else}
-								<span class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
-									>{item.name}</span
-								>
-							{/if}
-							<p class="mt-1 truncate text-xs leading-5 text-gray-500">
-								{shortenFileSize(item.size)}
 							</p>
 						</div>
-					</div>
+					</a>
-					<div class="hidden sm:flex sm:flex-col sm:items-end">
-						<p class="text-sm leading-6 text-gray-900">3D Tatort</p>
-						<p class="mt-1 text-xs leading-5 text-gray-500">
-							Zuletzt geändert <time datetime="2023-01-23T13:23Z"
-								>{timeElapsed(new Date(item.lastModified))}</time
-							>
-						</p>
-					</div>
 				</li>
 			{/each}
 		</ul>

src/routes/(token-based)/list/[vorgang]/+server.ts

@@ -3,25 +3,24 @@ 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"]
+    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 {
-        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) {
         // continue operation
-        console.log('continue operation')
+        console.log(error, 'continue operation');
     }
 
     // actual copy operation

src/routes/(token-based)/list/[vorgang]/[tatort]/+server.ts

@@ -0,0 +1,11 @@
+import { BUCKET, 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(BUCKET, `${vorgang}/${item}`);
+
+	return new Response(null, { status: 204 });
+}

src/routes/(token-based)/view/+page.server.ts

@@ -0,0 +1,6 @@
+import { redirectIfVorgangExists } from '$lib/server/vorgangService';
+
+/** @type {import('./$types').Actions} */
+export const actions = {
+	default: async ({request}: {request: Request}) => redirectIfVorgangExists(request)
+}

src/routes/(token-based)/view/+page.svelte

@@ -0,0 +1,40 @@
+<script lang="ts">
+	import BaseInputField from '$lib/components/BaseInputField.svelte';
+	import Button from '$lib/components/Button.svelte';
+	import ArrowRight from '$lib/icons/Arrow-right.svelte';
+	import Exclamation from '$lib/icons/Exclamation.svelte';
+
+	export let form;
+</script>
+
+<div class="mx-auto max-w-2xl">
+	<div class="flex flex-col items-center justify-center w-full">
+		<h1 class="text-xl">Vorgang ansehen</h1>
+	</div>
+	<p class="mt-8 mb-8 text-sm leading-6 text-gray-600">
+		Anhand der Vorgangsnummer werden Sie zu den Dateien des Vorgangs weitergeleitet und können sich
+		den Vorgang dann ansehen.
+	</p>
+	<form method="POST">
+		<BaseInputField
+			id="case-id"
+			name="case-id"
+			label="Vorgangskennung"
+			type="text"
+			value={form?.caseId}
+		/>
+		<div class="mt-5">
+			<BaseInputField
+				id="case-token"
+				name="case-token"
+				label="Zugangscode"
+				type="text"
+				value={form?.token}
+				error={form?.error?.message}
+			/>
+		</div>
+		<div class="flex justify-end pt-4">
+			<Button type="submit"><ArrowRight /></Button>
+		</div>
+	</form>
+</div>

src/routes/(token-based)/view/[vorgang]/[tatort]/+page.server.ts

@@ -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 };

src/routes/(token-based)/view/[vorgang]/[tatort]/+page.svelte

@@ -1,7 +1,7 @@
-<script>
+<script lang="ts">
-	import Panel from '$lib/components/ui/Panel.svelte';
+	import Panel from '$lib/components/Panel.svelte';
 	import { onMount } from 'svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
 
 	export let data;
 
@@ -19,26 +19,16 @@
 	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}%`;
 
-	/**
+	const onProgress = ({ detail }) => {
-	 * @param {any} detail
-	 */
-	function onProgress({ detail }) {
 		progress = Math.ceil(detail.totalProgress * 100.0);
 		if (progress == 100) {
 			setTimeout(() => {
@@ -48,21 +38,6 @@
 	}
 
 	function onResetView() {
-		console.log(
-			'show cameraOrbit:',
-			modelViewer.getCameraOrbit(),
-			modelViewer.cameraOrbit,
-			modelViewer.getDimensions()
-		);
-		console.log(
-			'Camera-orbit: ',
-			modelViewer.getAttribute('camera-orbit'),
-			'camera-target: ',
-			modelViewer.getAttribute('camera-target'),
-			'object-rotation: ',
-			modelViewer.getAttribute('rotation')
-		);
-
 		cameraAzimuth = 0;
 		cameraPolar = 0;
 		cameraZoom = 100;
@@ -76,12 +51,7 @@
 		fieldOfView = '10deg';
 	}
 
-	/**
+	function updateCameraOrbit(azimuth: number, polar: number, zoom: number) {
-	 * @param {number} azimuth
-	 * @param {number} polar
-	 * @param {number} zoom
-	 */
-	function updateCameraOrbit(azimuth, polar, zoom) {
 		cameraAzimuth = azimuth;
 		cameraPolar = polar;
 		cameraZoom = zoom;

src/routes/+layout.svelte

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

src/routes/anmeldung/+page.server.js

@@ -1,31 +0,0 @@
-import { dev } from '$app/environment';
-import { fail, redirect } from '@sveltejs/kit';
-import { authenticate } from '$lib/auth';
-
-const COOKIE_NAME = 'session';
-
-/** @type {import('./$types').Actions} */
-export const actions = {
-	login: async ({ request, cookies }) => {
-		const data = await request.formData();
-		const user = data.get('user');
-		const password = data.get('password');
-
-		const token = authenticate(user, password);
-
-		if (!token) return fail(400, { user, incorrect: true });
-
-		cookies.set(COOKIE_NAME, token, {
-			path: '/',
-			httpOnly: true,
-			sameSite: 'strict',
-			secure: !dev
-		});
-		throw redirect(303, '/');
-	},
-	logout: async (event) => {
-		event.cookies.delete(COOKIE_NAME, {path: '/'});
-		event.locals.user = null;
-		return { success: true };
-	}
-};

src/routes/anmeldung/+page.server.ts

@@ -0,0 +1,9 @@
+import { loginUser, logoutUser } from '$lib/server/authService';
+import { redirectIfVorgangExists } from '$lib/server/vorgangService.js';
+
+
+export const actions = {
+	login: ({ request, cookies }) => loginUser({request, cookies}),
+	logout: (event) => logoutUser(event),
+	redirectToVorgang: ({request}) => redirectIfVorgangExists(request)
+} as const;

src/routes/anmeldung/+page.svelte

@@ -1,38 +1,64 @@
-<script>
+<script lang="ts">
-	import Panel from '$lib/components/ui/Panel.svelte';
+	import BaseInputField from '$lib/components/BaseInputField.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/Button.svelte';
-	import Alert from '$lib/components/ui/Alert.svelte';
+	import Modal from '$lib/components/Modal/Modal.svelte';
+	import ModalContent from '$lib/components/Modal/ModalContent.svelte';
+	import ModalFooter from '$lib/components/Modal/ModalFooter.svelte';
+	import ModalTitle from '$lib/components/Modal/ModalTitle.svelte';
+	import ArrowRight from '$lib/icons/Arrow-right.svelte';
 	import Login from '$lib/icons/Login.svelte';
 
-	/** @type {import('./$types').ActionData} */
 	export let form;
 
-	let user = form?.user ?? '';
+	export let open = false;
-
-	function buttonClick() {}
 </script>
 
-<!--
-  This example requires updating your template:
-
-  ```
-  <html class="h-full bg-white">
-  <body class="h-full">
-  ```
--->
 <div class="flex min-h-full flex-col justify-center px-6 py-12 lg:px-8">
 	<div class="sm:mx-auto sm:w-full sm:max-w-sm">
 		<img class="mx-auto h-10 w-auto" src="/Landeswappen_NI.svg" alt="Landeswappen Niedersachsen" />
 
 		<h2 class="mt-10 text-center text-2xl font-bold leading-9 tracking-tight text-gray-900">
-			Anmeldung zum 3D Tatort
+			Willkommen beim 3D Tatort
 		</h2>
 	</div>
-
+	<div class="w-full max-w-sm mx-auto">
-	<div class="mt-10 sm:mx-auto sm:w-full sm:max-w-sm">
+		<div class="relative mt-5 bg-gray-50 rounded-xl shadow-xl p-3 pt-1">
-		<form class="space-y-6" action="?/login" method="POST">
+			<div class="mt-10">
+				<form action="?/redirectToVorgang" method="POST">
+					<BaseInputField
+						id="case-id"
+						name="case-id"
+						label="Vorgangskennung"
+						type="text"
+						value={form?.caseId}
+					/>
+					<div class="mt-5">
+						<BaseInputField
+							id="case-token"
+							name="case-token"
+							label="Zugangscode"
+							type="text"
+							value={form?.token}
+							error={form?.error?.message}
+						/>
+					</div>
+					<div class="flex justify-end pt-4">
+						<Button type="submit"><ArrowRight /></Button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<div class="flex justify-end mt-10 px-3">
+			<Button on:click={() => (open = true)}><Login /></Button>
+		</div>
+	</div>
+</div>
+<Modal {open}>
+	<ModalTitle>Anmelden</ModalTitle>
+	<ModalContent class="flex justify-center">
+		<form action="?/login" method="POST">
 			<div>
-				<label for="user" class="block text-sm font-medium leading-6 text-gray-900">Kennung</label>
+				<label for="user" class="text-sm font-medium leading-6 text-gray-900">Kennung</label>
 				<div class="mt-2">
 					<input
 						id="user"
@@ -40,17 +66,15 @@
 						type="text"
 						autocomplete="email"
 						required
-						class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
+						class="rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
 					/>
 				</div>
 			</div>
 
 			<div>
-				<div class="flex items-center justify-between">
+				<label for="password" class="block text-sm font-medium leading-6 text-gray-900"
-					<label for="password" class="block text-sm font-medium leading-6 text-gray-900"
+					>Passwort</label
-						>Passwort</label
+				>
-					>
-				</div>
 				<div class="mt-2">
 					<input
 						id="password"
@@ -63,13 +87,10 @@
 				</div>
 			</div>
 
-			<div>
+			<div class="flex justify-end">
-				<button
+				<Button type="submit" class="mt-5">Anmelden</Button>
-					type="submit"
-					class="mt-10 flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
-					>Anmelden</button
-				>
 			</div>
 		</form>
-	</div>
+	</ModalContent>
-</div>
+	<ModalFooter><Button on:click={() => (open = false)}>Ok</Button></ModalFooter>
+</Modal>

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

@@ -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) => {
@@ -15,6 +15,8 @@ export async function GET({ params }) {
 
 				const name = data.name.slice(prefix.length);
 				if (name === 'config.json') return;
+				// zugangscode datei
+				if (name === '__perm__') return;
 
 				controller.enqueue(`${JSON.stringify({ ...data, name, prefix })}\n`);
 			});
@@ -34,30 +36,25 @@ export async function GET({ params }) {
 	});
 }
 
-
 export async function DELETE({ params }) {
-	const vorgang = params.vorgang
+	const vorgang = params.vorgang;
 
 	const object_list = await new Promise((resolve, reject) => {
-
+		const res = [];
-		const res = []
+		const items_str = client.listObjects('tatort', vorgang, true);
-		const items_str = client.listObjects('tatort', vorgang, true)
 
 		items_str.on('data', (obj) => {
-			res.push(obj.name)
+			res.push(obj.name);
-		})
+		});
 
-		items_str.on('error', reject)
+		items_str.on('error', reject);
 
 		items_str.on('end', async () => {
-			resolve(res)
+			resolve(res);
-		})
+		});
+	});
 
-		console.log(`+++ ${vorgang}`)
+	await client.removeObjects('tatort', object_list);
 
-	})
+	return new Response(null, { status: 204 });
-
+}
-	await client.removeObjects('tatort', object_list)
-
-    return new Response(null, { status: 204 });
-};

src/routes/api/list/[[vorgang]]/code/+server.ts

@@ -0,0 +1,25 @@
+import { client } from '$lib/minio';
+
+/** @type {import('./$types').RequestHandler} */
+export async function GET({ params }) {
+	const prefix = params.vorgang ? `${params.vorgang}` : '';
+
+	const code_name = '__perm__';
+	const obj_path = `${prefix}/${code_name}`;
+
+	let result = null;
+
+	try {
+		result = await client.getObject('tatort', obj_path);
+	} catch (error) {
+		if (error.name == 'S3Error') {
+			result = null;
+		}
+	}
+
+	if (result != null) {
+		return new Response(result, { status: 200 });
+	} else {
+		return new Response(null, { status: 404 });
+	}
+}

src/routes/api/tatort/+server.ts

@@ -1,12 +1,10 @@
 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) => {
-				//console.log(data);
 				controller.enqueue(`${JSON.stringify(data)}\n`);
 			});
 			stream.on('end', () => {

src/routes/api/upload/+server.js

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

src/routes/api/upload/+server.ts

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

tsconfig.json

@@ -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
 	//