refactor-login-page #7

Merged
jared merged 61 commits from refactor-login-page into main 2025-06-18 13:10:25 +02:00
47 changed files with 535 additions and 669 deletions
Showing only changes of commit ecc2564c70 - Show all commits

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: { languageOptions: {
globals: { ...globals.browser, ...globals.node } globals: { ...globals.browser, ...globals.node }
}, },
rules: { 'no-undef': 'off' } rules: {
'no-undef': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
args: 'all',
argsIgnorePattern: '^_',
caughtErrors: 'all',
caughtErrorsIgnorePattern: '^_',
destructuredArrayIgnorePattern: '^_',
varsIgnorePattern: '^_',
ignoreRestSiblings: true
}
]
}
}, },
{ {
files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'], files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],

801
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,31 +13,31 @@
"format": "prettier --write .", "format": "prettier --write .",
"lint": "prettier --check . && eslint .", "lint": "prettier --check . && eslint .",
"test:unit": "vitest", "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": { "devDependencies": {
"@eslint/compat": "^1.2.5", "@eslint/compat": "^1.2.9",
"@eslint/js": "^9.18.0", "@eslint/js": "^9.18.0",
"@playwright/test": "^1.49.1",
"@sveltejs/adapter-auto": "^4.0.0", "@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/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": { "dependencies": {
"@google/model-viewer": "^4.1.0", "@google/model-viewer": "^4.1.0",
@@ -46,8 +46,7 @@
"autoprefixer": "^10.4.21", "autoprefixer": "^10.4.21",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"minio": "^8.0.5", "minio": "^8.0.5",
"postcss": "^8.5.3", "postcss": "^8.5.4",
"svelte-cubed": "^0.2.1",
"tailwindcss": "^3.4.17" "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 { decryptToken } from '$lib/auth';
import type { Handle } from '@sveltejs/kit';
/** @type {import('@sveltejs/kit').Handle} */ export const handle: Handle = ({ event, resolve }) => {
export async function handle({ event, resolve }) {
const jwt = event.cookies.get('session'); const jwt = event.cookies.get('session');
try { try {
if (jwt) { if (jwt) {
event.locals.user = decryptToken(jwt); event.locals.user = decryptToken(jwt);
return resolve(event); return resolve(event);
} }
} catch (err) { } catch (_) {
await event.cookies.delete('session'); event.cookies.delete('session', {path: '/'});
event.locals.user = null; event.locals.user = null;
} }
return await resolve(event); return await resolve(event);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

3
src/lib/config.ts Normal file
View File

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

View File

@@ -0,0 +1,17 @@
import { client } from '$lib/minio';
export default async function caseNumberOccupied (caseNumber: string): Promise<boolean> {
const prefix = `${caseNumber}/config.json`;
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;
}

View File

@@ -2,12 +2,7 @@ const KILO = 1024;
const MEGA = KILO * KILO; const MEGA = KILO * KILO;
const GIGA = MEGA * 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); const giga = Math.floor(size / GIGA);
let remainder = size % GIGA; let remainder = size % GIGA;
const mega = Math.floor(remainder / MEGA); const mega = Math.floor(remainder / MEGA);

View File

@@ -4,12 +4,7 @@ const DAY = 24 * HOUR;
const YEAR = 365 * DAY; const YEAR = 365 * DAY;
const MONTH = YEAR / 12; 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 now = new Date();
const age = Math.floor((now.getTime() - date.getTime()) / 1000); 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,7 +1,5 @@
<script> <script lang="ts">
import Chevron from '$lib/icons/Chevron-right.svelte'; import Chevron from '$lib/icons/Chevron-right.svelte';
import Login from '$lib/icons/Login.svelte';
import Profile from '$lib/icons/Profile.svelte';
export let data; export let data;
</script> </script>

View File

@@ -1,8 +1,7 @@
<script> <style>
import Panel from '$lib/components/ui/Panel.svelte'; </style>
import AddProcess from '$lib/icons/Add-Process.svelte';
import FileRect from '$lib/icons/File-rect.svelte'; <script lang="ts">
import ListIcon from '$lib/icons/List-icon.svelte';
export let data; export let data;
export let outline = true; export let outline = true;

View File

@@ -1,6 +1,5 @@
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { page } from '$app/stores';
import Trash from '$lib/icons/Trash.svelte'; import Trash from '$lib/icons/Trash.svelte';
import Folder from '$lib/icons/Folder.svelte'; import Folder from '$lib/icons/Folder.svelte';
@@ -27,25 +26,30 @@
.filter((i) => i.length > 0) .filter((i) => i.length > 0)
.map((i) => JSON.parse(i)); .map((i) => JSON.parse(i));
console.log(objs);
list = list.concat(objs); list = list.concat(objs);
} }
}); });
async function delete_item(ev: Event) { async function delete_item(ev: Event) {
let delete_item = window.confirm('Bist du sicher?'); let delete_item = window.confirm('Bist du sicher?');
let delete_item = window.confirm('Bist du sicher?');
if (delete_item) { if (delete_item) {
const target = ev.currentTarget as HTMLElement | null; const target = ev.currentTarget as HTMLElement | null;
if (!target) return; if (!target) return;
let filename = target.id.split('del__')[1]; let filename = target.id.split('del__')[1];
const target = ev.currentTarget as HTMLElement | null;
if (!target) return;
let filename = target.id.split('del__')[1];
// delete request
// --------------
// delete request // delete request
// -------------- // --------------
let url = `/api/list/${filename}`;
let url = `/api/list/${filename}`; let url = `/api/list/${filename}`;
console.log(`--- ${filename} + ${url}`);
try { try {
const response = await fetch(url, { method: 'DELETE' }); const response = await fetch(url, { method: 'DELETE' });
if (response.status == 204) { if (response.status == 204) {
@@ -104,3 +108,9 @@
min-width: 24rem; min-width: 24rem;
} }
</style> </style>
<style>
ul {
min-width: 24rem;
}
</style>

View File

@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { onMount, tick } from 'svelte'; import { onMount } from 'svelte';
import shortenFileSize from '$lib/helper/shortenFileSize'; import shortenFileSize from '$lib/helper/shortenFileSize';
import { page } from '$app/stores'; import { page } from '$app/stores';
@@ -15,6 +15,7 @@
import Edit from '$lib/icons/Edit.svelte'; import Edit from '$lib/icons/Edit.svelte';
import Trash from '$lib/icons/Trash.svelte'; import Trash from '$lib/icons/Trash.svelte';
/** export let data; */
/** @type {import('./$types').PageData} */ /** @type {import('./$types').PageData} */
export let data; export let data;
@@ -56,7 +57,6 @@
.filter((i) => i.length > 0) .filter((i) => i.length > 0)
.map((i) => JSON.parse(i)); .map((i) => JSON.parse(i));
console.log(objs);
list = list.concat(objs); list = list.concat(objs);
list = list.map((item) => { list = list.map((item) => {
@@ -67,7 +67,6 @@
}); });
function uploadSuccessful() { function uploadSuccessful() {
console.log('reset');
open = false; open = false;
} }
@@ -93,6 +92,7 @@
let text_field = document.getElementById(text_field_id); let text_field = document.getElementById(text_field_id);
if (text_field) { if (text_field) {
text_field.setAttribute('contenteditable', 'false');
text_field.setAttribute('contenteditable', 'false'); text_field.setAttribute('contenteditable', 'false');
text_field.textContent = item.name; text_field.textContent = item.name;
} }
@@ -102,7 +102,6 @@
return; return;
} }
if (ev.key == 'Enter') { if (ev.key == 'Enter') {
console.log('--- hitted');
let name_field = ev.currentTarget as HTMLElement | null; let name_field = ev.currentTarget as HTMLElement | null;
let new_name = name_field let new_name = name_field
? name_field.textContent || (name_field as any).innerText || '' ? name_field.textContent || (name_field as any).innerText || ''
@@ -142,7 +141,6 @@
err = true; err = true;
if (response.status == 400) { if (response.status == 400) {
let json_res = await response.json(); let json_res = await response.json();
// alert(json_res['msg'])
return; return;
} }
throw new Error(`Fehlgeschlagen: ${response.status}`); throw new Error(`Fehlgeschlagen: ${response.status}`);

View File

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

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

View File

@@ -1,4 +1,4 @@
<script> <script lang="ts">
import Alert from '$lib/components/ui/Alert.svelte'; import Alert from '$lib/components/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte'; import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte'; import Modal from '$lib/components/ui/Modal/Modal.svelte';
@@ -55,22 +55,22 @@
<div> <div>
<label for="description" class="block text-sm font-medium leading-6 text-gray-900" <label for="description" class="block text-sm font-medium leading-6 text-gray-900"
><span class="flex" ><span class="flex"
>{#if form?.error?.description} >{#if form?.description}
<span class="inline-block mr-1"><Exclamation /></span> <span class="inline-block mr-1"><Exclamation /></span>
{/if} Beschreibung</span {/if} Beschreibung</span
></label ></label
> >
<div class="mt-2"> <div class="mt-2">
<textarea <textarea
value={form?.description ?? ''} value={form?.description?.toString() ?? ''}
id="description" id="description"
name="description" name="description"
rows="3" 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" 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> ></textarea>
</div> </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} {/if}
</div> </div>

View File

@@ -1,14 +1,10 @@
import path from 'path';
import { writeFile } from 'fs/promises';
import { Buffer } from 'buffer'; import { Buffer } from 'buffer';
import { createReadStream } from 'fs';
/** import Minio from 'minio'; */ /** import Minio from 'minio'; */
import { Readable } from 'stream'; import { Readable } from 'stream';
/** const MINIO_ACCESS_KEY = 'tMhLrfog47lMm0HZ'; */
import { client } from '$lib/minio'; import { client } from '$lib/minio';
import { fail } from '@sveltejs/kit'; import { fail } from '@sveltejs/kit';
function isRequiredFieldValid(value) { const isRequiredFieldValid = (value: unknown) => {
if (value == null) return false; if (value == null) return false;
if (typeof value === 'string' || value instanceof String) return value.trim() !== ''; if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
@@ -16,9 +12,8 @@ function isRequiredFieldValid(value) {
return true; return true;
} }
/** @type {import('./$types').Actions} */
export const actions = { export const actions = {
url: async ({ request }) => { url: async ({ request }: {request: Request}) => {
const data = await request.formData(); const data = await request.formData();
const vorgang = data.get('vorgang'); const vorgang = data.get('vorgang');
const name = data.get('name'); const name = data.get('name');
@@ -32,7 +27,7 @@ export const actions = {
if (!objectName.endsWith('.png')) objectName += '.png'; if (!objectName.endsWith('.png')) objectName += '.png';
break; break;
case '': case '':
if (fileName.endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb'; if (fileName?.toString().endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb';
} }
const url = await client.presignedPutObject('tatort', objectName); const url = await client.presignedPutObject('tatort', objectName);
@@ -47,14 +42,14 @@ export const actions = {
return { url }; return { url };
}, },
validate: async ({ request }) => { validate: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const vorgang = data.vorgang; const vorgang = data.vorgang;
const name = data.name; const name = data.name;
const zugangscode = data.zugangscode; const zugangscode = data.zugangscode;
let success = true; let success = true;
let err = {}; const err = {};
if (isRequiredFieldValid(vorgang)) err.vorgang = null; if (isRequiredFieldValid(vorgang)) err.vorgang = null;
else { else {
@@ -79,24 +74,21 @@ export const actions = {
return fail(400, err); return fail(400, err);
}, },
upload: async ({ request }) => { upload: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const vorgang = data.vorgang; const vorgang = data.vorgang;
const name = data.name; const name = data.name;
console.log('I:', vorgang, name);
const url = await client.presignedPutObject('tatort', `${vorgang}/${name}`, 60); const url = await client.presignedPutObject('tatort', `${vorgang}/${name}`, 60);
console.log('O:', url);
return { url }; return { url };
}, },
upload3: async ({ request }) => { upload3: async ({ request }: {request: Request}) => {
const requestData = await request.formData(); const requestData = await request.formData();
const data = Object.fromEntries(requestData); const data = Object.fromEntries(requestData);
const name = data.name; const name = data.name;
const stream = data.file.stream(); const stream = data.file.stream();
console.log('Data:', stream);
const metaData = { 'Content-Type': 'model-gtlf-binary', 'X-VorgangsNr': '4711' }; const metaData = { 'Content-Type': 'model-gtlf-binary', 'X-VorgangsNr': '4711' };
const result = new Promise((resolve, reject) => { const result = new Promise((resolve, reject) => {
client.putObject('tatort', name, Readable.from(stream), metaData, function (err, etag) { client.putObject('tatort', name, Readable.from(stream), metaData, function (err, etag) {
@@ -108,13 +100,11 @@ export const actions = {
let error = null; let error = null;
try { try {
etag = await result; etag = await result;
console.log(etag);
} catch (err) { } catch (err) {
error = err; error = err;
console.log('Error:', err); console.log('Error:', err);
} }
return { etag, error }; return { etag, error };
//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
} }
}; };

View File

@@ -1,5 +1,5 @@
<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/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte'; import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte'; import Modal from '$lib/components/ui/Modal/Modal.svelte';
@@ -31,15 +31,12 @@
$: case_existing = false; $: case_existing = false;
let name = ''; let name = '';
/** @type {?string}*/ let etag: string | null = null;
let etag = null; let files: FileList | null = null;
/** @type {?FileList} */
let files = null;
$: inProgress = form === null; $: inProgress = form === null;
/** @type {?Record<string,any>}*/ let formErrors: Record<string,any> | null;
let formErrors;
async function validateForm() { async function validateForm() {
let data = new FormData(); let data = new FormData();
@@ -58,7 +55,6 @@
success = false; success = false;
} }
console.log('File', files);
if (!files?.length) { if (!files?.length) {
formErrors = { file: 'Sie haben keine Datei ausgewählt.', ...formErrors }; formErrors = { file: 'Sie haben keine Datei ausgewählt.', ...formErrors };
success = false; success = false;
@@ -89,14 +85,12 @@
return null; return null;
} }
/** @param {MouseEvent} event*/ async function buttonClick(event: MouseEvent) {
async function buttonClick(event) {
if (!(await validateForm())) { if (!(await validateForm())) {
event.preventDefault(); event.preventDefault();
return; return;
} }
const url = await getUrl(); const url = await getUrl();
console.log('URL', url);
open = true; open = true;
inProgress = true; inProgress = true;
@@ -104,7 +98,6 @@
.then((response) => { .then((response) => {
inProgress = false; inProgress = false;
etag = '123'; etag = '123';
console.log('SUCCESS', response);
}) })
.catch((err) => { .catch((err) => {
inProgress = false; inProgress = false;
@@ -114,7 +107,6 @@
} }
function uploadSuccessful() { function uploadSuccessful() {
console.log('reset');
open = false; open = false;
vorgang = ''; vorgang = '';
name = ''; name = '';

View File

@@ -4,7 +4,7 @@ import { client } from '$lib/minio';
/** @type {import('./$types').Actions} */ /** @type {import('./$types').Actions} */
export const actions = { export const actions = {
default: async ({ request }) => { default: async ({ request }: {request: Request}) => {
const data = await request.formData(); const data = await request.formData();
const caseNumber = data.get('caseNumber'); const caseNumber = data.get('caseNumber');
const user_token = data.get('token'); const user_token = data.get('token');
@@ -17,7 +17,7 @@ export const actions = {
}); });
} }
if (!(await caseNumberOccupied(caseNumber))) { if (typeof caseNumber === 'string' && !(await caseNumberOccupied(caseNumber))) {
return fail(400, { return fail(400, {
success: false, success: false,
caseNumber, caseNumber,

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
<script> <script lang="ts">
import Panel from '$lib/components/ui/Panel.svelte'; import Panel from '$lib/components/ui/Panel.svelte';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import Button from '$lib/components/ui/Button.svelte'; import Button from '$lib/components/ui/Button.svelte';
@@ -19,26 +19,16 @@
let cameraAzimuth = 0; let cameraAzimuth = 0;
let cameraPolar = 0; let cameraPolar = 0;
let frontView = cameraAzimuth === 0 && cameraPolar === 0 ? true : false;
let topView = cameraAzimuth === 0 && cameraPolar === 90 ? true : false;
let cameraZoom = 100; let cameraZoom = 100;
let xRotation = 0; let xRotation = 0;
let yRotation = 0; let yRotation = 0;
let zRotation = 0; let zRotation = 0;
/**
* @type {any}
*/
let modelViewer; let modelViewer;
$: style = `width: ${progress}%`; $: style = `width: ${progress}%`;
/** const onProgress = ({ detail }) => {
* @param {any} detail
*/
function onProgress({ detail }) {
progress = Math.ceil(detail.totalProgress * 100.0); progress = Math.ceil(detail.totalProgress * 100.0);
if (progress == 100) { if (progress == 100) {
setTimeout(() => { setTimeout(() => {
@@ -48,21 +38,6 @@
} }
function onResetView() { 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; cameraAzimuth = 0;
cameraPolar = 0; cameraPolar = 0;
cameraZoom = 100; cameraZoom = 100;
@@ -76,12 +51,7 @@
fieldOfView = '10deg'; 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; cameraAzimuth = azimuth;
cameraPolar = polar; cameraPolar = polar;
cameraZoom = zoom; cameraZoom = zoom;

View File

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

View File

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

View File

@@ -1,25 +1,12 @@
<script> <script lang="ts">
import Panel from '$lib/components/ui/Panel.svelte'; import type { ActionData } from "./$types";
import Button from '$lib/components/ui/Button.svelte';
import Alert from '$lib/components/ui/Alert.svelte';
import Login from '$lib/icons/Login.svelte';
/** @type {import('./$types').ActionData} */ export let form: ActionData;
export let form;
let user = form?.user ?? ''; let user = form?.user ?? '';
function buttonClick() {}
</script> </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="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"> <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" /> <img class="mx-auto h-10 w-auto" src="/Landeswappen_NI.svg" alt="Landeswappen Niedersachsen" />

View File

@@ -3,7 +3,7 @@ import { client } from '$lib/minio';
/** @type {import('./$types').RequestHandler} */ /** @type {import('./$types').RequestHandler} */
export async function GET({ params }) { export async function GET({ params }) {
const prefix = params.vorgang ? `${params.vorgang}/` : ''; const prefix = params.vorgang ? `${params.vorgang}/` : '';
let stream = client.listObjectsV2('tatort', prefix, false, ''); const stream = client.listObjectsV2('tatort', prefix, false, '');
const result = new ReadableStream({ const result = new ReadableStream({
start(controller) { start(controller) {
stream.on('data', (data) => { stream.on('data', (data) => {
@@ -52,8 +52,6 @@ export async function DELETE({ params }) {
items_str.on('end', async () => { items_str.on('end', async () => {
resolve(res); resolve(res);
}); });
console.log(`+++ ${vorgang}`);
}); });
await client.removeObjects('tatort', object_list); await client.removeObjects('tatort', object_list);

View File

@@ -1,12 +1,10 @@
import { client } from '$lib/minio'; import { client } from '$lib/minio';
/** @type {import('./$types').RequestHandler} */
export async function GET() { export async function GET() {
var stream = client.listObjectsV2('tatort', '', true); const stream = client.listObjectsV2('tatort', '', true);
const result = new ReadableStream({ const result = new ReadableStream({
start(controller) { start(controller) {
stream.on('data', (data) => { stream.on('data', (data) => {
//console.log(data);
controller.enqueue(`${JSON.stringify(data)}\n`); controller.enqueue(`${JSON.stringify(data)}\n`);
}); });
stream.on('end', () => { stream.on('end', () => {

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