Compare commits
8 Commits
d58be34fe5
...
archive/f0
| Author | SHA1 | Date | |
|---|---|---|---|
| b966d19792 | |||
| def4e22226 | |||
| b44187b010 | |||
| bebd226c80 | |||
| 4adea19981 | |||
| 6b7188350f | |||
| 20c74d49d9 | |||
| 131318da14 |
6
e2e/demo.test.ts
Normal file
6
e2e/demo.test.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { expect, test } from '@playwright/test';
|
||||||
|
|
||||||
|
test('home page has expected h1', async ({ page }) => {
|
||||||
|
await page.goto('/');
|
||||||
|
await expect(page.locator('h1')).toBeVisible();
|
||||||
|
});
|
||||||
@@ -20,21 +20,7 @@ export default ts.config(
|
|||||||
languageOptions: {
|
languageOptions: {
|
||||||
globals: { ...globals.browser, ...globals.node }
|
globals: { ...globals.browser, ...globals.node }
|
||||||
},
|
},
|
||||||
rules: {
|
rules: { 'no-undef': 'off' }
|
||||||
'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'],
|
||||||
|
|||||||
799
package-lock.json
generated
799
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
43
package.json
43
package.json
@@ -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.9",
|
"@eslint/compat": "^1.2.5",
|
||||||
"@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.21.3",
|
"@sveltejs/kit": "^2.16.0",
|
||||||
"@sveltejs/vite-plugin-svelte": "^5.1.0",
|
"@sveltejs/vite-plugin-svelte": "^5.0.0",
|
||||||
"@testing-library/jest-dom": "^6.6.3",
|
"@testing-library/jest-dom": "^6.6.3",
|
||||||
"@testing-library/svelte": "^5.2.8",
|
"@testing-library/svelte": "^5.2.4",
|
||||||
"@tsconfig/svelte": "^5.0.4",
|
"eslint": "^9.18.0",
|
||||||
"@types/jsonwebtoken": "^9.0.9",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
"eslint": "^9.28.0",
|
"eslint-plugin-svelte": "^3.0.0",
|
||||||
"eslint-config-prettier": "^10.1.5",
|
"globals": "^16.0.0",
|
||||||
"eslint-plugin-svelte": "^3.9.2",
|
"jsdom": "^26.0.0",
|
||||||
"globals": "^16.2.0",
|
"prettier": "^3.4.2",
|
||||||
"jsdom": "^26.1.0",
|
"prettier-plugin-svelte": "^3.3.3",
|
||||||
"prettier": "^3.5.3",
|
"svelte": "^5.0.0",
|
||||||
"prettier-plugin-svelte": "^3.4.0",
|
"svelte-check": "^4.0.0",
|
||||||
"svelte": "^5.33.18",
|
"typescript": "^5.0.0",
|
||||||
"svelte-check": "^4.2.1",
|
"typescript-eslint": "^8.20.0",
|
||||||
"typescript": "^5.8.3",
|
"vite": "^6.2.5",
|
||||||
"typescript-eslint": "^8.34.0",
|
"vitest": "^3.0.0"
|
||||||
"vite": "^6.3.5",
|
|
||||||
"vitest": "^3.2.3"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@google/model-viewer": "^4.1.0",
|
"@google/model-viewer": "^4.1.0",
|
||||||
@@ -46,7 +46,8 @@
|
|||||||
"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.4",
|
"postcss": "^8.5.3",
|
||||||
|
"svelte-cubed": "^0.2.1",
|
||||||
"tailwindcss": "^3.4.17"
|
"tailwindcss": "^3.4.17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
11
playwright.config.js
Normal file
11
playwright.config.js
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/** @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;
|
||||||
9
playwright.config.ts
Normal file
9
playwright.config.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { defineConfig } from '@playwright/test';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
webServer: {
|
||||||
|
command: 'npm run build && npm run preview',
|
||||||
|
port: 4173
|
||||||
|
},
|
||||||
|
testDir: 'e2e'
|
||||||
|
});
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
import { decryptToken } from '$lib/auth';
|
import { decryptToken } from '$lib/auth';
|
||||||
import type { Handle } from '@sveltejs/kit';
|
|
||||||
|
|
||||||
export const handle: Handle = ({ event, resolve }) => {
|
/** @type {import('@sveltejs/kit').Handle} */
|
||||||
|
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 (_) {
|
} catch (err) {
|
||||||
event.cookies.delete('session', {path: '/'});
|
await event.cookies.delete('session');
|
||||||
event.locals.user = null;
|
event.locals.user = null;
|
||||||
}
|
}
|
||||||
return resolve(event);
|
return resolve(event);
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
export let type = 'info';
|
export let type = 'info';
|
||||||
let classNames = '';
|
let classNames = '';
|
||||||
export { classNames as class };
|
export { classNames as class };
|
||||||
|
|||||||
@@ -173,7 +173,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
export let href = null;
|
export let href = null;
|
||||||
export let type = 'button';
|
export let type = 'button';
|
||||||
export let size = 'md';
|
export let size = 'md';
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
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';
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
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;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
export let scroll = true;
|
export let scroll = true;
|
||||||
export let padding = true;
|
export let padding = true;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
export let title = 'Erfolgreich';
|
export let title = 'Erfolgreich';
|
||||||
export let show = false;
|
export let show = false;
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
export let padding = 'p-6';
|
export let padding = 'p-6';
|
||||||
export let shadow = true;
|
export let shadow = true;
|
||||||
let classNames = '';
|
let classNames = '';
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
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';
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import { client } from '$lib/minio';
|
|||||||
* @param {string} caseNumber
|
* @param {string} caseNumber
|
||||||
* @returns {Promise<boolean}
|
* @returns {Promise<boolean}
|
||||||
*/
|
*/
|
||||||
export default async function caseNumberOccupied(caseNumber: string) {
|
export default async function caseNumberOccupied(caseNumber) {
|
||||||
const prefix = `${caseNumber}/config.json`;
|
const prefix = `${caseNumber}/config.json`;
|
||||||
const promise = new Promise((resolve) => {
|
const promise = new Promise((resolve) => {
|
||||||
const stream = client.listObjectsV2('tatort', prefix, false, '');
|
let stream = client.listObjectsV2('tatort', prefix, false, '');
|
||||||
stream.on('data', () => {
|
stream.on('data', () => {
|
||||||
stream.destroy();
|
stream.destroy();
|
||||||
resolve(true);
|
resolve(true);
|
||||||
@@ -7,7 +7,7 @@ const GIGA = MEGA * KILO;
|
|||||||
* @param {number} size
|
* @param {number} size
|
||||||
* @returns{string}
|
* @returns{string}
|
||||||
*/
|
*/
|
||||||
export default function shortenFileSize(size: number) {
|
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);
|
||||||
@@ -9,7 +9,7 @@ const MONTH = YEAR / 12;
|
|||||||
* @param {Date} date
|
* @param {Date} date
|
||||||
* @returns string
|
* @returns string
|
||||||
*/
|
*/
|
||||||
export default function timeElapsed(date: Date) {
|
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);
|
||||||
|
|
||||||
9
src/routes/(angemeldet)/+layout.server.js
Normal file
9
src/routes/(angemeldet)/+layout.server.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
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
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
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
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
import Chevron from '$lib/icons/Chevron-right.svelte';
|
import Chevron from '$lib/icons/Chevron-right.svelte';
|
||||||
|
import Login from '$lib/icons/Login.svelte';
|
||||||
|
|
||||||
export let data;
|
export let data;
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<style>
|
<style>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script>
|
||||||
|
import Panel from '$lib/components/ui/Panel.svelte';
|
||||||
|
|
||||||
export let data;
|
export let data;
|
||||||
</script>
|
</script>
|
||||||
@@ -39,7 +40,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{#if data.user.admin}
|
<!--{#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="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
|
||||||
<div
|
<div
|
||||||
class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
|
class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
|
||||||
@@ -65,7 +66,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
|
<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}-->
|
||||||
{#if data.user.admin}
|
{#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="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
|
<style>
|
||||||
|
ul {
|
||||||
|
min-width: 24rem;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
import { page } from '$app/stores';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type any[]
|
* @type any[]
|
||||||
@@ -30,34 +37,36 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
async function delete_item(ev: Event) {
|
async function delete_item(ev: Event) {
|
||||||
let delete_item = window.confirm('Bist du sicher?');
|
let delete_item = window.confirm("Bist du sicher?");
|
||||||
|
|
||||||
if (delete_item) {
|
if (delete_item) {
|
||||||
const target = ev.currentTarget as HTMLElement | null;
|
const target = ev.currentTarget as HTMLElement | null;
|
||||||
if (!target) return;
|
if (!target) return;
|
||||||
let filename = target.id.split('del__')[1];
|
let filename = target.id.split('del__')[1]
|
||||||
|
|
||||||
// delete request
|
// delete request
|
||||||
// --------------
|
// --------------
|
||||||
|
|
||||||
let url = `/api/list/${filename}`;
|
let url = `/api/list/${filename}`
|
||||||
|
|
||||||
console.log(`--- ${filename} + ${url}`);
|
console.log(`--- ${filename} + ${url}`)
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url, { method: 'DELETE' });
|
const response = await fetch(url,
|
||||||
if (response.status == 204) {
|
{method: 'DELETE'}
|
||||||
setTimeout(() => {
|
)
|
||||||
window.location.reload();
|
if (response.status == 204) {
|
||||||
}, 500);
|
setTimeout(() => {window.location.reload()}, 500)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error) {
|
if (error instanceof Error) {
|
||||||
console.log(error.message);
|
console.log(error.message);
|
||||||
} else {
|
} else {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -89,19 +98,14 @@
|
|||||||
<span class="text-sm font-semibold leading-6 text-gray-900">{item.name}</span>
|
<span class="text-sm font-semibold leading-6 text-gray-900">{item.name}</span>
|
||||||
<!-- Delete button -->
|
<!-- Delete button -->
|
||||||
<button
|
<button
|
||||||
style="padding: 2px"
|
style="padding: 2px"
|
||||||
id="del__{item.name}"
|
id="del__{item.name}"
|
||||||
on:click|preventDefault={delete_item}
|
on:click|preventDefault={delete_item}
|
||||||
aria-label="Vorgang {item.name} löschen"
|
aria-label="Vorgang {item.name} löschen"
|
||||||
>
|
>
|
||||||
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
<svg
|
||||||
><path
|
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
|
||||||
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
|
</button>
|
||||||
fill="#373737"
|
|
||||||
transform="translate(1 1)"
|
|
||||||
/></svg
|
|
||||||
>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="hidden sm:flex sm:flex-col sm:items-end">
|
<div class="hidden sm:flex sm:flex-col sm:items-end">
|
||||||
@@ -113,9 +117,3 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
|
||||||
ul {
|
|
||||||
min-width: 24rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
|
<style>
|
||||||
|
ul {
|
||||||
|
min-width: 24rem;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount } from 'svelte';
|
import { onMount, tick } from 'svelte';
|
||||||
import shortenFileSize from '$lib/helper/shortenFileSize';
|
import shortenFileSize from '$lib/helper/shortenFileSize';
|
||||||
import { page } from '$app/stores';
|
import { page } from '$app/stores';
|
||||||
|
|
||||||
@@ -12,7 +18,8 @@
|
|||||||
import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
|
import ModalContent from '$lib/components/ui/Modal/ModalContent.svelte';
|
||||||
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
|
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
|
||||||
|
|
||||||
/** export let data; */
|
/** @type {import('./$types').PageData} */
|
||||||
|
export let data;
|
||||||
|
|
||||||
interface ListItem {
|
interface ListItem {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -58,7 +65,7 @@
|
|||||||
list = list.map((item) => {
|
list = list.map((item) => {
|
||||||
item.show_button = true;
|
item.show_button = true;
|
||||||
return item;
|
return item;
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -68,12 +75,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function defocus_element(i: number) {
|
function defocus_element(i: number) {
|
||||||
let item = list[i];
|
let item = list[i]
|
||||||
let text_field_id = `label__${item.name}`;
|
let text_field_id = `label__${item.name}`
|
||||||
|
|
||||||
let text_field = document.getElementById(text_field_id);
|
let text_field = document.getElementById(text_field_id)
|
||||||
if (text_field) {
|
if (text_field) {
|
||||||
text_field.setAttribute('contenteditable', 'false');
|
text_field.setAttribute("contenteditable", "false")
|
||||||
text_field.textContent = item.name;
|
text_field.textContent = item.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,26 +90,25 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function handle_input(ev: KeyboardEvent, i: number) {
|
async function handle_input(ev: KeyboardEvent, i: number) {
|
||||||
let item = list[i];
|
let item = list[i]
|
||||||
if (ev.key == 'Escape') {
|
if (ev.key == "Escape") {
|
||||||
let text_field_id = `label__${item.name}`;
|
let text_field_id = `label__${item.name}`
|
||||||
|
|
||||||
let text_field = document.getElementById(text_field_id);
|
let text_field = document.getElementById(text_field_id)
|
||||||
if (text_field) {
|
if (text_field) {
|
||||||
text_field.setAttribute('contenteditable', 'false');
|
text_field.setAttribute("contenteditable", "false");
|
||||||
text_field.textContent = item.name;
|
text_field.textContent = item.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// reshow button
|
// reshow button
|
||||||
item.show_button = true;
|
item.show_button = true
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (ev.key == 'Enter') {
|
if (ev.key == "Enter") {
|
||||||
console.log('--- hitted');
|
console.log('--- hitted')
|
||||||
let name_field = ev.currentTarget as HTMLElement | null;
|
let name_field = ev.currentTarget as HTMLElement | null;
|
||||||
let new_name = name_field
|
let new_name = name_field ? (name_field.textContent || (name_field as any).innerText || '') : '';
|
||||||
? name_field.textContent || (name_field as any).innerText || ''
|
|
||||||
: '';
|
|
||||||
|
|
||||||
if (new_name == '') {
|
if (new_name == '') {
|
||||||
alert('Bitte einen gültigen Namen eingeben.');
|
alert('Bitte einen gültigen Namen eingeben.');
|
||||||
@@ -117,36 +123,34 @@
|
|||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
|
|
||||||
// construct PUT URL
|
// construct PUT URL
|
||||||
const url = $page.url;
|
const url = $page.url
|
||||||
console.log(url);
|
console.log(url);
|
||||||
|
|
||||||
let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' };
|
let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' };
|
||||||
data_obj['new_name'] = new_name;
|
data_obj["new_name"] = new_name
|
||||||
data_obj['old_name'] =
|
data_obj["old_name"] = ev.currentTarget && (ev.currentTarget as HTMLElement).id ? (ev.currentTarget as HTMLElement).id.split('__')[1] : ''
|
||||||
ev.currentTarget && (ev.currentTarget as HTMLElement).id
|
|
||||||
? (ev.currentTarget as HTMLElement).id.split('__')[1]
|
|
||||||
: '';
|
|
||||||
|
|
||||||
open = true;
|
open = true;
|
||||||
inProgress = true;
|
inProgress = true;
|
||||||
|
|
||||||
const response = await fetch(url, { method: 'PUT', body: JSON.stringify(data_obj) });
|
const response = await fetch(url,
|
||||||
|
{method: 'PUT', body: JSON.stringify( data_obj )
|
||||||
|
})
|
||||||
|
|
||||||
inProgress = false;
|
inProgress = false;
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
err = true;
|
err = true;
|
||||||
if (response.status == 400) {
|
if (response.status == 400) {
|
||||||
let json_res = await response.json();
|
let json_res = await response.json()
|
||||||
// alert(json_res['msg'])
|
// alert(json_res['msg'])
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
throw new Error(`Fehlgeschlagen: ${response.status}`);
|
throw new Error(`Fehlgeschlagen: ${response.status}`)
|
||||||
} else {
|
} else {
|
||||||
uploadSuccessful();
|
uploadSuccessful();
|
||||||
setTimeout(() => {
|
setTimeout(() => {window.location.reload()}, 500)
|
||||||
window.location.reload();
|
|
||||||
}, 500);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- upload finished ---
|
// --- upload finished ---
|
||||||
@@ -154,6 +158,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="-z-10 bg-white">
|
<div class="-z-10 bg-white">
|
||||||
@@ -185,99 +190,93 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<div class="min-w-0 flex-auto">
|
<div class="min-w-0 flex-auto">
|
||||||
<span
|
<span
|
||||||
style="display: inline-block; min-width: 5px;"
|
style="display: inline-block; min-width: 5px;"
|
||||||
id="label__{item.name}"
|
id="label__{item.name}"
|
||||||
class="text-sm font-semibold leading-6 text-gray-900"
|
class="text-sm font-semibold leading-6 text-gray-900"
|
||||||
contenteditable={!item.show_button}
|
contenteditable={! item.show_button}
|
||||||
role="textbox"
|
role="textbox"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
aria-label="Dateiname bearbeiten"
|
aria-label="Dateiname bearbeiten"
|
||||||
on:focusout={() => {
|
on:focusout={() => {
|
||||||
defocus_element(i);
|
defocus_element(i);
|
||||||
}}
|
}}
|
||||||
on:keydown|stopPropagation={// event needed to identify ID
|
on:keydown|stopPropagation={
|
||||||
// TO-DO: check if event is needed or if index is sufficient
|
// event needed to identify ID
|
||||||
async (ev) => {
|
// TO-DO: check if event is needed or if index is sufficient
|
||||||
handle_input(ev, i);
|
async (ev) => {handle_input(ev, i)}
|
||||||
}}>{item.name}</span
|
}
|
||||||
>
|
|
||||||
|
>{item.name}</span>
|
||||||
<!-- https://iconduck.com/icons/192863/edit-rename -->
|
<!-- https://iconduck.com/icons/192863/edit-rename -->
|
||||||
|
|
||||||
{#if item.show_button}
|
{#if item.show_button}
|
||||||
<button
|
<button
|
||||||
style="padding: 2px"
|
style="padding: 2px"
|
||||||
id="edit__{item.name}"
|
id="edit__{item.name}"
|
||||||
aria-label="Datei umbenennen"
|
aria-label="Datei umbenennen"
|
||||||
on:click|preventDefault={(ev) => {
|
on:click|preventDefault={(ev) => {
|
||||||
let text_field_id = `label__${item.name}`;
|
let text_field_id = `label__${item.name}`
|
||||||
|
|
||||||
let text_field = document.getElementById(text_field_id);
|
let text_field = document.getElementById(text_field_id)
|
||||||
if (text_field) {
|
if (text_field) {
|
||||||
text_field.setAttribute('contenteditable', 'true');
|
text_field.setAttribute("contenteditable", "true");
|
||||||
text_field.focus();
|
text_field.focus();
|
||||||
text_field.textContent = '';
|
text_field.textContent = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// hide button
|
// hide button
|
||||||
item.show_button = false;
|
item.show_button = false
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
<svg
|
||||||
><path
|
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z" fill="#373737" transform="translate(1 1)"/></svg>
|
||||||
d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z"
|
</button>
|
||||||
fill="#373737"
|
|
||||||
transform="translate(1 1)"
|
|
||||||
/></svg
|
|
||||||
>
|
|
||||||
</button>
|
|
||||||
{/if}
|
{/if}
|
||||||
<button
|
<button
|
||||||
style="padding: 2px"
|
style="padding: 2px"
|
||||||
id="del__{item.name}"
|
id="del__{item.name}"
|
||||||
on:click|preventDefault={async (ev) => {
|
on:click|preventDefault={async (ev) => {
|
||||||
let delete_item = window.confirm('Bist du sicher?');
|
let delete_item = window.confirm("Bist du sicher?");
|
||||||
|
|
||||||
if (delete_item) {
|
if (delete_item) {
|
||||||
// bucket: tatort, name: <vorgang>/item-name
|
// bucket: tatort, name: <vorgang>/item-name
|
||||||
let vorgang = $page.params.vorgang;
|
let vorgang = $page.params.vorgang
|
||||||
let filename = '';
|
let filename = '';
|
||||||
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
|
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
|
||||||
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
|
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// delete request
|
|
||||||
// --------------
|
|
||||||
|
// delete request
|
||||||
let url = new URL($page.url);
|
// --------------
|
||||||
url.pathname += `/${filename}`;
|
|
||||||
|
let url = new URL($page.url);
|
||||||
console.log(`--- ${vorgang} + ${filename} + ${url}`);
|
url.pathname += `/${filename}`;
|
||||||
try {
|
|
||||||
const response = await fetch(url, { method: 'DELETE' });
|
console.log(`--- ${vorgang} + ${filename} + ${url}`)
|
||||||
if (response.status == 204) {
|
try {
|
||||||
setTimeout(() => {
|
const response = await fetch(url,
|
||||||
window.location.reload();
|
{method: 'DELETE'}
|
||||||
}, 500);
|
)
|
||||||
}
|
if (response.status == 204) {
|
||||||
} catch (error) {
|
setTimeout(() => {window.location.reload()}, 500)
|
||||||
if (error instanceof Error) {
|
}
|
||||||
console.log(error.message);
|
} catch (error) {
|
||||||
} else {
|
if (error instanceof Error) {
|
||||||
console.log(error);
|
console.log(error.message)
|
||||||
}
|
} else {
|
||||||
}
|
console.log(error)
|
||||||
}
|
}
|
||||||
}}
|
}
|
||||||
aria-label="Datei löschen"
|
|
||||||
>
|
}
|
||||||
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
}}
|
||||||
><path
|
aria-label="Datei löschen"
|
||||||
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
|
>
|
||||||
fill="#373737"
|
<svg
|
||||||
transform="translate(1 1)"
|
height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
|
||||||
/></svg
|
</button>
|
||||||
>
|
|
||||||
</button>
|
|
||||||
<p class="mt-1 truncate text-xs leading-5 text-gray-500">
|
<p class="mt-1 truncate text-xs leading-5 text-gray-500">
|
||||||
{shortenFileSize(item.size)}
|
{shortenFileSize(item.size)}
|
||||||
</p>
|
</p>
|
||||||
@@ -297,7 +296,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Modal {open}
|
<Modal {open}
|
||||||
><ModalTitle>Umbenennen</ModalTitle><ModalContent>
|
><ModalTitle>Umbenennen</ModalTitle><ModalContent>
|
||||||
{#if inProgress}
|
{#if inProgress}
|
||||||
<p class="py-2 mb-1">Vorgang läuft...</p>
|
<p class="py-2 mb-1">Vorgang läuft...</p>
|
||||||
@@ -308,10 +307,5 @@
|
|||||||
</ModalContent>
|
</ModalContent>
|
||||||
<ModalFooter><Button disabled={inProgress} on:click={uploadSuccessful}>Ok</Button></ModalFooter>
|
<ModalFooter><Button disabled={inProgress} on:click={uploadSuccessful}>Ok</Button></ModalFooter>
|
||||||
</Modal>
|
</Modal>
|
||||||
</div>
|
|
||||||
|
|
||||||
<style>
|
</div>
|
||||||
ul {
|
|
||||||
min-width: 24rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -3,25 +3,25 @@ import { json } from '@sveltejs/kit';
|
|||||||
|
|
||||||
|
|
||||||
// rename operation
|
// rename operation
|
||||||
export async function PUT({ request }: {request: Request}) {
|
export async function PUT({ request }) {
|
||||||
const data = await request.json();
|
const data = await request.json();
|
||||||
|
|
||||||
console.log(`--- ${request.url.split('/').at(-1)} +++ ${JSON.stringify(data)}`);
|
console.log(`--- ${request.url.split('/').at(-1)} +++ ${JSON.stringify(data)}`);
|
||||||
|
|
||||||
// Vorgang
|
// Vorgang
|
||||||
const vorgang = request.url.split('/').at(-1);
|
let vorgang = request.url.split('/').at(-1)
|
||||||
|
|
||||||
// prepare copy, incl. check if new name exists already
|
// prepare copy, incl. check if new name exists already
|
||||||
const old_name = data["old_name"];
|
let old_name = data["old_name"]
|
||||||
const src_full_path = `/tatort/${vorgang}/${old_name}`;
|
let src_full_path = `/tatort/${vorgang}/${old_name}`
|
||||||
const new_name = `${vorgang}/${data["new_name"]}`;
|
let new_name = `${vorgang}/${data["new_name"]}`
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await client.statObject('tatort', new_name);
|
let file_stats = 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(error, 'continue operation');
|
console.log('continue operation')
|
||||||
}
|
}
|
||||||
|
|
||||||
// actual copy operation
|
// actual copy operation
|
||||||
13
src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.js
Normal file
13
src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.js
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
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 });
|
||||||
|
};
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
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 });
|
|
||||||
}
|
|
||||||
@@ -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 }: {request: Request}) => {
|
default: async ({ 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, undefined, {
|
await client.putObject('tatort', `${caseNumber}/config.json`, config, {
|
||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
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';
|
||||||
@@ -73,8 +73,24 @@
|
|||||||
<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.error.description}</p>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<label for="code">
|
||||||
|
<span >Zugangscode (optional) </span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="mt-2">
|
||||||
|
<div
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="code"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-6 flex items-center justify-end gap-x-6">
|
<div class="mt-6 flex items-center justify-end gap-x-6">
|
||||||
<button type="button" class="text-sm font-semibold leading-6 text-gray-900">Cancel</button>
|
<button type="button" class="text-sm font-semibold leading-6 text-gray-900">Cancel</button>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
|
import path from 'path';
|
||||||
|
import { writeFile } from 'fs/promises';
|
||||||
|
import { createReadStream } from 'fs';
|
||||||
|
/** 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';
|
||||||
|
|
||||||
const isRequiredFieldValid = (value: unknown) => {
|
function isRequiredFieldValid(value) {
|
||||||
if (value == null) return false;
|
if (value == null) return false;
|
||||||
|
|
||||||
if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
|
if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
|
||||||
@@ -12,11 +17,12 @@ const isRequiredFieldValid = (value: unknown) => {
|
|||||||
|
|
||||||
/** @type {import('./$types').Actions} */
|
/** @type {import('./$types').Actions} */
|
||||||
export const actions = {
|
export const actions = {
|
||||||
url: async ({ request }: {request: Request}) => {
|
url: async ({ 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');
|
||||||
const type = data.get('type');
|
const type = data.get('type');
|
||||||
|
const code = data.get('zugangscode');
|
||||||
const fileName = data.get('fileName');
|
const fileName = data.get('fileName');
|
||||||
|
|
||||||
let objectName = `${vorgang}/${name}`;
|
let objectName = `${vorgang}/${name}`;
|
||||||
@@ -25,20 +31,23 @@ export const actions = {
|
|||||||
if (!objectName.endsWith('.png')) objectName += '.png';
|
if (!objectName.endsWith('.png')) objectName += '.png';
|
||||||
break;
|
break;
|
||||||
case '':
|
case '':
|
||||||
if (fileName?.toString().endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb';
|
if (fileName.endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb';
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = await client.presignedPutObject('tatort', objectName);
|
const url = await client.presignedPutObject('tatort', objectName);
|
||||||
|
|
||||||
|
// enter code
|
||||||
|
|
||||||
return { url };
|
return { url };
|
||||||
},
|
},
|
||||||
validate: async ({ request }: {request: Request}) => {
|
validate: async ({ 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;
|
||||||
let success = true;
|
let success = true;
|
||||||
const err = {};
|
let err = {};
|
||||||
|
|
||||||
if (isRequiredFieldValid(vorgang)) err.vorgang = null;
|
if (isRequiredFieldValid(vorgang)) err.vorgang = null;
|
||||||
else {
|
else {
|
||||||
@@ -52,12 +61,18 @@ export const actions = {
|
|||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
|
||||||
|
else {
|
||||||
|
err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
|
||||||
|
success = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (success) return { success };
|
if (success) return { success };
|
||||||
|
|
||||||
return fail(400, err);
|
return fail(400, err);
|
||||||
},
|
},
|
||||||
|
|
||||||
upload: async ({ request }: {request: Request}) => {
|
upload: async ({ request }) => {
|
||||||
const requestData = await request.formData();
|
const requestData = await request.formData();
|
||||||
const data = Object.fromEntries(requestData);
|
const data = Object.fromEntries(requestData);
|
||||||
const vorgang = data.vorgang;
|
const vorgang = data.vorgang;
|
||||||
@@ -69,7 +84,7 @@ export const actions = {
|
|||||||
console.log('O:', url);
|
console.log('O:', url);
|
||||||
return { url };
|
return { url };
|
||||||
},
|
},
|
||||||
upload3: async ({ request }: {request: Request}) => {
|
upload3: async ({ 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;
|
||||||
@@ -94,5 +109,8 @@ export const actions = {
|
|||||||
|
|
||||||
return { etag, error };
|
return { etag, error };
|
||||||
//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
|
//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
|
||||||
|
},
|
||||||
|
get_code: async ({ request }) => {
|
||||||
|
console.log('TO-DO');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
import { deserialize } from '$app/forms';
|
import { deserialize, enhance } 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';
|
||||||
@@ -14,9 +14,21 @@
|
|||||||
let open = false;
|
let open = false;
|
||||||
let inProgress = false;
|
let inProgress = false;
|
||||||
let vorgang = '';
|
let vorgang = '';
|
||||||
|
const code_len = 8;
|
||||||
|
let zugangscode = ''
|
||||||
|
let zugangscode_prev = '';
|
||||||
|
|
||||||
|
$: zugangscode = Math.random().toString(36).slice(2, 2+code_len);
|
||||||
|
|
||||||
|
|
||||||
|
let case_existing = undefined;
|
||||||
|
$: case_existing = false;
|
||||||
|
|
||||||
let name = '';
|
let name = '';
|
||||||
let etag: string | null = null;
|
/** @type {?string}*/
|
||||||
let files: FileList | null = null;
|
let etag = null;
|
||||||
|
/** @type {?FileList} */
|
||||||
|
let files = null;
|
||||||
|
|
||||||
$: inProgress = form === null;
|
$: inProgress = form === null;
|
||||||
|
|
||||||
@@ -27,6 +39,7 @@
|
|||||||
let data = new FormData();
|
let data = new FormData();
|
||||||
data.append('vorgang', vorgang);
|
data.append('vorgang', vorgang);
|
||||||
data.append('name', name);
|
data.append('name', name);
|
||||||
|
data.append('zugangscode', zugangscode)
|
||||||
const response = await fetch('?/validate', { method: 'POST', body: data });
|
const response = await fetch('?/validate', { method: 'POST', body: data });
|
||||||
/** @type {import('@sveltejs/kit').ActionResult} */
|
/** @type {import('@sveltejs/kit').ActionResult} */
|
||||||
const result = deserialize(await response.text());
|
const result = deserialize(await response.text());
|
||||||
@@ -57,6 +70,7 @@
|
|||||||
let data = new FormData();
|
let data = new FormData();
|
||||||
data.append('vorgang', vorgang);
|
data.append('vorgang', vorgang);
|
||||||
data.append('name', name);
|
data.append('name', name);
|
||||||
|
data.append('zugangscode', zugangscode)
|
||||||
if (files?.length === 1) {
|
if (files?.length === 1) {
|
||||||
data.append('type', files[0].type);
|
data.append('type', files[0].type);
|
||||||
data.append('fileName', files[0].name);
|
data.append('fileName', files[0].name);
|
||||||
@@ -69,7 +83,8 @@
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buttonClick(event: MouseEvent) {
|
/** @param {MouseEvent} event*/
|
||||||
|
async function buttonClick(event) {
|
||||||
if (!(await validateForm())) {
|
if (!(await validateForm())) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
return;
|
return;
|
||||||
@@ -140,6 +155,33 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// return true or false
|
||||||
|
async function case_exists(case_no) {
|
||||||
|
// ping `/(angemeldet)/view` with caseNumber in POST body
|
||||||
|
let url = '/view'
|
||||||
|
let data = new FormData();
|
||||||
|
data.append('caseNumber', case_no);
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method: 'POST',
|
||||||
|
body: data,
|
||||||
|
redirect: 'error'
|
||||||
|
})
|
||||||
|
|
||||||
|
const res_json = await response.json();
|
||||||
|
const status = res_json.status;
|
||||||
|
|
||||||
|
// aktualisiere Zugangscode mit
|
||||||
|
if (status == 303) {
|
||||||
|
// TO-DO: check existing code
|
||||||
|
|
||||||
|
console.log(`+ existiert`)
|
||||||
|
case_existing = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
case_existing = false;
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="mx-auto max-w-2xl">
|
<div class="mx-auto max-w-2xl">
|
||||||
@@ -174,12 +216,18 @@
|
|||||||
id="vorgang"
|
id="vorgang"
|
||||||
autocomplete={vorgang}
|
autocomplete={vorgang}
|
||||||
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"
|
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"
|
||||||
|
on:input={() => case_exists(vorgang)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{#if formErrors?.vorgang}
|
{#if formErrors?.vorgang}
|
||||||
<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
|
<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
|
||||||
{/if}
|
{/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>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
@@ -209,6 +257,32 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label for="zugangscode" class="block text-sm font-medium leading-6 text-gray-900"
|
||||||
|
><span class="flex"
|
||||||
|
>{#if formErrors?.zugangscode}
|
||||||
|
<span class="inline-block mr-1"><Exclamation /></span>
|
||||||
|
{/if} Zugangscode</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
|
||||||
|
bind:value={zugangscode}
|
||||||
|
type="text"
|
||||||
|
name="zugangscode"
|
||||||
|
id="zugangscode"
|
||||||
|
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>
|
||||||
|
</div>
|
||||||
|
{#if formErrors?.code}
|
||||||
|
<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.code}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="col-span-full">
|
<div class="col-span-full">
|
||||||
<label for="file" class="block text-sm font-medium leading-6 text-gray-900"
|
<label for="file" class="block text-sm font-medium leading-6 text-gray-900"
|
||||||
><span class="flex"
|
><span class="flex"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { fail, redirect } from '@sveltejs/kit';
|
|||||||
|
|
||||||
/** @type {import('./$types').Actions} */
|
/** @type {import('./$types').Actions} */
|
||||||
export const actions = {
|
export const actions = {
|
||||||
default: async ({ request }: {request: Request}) => {
|
default: async ({ request }) => {
|
||||||
const data = await request.formData();
|
const data = await request.formData();
|
||||||
const caseNumber = data.get('caseNumber');
|
const caseNumber = data.get('caseNumber');
|
||||||
|
|
||||||
@@ -15,13 +15,13 @@ export const actions = {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof caseNumber === 'string' && !(await caseNumberOccupied(caseNumber))) {
|
if (!(await caseNumberOccupied(caseNumber))) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
success: false,
|
success: false,
|
||||||
caseNumber,
|
caseNumber,
|
||||||
error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
|
error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
throw redirect(303, `/list/${caseNumber}`);
|
redirect(303, `/list/${caseNumber}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1,5 +1,10 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
|
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;
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { client } from '$lib/minio';
|
import { client } from '$lib/minio';
|
||||||
import type { PageServerLoad } from './$types';
|
|
||||||
|
|
||||||
/** @type {import('./$types').PageServerLoad} */
|
/** @type {import('./$types').PageServerLoad} */
|
||||||
export const load: PageServerLoad = async ({ params }) => {
|
export async function load({ 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 };
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
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,11 +19,18 @@
|
|||||||
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}%`;
|
||||||
@@ -31,7 +38,7 @@
|
|||||||
/**
|
/**
|
||||||
* @param {any} detail
|
* @param {any} detail
|
||||||
*/
|
*/
|
||||||
const onProgress = ({ 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(() => {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
import '../app.css';
|
import '../app.css';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
import { dev } from '$app/environment';
|
import { dev } from '$app/environment';
|
||||||
import { fail, redirect, type Cookies } from '@sveltejs/kit';
|
import { fail, redirect } 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 }: {request: Request, cookies: Cookies}) => {
|
login: async ({ request, 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');
|
||||||
@@ -24,7 +23,7 @@ export const actions = {
|
|||||||
});
|
});
|
||||||
throw redirect(303, '/');
|
throw redirect(303, '/');
|
||||||
},
|
},
|
||||||
logout: async (event: RequestEvent) => {
|
logout: async (event) => {
|
||||||
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 };
|
||||||
@@ -1,4 +1,9 @@
|
|||||||
<script lang="ts">
|
<script>
|
||||||
|
import Panel from '$lib/components/ui/Panel.svelte';
|
||||||
|
import Button from '$lib/components/ui/Button.svelte';
|
||||||
|
import Alert from '$lib/components/ui/Alert.svelte';
|
||||||
|
import Login from '$lib/icons/Login.svelte';
|
||||||
|
|
||||||
/** @type {import('./$types').ActionData} */
|
/** @type {import('./$types').ActionData} */
|
||||||
export let form;
|
export let form;
|
||||||
|
|
||||||
|
|||||||
@@ -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}/` : '';
|
||||||
const stream = client.listObjectsV2('tatort', prefix, false, '');
|
let 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) => {
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import { client } from '$lib/minio';
|
import { client } from '$lib/minio';
|
||||||
|
|
||||||
|
/** @type {import('./$types').RequestHandler} */
|
||||||
export async function GET() {
|
export async function GET() {
|
||||||
const stream = client.listObjectsV2('tatort', '', true);
|
var 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) => {
|
||||||
6
src/routes/api/upload/+server.js
Normal file
6
src/routes/api/upload/+server.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { client } from '$lib/minio';
|
||||||
|
|
||||||
|
/** @type {import('./$types').RequestHandler} */
|
||||||
|
export async function GET(params) {
|
||||||
|
console.log('GET', params);
|
||||||
|
}
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
import type { RequestHandler } from "@sveltejs/kit";
|
|
||||||
|
|
||||||
export async function GET(params: RequestHandler) {
|
|
||||||
console.log('GET', params);
|
|
||||||
}
|
|
||||||
@@ -10,9 +10,7 @@
|
|||||||
"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
|
||||||
//
|
//
|
||||||
|
|||||||
Reference in New Issue
Block a user