refactor-login-page #7
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"jwt": {
|
"jwt": {
|
||||||
"secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB",
|
"secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB",
|
||||||
"expiresIn": 3600
|
"expiresIn": 36000
|
||||||
},
|
},
|
||||||
"auth": {
|
"auth": {
|
||||||
"admin": { "password": "A-InnoHUB_2025!", "admin": true },
|
"admin": { "password": "A-InnoHUB_2025!", "admin": true },
|
||||||
|
|||||||
4
src/error.html
Normal file
4
src/error.html
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<h1>Du wurdest automatisch ausgeloggt</h1>
|
||||||
|
<p>Lösche deine Cookies aus dem Browser und logge dich neu ein</p>
|
||||||
|
<p>Code %sveltekit.status%</p>
|
||||||
|
<p>%sveltekit.error.message%</p>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { decryptToken } from '$lib/auth';
|
import { decryptToken } from '$lib/auth';
|
||||||
import type { Handle } from '@sveltejs/kit';
|
import type { Handle } from '@sveltejs/kit';
|
||||||
|
|
||||||
export const handle: Handle = ({ event, resolve }) => {
|
export const handle: Handle = async ({ event, resolve }) => {
|
||||||
const jwt = event.cookies.get('session');
|
const jwt = event.cookies.get('session');
|
||||||
try {
|
try {
|
||||||
if (jwt) {
|
if (jwt) {
|
||||||
@@ -12,5 +12,5 @@ export const handle: Handle = ({ event, resolve }) => {
|
|||||||
event.cookies.delete('session', {path: '/'});
|
event.cookies.delete('session', {path: '/'});
|
||||||
event.locals.user = null;
|
event.locals.user = null;
|
||||||
}
|
}
|
||||||
return resolve(event);
|
return await resolve(event);
|
||||||
}
|
}
|
||||||
|
|||||||
22
src/lib/helper/caseNumberOccupied.js
Normal file
22
src/lib/helper/caseNumberOccupied.js
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
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}`;
|
||||||
|
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;
|
||||||
|
}
|
||||||
10
src/lib/helper/getCode.js
Normal file
10
src/lib/helper/getCode.js
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
19
src/lib/icons/Add-Process.svelte
Normal file
19
src/lib/icons/Add-Process.svelte
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
<script>
|
||||||
|
let classNames = '';
|
||||||
|
export { classNames as class };
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
class="h-6 w-6 text-gray-600 {classNames}"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke-width="1.5"
|
||||||
|
stroke="currentColor"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M13.5 16.875h3.375m0 0h3.375m-3.375 0V13.5m0 3.375v3.375M6 10.5h2.25a2.25 2.25 0 002.25-2.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v2.25A2.25 2.25 0 006 10.5zm0 9.75h2.25A2.25 2.25 0 0010.5 18v-2.25a2.25 2.25 0 00-2.25-2.25H6a2.25 2.25 0 00-2.25 2.25V18A2.25 2.25 0 006 20.25zm9.75-9.75H18a2.25 2.25 0 002.25-2.25V6A2.25 2.25 0 0018 3.75h-2.25A2.25 2.25 0 0013.5 6v2.25a2.25 2.25 0 002.25 2.25z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
14
src/lib/icons/Cube.svelte
Normal file
14
src/lib/icons/Cube.svelte
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<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="M21 7.5l-2.25-1.313M21 7.5v2.25m0-2.25l-2.25 1.313M3 7.5l2.25-1.313M3 7.5l2.25 1.313M3 7.5v2.25m9 3l2.25-1.313M12 12.75l-2.25-1.313M12 12.75V15m0 6.75l2.25-1.313M12 21.75V19.5m0 2.25l-2.25-1.313m0-16.875L12 2.25l2.25 1.313M21 14.25v2.25l-2.25 1.313m-13.5 0L3 16.5v-2.25"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 483 B |
7
src/lib/icons/Edit.svelte
Normal file
7
src/lib/icons/Edit.svelte
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
||||||
|
><path
|
||||||
|
d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z"
|
||||||
|
fill="#373737"
|
||||||
|
transform="translate(1 1)"
|
||||||
|
/></svg
|
||||||
|
>
|
||||||
|
After Width: | Height: | Size: 451 B |
35
src/lib/icons/File-rect.svelte
Normal file
35
src/lib/icons/File-rect.svelte
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<script>
|
||||||
|
export let outline = false;
|
||||||
|
let classNames = '';
|
||||||
|
export { classNames as class };
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if outline}
|
||||||
|
<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 {classNames}"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else}
|
||||||
|
<svg
|
||||||
|
class="mx-auto h-12 w-12 text-gray-300 {classNames}"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="currentColor"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
fill-rule="evenodd"
|
||||||
|
d="M1.5 6a2.25 2.25 0 012.25-2.25h16.5A2.25 2.25 0 0122.5 6v12a2.25 2.25 0 01-2.25 2.25H3.75A2.25 2.25 0 011.5 18V6zM3 16.06V18c0 .414.336.75.75.75h16.5A.75.75 0 0021 18v-1.94l-2.69-2.689a1.5 1.5 0 00-2.12 0l-.88.879.97.97a.75.75 0 11-1.06 1.06l-5.16-5.159a1.5 1.5 0 00-2.12 0L3 16.061zm10.125-7.81a1.125 1.125 0 112.25 0 1.125 1.125 0 01-2.25 0z"
|
||||||
|
clip-rule="evenodd"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{/if}
|
||||||
14
src/lib/icons/Folder.svelte
Normal file
14
src/lib/icons/Folder.svelte
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<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="M2.25 12.75V12A2.25 2.25 0 014.5 9.75h15A2.25 2.25 0 0121.75 12v.75m-8.69-6.44l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 460 B |
19
src/lib/icons/List-icon.svelte
Normal file
19
src/lib/icons/List-icon.svelte
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
<script>
|
||||||
|
let classNames = '';
|
||||||
|
export { classNames as class };
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<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 {classNames}"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zM3.75 12h.007v.008H3.75V12zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zm-.375 5.25h.007v.008H3.75v-.008zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
14
src/lib/icons/Profile.svelte
Normal file
14
src/lib/icons/Profile.svelte
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<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="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 402 B |
@@ -1,5 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Chevron from '$lib/icons/Chevron-right.svelte';
|
import Chevron from '$lib/icons/Chevron-right.svelte';
|
||||||
|
import Profile from '$lib/icons/Profile.svelte';
|
||||||
|
|
||||||
export let data;
|
export let data;
|
||||||
</script>
|
</script>
|
||||||
@@ -58,20 +59,9 @@
|
|||||||
href="/"
|
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"
|
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"
|
||||||
>
|
>
|
||||||
<svg
|
<!--icon-->
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
<Profile />
|
||||||
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="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
{data.user.id}
|
{data.user.id}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
<style>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
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 data;
|
||||||
|
export let outline = true;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -15,20 +17,7 @@
|
|||||||
<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"
|
||||||
>
|
>
|
||||||
<svg
|
<ListIcon class=" group-hover:text-indigo-600" />
|
||||||
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="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zM3.75 12h.007v.008H3.75V12zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zm-.375 5.25h.007v.008H3.75v-.008zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
</div>
|
||||||
<a href="/list" class="mt-6 block font-semibold text-gray-900">
|
<a href="/list" class="mt-6 block font-semibold text-gray-900">
|
||||||
Liste
|
Liste
|
||||||
@@ -44,47 +33,7 @@
|
|||||||
<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"
|
||||||
>
|
>
|
||||||
<svg
|
<AddProcess class=" group-hover:text-indigo-600" />
|
||||||
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
|
|
||||||
class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
class="h-6 w-6 text-gray-600 group-hover:text-indigo-600"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M13.5 16.875h3.375m0 0h3.375m-3.375 0V13.5m0 3.375v3.375M6 10.5h2.25a2.25 2.25 0 002.25-2.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v2.25A2.25 2.25 0 006 10.5zm0 9.75h2.25A2.25 2.25 0 0010.5 18v-2.25a2.25 2.25 0 00-2.25-2.25H6a2.25 2.25 0 00-2.25 2.25V18A2.25 2.25 0 006 20.25zm9.75-9.75H18a2.25 2.25 0 002.25-2.25V6A2.25 2.25 0 0018 3.75h-2.25A2.25 2.25 0 0013.5 6v2.25a2.25 2.25 0 002.25 2.25z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
</div>
|
||||||
<a href="/upload" class="mt-6 block font-semibold text-gray-900">
|
<a href="/upload" class="mt-6 block font-semibold text-gray-900">
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
@@ -97,20 +46,7 @@
|
|||||||
<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"
|
||||||
>
|
>
|
||||||
<svg
|
<FileRect class=" group-hover:text-indigo-600" {outline} />
|
||||||
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="M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
</div>
|
||||||
<a href="/view" class="mt-6 block font-semibold text-gray-900">
|
<a href="/view" class="mt-6 block font-semibold text-gray-900">
|
||||||
Ansicht
|
Ansicht
|
||||||
@@ -120,3 +56,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
</style>
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
import Trash from '$lib/icons/Trash.svelte';
|
||||||
|
import Folder from '$lib/icons/Folder.svelte';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type any[]
|
* @type any[]
|
||||||
@@ -35,7 +37,7 @@
|
|||||||
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
|
||||||
// --------------
|
// --------------
|
||||||
|
|
||||||
@@ -69,20 +71,8 @@
|
|||||||
<li>
|
<li>
|
||||||
<a href="/list/{item.name}" class="flex justify-between gap-x-6 py-5">
|
<a href="/list/{item.name}" class="flex justify-between gap-x-6 py-5">
|
||||||
<div class="flex gap-x-4">
|
<div class="flex gap-x-4">
|
||||||
<svg
|
<!-- Ordner -->
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
<Folder />
|
||||||
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="M2.25 12.75V12A2.25 2.25 0 014.5 9.75h15A2.25 2.25 0 0121.75 12v.75m-8.69-6.44l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<div class="min-w-0 flex-auto">
|
<div class="min-w-0 flex-auto">
|
||||||
<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 -->
|
||||||
@@ -92,13 +82,7 @@
|
|||||||
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"
|
<Trash />
|
||||||
><path
|
|
||||||
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
|
|
||||||
fill="#373737"
|
|
||||||
transform="translate(1 1)"
|
|
||||||
/></svg
|
|
||||||
>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,8 +11,13 @@
|
|||||||
import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte';
|
import ModalTitle from '$lib/components/ui/Modal/ModalTitle.svelte';
|
||||||
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';
|
||||||
|
import Cube from '$lib/icons/Cube.svelte';
|
||||||
|
import Edit from '$lib/icons/Edit.svelte';
|
||||||
|
import Trash from '$lib/icons/Trash.svelte';
|
||||||
|
|
||||||
/** export let data; */
|
/** export let data; */
|
||||||
|
/** @type {import('./$types').PageData} */
|
||||||
|
export let data;
|
||||||
|
|
||||||
interface ListItem {
|
interface ListItem {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -87,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;
|
||||||
}
|
}
|
||||||
@@ -115,6 +121,7 @@
|
|||||||
|
|
||||||
// construct PUT URL
|
// construct PUT URL
|
||||||
const url = $page.url;
|
const url = $page.url;
|
||||||
|
console.log(url);
|
||||||
|
|
||||||
let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' };
|
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;
|
||||||
@@ -134,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}`);
|
||||||
@@ -162,117 +168,114 @@
|
|||||||
<li>
|
<li>
|
||||||
<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"
|
||||||
>
|
>
|
||||||
<div class="flex gap-x-4">
|
<div class=" flex gap-x-4">
|
||||||
<svg
|
<Cube />
|
||||||
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="M21 7.5l-2.25-1.313M21 7.5v2.25m0-2.25l-2.25 1.313M3 7.5l2.25-1.313M3 7.5l2.25 1.313M3 7.5v2.25m9 3l2.25-1.313M12 12.75l-2.25-1.313M12 12.75V15m0 6.75l2.25-1.313M12 21.75V19.5m0 2.25l-2.25-1.313m0-16.875L12 2.25l2.25 1.313M21 14.25v2.25l-2.25 1.313m-13.5 0L3 16.5v-2.25"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<div class="min-w-0 flex-auto">
|
<div class="min-w-0 flex-auto">
|
||||||
<span
|
{#if data.user.admin}
|
||||||
style="display: inline-block; min-width: 5px;"
|
<span
|
||||||
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 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
|
||||||
|
// TO-DO: check if event is needed or if index is sufficient
|
||||||
|
async (ev) => {
|
||||||
|
handle_input(ev, i);
|
||||||
|
}}>{item.name}</span
|
||||||
|
>
|
||||||
|
|
||||||
|
<!--<input
|
||||||
|
class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
|
||||||
|
type="text"
|
||||||
|
name=""
|
||||||
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
|
}}
|
||||||
>
|
bind:value={item.name}
|
||||||
<!-- https://iconduck.com/icons/192863/edit-rename -->
|
id="label__{item.name}"
|
||||||
|
/>-->
|
||||||
|
<!-- disabled={item.show_button} -->
|
||||||
|
<!-- 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
|
<button
|
||||||
style="padding: 2px"
|
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"
|
||||||
>
|
>
|
||||||
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
<Trash />
|
||||||
><path
|
|
||||||
d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z"
|
|
||||||
fill="#373737"
|
|
||||||
transform="translate(1 1)"
|
|
||||||
/></svg
|
|
||||||
>
|
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{:else}
|
||||||
<button
|
<span class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
|
||||||
style="padding: 2px"
|
>{item.name}</span
|
||||||
id="del__{item.name}"
|
|
||||||
on:click|preventDefault={async (ev) => {
|
|
||||||
let delete_item = window.confirm('Bist du sicher?');
|
|
||||||
|
|
||||||
if (delete_item) {
|
|
||||||
// bucket: tatort, name: <vorgang>/item-name
|
|
||||||
let vorgang = $page.params.vorgang;
|
|
||||||
let filename = '';
|
|
||||||
if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
|
|
||||||
filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
// delete request
|
|
||||||
// --------------
|
|
||||||
|
|
||||||
let url = new URL($page.url);
|
|
||||||
url.pathname += `/${filename}`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await fetch(url, { method: 'DELETE' });
|
|
||||||
if (response.status == 204) {
|
|
||||||
setTimeout(() => {
|
|
||||||
window.location.reload();
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
if (error instanceof Error) {
|
|
||||||
console.log(error.message);
|
|
||||||
} else {
|
|
||||||
console.log(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
aria-label="Datei löschen"
|
|
||||||
>
|
|
||||||
<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"
|
|
||||||
><path
|
|
||||||
d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z"
|
|
||||||
fill="#373737"
|
|
||||||
transform="translate(1 1)"
|
|
||||||
/></svg
|
|
||||||
>
|
>
|
||||||
</button>
|
{/if}
|
||||||
<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>
|
||||||
|
|||||||
@@ -73,8 +73,24 @@
|
|||||||
<p class="block text-sm leading-6 text-red-900 mt-2">{form.description}</p>
|
<p class="block text-sm leading-6 text-red-900 mt-2">{form.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,3 +1,4 @@
|
|||||||
|
import { Buffer } from 'buffer';
|
||||||
import { Readable } from 'stream';
|
import { Readable } from 'stream';
|
||||||
import { client } from '$lib/minio';
|
import { client } from '$lib/minio';
|
||||||
import { fail } from '@sveltejs/kit';
|
import { fail } from '@sveltejs/kit';
|
||||||
@@ -16,6 +17,7 @@ export const actions = {
|
|||||||
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}`;
|
||||||
@@ -29,6 +31,14 @@ export const actions = {
|
|||||||
|
|
||||||
const url = await client.presignedPutObject('tatort', objectName);
|
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 };
|
return { url };
|
||||||
},
|
},
|
||||||
validate: async ({ request }: {request: Request}) => {
|
validate: async ({ request }: {request: Request}) => {
|
||||||
@@ -36,6 +46,7 @@ export const actions = {
|
|||||||
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 = {};
|
const err = {};
|
||||||
|
|
||||||
@@ -51,6 +62,12 @@ 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);
|
||||||
@@ -88,6 +105,5 @@ export const actions = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return { etag, error };
|
return { etag, error };
|
||||||
//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,12 +8,28 @@
|
|||||||
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
|
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
|
||||||
import shortenFileSize from '$lib/helper/shortenFileSize.js';
|
import shortenFileSize from '$lib/helper/shortenFileSize.js';
|
||||||
import Exclamation from '$lib/icons/Exclamation.svelte';
|
import Exclamation from '$lib/icons/Exclamation.svelte';
|
||||||
|
import FileRect from '$lib/icons/File-rect.svelte';
|
||||||
|
|
||||||
export let form;
|
export let form;
|
||||||
|
|
||||||
let open = false;
|
let open = false;
|
||||||
let inProgress = false;
|
let inProgress = false;
|
||||||
let vorgang = '';
|
let vorgang = '';
|
||||||
|
const code_len = 8;
|
||||||
|
|
||||||
|
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 = '';
|
let name = '';
|
||||||
let etag: string | null = null;
|
let etag: string | null = null;
|
||||||
let files: FileList | null = null;
|
let files: FileList | null = null;
|
||||||
@@ -26,6 +42,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());
|
||||||
@@ -55,6 +72,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);
|
||||||
@@ -99,40 +117,85 @@
|
|||||||
function swap_endian(val) {
|
function swap_endian(val) {
|
||||||
// from https://www.geeksforgeeks.org/bit-manipulation-swap-endianness-of-a-number/
|
// from https://www.geeksforgeeks.org/bit-manipulation-swap-endianness-of-a-number/
|
||||||
|
|
||||||
let leftmost_byte = (val & eval(0x000000FF)) >> 0;
|
let leftmost_byte = (val & eval(0x000000ff)) >> 0;
|
||||||
let left_middle_byte = (val & eval(0x0000FF00)) >> 8;
|
let left_middle_byte = (val & eval(0x0000ff00)) >> 8;
|
||||||
let right_middle_byte = (val & eval(0x00FF0000)) >> 16;
|
let right_middle_byte = (val & eval(0x00ff0000)) >> 16;
|
||||||
let rightmost_byte = (val & eval(0xFF000000)) >> 24;
|
let rightmost_byte = (val & eval(0xff000000)) >> 24;
|
||||||
|
|
||||||
leftmost_byte <<= 24;
|
leftmost_byte <<= 24;
|
||||||
left_middle_byte <<= 16;
|
left_middle_byte <<= 16;
|
||||||
right_middle_byte <<= 8;
|
right_middle_byte <<= 8;
|
||||||
rightmost_byte <<= 0;
|
rightmost_byte <<= 0;
|
||||||
|
|
||||||
let res = (leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte)
|
let res = leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte;
|
||||||
|
|
||||||
return res
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function check_valid_glb_file() {
|
async function check_valid_glb_file() {
|
||||||
// GLD Header, magic value 0x46546C67, identifies data as binary glTF, 4 bytes
|
// GLD Header, magic value 0x46546C67, identifies data as binary glTF, 4 bytes
|
||||||
// little endian!
|
// little endian!
|
||||||
const GLD_MAGIC = 0x46546C67;
|
const GLD_MAGIC = 0x46546c67;
|
||||||
|
|
||||||
// big endian!
|
// big endian!
|
||||||
let file = files[0];
|
let file = files[0];
|
||||||
let file_header = file.slice(0, 4)
|
let file_header = file.slice(0, 4);
|
||||||
let header_bytes = await file_header.bytes()
|
let header_bytes = await file_header.bytes();
|
||||||
let file_header_hex = '0x' + header_bytes.toHex().toString();
|
let file_header_hex = '0x' + header_bytes.toHex().toString();
|
||||||
|
|
||||||
|
|
||||||
if (GLD_MAGIC == swap_endian(file_header_hex)) {
|
if (GLD_MAGIC == swap_endian(file_header_hex)) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// `/(angemeldet)/view` return true or false
|
||||||
|
async function case_exists(case_no) {
|
||||||
|
|
||||||
|
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 res_json = await response.json();
|
||||||
|
const status = res_json.status;
|
||||||
|
|
||||||
|
if (status != 303) {
|
||||||
|
case_existing = false;
|
||||||
|
zugangscode = zugangscode_old;
|
||||||
|
}
|
||||||
|
|
||||||
|
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>
|
</script>
|
||||||
@@ -169,18 +232,24 @@
|
|||||||
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>
|
||||||
<label for="name" class="block text-sm font-medium leading-6 text-gray-900"
|
<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>
|
<span class="inline-block mr-1"><Exclamation /></span>
|
||||||
{/if} Name</span
|
{/if} Name</span
|
||||||
></label
|
></label
|
||||||
@@ -204,6 +273,41 @@
|
|||||||
{/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"
|
||||||
|
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>
|
||||||
|
{/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"
|
||||||
@@ -216,18 +320,7 @@
|
|||||||
class="mt-2 flex justify-center rounded-lg border border-dashed border-gray-900/25 px-6 py-10"
|
class="mt-2 flex justify-center rounded-lg border border-dashed border-gray-900/25 px-6 py-10"
|
||||||
>
|
>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<svg
|
<FileRect />
|
||||||
class="mx-auto h-12 w-12 text-gray-300"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="currentColor"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
fill-rule="evenodd"
|
|
||||||
d="M1.5 6a2.25 2.25 0 012.25-2.25h16.5A2.25 2.25 0 0122.5 6v12a2.25 2.25 0 01-2.25 2.25H3.75A2.25 2.25 0 011.5 18V6zM3 16.06V18c0 .414.336.75.75.75h16.5A.75.75 0 0021 18v-1.94l-2.69-2.689a1.5 1.5 0 00-2.12 0l-.88.879.97.97a.75.75 0 11-1.06 1.06l-5.16-5.159a1.5 1.5 0 00-2.12 0L3 16.061zm10.125-7.81a1.125 1.125 0 112.25 0 1.125 1.125 0 01-2.25 0z"
|
|
||||||
clip-rule="evenodd"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<div class="mt-4 flex text-sm leading-6 text-gray-600">
|
<div class="mt-4 flex text-sm leading-6 text-gray-600">
|
||||||
<label
|
<label
|
||||||
for="file"
|
for="file"
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
|
import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
|
||||||
import { fail, redirect } from '@sveltejs/kit';
|
import { fail, redirect } from '@sveltejs/kit';
|
||||||
|
import { client } from '$lib/minio';
|
||||||
|
|
||||||
/** @type {import('./$types').Actions} */
|
/** @type {import('./$types').Actions} */
|
||||||
export const actions = {
|
export const actions = {
|
||||||
default: async ({ request }: {request: 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');
|
||||||
|
|
||||||
if (!caseNumber) {
|
if (!caseNumber) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
@@ -22,6 +24,52 @@ export const actions = {
|
|||||||
error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
|
error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
throw redirect(303, `/list/${caseNumber}`);
|
|
||||||
|
//
|
||||||
|
// Ab hier ist Vorgang vorhanden
|
||||||
|
//
|
||||||
|
|
||||||
|
// Jetzt prüfen, ob Code vorhanden ist und
|
||||||
|
// dem eingegebenen Code entspricht
|
||||||
|
|
||||||
|
const token = await get_code_or_null(caseNumber);
|
||||||
|
console.log(`xxx ${token}, ${user_token}`);
|
||||||
|
|
||||||
|
// token vorhanden, check ob gleich sind
|
||||||
|
if (token && token != user_token) {
|
||||||
|
console.log(`ooo token check`);
|
||||||
|
return fail(400, {
|
||||||
|
success: false,
|
||||||
|
caseNumber,
|
||||||
|
error: { token: 'Der Token ist falsch.' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
redirect(303, `/list/${caseNumber}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// returns `code` oder `null`
|
||||||
|
|
||||||
|
async function get_code_or_null(vorg) {
|
||||||
|
const code_name = '__perm__';
|
||||||
|
const obj_path = `${vorg}/${code_name}`;
|
||||||
|
|
||||||
|
let resp = null;
|
||||||
|
let code_saved = '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
resp = await client.getObject('tatort', obj_path);
|
||||||
|
code_saved = await new Response(resp).text();
|
||||||
|
} catch (error) {
|
||||||
|
if (error.name == 'S3Error') {
|
||||||
|
resp = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resp != null) {
|
||||||
|
return code_saved;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -45,6 +45,29 @@
|
|||||||
<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.caseNumber}</p>
|
<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.caseNumber}</p>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label for="token" class="block text-sm font-medium leading-6 text-gray-900"
|
||||||
|
><span class="flex"> Zugangscode</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={false || ''}
|
||||||
|
placeholder="optional"
|
||||||
|
type="text"
|
||||||
|
name="token"
|
||||||
|
id="token"
|
||||||
|
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?.token}
|
||||||
|
<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.token}</p>
|
||||||
|
{/if}
|
||||||
|
</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">
|
||||||
|
|||||||
@@ -59,7 +59,10 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="h-full model w-full bg-neutral-200 p-4 transition-all delay-250">
|
<div class="h-full model w-full bg-neutral-200 p-4 transition-all delay-250">
|
||||||
|
<!-- xr-environment -->
|
||||||
<model-viewer
|
<model-viewer
|
||||||
|
ar
|
||||||
|
shadow-intensity="1"
|
||||||
src={data.url}
|
src={data.url}
|
||||||
bind:this={modelViewer}
|
bind:this={modelViewer}
|
||||||
touch-action="pan-y"
|
touch-action="pan-y"
|
||||||
@@ -78,7 +81,18 @@
|
|||||||
class:opacity-0={!hideProgressScreen}
|
class:opacity-0={!hideProgressScreen}
|
||||||
class:hidden={!hideProgressScreen}
|
class:hidden={!hideProgressScreen}
|
||||||
>
|
>
|
||||||
|
<button slot="ar-button" id="ar-button"> 👋 Activate AR </button>
|
||||||
|
|
||||||
|
<div id="ar-prompt">AR-Prompt</div>
|
||||||
|
|
||||||
|
<button id="ar-failure"> AR is not tracking! </button>
|
||||||
<div class="flex flex-col bg-white/50">
|
<div class="flex flex-col bg-white/50">
|
||||||
|
<button
|
||||||
|
on:click={() => {
|
||||||
|
console.log(modelViewer.ar, modelViewer.getAttribute('ar-status'));
|
||||||
|
}}>Test</button
|
||||||
|
>
|
||||||
|
|
||||||
<!--3 Buttons-->
|
<!--3 Buttons-->
|
||||||
<div class="p-2">
|
<div class="p-2">
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ export async function GET({ params }) {
|
|||||||
|
|
||||||
const name = data.name.slice(prefix.length);
|
const name = data.name.slice(prefix.length);
|
||||||
if (name === 'config.json') return;
|
if (name === 'config.json') return;
|
||||||
|
// zugangscode datei
|
||||||
|
if (name === '__perm__') return;
|
||||||
|
|
||||||
controller.enqueue(`${JSON.stringify({ ...data, name, prefix })}\n`);
|
controller.enqueue(`${JSON.stringify({ ...data, name, prefix })}\n`);
|
||||||
});
|
});
|
||||||
@@ -34,27 +36,25 @@ export async function GET({ params }) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export async function DELETE({ params }) {
|
export async function DELETE({ params }) {
|
||||||
const vorgang = params.vorgang
|
const vorgang = params.vorgang;
|
||||||
|
|
||||||
const object_list = await new Promise((resolve, reject) => {
|
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) => {
|
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 () => {
|
items_str.on('end', async () => {
|
||||||
resolve(res)
|
resolve(res);
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
await client.removeObjects('tatort', object_list)
|
await client.removeObjects('tatort', object_list);
|
||||||
|
|
||||||
return new Response(null, { status: 204 });
|
return new Response(null, { status: 204 });
|
||||||
};
|
}
|
||||||
|
|||||||
25
src/routes/api/list/[[vorgang]]/code/+server.ts
Normal file
25
src/routes/api/list/[[vorgang]]/code/+server.ts
Normal file
@@ -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 });
|
||||||
|
}
|
||||||
|
}
|
||||||
14
static/1.svg
Normal file
14
static/1.svg
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<svg
|
||||||
|
class="h-6 w-6 text-gray-600 group-hover:text-indigo-600"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke-width="1.5"
|
||||||
|
stroke="currentColor"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M13.5 16.875h3.375m0 0h3.375m-3.375 0V13.5m0 3.375v3.375M6 10.5h2.25a2.25 2.25 0 002.25-2.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v2.25A2.25 2.25 0 006 10.5zm0 9.75h2.25A2.25 2.25 0 0010.5 18v-2.25a2.25 2.25 0 00-2.25-2.25H6a2.25 2.25 0 00-2.25 2.25V18A2.25 2.25 0 006 20.25zm9.75-9.75H18a2.25 2.25 0 002.25-2.25V6A2.25 2.25 0 0018 3.75h-2.25A2.25 2.25 0 0013.5 6v2.25a2.25 2.25 0 002.25 2.25z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 714 B |
Reference in New Issue
Block a user