8 Commits

38 changed files with 128 additions and 40 deletions

18
package-lock.json generated
View File

@@ -27,7 +27,6 @@
"@sveltejs/vite-plugin-svelte": "^5.0.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.4",
"@tsconfig/svelte": "^5.0.4",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-svelte": "^3.0.0",
@@ -36,8 +35,8 @@
"prettier": "^3.4.2",
"prettier-plugin-svelte": "^3.3.3",
"svelte": "^5.0.0",
"svelte-check": "^4.2.1",
"typescript": "^5.8.3",
"svelte-check": "^4.0.0",
"typescript": "^5.0.0",
"typescript-eslint": "^8.20.0",
"vite": "^6.2.5",
"vitest": "^3.0.0"
@@ -1634,13 +1633,6 @@
}
}
},
"node_modules/@tsconfig/svelte": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-5.0.4.tgz",
"integrity": "sha512-BV9NplVgLmSi4mwKzD8BD/NQ8erOY/nUE/GpgWe2ckx+wIQF5RyRirn/QsSSCPeulVpc3RA/iJt6DpfTIZps0Q==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/aria-query": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
@@ -5680,9 +5672,9 @@
}
},
"node_modules/svelte-check": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.2.1.tgz",
"integrity": "sha512-e49SU1RStvQhoipkQ/aonDhHnG3qxHSBtNfBRb9pxVXoa+N7qybAo32KgA9wEb2PCYFNaDg7bZCdhLD1vHpdYA==",
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.1.5.tgz",
"integrity": "sha512-Gb0T2IqBNe1tLB9EB1Qh+LOe+JB8wt2/rNBDGvkxQVvk8vNeAoG+vZgFB/3P5+zC7RWlyBlzm9dVjZFph/maIg==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -25,7 +25,6 @@
"@sveltejs/vite-plugin-svelte": "^5.0.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.4",
"@tsconfig/svelte": "^5.0.4",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-svelte": "^3.0.0",
@@ -34,8 +33,8 @@
"prettier": "^3.4.2",
"prettier-plugin-svelte": "^3.3.3",
"svelte": "^5.0.0",
"svelte-check": "^4.2.1",
"typescript": "^5.8.3",
"svelte-check": "^4.0.0",
"typescript": "^5.0.0",
"typescript-eslint": "^8.20.0",
"vite": "^6.2.5",
"vitest": "^3.0.0"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
<style>
</style>
<script lang="ts">
<script>
import Panel from '$lib/components/ui/Panel.svelte';
export let data;
@@ -40,7 +40,7 @@
</p>
</div>
{/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="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
@@ -66,7 +66,7 @@
</a>
<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
</div>
{/if}
{/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

View File

@@ -19,7 +19,7 @@
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
/** @type {import('./$types').PageData} */
/** export let data; */
export let data;
interface ListItem {
name: string;

View File

@@ -1,4 +1,4 @@
<script lang="ts">
<script>
import Alert from '$lib/components/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte';
import Modal from '$lib/components/ui/Modal/Modal.svelte';
@@ -73,8 +73,24 @@
<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.description}</p>
{/if}
</div>
<label for="code">
<span >Zugangscode (optional) </span>
</label>
<div class="mt-2">
<div
>
<input
type="text"
id="code"
/>
</div>
</div>
</div>
</div>
<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

View File

@@ -22,6 +22,7 @@ export const actions = {
const vorgang = data.get('vorgang');
const name = data.get('name');
const type = data.get('type');
const code = data.get('zugangscode');
const fileName = data.get('fileName');
let objectName = `${vorgang}/${name}`;
@@ -35,6 +36,8 @@ export const actions = {
const url = await client.presignedPutObject('tatort', objectName);
// enter code
return { url };
},
validate: async ({ request }) => {
@@ -42,6 +45,7 @@ export const actions = {
const data = Object.fromEntries(requestData);
const vorgang = data.vorgang;
const name = data.name;
const zugangscode = data.zugangscode;
let success = true;
let err = {};
@@ -57,6 +61,12 @@ export const actions = {
success = false;
}
if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
else {
err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
success = false;
}
if (success) return { success };
return fail(400, err);
@@ -99,5 +109,8 @@ export const actions = {
return { etag, error };
//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
},
get_code: async ({ request }) => {
console.log('TO-DO');
}
};

View File

@@ -1,4 +1,4 @@
<script lang="ts">
<script>
import { deserialize, enhance } from '$app/forms';
import Alert from '$lib/components/ui/Alert.svelte';
import Button from '$lib/components/ui/Button.svelte';
@@ -14,6 +14,16 @@
let open = false;
let inProgress = false;
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 = '';
/** @type {?string}*/
let etag = null;
@@ -29,6 +39,7 @@
let data = new FormData();
data.append('vorgang', vorgang);
data.append('name', name);
data.append('zugangscode', zugangscode)
const response = await fetch('?/validate', { method: 'POST', body: data });
/** @type {import('@sveltejs/kit').ActionResult} */
const result = deserialize(await response.text());
@@ -59,6 +70,7 @@
let data = new FormData();
data.append('vorgang', vorgang);
data.append('name', name);
data.append('zugangscode', zugangscode)
if (files?.length === 1) {
data.append('type', files[0].type);
data.append('fileName', files[0].name);
@@ -143,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>
<div class="mx-auto max-w-2xl">
@@ -177,12 +216,18 @@
id="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"
on:input={() => case_exists(vorgang)}
/>
</div>
</div>
{#if formErrors?.vorgang}
<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
{/if}
{#if case_existing && (vorgang.length > 0) }
<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
{:else if (vorgang.length > 0) }
<span>Neuer Vorgang wird angelegt.</span>
{/if}
</div>
<div>
@@ -212,6 +257,32 @@
{/if}
</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">
<label for="file" class="block text-sm font-medium leading-6 text-gray-900"
><span class="flex"

View File

@@ -22,6 +22,6 @@ export const actions = {
error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
});
}
throw redirect(303, `/list/${caseNumber}`);
redirect(303, `/list/${caseNumber}`);
}
};

View File

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

View File

@@ -1,5 +1,4 @@
<script lang="ts">
import { preloadCode } from '$app/navigation';
<script>
import Panel from '$lib/components/ui/Panel.svelte';
import { onMount } from 'svelte';
import Button from '$lib/components/ui/Button.svelte';

View File

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

View File

@@ -1,4 +1,4 @@
<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';

View File

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