From e5e3c15b07feff74cead7b826129a62adb1fbeb2 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 29 Jun 2025 11:23:51 +0200 Subject: [PATCH] Add refresh functionality and duplicate fight feature in FightEditRow component --- .../pages/event/EventFightList.svelte | 1 + .../moderator/pages/event/FightEditRow.svelte | 45 ++++++++++- .../moderator/pages/event/RefereesList.svelte | 2 +- .../ui/datetime-picker/DateTimePicker.svelte | 42 ++++------- src/components/ui/input/index.ts | 29 +------ src/components/ui/input/input.svelte | 75 +++++++++---------- 6 files changed, 98 insertions(+), 96 deletions(-) diff --git a/src/components/moderator/pages/event/EventFightList.svelte b/src/components/moderator/pages/event/EventFightList.svelte index 9fb2a45..8f77693 100644 --- a/src/components/moderator/pages/event/EventFightList.svelte +++ b/src/components/moderator/pages/event/EventFightList.svelte @@ -296,6 +296,7 @@ bind:groups={data.groups} event={data.event} onupdate={(update) => (data.fights = data.fights.map((v) => (v.id === update.id ? update : v)))} + {refresh} > diff --git a/src/components/moderator/pages/event/FightEditRow.svelte b/src/components/moderator/pages/event/FightEditRow.svelte index 2ecbdbe..ecde5cb 100644 --- a/src/components/moderator/pages/event/FightEditRow.svelte +++ b/src/components/moderator/pages/event/FightEditRow.svelte @@ -1,15 +1,24 @@
@@ -46,4 +67,24 @@ + + + + + + + Fight duplizieren + Hier kannst du die Daten des duplizierten Fights ändern + + + {#snippet actions(dirty, submit)} + + + + {/snippet} + + +
diff --git a/src/components/moderator/pages/event/RefereesList.svelte b/src/components/moderator/pages/event/RefereesList.svelte index 63ee74b..904ee5c 100644 --- a/src/components/moderator/pages/event/RefereesList.svelte +++ b/src/components/moderator/pages/event/RefereesList.svelte @@ -73,7 +73,7 @@ No Players found :( {#each $players - .filter((v) => v.name.includes(playerSearch)) + .filter((v) => v.name.toLowerCase().includes(playerSearch.toLowerCase())) .filter((v, i) => i < 50) .filter((v) => !referees.some((k) => k.uuid === v.uuid)) as player (player.uuid)} addReferee(player.uuid)} keywords={[player.uuid]}>{player.name} diff --git a/src/components/ui/datetime-picker/DateTimePicker.svelte b/src/components/ui/datetime-picker/DateTimePicker.svelte index 849d9df..034648b 100644 --- a/src/components/ui/datetime-picker/DateTimePicker.svelte +++ b/src/components/ui/datetime-picker/DateTimePicker.svelte @@ -24,14 +24,15 @@ import { ScrollArea } from "$lib/components/ui/scroll-area"; import { CalendarIcon } from "lucide-svelte"; import { cn } from "@components/utils"; - import type {ZonedDateTime} from "@internationalized/date"; + import { fromDate, type ZonedDateTime } from "@internationalized/date"; + import Input from "../input/input.svelte"; let { value = $bindable(), - onChange + onChange, }: { - value: ZonedDateTime - onChange?: ((date: ZonedDateTime | undefined) => void) | undefined + value: ZonedDateTime; + onChange?: ((date: ZonedDateTime | undefined) => void) | undefined; } = $props(); let isOpen = $state(false); @@ -63,13 +64,7 @@ - {/each} @@ -113,12 +99,12 @@
{#each Array.from({ length: 60 }, (_, i) => i) as minute} {/each}
diff --git a/src/components/ui/input/index.ts b/src/components/ui/input/index.ts index 75e3bc2..1e30d04 100644 --- a/src/components/ui/input/index.ts +++ b/src/components/ui/input/index.ts @@ -1,29 +1,6 @@ import Root from "./input.svelte"; - -export type FormInputEvent = T & { - currentTarget: EventTarget & HTMLInputElement; -}; -export type InputEvents = { - blur: FormInputEvent; - change: FormInputEvent; - click: FormInputEvent; - focus: FormInputEvent; - focusin: FormInputEvent; - focusout: FormInputEvent; - keydown: FormInputEvent; - keypress: FormInputEvent; - keyup: FormInputEvent; - mouseover: FormInputEvent; - mouseenter: FormInputEvent; - mouseleave: FormInputEvent; - mousemove: FormInputEvent; - paste: FormInputEvent; - input: FormInputEvent; - wheel: FormInputEvent; -}; - export { - Root, - // - Root as Input, + Root, + // + Root as Input, }; diff --git a/src/components/ui/input/input.svelte b/src/components/ui/input/input.svelte index 33bb758..a1d1c7a 100644 --- a/src/components/ui/input/input.svelte +++ b/src/components/ui/input/input.svelte @@ -1,42 +1,39 @@ - +{#if type === "file"} + +{:else} + +{/if}