@@ -15,7 +20,7 @@
{name}
class="select select-bordered select-xs"
disabled={disabled || available.length === 0}
- on:change={(e) => {
+ onchange={(e) => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
value.push(Object.values(available)[Object.keys(available).indexOf(e.target.value)]);
@@ -42,7 +47,7 @@
import { Eye, EyeSlash } from 'svelte-heros-v2';
- import { createEventDispatcher } from 'svelte';
+ import type { Snippet } from 'svelte';
- export let id: string | null = null;
- export let name: string | null = null;
- export let type = 'text';
- export let value: string | null = null;
- export let placeholder: string | null = null;
- export let pattern: RegExp | null = null;
- export let required = false;
- export let disabled = false;
- export let readonly = false;
- export let checked = false;
- export let size: 'xs' | 'sm' | 'md' | 'lg' = 'md';
- export let pickyWidth = true;
- export let containerClass = '';
-
- export let inputElement: HTMLInputElement | undefined = undefined;
-
- const dispatch = createEventDispatcher();
- function input(e: Event & { currentTarget: EventTarget & HTMLInputElement }) {
- dispatch('input', e);
- }
- function click(e: Event) {
- dispatch('click', e);
- }
+ let {
+ label,
+ notice,
+ id,
+ name,
+ type = 'text',
+ value = $bindable(),
+ placeholder,
+ pattern,
+ required = false,
+ disabled = false,
+ readonly = false,
+ checked = false,
+ size = 'md',
+ pickyWidth = true,
+ containerClass = '',
+ inputElement = $bindable(),
+ oninput,
+ onclick
+ }: {
+ label?: Snippet;
+ notice?: Snippet;
+ id?: string;
+ name?: string;
+ type?: string;
+ value?: string;
+ placeholder?: string;
+ pattern?: RegExp;
+ required?: boolean;
+ disabled?: boolean;
+ readonly?: boolean;
+ checked?: boolean;
+ size?: 'xs' | 'sm' | 'md' | 'lg';
+ pickyWidth?: boolean;
+ containerClass?: string;
+ inputElement?: HTMLInputElement;
+ oninput?: (e: Event & { currentTarget: EventTarget & HTMLInputElement }) => void;
+ onclick?: (e: Event) => void;
+ } = $props();
let initialType = type;
@@ -50,15 +66,15 @@
{disabled}
bind:value
bind:this={inputElement}
- on:input={input}
- on:click={click}
+ {oninput}
+ {onclick}
/>
{:else}
- {#if $$slots.label}
+ {#if label}
- {#if $$slots.notice}
+ {#if notice}
{/if}
@@ -42,7 +53,7 @@
{id}
{required}
bind:value={inputValue}
- on:input={(e) => {
+ oninput={(e: Event & { currentTarget: EventTarget & HTMLInputElement }) => {
value = '';
searchSuggestionFunc(inputValue).then((v) => {
searchSuggestions = v;
@@ -51,15 +62,15 @@
inputValue = searchSuggestion.name;
value = searchSuggestion.value;
searchSuggestions = [];
- e.target?.setCustomValidity('');
- dispatch('submit', { input: inputValue, value: value });
+ e.currentTarget.setCustomValidity('');
+ onsubmit && onsubmit(Object.assign(e, { input: inputValue, value: value }));
} else if (inputValue === '' && emptyAllowed) {
- dispatch('submit', { input: '', value: '' });
+ onsubmit && onsubmit(Object.assign(e, { input: '', value: '' }));
}
});
}}
- on:invalid={(e) => {
- if (invalidMessage != null) e.target?.setCustomValidity(invalidMessage);
+ oninvalid={(e: Event & { currentTarget: EventTarget & HTMLInputElement }) => {
+ invalidMessage && e.currentTarget.setCustomValidity(invalidMessage);
}}
pattern={suggestionRequired
? `${value ? inputValue : 'a^' + (emptyAllowed ? '|$^' : '')}`
@@ -74,11 +85,11 @@
@@ -90,7 +101,8 @@
{#if inputValue && searchSuggestions.length !== 0}
{/if}
diff --git a/src/lib/components/Input/Select.svelte b/src/lib/components/Input/Select.svelte
index 8f3127a..6b27acc 100644
--- a/src/lib/components/Input/Select.svelte
+++ b/src/lib/components/Input/Select.svelte
@@ -1,20 +1,31 @@
@@ -40,9 +51,9 @@
{required}
{disabled}
bind:value
- on:change={(e) => dispatch('change', { value: value })}
+ onchange={() => onChange && onChange({ value: value })}
>
-
+ {@render children()}
{#if notice}
{/if}
diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts
index ac090f3..8646559 100644
--- a/src/lib/server/database.ts
+++ b/src/lib/server/database.ts
@@ -1,4 +1,4 @@
-import { DataTypes, Op } from 'sequelize';
+import { DataTypes } from 'sequelize';
import { env } from '$env/dynamic/private';
import { building, dev } from '$app/environment';
import * as bcrypt from 'bcrypt';
@@ -53,6 +53,8 @@ export class Report extends Model {
declare notice: string;
@Column({ type: DataTypes.STRING })
declare statement: string;
+ @Column({ type: DataTypes.DATE })
+ declare striked_at: Date | null;
@Column({ type: DataTypes.INTEGER, allowNull: false })
@ForeignKey(() => User)
declare reporter_id: number;
@@ -66,17 +68,26 @@ export class Report extends Model {
@ForeignKey(() => StrikeReason)
declare strike_reason_id: number | null;
- @BelongsTo(() => User, 'reporter_id')
+ @BelongsTo(() => User, {
+ onDelete: 'CASCADE',
+ foreignKey: 'reporter_id'
+ })
declare reporter: User;
- @BelongsTo(() => User, 'reported_id')
+ @BelongsTo(() => User, {
+ onDelete: 'CASCADE',
+ foreignKey: 'reported_id'
+ })
declare reported: User;
- @BelongsTo(() => Admin, 'auditor_id')
+ @BelongsTo(() => Admin, {
+ onDelete: 'CASCADE',
+ foreignKey: 'auditor_id'
+ })
declare auditor: Admin;
- @BelongsTo(() => StrikeReason, 'strike_reason_id')
+ @BelongsTo(() => StrikeReason, {
+ onDelete: 'CASCADE',
+ foreignKey: 'strike_reason_id'
+ })
declare strike_reason: StrikeReason;
-
- @Column({ type: DataTypes.DATE })
- declare striked_at: Date | null;
}
@Table({ modelName: 'strike_reason', underscored: true, createdAt: false, updatedAt: false })
@@ -110,7 +121,10 @@ export class Feedback extends Model {
@ForeignKey(() => User)
declare user_id: number;
- @BelongsTo(() => User, 'user_id')
+ @BelongsTo(() => User, {
+ onDelete: 'CASCADE',
+ foreignKey: 'user_id'
+ })
declare user: User;
}
@@ -153,7 +167,6 @@ export class Settings extends Model {
@Column({
type: DataTypes.STRING,
allowNull: false,
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
get(this: Settings): any {
const value = this.getDataValue('value');
return value != null ? JSON.parse(value) : null;
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 93b9a30..3406f91 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -4,7 +4,9 @@
import { goto } from '$app/navigation';
import { page } from '$app/stores';
- let navPaths = [
+ let { children } = $props();
+
+ let navPaths = $state([
{
name: 'Startseite',
sprite: `${env.PUBLIC_BASE_PATH}/img/menu-home.png`,
@@ -41,24 +43,24 @@
href: `${env.PUBLIC_BASE_PATH}/team`,
active: false
}
- ];
+ ]);
+ let showMenuPermanent = $state(false);
+ let onAdminPage = $state(false);
+ let isTouch = $state(false);
+ let windowHeight = $state(0);
- let showMenuPermanent = false;
-
- let onAdminPage = false;
- $: onAdminPage =
- $page.url.pathname.startsWith(`${env.PUBLIC_BASE_PATH}/admin`) &&
- $page.url.pathname !== `${env.PUBLIC_BASE_PATH}/admin/login`;
- $: {
+ $effect(() => {
+ onAdminPage =
+ $page.url.pathname.startsWith(`${env.PUBLIC_BASE_PATH}/admin`) &&
+ $page.url.pathname !== `${env.PUBLIC_BASE_PATH}/admin/login`;
+ });
+ $effect(() => {
for (let i = 0; i < navPaths.length; i++) {
navPaths[i].active = navPaths[i].href === $page.url.pathname;
}
- }
+ });
- let isTouch = false;
- let nav: HTMLDivElement;
-
- $: windowHeight = 0;
+ let navElem: HTMLDivElement;
@@ -67,7 +69,7 @@
on:touchend={(e) => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
- if (isTouch && !nav.contains(e.target)) showMenuPermanent = false;
+ if (isTouch && !navElem.contains(e.target)) showMenuPermanent = false;
}}
/>
@@ -81,20 +83,20 @@
-
+ {@render children()}