innohub/tatort
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring part 1: camelcase naming, token vs pw naming

Browse Source
This commit is contained in:
Chi Cong Tran
2025-07-16 09:39:02 +02:00
parent b8e5031669
commit 34d5034a71
9 changed files with 96 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,29 +21,29 @@ export const actions = {
const vorgang = data.get('vorgang');
const name = data.get('name');
const type = data.get('type');
const code = data.get('zugangscode');
const pw = data.get('zugangscode');
const fileName = data.get('fileName');
// store case in database
// skip if Vorgang exists and token not changed
const vorgang_exists = vorgangNameExists(vorgang);
const vorgangExists = vorgangNameExists(vorgang);
let token;
if (!vorgang_exists) {
if (!vorgangExists) {
token = uuidv4();
let insert_stmt = `INSERT INTO cases (token, name, pw) VALUES (?, ?, ?)`;
const stmt = db.prepare(insert_stmt);
stmt.run(token, vorgang, code);
let insertSQLStmt = `INSERT INTO cases (token, name, pw) VALUES (?, ?, ?)`;
const statement = db.prepare(insertSQLStmt);
statement.run(token, vorgang, pw);
} else {
// vorgang exists
// check if PW was changed, and update DB if it was
const vorg = getVorgangByName(vorgang);
const vorg = getVorgangByName(vorg);
token = vorg.token;
if (vorg.pw != code) {
let update_stmt = `UPDATE cases SET pw = ? WHERE name = ?`;
const stmt = db.prepare(update_stmt);
stmt.run(code, vorgang);
if (vorg.pw != pw) {
let updateSQLStmt = `UPDATE cases SET pw = ? WHERE name = ?`;
const statement = db.prepare(updateSQLStmt);
statement.run(pw, vorg);
}
}

40
src/routes/(angemeldet)/upload/+page.svelte
View File

@@ -23,12 +23,12 @@
.slice(2, 2 + code_len);
}
let zugangscode = ''
let zugangscode_old = ''
$: zugangscode_old = generate_token();
$: zugangscode = zugangscode_old
let zugangscodeOld = ''
$: zugangscodeOld = generate_token();
$: zugangscode = zugangscodeOld
let case_existing = undefined;
$: case_existing = false;
let caseExisting = undefined;
$: caseExisting = false;
let name = '';
let etag: string | null = null;
@@ -152,37 +152,37 @@
}
// `/(angemeldet)/view` return true or false
async function case_exists(case_name: string) {
async function caseExists(caseName: string) {
if (case_name == '') {
zugangscode = zugangscode_old;
if (caseName == '') {
zugangscode = zugangscodeOld;
return;
}
let url = `/api/list/${case_name}`
let url = `/api/list/${caseName}`
const response = await fetch(url, { method: 'HEAD'});
const status = response.status;
if (status == 200) {
case_existing = true;
const code = await get_code(case_name);
caseExisting = true;
const code = await getCode(caseName);
zugangscode = code;
return true
} else {
case_existing = false;
zugangscode = zugangscode_old;
caseExisting = false;
zugangscode = zugangscodeOld;
return false
}
}
async function get_code(case_no: string) {
async function getCode(caseName: string) {
if (case_no == '') return;
if (caseName == '') return;
let url = `/api/list/${case_no}/code`;
let url = `/api/list/${caseName}/code`;
const response = await fetch(url);
if (response.status == 200) {
@@ -226,14 +226,14 @@
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)}
on:input={() => caseExists(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}
{#if caseExisting && vorgang.length > 0}
<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
{:else if vorgang.length > 0}
<span>Neuer Vorgang wird angelegt.</span>
@@ -284,7 +284,7 @@
type="text"
name="zugangscode"
id="zugangscode"
on:input="{ (ev) => { zugangscode_old = ev.target.value }}"
on:input="{ (ev) => { zugangscodeOld = 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"
/>
@@ -292,7 +292,7 @@
<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(); }}"
zugangscode = zugangscodeOld = generate_token(); }}"
type="button">
Generiere Zugangscode
</button>

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

@@ -1,4 +1,4 @@
import { getVorgang, getVorgangByCaseId } from '$lib/server/vorgangService';
import { getVorgangByToken, getVorgangByCaseId } from '$lib/server/vorgangService';
import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ params, url }) => {
@@ -6,7 +6,7 @@ export const load: PageServerLoad = async ({ params, url }) => {
const caseToken = url.searchParams.get('token');
const crimesList = await getVorgangByCaseId(caseId);
const vorg = getVorgang(caseId);
const vorg = getVorgangByToken(caseId);
return {
crimesList,

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

@@ -143,7 +143,7 @@
<div class="flex flex-col items-center justify-center w-full">
<h1 class="text-xl">Vorgang {vorg.name}</h1>
{#if data?.user?.admin}
Zugangscode: {vorg.pw}
Zugangspasswort: {vorg.pw}
<Button on:click={() => setClipboard($page.url.toString().split('?')[0])}>Copy Link</Button>
{/if}
</div>

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

@@ -2,7 +2,7 @@ import { client } from '$lib/minio';
import { db } from '$lib/server/dbService';
import {
deleteVorgangByName,
getVorgang,
getVorgangByToken,
getVorgangByName,
vorgangNameExists
} from '$lib/server/vorgangService';
@@ -11,11 +11,11 @@ export async function DELETE({ params }) {
const vorgang = params.vorgang;
const vorg = getVorgangByName(vorgang);
let vorg_token = vorg.token;
let vorgangToken = vorg.token;
const object_list = await new Promise((resolve, reject) => {
const res = [];
const items_str = client.listObjects('tatort', vorg_token, true);
const items_str = client.listObjects('tatort', vorgangToken, true);
items_str.on('data', (obj) => {
res.push(obj.name);
@@ -35,9 +35,9 @@ export async function DELETE({ params }) {
}
export async function HEAD({ params }) {
const vorgang_name = params.vorgang;
const vorgangName = params.vorgang;
const existing = vorgangNameExists(vorgang_name);
const existing = vorgangNameExists(vorgangName);
if (existing) {
return new Response(null, { status: 200 });

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

@@ -3,14 +3,14 @@ import { db } from '$lib/server/dbService';
/** @type {import('./$types').RequestHandler} */
export async function GET({ params }) {
const vorgang_name = params.vorgang;
const vorgangName = params.vorgang;
let get_code_stmt = `SELECT pw FROM cases WHERE name = ?;`;
const row = db.prepare(get_code_stmt).get(vorgang_name);
let pw = row.pw;
let getCodeSQLStmt = `SELECT pw FROM cases WHERE name = ?;`;
const row = db.prepare(getCodeSQLStmt).get(vorgangName);
let password = row.pw;
if (pw) {
return new Response(pw, { status: 200 });
if (password) {
return new Response(password, { status: 200 });
} else {
return new Response(null, { status: 404 });
}