From dc74fcae5e87d45036575136146838e10784be31 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 12 Apr 2024 04:04:03 +0200
Subject: [PATCH 001/247] =?UTF-8?q?=F0=9F=92=A9=20initial=20commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssignMatchesKnockout.vue   |   5 +-
 .../assignMatches/TeamContainerDraggable.vue  |   5 +
 .../ViewKnockoutTreeDraggable.vue             | 318 ++++++++++++++++++
 3 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index bc047771..7d109800 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -85,11 +85,12 @@
 				<template #title>{{ t("general.tournament_tree") }}</template>
 				<template #content>
 					<ScrollPanel style="width: 100%; height: 500px">
-						<ViewKnockoutTree
+						<ViewKnockoutTreeDraggable
 							v-if="competition && finale && thirdPlace"
 							:mode="competition.mode"
 							:match="finale"
 							:third-place="thirdPlace"
+							:competition="competition"
 						/>
 					</ScrollPanel>
 				</template>
@@ -112,7 +113,7 @@ import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
-import { getCompetitionDetails } from "@/backend/competition"
+import ViewKnockoutTreeDraggable from "@/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue"
 
 const route = useRoute()
 const toast = useToast()
diff --git a/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
index a59d1929..ea33fe4c 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
@@ -16,6 +16,7 @@
 			'min-team-height': competition?.mode === Mode.DOUBLE,
 		}"
 		style="box-sizing: content-box"
+		:single="props.single"
 	>
 		<template #default="{ item }">
 			<PlayerCard
@@ -53,6 +54,10 @@ const props = defineProps<{
 	teams: Team[]
 	competition: Competition
 	animated: boolean
+	single: {
+		type: boolean
+		default: false
+	}
 }>()
 </script>
 
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
new file mode 100644
index 00000000..cc357414
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
@@ -0,0 +1,318 @@
+<template>
+	<div>
+		<table
+			:class="
+				props.competition.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'
+			"
+		>
+			<tr>
+				<template v-for="index in rangeArr(maxDepth)" :key="index">
+					<th>
+						{{ roundTitle(index + 1, maxDepth) }}
+					</th>
+					<template v-if="index < maxDepth - 1">
+						<th class="interCell"></th>
+						<th class="interCell"></th>
+					</template>
+				</template>
+			</tr>
+			<tr v-for="indexR in rangeArr(height)" :key="indexR">
+				<template v-for="indexC in rangeArr(maxDepth)" :key="indexC">
+					<td
+						v-if="
+							matchColumnCellType(indexR, indexC) === cellType.match &&
+							indexC === 0
+						"
+						rowspan="5"
+						class="matchCol"
+					>
+						<TeamContainerDraggable
+							:teams="[]"
+							:animated="animated"
+							:competition="props.competition"
+							:single="true"
+						></TeamContainerDraggable>
+					</td>
+					<td
+						v-else-if="matchColumnCellType(indexR, indexC) === cellType.match"
+						rowspan="5"
+						class="matchCol"
+					>
+						<ViewMatchV3 :match="getMatch(indexR, indexC)" :mode="props.mode" />
+					</td>
+					<td
+						v-else-if="
+							matchColumnCellType(indexR, indexC) === cellType.emptyCell
+						"
+					></td>
+					<td
+						v-else-if="
+							matchColumnCellType(indexR, indexC) === cellType.thirdPlace
+						"
+						class="fixHeight"
+					>
+						{{ t("ViewKnockout.thirdPlace") }}
+					</td>
+
+					<template v-if="indexC < maxDepth - 1">
+						<td
+							v-if="
+								interColumnCellType(indexR, indexC) === interCellType.topRight
+							"
+							class="topRightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) ===
+								interCellType.bottomRight
+							"
+							class="bottomRightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) === interCellType.right
+							"
+							class="rightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) === interCellType.blank
+							"
+							class="interCell"
+						></td>
+
+						<td
+							v-if="isBottomInterCell(indexR, indexC)"
+							class="bottomInterCell interCell"
+						></td>
+						<td v-else class="interCell"></td>
+					</template>
+				</template>
+			</tr>
+		</table>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { useI18n } from "vue-i18n"
+import ViewMatchV3 from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import { Competition, Mode } from "@/interfaces/competition"
+import { computed, ref } from "vue"
+import TeamContainerDraggable from "@/components/views/prepare/assignMatches/TeamContainerDraggable.vue"
+import { Team } from "@/interfaces/match"
+
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	match: KnockoutMatch
+	thirdPlace: KnockoutMatch
+	mode: Mode
+	competition: Competition
+}>()
+
+const maxDepth = computed(() => calcMaxDepth(props.match))
+const teamsCount = computed(() => Math.pow(2, maxDepth.value))
+const height = computed(() => tableHeight())
+
+const teams = ref<Team[]>([])
+const animated = ref<boolean>(false)
+
+function getMatch(indexR: number, indexC: number): KnockoutMatch {
+	// detect semifinal
+	if (indexC === maxDepth.value - 1 && indexR > height.value / 2) {
+		return props.thirdPlace
+	}
+
+	let curMatch = props.match
+	let curHeight = height.value
+	for (let i = 0; i < maxDepth.value - indexC - 1; i++) {
+		curHeight /= 2
+		if (curMatch.prevMatch === undefined)
+			throw new Error("prevMatch is undefined")
+		if (indexR < curHeight) {
+			curMatch = curMatch.prevMatch.a
+		} else {
+			curMatch = curMatch.prevMatch.b
+			indexR -= curHeight
+		}
+	}
+	return curMatch
+}
+
+function tableHeight(): number {
+	if (teamsCount.value === 3 || teamsCount.value === 4) return 17
+	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
+}
+
+function roundTitle(round: number, totalRounds: number): string {
+	if (round === totalRounds) return t("ViewKnockout.finale")
+	else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
+	else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
+	else return t("ViewKnockout.round") + " " + round
+}
+
+function matchColumnCellType(indexR: number, indexC: number): cellType {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		if (indexC === 0) {
+			if (indexR === 0) return cellType.match
+			else if (indexR < 5) return cellType.empty
+			else if (indexR < 12) return cellType.emptyCell
+			else if (indexR === 12) return cellType.match
+			else return cellType.empty
+		} else {
+			if (indexR === 6) return cellType.match
+			else if (indexR < 11) return cellType.empty
+			else if (indexR === 11) return cellType.thirdPlace
+			else if (indexR === 12) return cellType.match
+			else return cellType.empty
+		}
+	}
+
+	if (indexC === 0) {
+		const mod = indexR % 6
+		if (mod === 0) return cellType.match
+		else if (mod < 5) return cellType.empty
+		else return cellType.emptyCell
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC - 1)
+	const heightLeftTop =
+		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
+
+	const countMatchesLeft = Math.pow(2, indexC)
+	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
+
+	if (indexR < heightLeftTop) return cellType.emptyCell
+	const mod = (indexR - heightLeftTop) % heightLeft
+	if (mod === 0) return cellType.match
+	else if (mod < 5) return cellType.empty
+	else {
+		if (indexC < maxDepth.value - 1) return cellType.emptyCell
+		else {
+			if (mod === 5) return cellType.emptyCell
+			else if (mod === 6) return cellType.thirdPlace
+			else if (mod === 7) return cellType.match
+			else if (mod < 11) return cellType.empty
+			else return cellType.emptyCell
+		}
+	}
+}
+
+function interColumnCellType(indexR: number, indexC: number): interCellType {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		if (indexR < 2) return interCellType.blank
+		else if (indexR === 2) return interCellType.topRight
+		else if (indexR < 13) return interCellType.right
+		else if (indexR === 13) return interCellType.bottomRight
+		else return interCellType.blank
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC)
+	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
+
+	const countMatchesLeft = Math.pow(2, indexC + 1)
+	const heightLeft =
+		4 * countMatchesLeft + 2 * (countMatchesLeft - 1) - heightLeftTop
+
+	const mod = (indexR - heightLeftTop / 2) % (2 * heightLeft)
+	if (indexR < heightLeftTop / 2) return interCellType.blank
+	if (mod === 0) return interCellType.topRight
+	if (mod === heightLeft - 1) return interCellType.bottomRight
+	if (mod < heightLeft) return interCellType.right
+	else return interCellType.blank
+}
+
+function isBottomInterCell(indexR: number, indexC: number): boolean {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		return indexR === 7
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC)
+	const heightLeftTop =
+		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
+
+	const countMatchesLeft = Math.pow(2, indexC + 1)
+	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
+
+	if (indexR < heightLeftTop) return false
+	const mod = (indexR - heightLeftTop) % heightLeft
+	return mod === 1
+}
+
+function calcMaxDepth(match: KnockoutMatch): number {
+	if (match.prevMatch === undefined) return 1
+
+	return (
+		1 +
+		Math.max(calcMaxDepth(match.prevMatch.a), calcMaxDepth(match.prevMatch.b))
+	)
+}
+
+enum cellType {
+	match,
+	empty,
+	emptyCell,
+	thirdPlace,
+}
+
+enum interCellType {
+	topRight,
+	bottomRight,
+	right,
+	blank,
+}
+
+function rangeArr(r: number) {
+	return Array.from({ length: r }, (value, index) => index)
+}
+</script>
+
+<style scoped>
+table {
+	table-layout: fixed;
+	border-collapse: collapse;
+}
+
+th {
+	text-align: center;
+}
+
+td {
+	padding: 0;
+}
+
+.tableSingles > tr > td {
+	height: 20px;
+	font-size: 13px;
+}
+
+.tableDoubles > tr > td {
+	height: 28px;
+}
+
+.matchCol {
+}
+
+.topRightInterCell {
+	border-top: solid black 2px;
+	border-right: solid black 2px;
+}
+
+.bottomRightInterCell {
+	border-right: solid black 2px;
+	border-bottom: solid black 2px;
+}
+
+.rightInterCell {
+	border-right: solid black 2px;
+}
+
+.bottomInterCell {
+	border-bottom: solid black 2px;
+}
+
+.interCell {
+	min-width: 25px;
+}
+</style>

From bf35fbb862aaffd5415c6b6be6981a03455fb9f5 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 15 Apr 2024 11:55:00 +0200
Subject: [PATCH 002/247] remove support for deprecated CJS Node API in Vite

---
 frontend/app/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index c351b6a7..205df9ec 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -12,6 +12,7 @@
 		"format:validate": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .vue,.ts,.tsx,.js,.jsx && prettier . --check",
 		"format:fix": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .vue,.ts,.tsx,.js,.jsx --fix && prettier . --write"
 	},
+	"type": "module",
 	"dependencies": {
 		"@vee-validate/yup": "^4.12.3",
 		"@vue/cli": "^5.0.8",

From f86dd0b2f34afa21ab44a7f7354d6539bc041268 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 15 Apr 2024 20:38:18 +0200
Subject: [PATCH 003/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20import=20and=20sin?=
 =?UTF-8?q?gle=20attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/assignMatches/AssignMatchesKnockout.vue    | 1 +
 .../views/prepare/assignMatches/TeamContainerDraggable.vue   | 5 +----
 .../prepare/assignMatches/ViewKnockoutTreeDraggable.vue      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 7d109800..ba5d9800 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -26,6 +26,7 @@
 						:animated="animated"
 						:teams="teams"
 						:competition="competition"
+						:single="true"
 					/>
 				</template>
 			</Card>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
index ea33fe4c..7dc7ca82 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
@@ -54,10 +54,7 @@ const props = defineProps<{
 	teams: Team[]
 	competition: Competition
 	animated: boolean
-	single: {
-		type: boolean
-		default: false
-	}
+	single: boolean
 }>()
 </script>
 
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
index cc357414..c63d6fd6 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
@@ -100,7 +100,7 @@ import ViewMatchV3 from "@/components/views/competition/knockoutSystem/ViewMatch
 import { Competition, Mode } from "@/interfaces/competition"
 import { computed, ref } from "vue"
 import TeamContainerDraggable from "@/components/views/prepare/assignMatches/TeamContainerDraggable.vue"
-import { Team } from "@/interfaces/match"
+import { Team } from "@/interfaces/team"
 
 const { t } = useI18n({ inheritLocale: true })
 

From 2a0d36e42ec3eb324b9f60fcd1390d91fdc4c389 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 15 Apr 2024 20:39:13 +0200
Subject: [PATCH 004/247] =?UTF-8?q?=F0=9F=9A=A7=20extract=20ViewMatch=20to?=
 =?UTF-8?q?=20allow=20for=20more=20flexible=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutTree.vue       | 14 ++-
 .../competition/knockoutSystem/ViewMatch.vue  | 88 +++--------------
 .../knockoutSystem/ViewMatchEdit.vue          |  5 +
 .../knockoutSystem/ViewMatchView.vue          | 97 +++++++++++++++++++
 4 files changed, 129 insertions(+), 75 deletions(-)
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index 548d1ac2..aa1d1244 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -21,7 +21,17 @@
 						rowspan="5"
 						class="matchCol"
 					>
-						<ViewMatchV3 :match="getMatch(indexR, indexC)" :mode="props.mode" />
+						<ViewMatchView
+							:match="getMatch(indexR, indexC)"
+							:mode="props.mode"
+							:teamA="getMatch(indexR, indexC).teamA"
+							:teamB="getMatch(indexR, indexC).teamB"
+							:sets="getMatch(indexR, indexC).sets"
+							:finished="getMatch(indexR, indexC).finished"
+							:winner="getMatch(indexR, indexC).winner"
+							:single="props.mode === Mode.SINGLE"
+						>
+						</ViewMatchView>
 					</td>
 					<td
 						v-else-if="
@@ -79,7 +89,7 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { useI18n } from "vue-i18n"
-import ViewMatchV3 from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import { Mode } from "@/interfaces/competition"
 import { computed } from "vue"
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index a23d9559..0efd2585 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -1,87 +1,43 @@
 <template>
 	<table
 		:class="{
-			tableSingles: props.mode === Mode.SINGLE,
-			tableDoubles: props.mode === Mode.DOUBLE,
+			tableSingles: props.single,
+			tableDoubles: !props.single,
 		}"
 	>
-		<tr :class="{ winner: props.match.finished && !props.match.winner }">
+		<tr :class="{ winner: props.finished && !props.winner }">
 			<td class="name">
-				{{
-					props.match.teamA?.playerA
-						? `${props.match.teamA.playerA.lastName}, ${props.match.teamA.playerA.firstName}`
-						: ""
-				}}
-				<template v-if="props.mode === Mode.DOUBLE">
-					<br />
-					{{
-						props.match.teamA?.playerB
-							? `${props.match.teamA.playerB.lastName}, ${props.match.teamA.playerB.firstName}`
-							: ""
-					}}
-				</template>
+				<slot name="teamA-name"></slot>
 			</td>
-
-			<template v-if="props.match.sets !== null">
-				<td v-for="set in props.match.sets" :key="set.index" class="result">
+			<template v-if="props.sets !== null">
+				<td v-for="set in props.sets" :key="set.index" class="result">
 					{{ set.scoreA }}
 				</td>
 			</template>
 		</tr>
-		<tr :class="{ winner: props.match.finished && props.match.winner }">
+		<tr :class="{ winner: props.finished && props.winner }">
 			<td class="name">
-				{{
-					props.match.teamB?.playerA
-						? `${props.match.teamB.playerA.lastName}, ${props.match.teamB.playerA.firstName}`
-						: ""
-				}}
-				<template v-if="props.mode === Mode.DOUBLE">
-					<br />
-					{{
-						props.match.teamB?.playerB
-							? `${props.match.teamB.playerB.lastName}, ${props.match.teamB.playerB.firstName}`
-							: ""
-					}}
-				</template>
+				<slot name="teamB-name" />
 			</td>
 
-			<template v-if="props.match.sets !== null">
-				<td v-for="set in props.match.sets" :key="set.index" class="result">
+			<template v-if="props.sets !== null">
+				<td v-for="set in props.sets" :key="set.index" class="result">
 					{{ set.scoreB }}
 				</td>
 			</template>
 		</tr>
 	</table>
-	<div
-		id="date"
-		:class="{
-			dateSingles: props.mode === Mode.SINGLE,
-			dateDoubles: props.mode === Mode.DOUBLE,
-		}"
-	>
-		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
-	</div>
 </template>
 
 <script setup lang="ts">
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { useI18n } from "vue-i18n"
-import { Mode } from "@/interfaces/competition"
-
-const { t } = useI18n({ inheritLocale: true })
+import { Set } from "@/interfaces/match"
 
 const props = defineProps<{
-	match: KnockoutMatch
-	mode: Mode
+	sets: Array<Set> | null
+	single: boolean
+	finished: boolean
+	winner: boolean | null
 }>()
-
-const dateOptions: Intl.DateTimeFormatOptions = {
-	year: "2-digit",
-	month: "numeric",
-	day: "numeric",
-	hour: "numeric",
-	minute: "numeric",
-}
 </script>
 
 <style scoped>
@@ -122,20 +78,6 @@ td {
 	padding-left: 20px;
 }
 
-#date {
-	text-align: right;
-	padding-right: 20px;
-	font-style: italic;
-}
-
-.dateSingles {
-	height: 20px;
-}
-
-.dateDoubles {
-	height: 28px;
-}
-
 .result {
 	text-align: center;
 	width: 25px;
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
new file mode 100644
index 00000000..d879ed07
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template></template>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
new file mode 100644
index 00000000..8d2845e6
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
@@ -0,0 +1,97 @@
+<template>
+	<ViewMatch
+		:teamA="props.teamA"
+		:teamB="props.teamB"
+		:sets="props.sets"
+		:finished="props.finished"
+		:winner="props.winner"
+		:single="props.single"
+	>
+		<template #teamA-name>
+			{{
+				props.teamA?.playerA
+					? `${props.teamA.playerA.lastName}, ${props.teamA.playerA.firstName}`
+					: ""
+			}}
+			<template v-if="!props.single">
+				<br />
+				{{
+					props.teamA?.playerB
+						? `${props.teamA.playerB.lastName}, ${props.teamA.playerB.firstName}`
+						: ""
+				}}
+			</template>
+		</template>
+
+		<template #teamB-name>
+			{{
+				props.teamB?.playerA
+					? `${props.teamB.playerA.lastName}, ${props.teamB.playerA.firstName}`
+					: ""
+			}}
+			<template v-if="!props.single">
+				<br />
+				{{
+					props.teamB?.playerB
+						? `${props.teamB.playerB.lastName}, ${props.teamB.playerB.firstName}`
+						: ""
+				}}
+			</template>
+		</template>
+	</ViewMatch>
+	<div
+		id="date"
+		:class="{
+			dateSingles: props.single,
+			dateDoubles: !props.single,
+		}"
+	>
+		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
+	</div>
+</template>
+
+<script setup lang="ts">
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Mode } from "@/interfaces/competition"
+import { Team } from "@/interfaces/team"
+import { Set } from "@/interfaces/match"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	match: KnockoutMatch
+	mode: Mode
+	teamA: Team | null
+	teamB: Team | null
+	sets: Array<Set> | null
+	single: boolean
+	finished: boolean
+	winner: boolean | null
+}>()
+
+const dateOptions: Intl.DateTimeFormatOptions = {
+	year: "2-digit",
+	month: "numeric",
+	day: "numeric",
+	hour: "numeric",
+	minute: "numeric",
+}
+</script>
+
+<style scoped>
+#date {
+	text-align: right;
+	padding-right: 20px;
+	font-style: italic;
+}
+
+.dateSingles {
+	height: 20px;
+}
+
+.dateDoubles {
+	height: 28px;
+}
+</style>

From ccd7b64162fa759d5e40bdfeab1aa6a35ea055e8 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 16 Apr 2024 10:46:49 +0200
Subject: [PATCH 005/247] =?UTF-8?q?=F0=9F=92=84=20convert=20px=20to=20rem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/knockoutSystem/ViewMatchView.vue    | 8 +++-----
 frontend/app/src/style.css                                | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
index 8d2845e6..e984da01 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
@@ -1,7 +1,5 @@
 <template>
 	<ViewMatch
-		:teamA="props.teamA"
-		:teamB="props.teamB"
 		:sets="props.sets"
 		:finished="props.finished"
 		:winner="props.winner"
@@ -83,15 +81,15 @@ const dateOptions: Intl.DateTimeFormatOptions = {
 <style scoped>
 #date {
 	text-align: right;
-	padding-right: 20px;
+	padding-right: 1rem;
 	font-style: italic;
 }
 
 .dateSingles {
-	height: 20px;
+	height: 1rem;
 }
 
 .dateDoubles {
-	height: 28px;
+	height: 1rem;
 }
 </style>
diff --git a/frontend/app/src/style.css b/frontend/app/src/style.css
index 9cf7aae1..7dbfbbea 100644
--- a/frontend/app/src/style.css
+++ b/frontend/app/src/style.css
@@ -43,9 +43,9 @@ body {
 }
 
 .min-player-height {
-	min-height: 3rem;
+	min-height: 2.5rem;
 }
 
 .min-team-height {
-	min-height: calc(6rem + 9px);
+	min-height: calc(5rem);
 }

From 974830fda321b8e26bac8c88e57d11364804aef6 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 17 May 2024 01:39:55 +0200
Subject: [PATCH 006/247] =?UTF-8?q?=F0=9F=8E=A8=20pull=20out=20reusable=20?=
 =?UTF-8?q?PlayerCard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PlayerContainerDraggable.vue   | 52 +++++++++++++++++++
 .../TeamContainerDraggable.vue                |  0
 .../views/prepare/editTeams/PlayerList.vue    | 34 ++++--------
 3 files changed, 61 insertions(+), 25 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
 rename frontend/app/src/components/views/prepare/{assignMatches => components}/TeamContainerDraggable.vue (100%)

diff --git a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
new file mode 100644
index 00000000..b4c4dc8a
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
@@ -0,0 +1,52 @@
+<template>
+	<DraggablePanel
+		:id="id"
+		:component-data="{
+			tag: 'div',
+			name: props.isUpdating || isUpdating ? 'playerList' : 'default',
+			type: 'transition',
+		}"
+		:group="group"
+		:list="props.players"
+		:put="[group]"
+		:tag="TransitionGroup"
+		class="flex flex-row flex-wrap gap-2 border-3 min-player-height border-round border-dashed"
+		item-key="name"
+		style="box-sizing: content-box; width: calc(100% - 6px)"
+	>
+		<template #default="{ item }">
+			<PlayerCard
+				:key="(<Player>item).name"
+				:player="item"
+				:secondary="secondary"
+			/>
+		</template>
+	</DraggablePanel>
+</template>
+
+<script setup lang="ts">
+import { ref, TransitionGroup } from "vue"
+import { Player } from "@/interfaces/player"
+import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
+import { Tournament } from "@/interfaces/tournament"
+import { Competition } from "@/interfaces/competition"
+import AddPlayer from "@/components/views/prepare/editTeams/AddPlayer.vue"
+import DeleteBox from "@/components/views/prepare/editTeams/DeleteBox.vue"
+
+const props = withDefaults(
+	defineProps<{
+		id?: string
+		players: Player[]
+		group: string
+		secondary?: boolean
+		isUpdating: boolean
+	}>(),
+	{
+		isUpdating: false,
+		secondary: false,
+	},
+)
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/TeamContainerDraggable.vue
rename to frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue b/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
index 75ba3ec0..b60ebb48 100644
--- a/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
@@ -16,31 +16,13 @@
 						/>
 						<DeleteBox :group="props.group" :secondary="secondary" />
 					</div>
-
-					<DraggablePanel
-						:id="id"
-						:component-data="{
-							tag: 'div',
-							name: props.isUpdating || locAnimated ? 'playerList' : 'default',
-							type: 'transition',
-						}"
-						:group="group"
-						:list="props.players"
-						:put="[group]"
-						:tag="TransitionGroup"
-						class="flex flex-row flex-wrap gap-2 border-3 min-player-height border-round border-dashed"
-						item-key="name"
-						style="box-sizing: content-box; width: calc(100% - 6px)"
-					>
-						<template #default="{ item }">
-							<PlayerCard
-								:key="(<Player>item).name"
-								:player="item"
-								:secondary="secondary"
-								@add-player="addPlayer"
-							/>
-						</template>
-					</DraggablePanel>
+					<PlayerContainerDraggable
+						:id="props.id"
+						:players="props.players"
+						:group="props.group"
+						:secondary="props.secondary"
+						:is-updating="locAnimated"
+					/>
 				</div>
 			</template>
 		</Card>
@@ -56,6 +38,7 @@ import { ref, TransitionGroup } from "vue"
 import { Player } from "@/interfaces/player"
 import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import PlayerContainerDraggable from "@/components/views/prepare/components/PlayerContainerDraggable.vue"
 
 const props = withDefaults(
 	defineProps<{
@@ -78,6 +61,7 @@ const locAnimated = ref(false)
 
 async function addPlayer(p: Player) {
 	locAnimated.value = true
+	//TODO don't add duplicates
 	props.players.push(p)
 	await new Promise((resolve) => setTimeout(resolve, 500))
 	locAnimated.value = false

From 600f7983d013b22f46fbaa0cb2297892b8f28b99 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 14 Jun 2024 10:11:05 +0200
Subject: [PATCH 007/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20bug=20in=20tournam?=
 =?UTF-8?q?ent=20probs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/components/items/ItemTournament.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/src/components/items/ItemTournament.vue b/frontend/app/src/components/items/ItemTournament.vue
index 14332290..d68d71a3 100644
--- a/frontend/app/src/components/items/ItemTournament.vue
+++ b/frontend/app/src/components/items/ItemTournament.vue
@@ -4,7 +4,7 @@
 			{{ props.tournament.name }}
 		</template>
 		<template #subtitle>
-			<p v-if="new Date() >= props.tournament.registration_phase[1]">
+			<p v-if="new Date() >= props.tournament.registration_phase.end">
 				{{ props.tournament.game_phase.begin.toLocaleDateString() }}
 				- {{ props.tournament.game_phase.end.toLocaleDateString() }}
 			</p>

From a8e776dd82be152eab75c19032280c5e5fa098de Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 16 Jun 2024 00:05:41 +0200
Subject: [PATCH 008/247] =?UTF-8?q?=F0=9F=8E=A8=20extract=20ViewMatch=20to?=
 =?UTF-8?q?=20ViewMatchView=20and=20ViewMatchEdit=20(used=20in=20ViewKnock?=
 =?UTF-8?q?outTreeDraggable.vue=20and=20ViewMatchArray=20(copy=20of=20View?=
 =?UTF-8?q?MatchView=20with=20different=20type)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutTree.vue       |   2 +-
 .../knockoutSystem/ViewMatchEdit.vue          |  74 ++++++++++++-
 .../knockoutSystem/ViewMatchView.vue          |  49 +++++----
 .../knockoutSystem/ViewMatchViewArray.vue     | 104 ++++++++++++++++++
 4 files changed, 205 insertions(+), 24 deletions(-)
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index aa1d1244..ff76917e 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -89,9 +89,9 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { useI18n } from "vue-i18n"
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import { Mode } from "@/interfaces/competition"
 import { computed } from "vue"
+import ViewMatchView from "@/components/views/competition/knockoutSystem/ViewMatchView.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
index d879ed07..8871dbdc 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
@@ -1,5 +1,73 @@
-<script setup lang="ts"></script>
+<template>
+	<ViewMatch
+		:sets="null"
+		:finished="true"
+		:winner="false"
+		:single="props.single"
+	>
+		<template #teamA-name>
+			<TeamTableElementDraggable
+				:teams="teamA"
+				:animated="false"
+				:competition="competition"
+				@onAdd="emit('onAdd', index, 0)"
+				@onRemove="emit('onRemove', index, 0)"
+			>
+			</TeamTableElementDraggable>
+		</template>
+		<template #teamB-name>
+			<TeamTableElementDraggable
+				:teams="teamB"
+				:animated="false"
+				:competition="competition"
+			>
+			</TeamTableElementDraggable>
+		</template>
+	</ViewMatch>
+	<div
+		id="date"
+		:class="{
+			dateSingles: props.single,
+			dateDoubles: !props.single,
+		}"
+	/>
+</template>
 
-<template></template>
+<script setup lang="ts">
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Competition, Mode } from "@/interfaces/competition"
+import { Team } from "@/interfaces/team"
+import { useI18n } from "vue-i18n"
+import { TransitionGroup } from "vue"
+import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
+import TeamTableElementDraggable from "@/components/views/prepare/components/TeamTableElementDraggable.vue"
 
-<style scoped></style>
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	teamA: Team[]
+	teamB: Team[]
+	single: boolean
+	competition: Competition
+}>()
+
+const emit = defineEmits(["onAdd", "onRemove"])
+</script>
+
+<style scoped>
+#date {
+	text-align: right;
+	padding-right: 1rem;
+	font-style: italic;
+}
+
+.dateSingles {
+	height: 1rem;
+}
+
+.dateDoubles {
+	height: 1rem;
+}
+</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
index e984da01..f29711c4 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
@@ -6,35 +6,39 @@
 		:single="props.single"
 	>
 		<template #teamA-name>
-			{{
-				props.teamA?.playerA
-					? `${props.teamA.playerA.lastName}, ${props.teamA.playerA.firstName}`
-					: ""
-			}}
-			<template v-if="!props.single">
-				<br />
+			<td class="name">
 				{{
-					props.teamA?.playerB
-						? `${props.teamA.playerB.lastName}, ${props.teamA.playerB.firstName}`
+					props.teamA?.playerA
+						? `${props.teamA.playerA.lastName}, ${props.teamA.playerA.firstName}`
 						: ""
 				}}
-			</template>
+				<template v-if="!props.single">
+					<br />
+					{{
+						props.teamA?.playerB
+							? `${props.teamA.playerB.lastName}, ${props.teamA.playerB.firstName}`
+							: ""
+					}}
+				</template>
+			</td>
 		</template>
 
 		<template #teamB-name>
-			{{
-				props.teamB?.playerA
-					? `${props.teamB.playerA.lastName}, ${props.teamB.playerA.firstName}`
-					: ""
-			}}
-			<template v-if="!props.single">
-				<br />
+			<td class="name">
 				{{
-					props.teamB?.playerB
-						? `${props.teamB.playerB.lastName}, ${props.teamB.playerB.firstName}`
+					props.teamB?.playerA
+						? `${props.teamB.playerA.lastName}, ${props.teamB.playerA.firstName}`
 						: ""
 				}}
-			</template>
+				<template v-if="!props.single">
+					<br />
+					{{
+						props.teamB?.playerB
+							? `${props.teamB.playerB.lastName}, ${props.teamB.playerB.firstName}`
+							: ""
+					}}
+				</template>
+			</td>
 		</template>
 	</ViewMatch>
 	<div
@@ -92,4 +96,9 @@ const dateOptions: Intl.DateTimeFormatOptions = {
 .dateDoubles {
 	height: 1rem;
 }
+
+.name {
+	text-align: left;
+	padding-left: 20px;
+}
 </style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
new file mode 100644
index 00000000..36649737
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
@@ -0,0 +1,104 @@
+<template>
+	<ViewMatch
+		:sets="props.sets"
+		:finished="props.finished"
+		:winner="props.winner"
+		:single="props.single"
+	>
+		<template #teamA-name>
+			<td class="name">
+				{{
+					props.teamA.length === 1
+						? `${props.teamA[0].playerA?.lastName}, ${props.teamA[0].playerA?.firstName}`
+						: ""
+				}}
+				<template v-if="!props.single">
+					<br />
+					{{
+						props.teamA.length === 1
+							? `${props.teamA[0].playerB?.lastName}, ${props.teamA[0].playerB?.firstName}`
+							: ""
+					}}
+				</template>
+			</td>
+		</template>
+
+		<template #teamB-name>
+			<td class="name">
+				{{
+					props.teamB.length === 1
+						? `${props.teamB[0].playerA?.lastName}, ${props.teamB[0].playerA?.firstName}`
+						: ""
+				}}
+				<template v-if="!props.single">
+					<br />
+					{{
+						props.teamB.length === 1
+							? `${props.teamB[0].playerB?.lastName}, ${props.teamB[0].playerB?.firstName}`
+							: ""
+					}}
+				</template>
+			</td>
+		</template>
+	</ViewMatch>
+	<div
+		id="date"
+		:class="{
+			dateSingles: props.single,
+			dateDoubles: !props.single,
+		}"
+	>
+		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
+	</div>
+</template>
+
+<script setup lang="ts">
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Mode } from "@/interfaces/competition"
+import { Team } from "@/interfaces/team"
+import { Set } from "@/interfaces/match"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	match: KnockoutMatch
+	mode: Mode
+	teamA: Team[]
+	teamB: Team[]
+	sets: Array<Set> | null
+	single: boolean
+	finished: boolean
+	winner: boolean | null
+}>()
+
+const dateOptions: Intl.DateTimeFormatOptions = {
+	year: "2-digit",
+	month: "numeric",
+	day: "numeric",
+	hour: "numeric",
+	minute: "numeric",
+}
+</script>
+
+<style scoped>
+#date {
+	text-align: right;
+	padding-right: 1rem;
+	font-style: italic;
+}
+
+.dateSingles {
+	height: 1rem;
+}
+
+.dateDoubles {
+	height: 1rem;
+}
+
+.name {
+	text-align: left;
+	padding-left: 20px;
+}
+</style>

From a0ac0521035fd791eef0ea945b3785cbf2a16036 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 22:36:30 +0200
Subject: [PATCH 009/247] add new warning message vor assignedTeams

---
 .../assignMatches/AssignMatchesKnockout.vue   | 27 ++++++++++++++++++-
 frontend/app/src/i18n/de.json                 |  3 ++-
 frontend/app/src/i18n/en.json                 |  3 ++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index ba5d9800..96971547 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -121,7 +121,8 @@ const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
 const teams = ref<Team[]>([])
-const sortedTeams = ref<Team[]>([])
+//  [row number in the tree][ upper or lower part of a bracket ][just in an array for draggable]
+const assignedTeams = ref<Team[][][]>([])
 
 const animated = ref<boolean>(false)
 
@@ -308,7 +309,31 @@ const finale = computed(() =>
 
 const thirdPlace = computed(() => generateTree(0, []))
 
+function knockoutTreeCompletelyAssigned(): boolean {
+	console.log(assignedTeams.value)
+	for (let i = 0; i < assignedTeams.value.length; i++) {
+		if (
+			assignedTeams.value[i][0].length === 0 ||
+			assignedTeams.value[i][1].length === 0
+		) {
+			return false
+		}
+	}
+	return true
+}
+
 function save() {
+	if (!knockoutTreeCompletelyAssigned()) {
+		toast.add({
+			severity: "error",
+			summary: t("general.failure"),
+			detail: t("ViewPrepare.assignMatches.knockout_not_assigned"),
+			life: 3000,
+			closable: false,
+		})
+		return
+	}
+
 	const req: KnockoutOrder = {
 		teams: sortedTeams.value.map((t) => teamClientToServer(t)),
 	}
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index e6243a7a..723a9ec1 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -203,7 +203,8 @@
 			"emptyGroupSum": "Ungültige Gruppe(n)",
 			"emptyGroupDet": "Jede Gruppe benötigt mindestens 2 Teams",
 			"teams": "Teams",
-			"ranking": "Rangliste"
+			"ranking": "Rangliste",
+			"knockout_not_assigned": "Es wurden noch nicht alle Spiele ausgelost"
 		}
 	},
 	"validation": {
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 996ffc2c..2aea5468 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -205,7 +205,8 @@
 			"emptyGroupSum": "Invalid group(s)",
 			"emptyGroupDet": "Every group needs at least 2 teams",
 			"teams": "Teams",
-			"ranking": "Ranking"
+			"ranking": "Ranking",
+			"knockout_not_assigned": "Not all games have been assigned yet"
 		}
 	},
 	"validation": {

From 6324fed49289e92ebc5fa469bfb896eb44ac2259 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 22:37:14 +0200
Subject: [PATCH 010/247] add new Draggable element for knockoutTree

---
 .../components/TeamTableElementDraggable.vue  | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue

diff --git a/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
new file mode 100644
index 00000000..e5be0d22
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
@@ -0,0 +1,107 @@
+<template>
+	<DraggablePanel
+		:list="teams"
+		:put="true"
+		item-key="id"
+		:tag="TransitionGroup"
+		:component-data="{
+			tag: 'div',
+			name: props.animated ? 'playerList' : 'default',
+			type: 'transition',
+		}"
+		single
+		group="teams"
+		class="flex justify-content-start"
+		:class="{
+			'min-player-height': competition?.mode === Mode.SINGLE,
+			'min-team-height': competition?.mode === Mode.DOUBLE,
+		}"
+		style="box-sizing: content-box"
+	>
+		<template #default="{ item }">
+			<td
+				class="border-round select-none cursor-pointer font-bold pl-3 pr-3 min-player-height inline text-900 flex align-items-center justify-content-center"
+			>
+				{{
+					props.teams[0]?.playerA
+						? `${props.teams[0].playerA.lastName}, ${props.teams[0].playerA.firstName}`
+						: ""
+				}}
+				<br />
+				{{
+					props.teams[0]?.playerB
+						? `${props.teams[0].playerB.lastName}, ${props.teams[0].playerB.firstName}`
+						: ""
+				}}
+			</td>
+		</template>
+	</DraggablePanel>
+</template>
+
+<script setup lang="ts">
+import { TransitionGroup } from "vue"
+import { Competition, Mode } from "@/interfaces/competition"
+import { Team } from "@/interfaces/team"
+import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
+import TeamBox from "@/components/views/prepare/components/TeamBox.vue"
+import DraggablePanel from "@/draggable/DraggablePanel.vue"
+
+const props = defineProps<{
+	teams: Team[]
+	competition: Competition
+	animated: boolean
+}>()
+</script>
+
+<style scoped>
+table {
+	table-layout: fixed;
+	width: 300px;
+	background-color: #e0e0e0;
+	margin: 0;
+	border: solid black 2px;
+}
+
+.tableSingles {
+	height: 80px;
+}
+
+.tableDoubles {
+	height: 108px;
+}
+
+table > tr {
+	height: 50%;
+}
+
+.winner {
+	background-color: #c0c0c0;
+}
+
+tr {
+	border: solid black 2px;
+}
+
+td {
+	border: solid black 1px;
+}
+
+.name {
+	text-align: left;
+	padding-left: 20px;
+}
+
+.result {
+	text-align: center;
+	width: 25px;
+	background-color: #fdfdfd;
+}
+.fill {
+	width: 100%;
+	height: 100%;
+}
+
+.winner > .result {
+	background-color: #e0e0e0;
+}
+</style>

From 4cc36ef0ee8cd8e25e913a1def55b03ce3f5e378 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 22:38:14 +0200
Subject: [PATCH 011/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20cleanup=20some=20f?=
 =?UTF-8?q?iles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition/knockoutSystem/ViewMatchEdit.vue | 13 +------------
 .../knockoutSystem/ViewMatchViewArray.vue        | 16 +---------------
 .../components/TeamContainerDraggable.vue        |  2 --
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
index 8871dbdc..a03d65f6 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
@@ -10,8 +10,6 @@
 				:teams="teamA"
 				:animated="false"
 				:competition="competition"
-				@onAdd="emit('onAdd', index, 0)"
-				@onRemove="emit('onRemove', index, 0)"
 			>
 			</TeamTableElementDraggable>
 		</template>
@@ -35,25 +33,16 @@
 
 <script setup lang="ts">
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { Competition, Mode } from "@/interfaces/competition"
+import { Competition } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
-import { useI18n } from "vue-i18n"
-import { TransitionGroup } from "vue"
-import DraggablePanel from "@/draggable/DraggablePanel.vue"
-import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import TeamTableElementDraggable from "@/components/views/prepare/components/TeamTableElementDraggable.vue"
 
-const { t } = useI18n({ inheritLocale: true })
-
 const props = defineProps<{
 	teamA: Team[]
 	teamB: Team[]
 	single: boolean
 	competition: Competition
 }>()
-
-const emit = defineEmits(["onAdd", "onRemove"])
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
index 36649737..c26af11f 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
@@ -47,23 +47,17 @@
 			dateSingles: props.single,
 			dateDoubles: !props.single,
 		}"
-	>
-		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
-	</div>
+	></div>
 </template>
 
 <script setup lang="ts">
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
 import { Set } from "@/interfaces/match"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
-
 const props = defineProps<{
-	match: KnockoutMatch
 	mode: Mode
 	teamA: Team[]
 	teamB: Team[]
@@ -72,14 +66,6 @@ const props = defineProps<{
 	finished: boolean
 	winner: boolean | null
 }>()
-
-const dateOptions: Intl.DateTimeFormatOptions = {
-	year: "2-digit",
-	month: "numeric",
-	day: "numeric",
-	hour: "numeric",
-	minute: "numeric",
-}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
index 7dc7ca82..a59d1929 100644
--- a/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
@@ -16,7 +16,6 @@
 			'min-team-height': competition?.mode === Mode.DOUBLE,
 		}"
 		style="box-sizing: content-box"
-		:single="props.single"
 	>
 		<template #default="{ item }">
 			<PlayerCard
@@ -54,7 +53,6 @@ const props = defineProps<{
 	teams: Team[]
 	competition: Competition
 	animated: boolean
-	single: boolean
 }>()
 </script>
 

From 8bee39f5a18a3e1c43bc48ad5799529aaf8bde01 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 22:39:36 +0200
Subject: [PATCH 012/247] =?UTF-8?q?=E2=9C=A8=20implement=20shuffle,=20upda?=
 =?UTF-8?q?te,=20reset=20for=20draggable=20knockoutTree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssignMatchesKnockout.vue   | 182 +++++++-----------
 .../ViewKnockoutTreeDraggable.vue             | 116 +++++------
 2 files changed, 122 insertions(+), 176 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 96971547..483264e3 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="grid">
-		<div class="col-4 flex flex-column gap-3">
+		<div class="col-3 flex flex-column gap-3">
 			<Card>
 				<!-- TODO i18n -->
 				<template #title>
@@ -26,72 +26,22 @@
 						:animated="animated"
 						:teams="teams"
 						:competition="competition"
-						:single="true"
 					/>
 				</template>
 			</Card>
 		</div>
-		<div class="col-2">
-			<Card>
-				<template #title>{{ t("ViewPrepare.assignMatches.ranking") }}</template>
-				<template #content>
-					<DraggablePanel
-						:list="sortedTeams"
-						:put="true"
-						item-key="id"
-						:tag="TransitionGroup"
-						:component-data="{
-							tag: 'div',
-							name: animated ? 'playerList' : 'default',
-							type: 'transition',
-						}"
-						group="teams"
-						class="flex flex-column gap-2 border-3 border-round border-dashed justify-content-center"
-						:class="{
-							'min-player-height': competition?.mode === Mode.SINGLE,
-							'min-team-height': competition?.mode === Mode.DOUBLE,
-						}"
-						style="box-sizing: content-box"
-					>
-						<template #default="{ item }">
-							<PlayerCard
-								v-if="item.playerA && competition?.mode === Mode.SINGLE"
-								:player="item.playerA"
-							></PlayerCard>
-							<TeamBox
-								v-else-if="competition?.mode === Mode.DOUBLE"
-								:different="competition?.playerB.different || false"
-							>
-								<template #playerA>
-									<PlayerCard
-										v-if="item.playerA"
-										:player="item.playerA"
-									></PlayerCard>
-								</template>
-								<template #playerB>
-									<PlayerCard
-										v-if="item.playerB"
-										:player="item.playerB"
-										:secondary="competition?.playerB.different || false"
-									></PlayerCard>
-								</template>
-							</TeamBox>
-						</template>
-					</DraggablePanel>
-				</template>
-			</Card>
-		</div>
-		<div class="col-6">
+		<div class="col-9">
 			<Card class="w-full">
 				<template #title>{{ t("general.tournament_tree") }}</template>
 				<template #content>
-					<ScrollPanel style="width: 100%; height: 500px">
+					<ScrollPanel style="width: 100%; height: 1000px">
 						<ViewKnockoutTreeDraggable
-							v-if="competition && finale && thirdPlace"
+							v-if="competition && !animated"
 							:mode="competition.mode"
-							:match="finale"
+							:depth="size + 1"
 							:third-place="thirdPlace"
 							:competition="competition"
+							:assignedTeams="assignedTeams"
 						/>
 					</ScrollPanel>
 				</template>
@@ -104,16 +54,13 @@
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
-import { computed, Ref, ref, TransitionGroup } from "vue"
-import TeamContainerDraggable from "@/components/views/prepare/assignMatches/TeamContainerDraggable.vue"
+import { computed, Ref, ref } from "vue"
+import { getCompetitionDetails } from "@/backend/competition"
+import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { Team, teamClientToServer, teamServerToClient } from "@/interfaces/team"
 import axios from "axios"
-import { KnockoutOrder, Mode, Progress } from "@/interfaces/competition"
-import TeamBox from "@/components/views/prepare/components/TeamBox.vue"
-import DraggablePanel from "@/draggable/DraggablePanel.vue"
-import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
+import { KnockoutOrder, Progress } from "@/interfaces/competition"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import ViewKnockoutTreeDraggable from "@/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue"
 
 const route = useRoute()
@@ -124,7 +71,7 @@ const teams = ref<Team[]>([])
 //  [row number in the tree][ upper or lower part of a bracket ][just in an array for draggable]
 const assignedTeams = ref<Team[][][]>([])
 
-const animated = ref<boolean>(false)
+const animated = ref<boolean>(true)
 
 const duration = 2000
 const teamCount = ref(0)
@@ -165,7 +112,7 @@ function selectRandomElement<T>(players: Ref<T[]>) {
 	const r = Math.floor(Math.random() * players.value.length)
 	const element = players.value[r]
 	players.value.splice(r, 1)
-	//players.value = players.value.filter((v, i) => i !== r)
+	players.value = players.value.filter((v, i) => i !== r)
 	return element
 }
 
@@ -173,8 +120,9 @@ async function randomize() {
 	animated.value = true
 	while (teams.value.length) {
 		const element = selectRandomElement(teams)
+		const element2 = selectRandomElement(teams)
 		await sleep(delayBetween.value)
-		sortedTeams.value.push(element)
+		assignedTeams.value.push([[element], [element2]])
 		await sleep(delay.value)
 	}
 	animated.value = false
@@ -187,13 +135,18 @@ async function reroll() {
 
 async function reset() {
 	animated.value = true
-	while (sortedTeams.value.length) {
-		let i = sortedTeams.value.length - 1
-		const team = sortedTeams.value.splice(i, 1)[0]
-		await sleep(delayBetween.value)
-		teams.value.push(team)
+	console.log("assignedTeams", assignedTeams.value)
+	console.log("assignedTeams", assignedTeams.value.length)
+	for (let i = 0; i < assignedTeams.value.length; i++) {
+		let team1 = assignedTeams.value[i][0].pop()
+		let team2 = assignedTeams.value[i][1].pop()
+		console.log("team1", team1)
+		if (team1) teams.value.push(team1)
+		if (team2) teams.value.push(team2)
 		await sleep(delay.value)
+		console.log(assignedTeams.value.length)
 	}
+
 	animated.value = false
 }
 
@@ -202,53 +155,64 @@ let firstUpdate = true
 async function update() {
 	animated.value = true
 	teams.value = []
-	sortedTeams.value = []
+	while (assignedTeams.value.length > 0) {
+		assignedTeams.value.pop()
+	}
 	const anFin = sleep(firstUpdate ? 0 : 500)
 	firstUpdate = false
-	// TODO vue-query
-	axios
-		.get<Team[]>(
-			`tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
-		)
-		.then(async (response) => {
-			await anFin
-			teamCount.value = 0
-			response.data.forEach((team) => {
-				teams.value.push(teamServerToClient(team))
-				teamCount.value++
-			})
-			adjustUnsorted()
-			await sleep(500)
-			animated.value = false
-		})
-		.catch((error) => {
-			console.log(error)
-		})
-
+	teamCount.value = 0
 	if (
 		competition.value?.cProgress === Progress.GAMES ||
 		competition.value?.cProgress === Progress.SCHEDULING
 	) {
-		// TODO vue-query
 		axios
 			.get<KnockoutOrder>(
 				`tournament/${route.params.tourId}/competition/${route.params.compId}/knockoutOrder`,
 			)
 			.then(async (response) => {
-				await anFin
-				sortedTeams.value = response.data.teams.map((t) =>
-					teamServerToClient(t),
-				)
-				adjustUnsorted()
+				let sortedTeams = response.data.teams.map((t) => teamServerToClient(t))
+				console.log("sorted teams", sortedTeams)
+				teamCount.value += sortedTeams.length
+				// initialize the knockout order
+				for (let i = 0; i < nearestPowerOf2(sortedTeams.length) / 2; i++) {
+					assignedTeams.value.push([
+						[sortedTeams[i * 2]],
+						[sortedTeams[i * 2 + 1]],
+					])
+				}
+				console.log("assignedTeams", assignedTeams)
+				console.log("depth", size.value)
+				animated.value = false
 			})
 			.catch(() => {})
+	} else {
+		axios
+			.get<Team[]>(
+				`tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
+			)
+			.then(async (response) => {
+				// await anFin
+				response.data.forEach((team) => {
+					teams.value.push(teamServerToClient(team))
+					teamCount.value++
+				})
+				console.log("Final Count" + teamCount.value)
+				// await sleep(500)
+				if (competition.value?.cProgress === Progress.TEAMS) {
+					for (let i = 0; i < nearestPowerOf2(teams.value.length) / 2; i++) {
+						assignedTeams.value.push([[], []])
+					}
+				}
+				animated.value = false
+			})
+			.catch((error) => {
+				console.log(error)
+			})
 	}
 }
 
-function adjustUnsorted() {
-	teams.value = teams.value.filter(
-		(e) => !sortedTeams.value.some((t) => t.id === e.id),
-	)
+function nearestPowerOf2(n: number): number {
+	return 1 << (31 - Math.clz32(n))
 }
 
 function split(size: number, teams: Team[]): Team[][] {
@@ -298,14 +262,6 @@ function generateTree(
 const size = computed(() =>
 	Math.max(0, Math.ceil(Math.log2(teamCount.value)) - 1),
 )
-const finale = computed(() =>
-	generateTree(
-		size.value,
-		sortedTeams.value.concat(
-			new Array(2 ** (size.value + 1) - sortedTeams.value.length).fill(null),
-		),
-	),
-)
 
 const thirdPlace = computed(() => generateTree(0, []))
 
@@ -335,10 +291,12 @@ function save() {
 	}
 
 	const req: KnockoutOrder = {
-		teams: sortedTeams.value.map((t) => teamClientToServer(t)),
+		teams: assignedTeams.value
+			.flat()
+			.flat()
+			.map((t) => teamClientToServer(t)),
 	}
 
-	// TODO vue-query
 	axios
 		.post<boolean>(
 			`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
index c63d6fd6..afad540d 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
@@ -1,9 +1,7 @@
 <template>
 	<div>
 		<table
-			:class="
-				props.competition.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'
-			"
+			:class="props.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'"
 		>
 			<tr>
 				<template v-for="index in rangeArr(maxDepth)" :key="index">
@@ -26,19 +24,31 @@
 						rowspan="5"
 						class="matchCol"
 					>
-						<TeamContainerDraggable
-							:teams="[]"
-							:animated="animated"
+						<ViewMatchEdit
+							:teamA="props.assignedTeams[indexR / 6][0]"
+							:teamB="props.assignedTeams[indexR / 6][1]"
+							:single="props.mode === Mode.SINGLE"
 							:competition="props.competition"
-							:single="true"
-						></TeamContainerDraggable>
+						>
+						</ViewMatchEdit>
+						{{ indexR }} {{ indexC }}
 					</td>
 					<td
 						v-else-if="matchColumnCellType(indexR, indexC) === cellType.match"
 						rowspan="5"
 						class="matchCol"
 					>
-						<ViewMatchV3 :match="getMatch(indexR, indexC)" :mode="props.mode" />
+						<ViewMatchViewArray
+							:teamA="props.assignedTeams[Math.floor((indexR - 3) / 6)][0]"
+							:teamB="props.assignedTeams[Math.floor((indexR - 3) / 6)][1]"
+							:mode="props.mode"
+							:single="props.mode === Mode.SINGLE"
+							:sets="null"
+							:winner="false"
+							:finished="true"
+						>
+						</ViewMatchViewArray>
+						{{ indexR }} {{ indexC }}
 					</td>
 					<td
 						v-else-if="
@@ -96,52 +106,30 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { useI18n } from "vue-i18n"
-import ViewMatchV3 from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatchEdit from "@/components/views/competition/knockoutSystem/ViewMatchEdit.vue"
+import ViewMatchViewArray from "@/components/views/competition/knockoutSystem/ViewMatchViewArray.vue"
 import { Competition, Mode } from "@/interfaces/competition"
-import { computed, ref } from "vue"
-import TeamContainerDraggable from "@/components/views/prepare/assignMatches/TeamContainerDraggable.vue"
+import { computed } from "vue"
 import { Team } from "@/interfaces/team"
 
 const { t } = useI18n({ inheritLocale: true })
 
 const props = defineProps<{
-	match: KnockoutMatch
+	depth: number
+	// match: KnockoutMatch
 	thirdPlace: KnockoutMatch
 	mode: Mode
 	competition: Competition
+	assignedTeams: Team[][][]
 }>()
 
-const maxDepth = computed(() => calcMaxDepth(props.match))
+const maxDepth = computed(() => props.depth)
 const teamsCount = computed(() => Math.pow(2, maxDepth.value))
 const height = computed(() => tableHeight())
 
-const teams = ref<Team[]>([])
-const animated = ref<boolean>(false)
-
-function getMatch(indexR: number, indexC: number): KnockoutMatch {
-	// detect semifinal
-	if (indexC === maxDepth.value - 1 && indexR > height.value / 2) {
-		return props.thirdPlace
-	}
-
-	let curMatch = props.match
-	let curHeight = height.value
-	for (let i = 0; i < maxDepth.value - indexC - 1; i++) {
-		curHeight /= 2
-		if (curMatch.prevMatch === undefined)
-			throw new Error("prevMatch is undefined")
-		if (indexR < curHeight) {
-			curMatch = curMatch.prevMatch.a
-		} else {
-			curMatch = curMatch.prevMatch.b
-			indexR -= curHeight
-		}
-	}
-	return curMatch
-}
+console.log("maxDepth", maxDepth.value)
 
 function tableHeight(): number {
-	if (teamsCount.value === 3 || teamsCount.value === 4) return 17
 	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
 }
 
@@ -153,21 +141,21 @@ function roundTitle(round: number, totalRounds: number): string {
 }
 
 function matchColumnCellType(indexR: number, indexC: number): cellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexC === 0) {
-			if (indexR === 0) return cellType.match
-			else if (indexR < 5) return cellType.empty
-			else if (indexR < 12) return cellType.emptyCell
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
-		} else {
-			if (indexR === 6) return cellType.match
-			else if (indexR < 11) return cellType.empty
-			else if (indexR === 11) return cellType.thirdPlace
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
-		}
-	}
+	// if (teamsCount.value === 3 || teamsCount.value === 4) {
+	// 	if (indexC === 0) {
+	// 		if (indexR === 0) return cellType.match
+	// 		else if (indexR < 5) return cellType.empty
+	// 		else if (indexR < 12) return cellType.emptyCell
+	// 		else if (indexR === 12) return cellType.match
+	// 		else return cellType.empty
+	// 	} else {
+	// 		if (indexR === 3) return cellType.match
+	// 		else if (indexR < 11) return cellType.empty
+	// 		else if (indexR === 11) return cellType.thirdPlace
+	// 		else if (indexR === 12) return cellType.match
+	// 		else return cellType.empty
+	// 	}
+	// }
 
 	if (indexC === 0) {
 		const mod = indexR % 6
@@ -200,13 +188,13 @@ function matchColumnCellType(indexR: number, indexC: number): cellType {
 }
 
 function interColumnCellType(indexR: number, indexC: number): interCellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexR < 2) return interCellType.blank
-		else if (indexR === 2) return interCellType.topRight
-		else if (indexR < 13) return interCellType.right
-		else if (indexR === 13) return interCellType.bottomRight
-		else return interCellType.blank
-	}
+	// if (teamsCount.value === 3 || teamsCount.value === 4) {
+	// 	if (indexR < 2) return interCellType.blank
+	// 	else if (indexR === 2) return interCellType.topRight
+	// 	else if (indexR < 13) return interCellType.right
+	// 	else if (indexR === 13) return interCellType.bottomRight
+	// 	else return interCellType.blank
+	// }
 
 	const countMatchesLeftTop = Math.pow(2, indexC)
 	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
@@ -224,9 +212,9 @@ function interColumnCellType(indexR: number, indexC: number): interCellType {
 }
 
 function isBottomInterCell(indexR: number, indexC: number): boolean {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		return indexR === 7
-	}
+	// if (teamsCount.value === 3 || teamsCount.value === 4) {
+	// 	return indexR === 7
+	// }
 
 	const countMatchesLeftTop = Math.pow(2, indexC)
 	const heightLeftTop =

From 61ff3e624d7adbfcbefc715046a5256a7f2fe169 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 23:50:19 +0200
Subject: [PATCH 013/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20bug=20in=20randomi?=
 =?UTF-8?q?ze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssignMatchesKnockout.vue   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 483264e3..45da7d15 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -112,19 +112,33 @@ function selectRandomElement<T>(players: Ref<T[]>) {
 	const r = Math.floor(Math.random() * players.value.length)
 	const element = players.value[r]
 	players.value.splice(r, 1)
-	players.value = players.value.filter((v, i) => i !== r)
 	return element
 }
 
 async function randomize() {
 	animated.value = true
+	let knockOutListIndex = 0
 	while (teams.value.length) {
+		console.log("teams", teams.value)
 		const element = selectRandomElement(teams)
-		const element2 = selectRandomElement(teams)
+		console.log("after", teams.value)
 		await sleep(delayBetween.value)
-		assignedTeams.value.push([[element], [element2]])
+		while (
+			assignedTeams.value[knockOutListIndex][0].length === 1 &&
+			assignedTeams.value[knockOutListIndex][1].length === 1
+		) {
+			knockOutListIndex++
+		}
+		if (assignedTeams.value[knockOutListIndex][0].length === 0) {
+			assignedTeams.value[knockOutListIndex][0].push(element)
+		} else {
+			assignedTeams.value[knockOutListIndex][1].push(element)
+			knockOutListIndex++
+		}
+		console.log("assignedTeams", assignedTeams.value)
 		await sleep(delay.value)
 	}
+	console.log("assignedTeams", assignedTeams.value)
 	animated.value = false
 }
 

From f0f5a610f1895176d4f6f5d028171592e17dd2b4 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 23:55:45 +0200
Subject: [PATCH 014/247] =?UTF-8?q?=F0=9F=8E=A8=20format=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/knockoutSystem/ViewMatchViewArray.vue | 1 -
 .../views/prepare/assignMatches/AssignMatchesKnockout.vue   | 2 +-
 .../views/prepare/components/PlayerContainerDraggable.vue   | 6 +-----
 .../views/prepare/components/TeamTableElementDraggable.vue  | 2 --
 .../src/components/views/prepare/editTeams/PlayerList.vue   | 4 +---
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
index c26af11f..c59cecd2 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
@@ -55,7 +55,6 @@ import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.v
 import { Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
 import { Set } from "@/interfaces/match"
-import { useI18n } from "vue-i18n"
 
 const props = defineProps<{
 	mode: Mode
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 45da7d15..e5c4d6c9 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -172,7 +172,7 @@ async function update() {
 	while (assignedTeams.value.length > 0) {
 		assignedTeams.value.pop()
 	}
-	const anFin = sleep(firstUpdate ? 0 : 500)
+	// const anFin = sleep(firstUpdate ? 0 : 500)
 	firstUpdate = false
 	teamCount.value = 0
 	if (
diff --git a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
index b4c4dc8a..ab9965f3 100644
--- a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
@@ -25,14 +25,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, TransitionGroup } from "vue"
+import { TransitionGroup } from "vue"
 import { Player } from "@/interfaces/player"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
-import { Tournament } from "@/interfaces/tournament"
-import { Competition } from "@/interfaces/competition"
-import AddPlayer from "@/components/views/prepare/editTeams/AddPlayer.vue"
-import DeleteBox from "@/components/views/prepare/editTeams/DeleteBox.vue"
 
 const props = withDefaults(
 	defineProps<{
diff --git a/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
index e5be0d22..99ce306f 100644
--- a/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
+++ b/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
@@ -42,8 +42,6 @@
 import { TransitionGroup } from "vue"
 import { Competition, Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
-import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
-import TeamBox from "@/components/views/prepare/components/TeamBox.vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 
 const props = defineProps<{
diff --git a/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue b/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
index b60ebb48..874ccd47 100644
--- a/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
@@ -34,10 +34,8 @@ import { Tournament } from "@/interfaces/tournament"
 import { Competition } from "@/interfaces/competition"
 import AddPlayer from "@/components/views/prepare/editTeams/AddPlayer.vue"
 import DeleteBox from "@/components/views/prepare/editTeams/DeleteBox.vue"
-import { ref, TransitionGroup } from "vue"
+import { ref } from "vue"
 import { Player } from "@/interfaces/player"
-import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
-import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import PlayerContainerDraggable from "@/components/views/prepare/components/PlayerContainerDraggable.vue"
 
 const props = withDefaults(

From 781fe34c3979e9573212aa54f13062c95e0ce986 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 19 Jun 2024 23:58:44 +0200
Subject: [PATCH 015/247] =?UTF-8?q?=F0=9F=8E=A8=20remove=20debug=20prints?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/assignMatches/AssignMatchesKnockout.vue   | 11 -----------
 .../assignMatches/ViewKnockoutTreeDraggable.vue       |  2 --
 2 files changed, 13 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index e5c4d6c9..1df819c9 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -119,9 +119,7 @@ async function randomize() {
 	animated.value = true
 	let knockOutListIndex = 0
 	while (teams.value.length) {
-		console.log("teams", teams.value)
 		const element = selectRandomElement(teams)
-		console.log("after", teams.value)
 		await sleep(delayBetween.value)
 		while (
 			assignedTeams.value[knockOutListIndex][0].length === 1 &&
@@ -135,10 +133,8 @@ async function randomize() {
 			assignedTeams.value[knockOutListIndex][1].push(element)
 			knockOutListIndex++
 		}
-		console.log("assignedTeams", assignedTeams.value)
 		await sleep(delay.value)
 	}
-	console.log("assignedTeams", assignedTeams.value)
 	animated.value = false
 }
 
@@ -149,12 +145,9 @@ async function reroll() {
 
 async function reset() {
 	animated.value = true
-	console.log("assignedTeams", assignedTeams.value)
-	console.log("assignedTeams", assignedTeams.value.length)
 	for (let i = 0; i < assignedTeams.value.length; i++) {
 		let team1 = assignedTeams.value[i][0].pop()
 		let team2 = assignedTeams.value[i][1].pop()
-		console.log("team1", team1)
 		if (team1) teams.value.push(team1)
 		if (team2) teams.value.push(team2)
 		await sleep(delay.value)
@@ -185,7 +178,6 @@ async function update() {
 			)
 			.then(async (response) => {
 				let sortedTeams = response.data.teams.map((t) => teamServerToClient(t))
-				console.log("sorted teams", sortedTeams)
 				teamCount.value += sortedTeams.length
 				// initialize the knockout order
 				for (let i = 0; i < nearestPowerOf2(sortedTeams.length) / 2; i++) {
@@ -194,8 +186,6 @@ async function update() {
 						[sortedTeams[i * 2 + 1]],
 					])
 				}
-				console.log("assignedTeams", assignedTeams)
-				console.log("depth", size.value)
 				animated.value = false
 			})
 			.catch(() => {})
@@ -210,7 +200,6 @@ async function update() {
 					teams.value.push(teamServerToClient(team))
 					teamCount.value++
 				})
-				console.log("Final Count" + teamCount.value)
 				// await sleep(500)
 				if (competition.value?.cProgress === Progress.TEAMS) {
 					for (let i = 0; i < nearestPowerOf2(teams.value.length) / 2; i++) {
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
index afad540d..1dee9cf3 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
@@ -127,8 +127,6 @@ const maxDepth = computed(() => props.depth)
 const teamsCount = computed(() => Math.pow(2, maxDepth.value))
 const height = computed(() => tableHeight())
 
-console.log("maxDepth", maxDepth.value)
-
 function tableHeight(): number {
 	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
 }

From 2a858488571bfb5707e36ec7a92f188411f9961b Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 2 Jul 2024 22:44:03 +0200
Subject: [PATCH 016/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20saving=20of=20team?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/signup.ts                            | 4 ++--
 .../views/prepare/assignMatches/AssignMatchesGroups.vue       | 2 +-
 .../src/components/views/prepare/editTeams/ViewEditTeams.vue  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index 0a370da0..696e5410 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -168,10 +168,10 @@ export function useUpdateTeams(
 ) {
 	const queryClient = useQueryClient()
 	return useMutation(
-		async () => {
+		async (req) => {
 			return axios.post(
 				`/tournament/${route.params.tourId}/competition/${route.params.compId}/updateTeams`,
-				t,
+				req,
 			)
 		},
 		{
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 61a05ba8..6e017aef 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -92,12 +92,12 @@ import { useToast } from "primevue/usetoast"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { computed, Ref, ref, watch } from "vue"
 import { Team } from "@/interfaces/team"
-import TeamContainerDraggable from "@/components/views/prepare/assignMatches/TeamContainerDraggable.vue"
 import { TourType } from "@/interfaces/competition"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
 import { getGroupsDivision, useInitGroups } from "@/backend/group"
+import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 
 const route = useRoute()
 const toast = useToast()
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index b5282c2b..c209f41a 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -307,7 +307,7 @@ function save() {
 			playerB: player,
 		}),
 	)
-	updateTeams()
+	updateTeams(t)
 }
 
 function prevPage() {

From df31641c630158960948c68ea019f56c67bbbf4d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 22 Jul 2024 16:16:59 +0200
Subject: [PATCH 017/247] =?UTF-8?q?=E2=9C=A8=20Introduce=20new=20KnockoutT?=
 =?UTF-8?q?ree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutSystem.vue     |  18 +-
 .../knockoutSystem/ViewKnockoutTree.vue       | 484 +++++++++---------
 .../knockoutSystem/ViewKnockoutTree_old.vue   | 305 +++++++++++
 .../competition/knockoutSystem/ViewMatch.vue  |  63 ++-
 .../knockoutSystem/ViewMatchDate.vue          |  34 ++
 .../knockoutSystem/ViewMatchEdit.vue          |   2 +-
 .../knockoutSystem/ViewMatchView.vue          |   2 +-
 .../knockoutSystem/ViewMatchViewArray.vue     |   2 +-
 .../knockoutSystem/ViewMatch_old.vue          |  90 ++++
 .../assignMatches/AssignMatchesGroups.vue     |   2 +-
 10 files changed, 730 insertions(+), 272 deletions(-)
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index e5234355..b240b100 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -2,10 +2,20 @@
 	<p>Knockout system</p>
 	<template v-if="knockoutSystem">
 		<ViewKnockoutTree
-			:match="knockoutSystem.finale"
+			:finale="knockoutSystem.finale"
 			:third-place="knockoutSystem.thirdPlace"
-			:mode="props.mode"
-		/>
+			:border-radius="0"
+			:border-thickness="2"
+			:margin-small="30"
+			:margin-big="40"
+		>
+			<template #match="{match}">
+				<ViewMatch v-if="match" :match="match" :mode="props.mode" />
+			</template>
+			<template #additional="{match}">
+				<ViewMatchDate v-if="match" :match="match" />
+			</template>
+		</ViewKnockoutTree>
 	</template>
 </template>
 
@@ -14,6 +24,8 @@ import { useRoute } from "vue-router"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import { Mode } from "@/interfaces/competition"
 import { getKnockout } from "@/backend/knockout"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
 
 const props = defineProps<{
 	mode: Mode
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index ff76917e..4fea677e 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -1,305 +1,289 @@
 <template>
-	<div>
-		<table
-			:class="props.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'"
-		>
-			<tr>
-				<template v-for="index in rangeArr(maxDepth)" :key="index">
-					<th>
-						{{ roundTitle(index + 1, maxDepth) }}
-					</th>
-					<template v-if="index < maxDepth - 1">
-						<th class="interCell"></th>
-						<th class="interCell"></th>
-					</template>
-				</template>
-			</tr>
-			<tr v-for="indexR in rangeArr(height)" :key="indexR">
-				<template v-for="indexC in rangeArr(maxDepth)" :key="indexC">
-					<td
-						v-if="matchColumnCellType(indexR, indexC) === cellType.match"
-						rowspan="5"
-						class="matchCol"
+	<div id="wrapper">
+		<template v-for="level in range(treeHeight)" :key="level">
+			<!-- Data column -->
+			<div class="column">
+				<div v-if="props.titles" class="title" style="text-align: center">
+					{{ props.titles(level, treeHeight) }}
+				</div>
+				<template v-for="index in range(Math.pow(2, treeHeight-level-1))" :key="index">
+					<div class="match"
+							 :style="{
+                      height: maxHeight+'px',
+                      'margin-top': getMargin(level, index)+'px',
+                    }"
 					>
-						<ViewMatchView
-							:match="getMatch(indexR, indexC)"
-							:mode="props.mode"
-							:teamA="getMatch(indexR, indexC).teamA"
-							:teamB="getMatch(indexR, indexC).teamB"
-							:sets="getMatch(indexR, indexC).sets"
-							:finished="getMatch(indexR, indexC).finished"
-							:winner="getMatch(indexR, indexC).winner"
-							:single="props.mode === Mode.SINGLE"
-						>
-						</ViewMatchView>
-					</td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.emptyCell
-						"
-					></td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.thirdPlace
-						"
-						class="fixHeight"
+						<div style="height: fit-content; flex: 1 0 auto" :ref="(el: HTMLElement) => setEl(level, index, el)">
+							<slot name="match" v-bind="{ match: getMatch(level, index) }">
+								Fallback
+							</slot>
+						</div>
+					</div>
+					<div v-if="level > 0 || index < Math.pow(2, treeHeight-level-1)-1" class="additionalPar">
+						<div class="additionalCont">
+							<slot name="additional" v-bind="{ match: getMatch(level, index) }">
+							</slot>
+						</div>
+					</div>
+					<div v-else>
+						<slot name="additional" v-bind="{ match: getMatch(level, index) }">
+						</slot>
+					</div>
+				</template>
+				<template v-if="level === treeHeight - 1">
+					<div class="match"
+							 :style="{
+                      height: maxHeight+'px',
+                      'margin-top': props.marginSmall + 'px',
+                    }"
 					>
-						{{ t("ViewKnockout.thirdPlace") }}
-					</td>
-
-					<template v-if="indexC < maxDepth - 1">
-						<td
-							v-if="
-								interColumnCellType(indexR, indexC) === interCellType.topRight
-							"
-							class="topRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) ===
-								interCellType.bottomRight
-							"
-							class="bottomRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.right
-							"
-							class="rightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.blank
-							"
-							class="interCell"
-						></td>
-
-						<td
-							v-if="isBottomInterCell(indexR, indexC)"
-							class="bottomInterCell interCell"
-						></td>
-						<td v-else class="interCell"></td>
-					</template>
+						<div style="height: fit-content; flex: 1 0 auto">
+							<slot name="match" v-bind="{ match: thirdPlace }">
+								Fallback
+							</slot>
+						</div>
+					</div>
+					<slot name="additional" v-bind="{ match: thirdPlace }">
+					</slot>
 				</template>
-			</tr>
-		</table>
+			</div>
+			<!-- Connection columns -->
+			<div class="column" v-if="level < treeHeight-1" :style="{width: (props.conWidth+props.borderThickness) + 'px'}">
+				<div v-if="props.titles" class="title"></div>
+				<div v-for="index in range(Math.pow(2, treeHeight-level-2))" :key="index" class="left-con"
+						 :style="{
+                height: getHeightCon(level, index)+'px',
+                'margin-top': getMarginConLeft(level, index)+'px',
+                'border-right': props.borderThickness + 'px solid black',
+                'border-top': props.borderThickness + 'px solid black',
+                'border-bottom': props.borderThickness + 'px solid black',
+                'border-radius': `0 ${props.borderRadius}px ${props.borderRadius}px 0`
+             }"
+				>
+				</div>
+			</div>
+			<div class="column" v-if="level < treeHeight-1" :style="{width: props.conWidth + 'px'}">
+				<div v-if="props.titles" class="title"></div>
+				<div v-for="index in range(Math.pow(2, treeHeight-level-2))" :key="index" class="right-con"
+						 :style="{
+                'margin-top': getMarginConRight(level, index)+'px',
+                'height': props.borderThickness+'px'
+          }"
+				>
+				</div>
+			</div>
+		</template>
 	</div>
 </template>
 
 <script setup lang="ts">
+import {computed, Ref, ref, watch} from "vue";
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { useI18n } from "vue-i18n"
-import { Mode } from "@/interfaces/competition"
-import { computed } from "vue"
-import ViewMatchView from "@/components/views/competition/knockoutSystem/ViewMatchView.vue"
-
-const { t } = useI18n({ inheritLocale: true })
-
-const props = defineProps<{
-	match: KnockoutMatch
-	thirdPlace: KnockoutMatch
-	mode: Mode
-}>()
-
-const maxDepth = computed(() => calcMaxDepth(props.match))
-const teamsCount = computed(() => Math.pow(2, maxDepth.value))
-const height = computed(() => tableHeight())
-
-function getMatch(indexR: number, indexC: number): KnockoutMatch {
-	// detect semifinal
-	if (indexC === maxDepth.value - 1 && indexR > height.value / 2) {
-		return props.thirdPlace
-	}
 
-	let curMatch = props.match
-	let curHeight = height.value
-	for (let i = 0; i < maxDepth.value - indexC - 1; i++) {
-		curHeight /= 2
-		if (curMatch.prevMatch === undefined)
-			throw new Error("prevMatch is undefined")
-		if (indexR < curHeight) {
-			curMatch = curMatch.prevMatch.a
-		} else {
-			curMatch = curMatch.prevMatch.b
-			indexR -= curHeight
-		}
-	}
-	return curMatch
+const finale = defineModel<KnockoutMatch>("finale")
+const thirdPlace = defineModel<KnockoutMatch>("thirdPlace")
+
+const props = withDefaults(defineProps<{
+	marginSmall?: number,
+	marginBig?: number,
+	conWidth?: number,
+	borderThickness?: number,
+	borderRadius?: number,
+	titles?: ((round: number, total: number) => string)
+}>(), {
+	marginSmall: 10,
+	marginBig: 20,
+	conWidth: 7,
+	borderThickness: 1,
+	borderRadius: 10
+})
+
+function measureHeight(tree: KnockoutMatch): number {
+	const a = tree.prevMatch ? measureHeight(tree.prevMatch.a) : 0
+	const b = tree.prevMatch ? measureHeight(tree.prevMatch.b) : 0
+	return 1 + Math.max(a, b)
 }
 
-function tableHeight(): number {
-	if (teamsCount.value === 3 || teamsCount.value === 4) return 17
-	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
+const treeHeight = computed(() => finale.value ? measureHeight(finale.value) : 0)
+
+const matchRefs: Ref<HTMLElement[][]> = ref<HTMLElement[][]>([])
+const margins: Ref<number[][]> = ref<number[][]>([])
+const heightCon: Ref<number[][]> = ref<number[][]>([])
+const marginConLeft: Ref<number[][]> = ref<number[][]>([])
+const marginConRight: Ref<number[][]> = ref<number[][]>([])
+const resizeObserver: Ref<ResizeObserver[][]> = ref<ResizeObserver[][]>([])
+
+function setEl(level: number, index: number, el: HTMLElement) {
+	if (!matchRefs.value[level])
+		matchRefs.value[level] = []
+	if (!resizeObserver.value[level])
+		resizeObserver.value[level] = []
+	if (!resizeObserver.value[level][index])
+		resizeObserver.value[level][index] = new ResizeObserver(update)
+	matchRefs.value[level][index] = el
+	resizeObserver.value[level][index].observe(el)
 }
 
-function roundTitle(round: number, totalRounds: number): string {
-	if (round === totalRounds) return t("ViewKnockout.finale")
-	else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
-	else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
-	else return t("ViewKnockout.round") + " " + round
-}
+const maxHeight = ref(0)
 
-function matchColumnCellType(indexR: number, indexC: number): cellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexC === 0) {
-			if (indexR === 0) return cellType.match
-			else if (indexR < 5) return cellType.empty
-			else if (indexR < 12) return cellType.emptyCell
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
-		} else {
-			if (indexR === 6) return cellType.match
-			else if (indexR < 11) return cellType.empty
-			else if (indexR === 11) return cellType.thirdPlace
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
+watch([props], update)
+
+function update() {
+	let mH = 0;
+	for (const row of matchRefs.value) {
+		for (const match of (row ?? [])) {
+			mH = Math.max(mH, match.getBoundingClientRect().height)
 		}
 	}
-
-	if (indexC === 0) {
-		const mod = indexR % 6
-		if (mod === 0) return cellType.match
-		else if (mod < 5) return cellType.empty
-		else return cellType.emptyCell
+	if (mH === maxHeight.value)
+		return
+	maxHeight.value = mH
+
+	if (matchRefs.value.length === 0)
+		return
+
+	margins.value[0] = []
+	margins.value[0][0] = 0
+	for (let index = 1; index < matchRefs.value[0].length; index++) {
+		if (index % 2 === 1) {
+			margins.value[0][index] = props.marginSmall
+		} else {
+			margins.value[0][index] = props.marginBig
+		}
 	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC - 1)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
-
-	const countMatchesLeft = Math.pow(2, indexC)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return cellType.emptyCell
-	const mod = (indexR - heightLeftTop) % heightLeft
-	if (mod === 0) return cellType.match
-	else if (mod < 5) return cellType.empty
-	else {
-		if (indexC < maxDepth.value - 1) return cellType.emptyCell
-		else {
-			if (mod === 5) return cellType.emptyCell
-			else if (mod === 6) return cellType.thirdPlace
-			else if (mod === 7) return cellType.match
-			else if (mod < 11) return cellType.empty
-			else return cellType.emptyCell
+	for (let level = 1; level < matchRefs.value.length; level++) {
+		if (!margins.value[level])
+			margins.value[level] = []
+		const blockHeight = Math.pow(2, level) * maxHeight.value
+			+ Math.pow(2, level - 1) * props.marginSmall
+			+ (Math.pow(2, Math.max(0, level - 1)) - 1) * props.marginBig
+
+		margins.value[level][0] = blockHeight / 2 - maxHeight.value / 2
+		for (let index = 1; index < matchRefs.value[level].length; index++) {
+			if (matchRefs.value.length < level || matchRefs.value[level - 1].length < 2 * index + 1)
+				continue
+
+			margins.value[level][index] = blockHeight + props.marginBig - maxHeight.value
 		}
 	}
-}
 
-function interColumnCellType(indexR: number, indexC: number): interCellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexR < 2) return interCellType.blank
-		else if (indexR === 2) return interCellType.topRight
-		else if (indexR < 13) return interCellType.right
-		else if (indexR === 13) return interCellType.bottomRight
-		else return interCellType.blank
+	for (let level = 0; level < treeHeight.value - 1; level++) {
+		heightCon.value[level] = []
+		marginConLeft.value[level] = []
+		marginConRight.value[level] = []
+
+		const height = ((Math.pow(2, level)) * maxHeight.value)
+			+ ((Math.pow(2, Math.max(level - 1, 0))) * props.marginSmall)
+			+ ((level === 0 ? 0 : Math.pow(2, level - 1)) * props.marginBig)
+		for (let index = 0; index < Math.pow(2, treeHeight.value - level - 2); index++) {
+			heightCon.value[level][index] = height + props.borderThickness
+			if (index === 0) {
+				marginConLeft.value[level][index] = margins.value[level][index] + (maxHeight.value / 2) - (props.borderThickness / 2)
+				marginConRight.value[level][index] = margins.value[level][index] + (maxHeight.value / 2) + (height / 2) - (props.borderThickness / 2)
+			} else {
+				if (level === 0) {
+					marginConLeft.value[level][index] = maxHeight.value + props.marginBig - props.borderThickness
+					marginConRight.value[level][index] = maxHeight.value + props.marginBig + height - props.borderThickness
+				} else {
+					marginConLeft.value[level][index] = height - props.borderThickness
+					marginConRight.value[level][index] = 2 * height - props.borderThickness
+				}
+			}
+		}
 	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
-
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft =
-		4 * countMatchesLeft + 2 * (countMatchesLeft - 1) - heightLeftTop
-
-	const mod = (indexR - heightLeftTop / 2) % (2 * heightLeft)
-	if (indexR < heightLeftTop / 2) return interCellType.blank
-	if (mod === 0) return interCellType.topRight
-	if (mod === heightLeft - 1) return interCellType.bottomRight
-	if (mod < heightLeft) return interCellType.right
-	else return interCellType.blank
 }
 
-function isBottomInterCell(indexR: number, indexC: number): boolean {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		return indexR === 7
-	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
 
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return false
-	const mod = (indexR - heightLeftTop) % heightLeft
-	return mod === 1
+function range(n: number) {
+	return [...Array(n)].map((_, i) => i)
 }
 
-function calcMaxDepth(match: KnockoutMatch): number {
-	if (match.prevMatch === undefined) return 1
-
-	return (
-		1 +
-		Math.max(calcMaxDepth(match.prevMatch.a), calcMaxDepth(match.prevMatch.b))
-	)
+function getMargin(level: number, index: number) {
+	return getSafeValue(level, index, margins.value)
 }
 
-enum cellType {
-	match,
-	empty,
-	emptyCell,
-	thirdPlace,
+function getHeightCon(level: number, index: number) {
+	return getSafeValue(level, index, heightCon.value)
 }
 
-enum interCellType {
-	topRight,
-	bottomRight,
-	right,
-	blank,
+function getMarginConLeft(level: number, index: number) {
+	return getSafeValue(level, index, marginConLeft.value)
 }
 
-function rangeArr(r: number) {
-	return Array.from({ length: r }, (value, index) => index)
+function getMarginConRight(level: number, index: number) {
+	return getSafeValue(level, index, marginConRight.value)
 }
-</script>
 
-<style scoped>
-table {
-	table-layout: fixed;
-	border-collapse: collapse;
-}
+function getSafeValue(level: number, index: number, array: number[][]) {
+	if (array.length <= level)
+		return 0
+	if (array[level].length <= index)
+		return 0
 
-th {
-	text-align: center;
+	return array[level][index]
 }
 
-td {
-	padding: 0;
+function getMatch(level: number, index: number): KnockoutMatch {
+	let curMatch = finale.value
+	if (!curMatch)
+		throw new Error("Finale is undefined")
+	let curHeight = Math.pow(2, treeHeight.value)
+	for (let i = 0; i < treeHeight.value - level - 1; i++) {
+		curHeight /= 2
+		if (!curMatch.prevMatch)
+			throw new Error("prevMatch is undefined")
+		if (index < curHeight) {
+			curMatch = curMatch.prevMatch.a
+		} else {
+			curMatch = curMatch.prevMatch.b
+			index -= curHeight
+		}
+	}
+	return curMatch
 }
+</script>
 
-.tableSingles > tr > td {
-	height: 20px;
-	font-size: 13px;
+<style scoped>
+#wrapper {
+	padding: 5px;
+	display: flex;
+	width: fit-content;
+	flex-direction: row;
 }
 
-.tableDoubles > tr > td {
-	height: 28px;
+.match {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
-.matchCol {
+.column {
+	height: 100%;
+	width: max-content;
 }
 
-.topRightInterCell {
-	border-top: solid black 2px;
-	border-right: solid black 2px;
+.left-con {
+	box-sizing: border-box;
 }
 
-.bottomRightInterCell {
-	border-right: solid black 2px;
-	border-bottom: solid black 2px;
+.right-con {
+	background-color: black
 }
 
-.rightInterCell {
-	border-right: solid black 2px;
+.additionalPar {
+	position: relative;
 }
 
-.bottomInterCell {
-	border-bottom: solid black 2px;
+.additionalCont {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0
 }
 
-.interCell {
-	min-width: 25px;
+.title {
+	height: 30px;
+	font-weight: bold;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
new file mode 100644
index 00000000..ff76917e
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
@@ -0,0 +1,305 @@
+<template>
+	<div>
+		<table
+			:class="props.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'"
+		>
+			<tr>
+				<template v-for="index in rangeArr(maxDepth)" :key="index">
+					<th>
+						{{ roundTitle(index + 1, maxDepth) }}
+					</th>
+					<template v-if="index < maxDepth - 1">
+						<th class="interCell"></th>
+						<th class="interCell"></th>
+					</template>
+				</template>
+			</tr>
+			<tr v-for="indexR in rangeArr(height)" :key="indexR">
+				<template v-for="indexC in rangeArr(maxDepth)" :key="indexC">
+					<td
+						v-if="matchColumnCellType(indexR, indexC) === cellType.match"
+						rowspan="5"
+						class="matchCol"
+					>
+						<ViewMatchView
+							:match="getMatch(indexR, indexC)"
+							:mode="props.mode"
+							:teamA="getMatch(indexR, indexC).teamA"
+							:teamB="getMatch(indexR, indexC).teamB"
+							:sets="getMatch(indexR, indexC).sets"
+							:finished="getMatch(indexR, indexC).finished"
+							:winner="getMatch(indexR, indexC).winner"
+							:single="props.mode === Mode.SINGLE"
+						>
+						</ViewMatchView>
+					</td>
+					<td
+						v-else-if="
+							matchColumnCellType(indexR, indexC) === cellType.emptyCell
+						"
+					></td>
+					<td
+						v-else-if="
+							matchColumnCellType(indexR, indexC) === cellType.thirdPlace
+						"
+						class="fixHeight"
+					>
+						{{ t("ViewKnockout.thirdPlace") }}
+					</td>
+
+					<template v-if="indexC < maxDepth - 1">
+						<td
+							v-if="
+								interColumnCellType(indexR, indexC) === interCellType.topRight
+							"
+							class="topRightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) ===
+								interCellType.bottomRight
+							"
+							class="bottomRightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) === interCellType.right
+							"
+							class="rightInterCell interCell"
+						></td>
+						<td
+							v-else-if="
+								interColumnCellType(indexR, indexC) === interCellType.blank
+							"
+							class="interCell"
+						></td>
+
+						<td
+							v-if="isBottomInterCell(indexR, indexC)"
+							class="bottomInterCell interCell"
+						></td>
+						<td v-else class="interCell"></td>
+					</template>
+				</template>
+			</tr>
+		</table>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { useI18n } from "vue-i18n"
+import { Mode } from "@/interfaces/competition"
+import { computed } from "vue"
+import ViewMatchView from "@/components/views/competition/knockoutSystem/ViewMatchView.vue"
+
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	match: KnockoutMatch
+	thirdPlace: KnockoutMatch
+	mode: Mode
+}>()
+
+const maxDepth = computed(() => calcMaxDepth(props.match))
+const teamsCount = computed(() => Math.pow(2, maxDepth.value))
+const height = computed(() => tableHeight())
+
+function getMatch(indexR: number, indexC: number): KnockoutMatch {
+	// detect semifinal
+	if (indexC === maxDepth.value - 1 && indexR > height.value / 2) {
+		return props.thirdPlace
+	}
+
+	let curMatch = props.match
+	let curHeight = height.value
+	for (let i = 0; i < maxDepth.value - indexC - 1; i++) {
+		curHeight /= 2
+		if (curMatch.prevMatch === undefined)
+			throw new Error("prevMatch is undefined")
+		if (indexR < curHeight) {
+			curMatch = curMatch.prevMatch.a
+		} else {
+			curMatch = curMatch.prevMatch.b
+			indexR -= curHeight
+		}
+	}
+	return curMatch
+}
+
+function tableHeight(): number {
+	if (teamsCount.value === 3 || teamsCount.value === 4) return 17
+	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
+}
+
+function roundTitle(round: number, totalRounds: number): string {
+	if (round === totalRounds) return t("ViewKnockout.finale")
+	else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
+	else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
+	else return t("ViewKnockout.round") + " " + round
+}
+
+function matchColumnCellType(indexR: number, indexC: number): cellType {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		if (indexC === 0) {
+			if (indexR === 0) return cellType.match
+			else if (indexR < 5) return cellType.empty
+			else if (indexR < 12) return cellType.emptyCell
+			else if (indexR === 12) return cellType.match
+			else return cellType.empty
+		} else {
+			if (indexR === 6) return cellType.match
+			else if (indexR < 11) return cellType.empty
+			else if (indexR === 11) return cellType.thirdPlace
+			else if (indexR === 12) return cellType.match
+			else return cellType.empty
+		}
+	}
+
+	if (indexC === 0) {
+		const mod = indexR % 6
+		if (mod === 0) return cellType.match
+		else if (mod < 5) return cellType.empty
+		else return cellType.emptyCell
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC - 1)
+	const heightLeftTop =
+		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
+
+	const countMatchesLeft = Math.pow(2, indexC)
+	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
+
+	if (indexR < heightLeftTop) return cellType.emptyCell
+	const mod = (indexR - heightLeftTop) % heightLeft
+	if (mod === 0) return cellType.match
+	else if (mod < 5) return cellType.empty
+	else {
+		if (indexC < maxDepth.value - 1) return cellType.emptyCell
+		else {
+			if (mod === 5) return cellType.emptyCell
+			else if (mod === 6) return cellType.thirdPlace
+			else if (mod === 7) return cellType.match
+			else if (mod < 11) return cellType.empty
+			else return cellType.emptyCell
+		}
+	}
+}
+
+function interColumnCellType(indexR: number, indexC: number): interCellType {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		if (indexR < 2) return interCellType.blank
+		else if (indexR === 2) return interCellType.topRight
+		else if (indexR < 13) return interCellType.right
+		else if (indexR === 13) return interCellType.bottomRight
+		else return interCellType.blank
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC)
+	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
+
+	const countMatchesLeft = Math.pow(2, indexC + 1)
+	const heightLeft =
+		4 * countMatchesLeft + 2 * (countMatchesLeft - 1) - heightLeftTop
+
+	const mod = (indexR - heightLeftTop / 2) % (2 * heightLeft)
+	if (indexR < heightLeftTop / 2) return interCellType.blank
+	if (mod === 0) return interCellType.topRight
+	if (mod === heightLeft - 1) return interCellType.bottomRight
+	if (mod < heightLeft) return interCellType.right
+	else return interCellType.blank
+}
+
+function isBottomInterCell(indexR: number, indexC: number): boolean {
+	if (teamsCount.value === 3 || teamsCount.value === 4) {
+		return indexR === 7
+	}
+
+	const countMatchesLeftTop = Math.pow(2, indexC)
+	const heightLeftTop =
+		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
+
+	const countMatchesLeft = Math.pow(2, indexC + 1)
+	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
+
+	if (indexR < heightLeftTop) return false
+	const mod = (indexR - heightLeftTop) % heightLeft
+	return mod === 1
+}
+
+function calcMaxDepth(match: KnockoutMatch): number {
+	if (match.prevMatch === undefined) return 1
+
+	return (
+		1 +
+		Math.max(calcMaxDepth(match.prevMatch.a), calcMaxDepth(match.prevMatch.b))
+	)
+}
+
+enum cellType {
+	match,
+	empty,
+	emptyCell,
+	thirdPlace,
+}
+
+enum interCellType {
+	topRight,
+	bottomRight,
+	right,
+	blank,
+}
+
+function rangeArr(r: number) {
+	return Array.from({ length: r }, (value, index) => index)
+}
+</script>
+
+<style scoped>
+table {
+	table-layout: fixed;
+	border-collapse: collapse;
+}
+
+th {
+	text-align: center;
+}
+
+td {
+	padding: 0;
+}
+
+.tableSingles > tr > td {
+	height: 20px;
+	font-size: 13px;
+}
+
+.tableDoubles > tr > td {
+	height: 28px;
+}
+
+.matchCol {
+}
+
+.topRightInterCell {
+	border-top: solid black 2px;
+	border-right: solid black 2px;
+}
+
+.bottomRightInterCell {
+	border-right: solid black 2px;
+	border-bottom: solid black 2px;
+}
+
+.rightInterCell {
+	border-right: solid black 2px;
+}
+
+.bottomInterCell {
+	border-bottom: solid black 2px;
+}
+
+.interCell {
+	min-width: 25px;
+}
+</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 0efd2585..a7c0c7f2 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -1,43 +1,76 @@
 <template>
 	<table
 		:class="{
-			tableSingles: props.single,
-			tableDoubles: !props.single,
+			tableSingles: props.mode === Mode.SINGLE,
+			tableDoubles: props.mode === Mode.DOUBLE,
 		}"
 	>
-		<tr :class="{ winner: props.finished && !props.winner }">
+		<tr :class="{ winner: props.match.finished && !props.match.winner }">
 			<td class="name">
-				<slot name="teamA-name"></slot>
+				{{
+					props.match.teamA?.playerA
+						? `${props.match.teamA.playerA.lastName}, ${props.match.teamA.playerA.firstName}`
+						: ""
+				}}
+				<template v-if="props.mode === Mode.DOUBLE">
+					<br />
+					{{
+						props.match.teamA?.playerB
+							? `${props.match.teamA.playerB.lastName}, ${props.match.teamA.playerB.firstName}`
+							: ""
+					}}
+				</template>
 			</td>
-			<template v-if="props.sets !== null">
-				<td v-for="set in props.sets" :key="set.index" class="result">
+
+			<template v-if="props.match.sets !== null">
+				<td v-for="set in props.match.sets" :key="set.index" class="result">
 					{{ set.scoreA }}
 				</td>
 			</template>
 		</tr>
-		<tr :class="{ winner: props.finished && props.winner }">
+		<tr :class="{ winner: props.match.finished && props.match.winner }">
 			<td class="name">
-				<slot name="teamB-name" />
+				{{
+					props.match.teamB?.playerA
+						? `${props.match.teamB.playerA.lastName}, ${props.match.teamB.playerA.firstName}`
+						: ""
+				}}
+				<template v-if="props.mode === Mode.DOUBLE">
+					<br />
+					{{
+						props.match.teamB?.playerB
+							? `${props.match.teamB.playerB.lastName}, ${props.match.teamB.playerB.firstName}`
+							: ""
+					}}
+				</template>
 			</td>
 
-			<template v-if="props.sets !== null">
-				<td v-for="set in props.sets" :key="set.index" class="result">
+			<template v-if="props.match.sets !== null">
+				<td v-for="set in props.match.sets" :key="set.index" class="result">
 					{{ set.scoreB }}
 				</td>
 			</template>
 		</tr>
 	</table>
+
 </template>
 
 <script setup lang="ts">
-import { Set } from "@/interfaces/match"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Mode } from "@/interfaces/competition"
 
 const props = defineProps<{
-	sets: Array<Set> | null
-	single: boolean
-	finished: boolean
-	winner: boolean | null
+	match: KnockoutMatch
+	mode: Mode
 }>()
+
+const dateOptions: Intl.DateTimeFormatOptions = {
+	year: "2-digit",
+	month: "numeric",
+	day: "numeric",
+	hour: "numeric",
+	minute: "numeric",
+}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
new file mode 100644
index 00000000..5ed5d2f1
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
@@ -0,0 +1,34 @@
+<template>
+	<div
+		id="date"
+	>
+		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
+	</div>
+</template>
+
+<script setup lang="ts">
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
+
+const props = defineProps<{
+	match: KnockoutMatch
+}>()
+
+const dateOptions: Intl.DateTimeFormatOptions = {
+	year: "2-digit",
+	month: "numeric",
+	day: "numeric",
+	hour: "numeric",
+	minute: "numeric",
+}
+</script>
+
+<style scoped>
+#date {
+	text-align: right;
+	padding-right: 20px;
+	font-style: italic;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
index a03d65f6..124e42ab 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
 import { Competition } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
 import TeamTableElementDraggable from "@/components/views/prepare/components/TeamTableElementDraggable.vue"
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
index f29711c4..6cb59f9f 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
index c59cecd2..68722541 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
 import { Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
 import { Set } from "@/interfaces/match"
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue
new file mode 100644
index 00000000..0efd2585
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue
@@ -0,0 +1,90 @@
+<template>
+	<table
+		:class="{
+			tableSingles: props.single,
+			tableDoubles: !props.single,
+		}"
+	>
+		<tr :class="{ winner: props.finished && !props.winner }">
+			<td class="name">
+				<slot name="teamA-name"></slot>
+			</td>
+			<template v-if="props.sets !== null">
+				<td v-for="set in props.sets" :key="set.index" class="result">
+					{{ set.scoreA }}
+				</td>
+			</template>
+		</tr>
+		<tr :class="{ winner: props.finished && props.winner }">
+			<td class="name">
+				<slot name="teamB-name" />
+			</td>
+
+			<template v-if="props.sets !== null">
+				<td v-for="set in props.sets" :key="set.index" class="result">
+					{{ set.scoreB }}
+				</td>
+			</template>
+		</tr>
+	</table>
+</template>
+
+<script setup lang="ts">
+import { Set } from "@/interfaces/match"
+
+const props = defineProps<{
+	sets: Array<Set> | null
+	single: boolean
+	finished: boolean
+	winner: boolean | null
+}>()
+</script>
+
+<style scoped>
+table {
+	table-layout: fixed;
+	width: 300px;
+	background-color: #e0e0e0;
+	margin: 0;
+	border: solid black 2px;
+}
+
+.tableSingles {
+	height: 80px;
+}
+
+.tableDoubles {
+	height: 108px;
+}
+
+table > tr {
+	height: 50%;
+}
+
+.winner {
+	background-color: #c0c0c0;
+}
+
+tr {
+	border: solid black 2px;
+}
+
+td {
+	border: solid black 1px;
+}
+
+.name {
+	text-align: left;
+	padding-left: 20px;
+}
+
+.result {
+	text-align: center;
+	width: 25px;
+	background-color: #fdfdfd;
+}
+
+.winner > .result {
+	background-color: #e0e0e0;
+}
+</style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 6e017aef..01ce964a 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -93,7 +93,7 @@ import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { computed, Ref, ref, watch } from "vue"
 import { Team } from "@/interfaces/team"
 import { TourType } from "@/interfaces/competition"
-import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
+import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
 import { getGroupsDivision, useInitGroups } from "@/backend/group"

From cd9accbe55b5cd06ab8ec2b4955732ec79075bd0 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 23 Jul 2024 00:53:43 +0200
Subject: [PATCH 018/247] =?UTF-8?q?=F0=9F=94=A5=20Clean=20up=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutSystem.vue     |   4 +-
 .../knockoutSystem/ViewKnockoutTree.vue       | 247 ++++++++------
 .../knockoutSystem/ViewKnockoutTree_old.vue   | 305 ------------------
 .../competition/knockoutSystem/ViewMatch.vue  |   9 -
 .../knockoutSystem/ViewMatchDate.vue          |   6 +-
 .../knockoutSystem/ViewMatchEdit.vue          |  62 ----
 .../knockoutSystem/ViewMatchView.vue          | 104 ------
 .../knockoutSystem/ViewMatchViewArray.vue     |  89 -----
 .../knockoutSystem/ViewMatch_old.vue          |  90 ------
 .../assignMatches/AssignMatchesGroups.vue     | 117 +++----
 .../assignMatches/AssignMatchesKnockout.vue   | 237 +++++++-------
 .../ViewKnockoutTreeDraggable.vue             | 304 -----------------
 .../prepare/assignMatches/ViewMatchEdit.vue   |  66 ++++
 .../views/prepare/components/MatchBox.vue     |  36 +++
 .../views/prepare/components/TeamCard.vue     |  20 ++
 .../components/TeamContainerDraggable.vue     |  19 +-
 .../components/TeamTableElementDraggable.vue  | 105 ------
 17 files changed, 430 insertions(+), 1390 deletions(-)
 delete mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
 delete mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
 delete mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
 delete mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
 delete mode 100644 frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue
 delete mode 100644 frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
 create mode 100644 frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
 create mode 100644 frontend/app/src/components/views/prepare/components/MatchBox.vue
 create mode 100644 frontend/app/src/components/views/prepare/components/TeamCard.vue
 delete mode 100644 frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index b240b100..5e78c2d5 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -9,10 +9,10 @@
 			:margin-small="30"
 			:margin-big="40"
 		>
-			<template #match="{match}">
+			<template #match="{ match }">
 				<ViewMatch v-if="match" :match="match" :mode="props.mode" />
 			</template>
-			<template #additional="{match}">
+			<template #additional="{ match }">
 				<ViewMatchDate v-if="match" :match="match" />
 			</template>
 		</ViewKnockoutTree>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index 4fea677e..ac9af5a5 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -6,97 +6,139 @@
 				<div v-if="props.titles" class="title" style="text-align: center">
 					{{ props.titles(level, treeHeight) }}
 				</div>
-				<template v-for="index in range(Math.pow(2, treeHeight-level-1))" :key="index">
-					<div class="match"
-							 :style="{
-                      height: maxHeight+'px',
-                      'margin-top': getMargin(level, index)+'px',
-                    }"
+				<template
+					v-for="index in range(Math.pow(2, treeHeight - level - 1))"
+					:key="index"
+				>
+					<div
+						class="match"
+						:style="{
+							height: maxHeight + 'px',
+							'margin-top': getMargin(level, index) + 'px',
+						}"
 					>
-						<div style="height: fit-content; flex: 1 0 auto" :ref="(el: HTMLElement) => setEl(level, index, el)">
-							<slot name="match" v-bind="{ match: getMatch(level, index) }">
+						<div
+							:ref="(el: HTMLElement) => setEl(level, index, el)"
+							style="height: fit-content; flex: 1 0 auto"
+						>
+							<slot
+								name="match"
+								v-bind="{ match: getMatch(level, index), level, index }"
+							>
 								Fallback
 							</slot>
 						</div>
 					</div>
-					<div v-if="level > 0 || index < Math.pow(2, treeHeight-level-1)-1" class="additionalPar">
+					<div
+						v-if="level > 0 || index < Math.pow(2, treeHeight - level - 1) - 1"
+						class="additionalPar"
+					>
 						<div class="additionalCont">
-							<slot name="additional" v-bind="{ match: getMatch(level, index) }">
+							<slot
+								name="additional"
+								v-bind="{ match: getMatch(level, index), level, index }"
+							>
 							</slot>
 						</div>
 					</div>
 					<div v-else>
-						<slot name="additional" v-bind="{ match: getMatch(level, index) }">
+						<slot
+							name="additional"
+							v-bind="{ match: getMatch(level, index), level, index }"
+						>
 						</slot>
 					</div>
 				</template>
-				<template v-if="level === treeHeight - 1">
-					<div class="match"
-							 :style="{
-                      height: maxHeight+'px',
-                      'margin-top': props.marginSmall + 'px',
-                    }"
+				<template v-if="thirdPlace && level === treeHeight - 1">
+					<div
+						class="match"
+						:style="{
+							height: maxHeight + 'px',
+							'margin-top': props.marginSmall + 'px',
+						}"
 					>
 						<div style="height: fit-content; flex: 1 0 auto">
-							<slot name="match" v-bind="{ match: thirdPlace }">
+							<slot
+								name="match"
+								v-bind="{ match: thirdPlace, level, index: 1 }"
+							>
 								Fallback
 							</slot>
 						</div>
 					</div>
-					<slot name="additional" v-bind="{ match: thirdPlace }">
+					<slot
+						name="additional"
+						v-bind="{ match: thirdPlace, level, index: 1 }"
+					>
 					</slot>
 				</template>
 			</div>
 			<!-- Connection columns -->
-			<div class="column" v-if="level < treeHeight-1" :style="{width: (props.conWidth+props.borderThickness) + 'px'}">
+			<div
+				v-if="level < treeHeight - 1"
+				class="column"
+				:style="{ width: props.conWidth + props.borderThickness + 'px' }"
+			>
 				<div v-if="props.titles" class="title"></div>
-				<div v-for="index in range(Math.pow(2, treeHeight-level-2))" :key="index" class="left-con"
-						 :style="{
-                height: getHeightCon(level, index)+'px',
-                'margin-top': getMarginConLeft(level, index)+'px',
-                'border-right': props.borderThickness + 'px solid black',
-                'border-top': props.borderThickness + 'px solid black',
-                'border-bottom': props.borderThickness + 'px solid black',
-                'border-radius': `0 ${props.borderRadius}px ${props.borderRadius}px 0`
-             }"
-				>
-				</div>
+				<div
+					v-for="index in range(Math.pow(2, treeHeight - level - 2))"
+					:key="index"
+					class="left-con"
+					:style="{
+						height: getHeightCon(level, index) + 'px',
+						'margin-top': getMarginConLeft(level, index) + 'px',
+						'border-right': props.borderThickness + 'px solid black',
+						'border-top': props.borderThickness + 'px solid black',
+						'border-bottom': props.borderThickness + 'px solid black',
+						'border-radius': `0 ${props.borderRadius}px ${props.borderRadius}px 0`,
+					}"
+				></div>
 			</div>
-			<div class="column" v-if="level < treeHeight-1" :style="{width: props.conWidth + 'px'}">
+			<div
+				v-if="level < treeHeight - 1"
+				class="column"
+				:style="{ width: props.conWidth + 'px' }"
+			>
 				<div v-if="props.titles" class="title"></div>
-				<div v-for="index in range(Math.pow(2, treeHeight-level-2))" :key="index" class="right-con"
-						 :style="{
-                'margin-top': getMarginConRight(level, index)+'px',
-                'height': props.borderThickness+'px'
-          }"
-				>
-				</div>
+				<div
+					v-for="index in range(Math.pow(2, treeHeight - level - 2))"
+					:key="index"
+					class="right-con"
+					:style="{
+						'margin-top': getMarginConRight(level, index) + 'px',
+						height: props.borderThickness + 'px',
+					}"
+				></div>
 			</div>
 		</template>
 	</div>
 </template>
 
 <script setup lang="ts">
-import {computed, Ref, ref, watch} from "vue";
+import { computed, Ref, ref, watch } from "vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 
 const finale = defineModel<KnockoutMatch>("finale")
-const thirdPlace = defineModel<KnockoutMatch>("thirdPlace")
-
-const props = withDefaults(defineProps<{
-	marginSmall?: number,
-	marginBig?: number,
-	conWidth?: number,
-	borderThickness?: number,
-	borderRadius?: number,
-	titles?: ((round: number, total: number) => string)
-}>(), {
-	marginSmall: 10,
-	marginBig: 20,
-	conWidth: 7,
-	borderThickness: 1,
-	borderRadius: 10
-})
+const thirdPlace = defineModel<KnockoutMatch | undefined>("thirdPlace")
+
+const props = withDefaults(
+	defineProps<{
+		marginSmall?: number
+		marginBig?: number
+		conWidth?: number
+		borderThickness?: number
+		borderRadius?: number
+		titles?: (round: number, total: number) => string
+	}>(),
+	{
+		marginSmall: 10,
+		marginBig: 20,
+		conWidth: 7,
+		borderThickness: 1,
+		borderRadius: 10,
+		titles: undefined,
+	},
+)
 
 function measureHeight(tree: KnockoutMatch): number {
 	const a = tree.prevMatch ? measureHeight(tree.prevMatch.a) : 0
@@ -104,7 +146,9 @@ function measureHeight(tree: KnockoutMatch): number {
 	return 1 + Math.max(a, b)
 }
 
-const treeHeight = computed(() => finale.value ? measureHeight(finale.value) : 0)
+const treeHeight = computed(() =>
+	finale.value ? measureHeight(finale.value) : 0,
+)
 
 const matchRefs: Ref<HTMLElement[][]> = ref<HTMLElement[][]>([])
 const margins: Ref<number[][]> = ref<number[][]>([])
@@ -114,10 +158,8 @@ const marginConRight: Ref<number[][]> = ref<number[][]>([])
 const resizeObserver: Ref<ResizeObserver[][]> = ref<ResizeObserver[][]>([])
 
 function setEl(level: number, index: number, el: HTMLElement) {
-	if (!matchRefs.value[level])
-		matchRefs.value[level] = []
-	if (!resizeObserver.value[level])
-		resizeObserver.value[level] = []
+	if (!matchRefs.value[level]) matchRefs.value[level] = []
+	if (!resizeObserver.value[level]) resizeObserver.value[level] = []
 	if (!resizeObserver.value[level][index])
 		resizeObserver.value[level][index] = new ResizeObserver(update)
 	matchRefs.value[level][index] = el
@@ -126,21 +168,18 @@ function setEl(level: number, index: number, el: HTMLElement) {
 
 const maxHeight = ref(0)
 
-watch([props], update)
+watch([props, matchRefs], update)
 
 function update() {
-	let mH = 0;
+	let mH = 0
 	for (const row of matchRefs.value) {
-		for (const match of (row ?? [])) {
+		for (const match of row ?? []) {
 			mH = Math.max(mH, match.getBoundingClientRect().height)
 		}
 	}
-	if (mH === maxHeight.value)
-		return
 	maxHeight.value = mH
 
-	if (matchRefs.value.length === 0)
-		return
+	if (matchRefs.value.length === 0) return
 
 	margins.value[0] = []
 	margins.value[0][0] = 0
@@ -152,48 +191,66 @@ function update() {
 		}
 	}
 	for (let level = 1; level < matchRefs.value.length; level++) {
-		if (!margins.value[level])
-			margins.value[level] = []
-		const blockHeight = Math.pow(2, level) * maxHeight.value
-			+ Math.pow(2, level - 1) * props.marginSmall
-			+ (Math.pow(2, Math.max(0, level - 1)) - 1) * props.marginBig
+		if (!margins.value[level]) margins.value[level] = []
+		const blockHeight =
+			Math.pow(2, level) * maxHeight.value +
+			Math.pow(2, level - 1) * props.marginSmall +
+			(Math.pow(2, Math.max(0, level - 1)) - 1) * props.marginBig
 
 		margins.value[level][0] = blockHeight / 2 - maxHeight.value / 2
 		for (let index = 1; index < matchRefs.value[level].length; index++) {
-			if (matchRefs.value.length < level || matchRefs.value[level - 1].length < 2 * index + 1)
+			if (
+				matchRefs.value.length < level ||
+				matchRefs.value[level - 1].length < 2 * index + 1
+			)
 				continue
 
-			margins.value[level][index] = blockHeight + props.marginBig - maxHeight.value
+			margins.value[level][index] =
+				blockHeight + props.marginBig - maxHeight.value
 		}
 	}
 
-	for (let level = 0; level < treeHeight.value - 1; level++) {
+	for (let level = 0; level < matchRefs.value.length; level++) {
 		heightCon.value[level] = []
 		marginConLeft.value[level] = []
 		marginConRight.value[level] = []
 
-		const height = ((Math.pow(2, level)) * maxHeight.value)
-			+ ((Math.pow(2, Math.max(level - 1, 0))) * props.marginSmall)
-			+ ((level === 0 ? 0 : Math.pow(2, level - 1)) * props.marginBig)
-		for (let index = 0; index < Math.pow(2, treeHeight.value - level - 2); index++) {
+		const height =
+			Math.pow(2, level) * maxHeight.value +
+			Math.pow(2, Math.max(level - 1, 0)) * props.marginSmall +
+			(level === 0 ? 0 : Math.pow(2, level - 1)) * props.marginBig
+		for (
+			let index = 0;
+			index < Math.pow(2, treeHeight.value - level - 2);
+			index++
+		) {
 			heightCon.value[level][index] = height + props.borderThickness
 			if (index === 0) {
-				marginConLeft.value[level][index] = margins.value[level][index] + (maxHeight.value / 2) - (props.borderThickness / 2)
-				marginConRight.value[level][index] = margins.value[level][index] + (maxHeight.value / 2) + (height / 2) - (props.borderThickness / 2)
+				marginConLeft.value[level][index] =
+					margins.value[level][index] +
+					maxHeight.value / 2 -
+					props.borderThickness / 2
+				marginConRight.value[level][index] =
+					margins.value[level][index] +
+					maxHeight.value / 2 +
+					height / 2 -
+					props.borderThickness / 2
 			} else {
 				if (level === 0) {
-					marginConLeft.value[level][index] = maxHeight.value + props.marginBig - props.borderThickness
-					marginConRight.value[level][index] = maxHeight.value + props.marginBig + height - props.borderThickness
+					marginConLeft.value[level][index] =
+						maxHeight.value + props.marginBig - props.borderThickness
+					marginConRight.value[level][index] =
+						maxHeight.value + props.marginBig + height - props.borderThickness
 				} else {
 					marginConLeft.value[level][index] = height - props.borderThickness
-					marginConRight.value[level][index] = 2 * height - props.borderThickness
+					marginConRight.value[level][index] =
+						2 * height - props.borderThickness
 				}
 			}
 		}
 	}
 }
 
-
 function range(n: number) {
 	return [...Array(n)].map((_, i) => i)
 }
@@ -215,23 +272,19 @@ function getMarginConRight(level: number, index: number) {
 }
 
 function getSafeValue(level: number, index: number, array: number[][]) {
-	if (array.length <= level)
-		return 0
-	if (array[level].length <= index)
-		return 0
+	if (array.length <= level) return 0
+	if (array[level].length <= index) return 0
 
 	return array[level][index]
 }
 
 function getMatch(level: number, index: number): KnockoutMatch {
 	let curMatch = finale.value
-	if (!curMatch)
-		throw new Error("Finale is undefined")
+	if (!curMatch) throw new Error("Finale is undefined")
 	let curHeight = Math.pow(2, treeHeight.value)
 	for (let i = 0; i < treeHeight.value - level - 1; i++) {
 		curHeight /= 2
-		if (!curMatch.prevMatch)
-			throw new Error("prevMatch is undefined")
+		if (!curMatch.prevMatch) throw new Error("prevMatch is undefined")
 		if (index < curHeight) {
 			curMatch = curMatch.prevMatch.a
 		} else {
@@ -268,7 +321,7 @@ function getMatch(level: number, index: number): KnockoutMatch {
 }
 
 .right-con {
-	background-color: black
+	background-color: black;
 }
 
 .additionalPar {
@@ -279,11 +332,11 @@ function getMatch(level: number, index: number): KnockoutMatch {
 	position: absolute;
 	top: 0;
 	left: 0;
-	right: 0
+	right: 0;
 }
 
 .title {
 	height: 30px;
 	font-weight: bold;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
deleted file mode 100644
index ff76917e..00000000
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-	<div>
-		<table
-			:class="props.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'"
-		>
-			<tr>
-				<template v-for="index in rangeArr(maxDepth)" :key="index">
-					<th>
-						{{ roundTitle(index + 1, maxDepth) }}
-					</th>
-					<template v-if="index < maxDepth - 1">
-						<th class="interCell"></th>
-						<th class="interCell"></th>
-					</template>
-				</template>
-			</tr>
-			<tr v-for="indexR in rangeArr(height)" :key="indexR">
-				<template v-for="indexC in rangeArr(maxDepth)" :key="indexC">
-					<td
-						v-if="matchColumnCellType(indexR, indexC) === cellType.match"
-						rowspan="5"
-						class="matchCol"
-					>
-						<ViewMatchView
-							:match="getMatch(indexR, indexC)"
-							:mode="props.mode"
-							:teamA="getMatch(indexR, indexC).teamA"
-							:teamB="getMatch(indexR, indexC).teamB"
-							:sets="getMatch(indexR, indexC).sets"
-							:finished="getMatch(indexR, indexC).finished"
-							:winner="getMatch(indexR, indexC).winner"
-							:single="props.mode === Mode.SINGLE"
-						>
-						</ViewMatchView>
-					</td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.emptyCell
-						"
-					></td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.thirdPlace
-						"
-						class="fixHeight"
-					>
-						{{ t("ViewKnockout.thirdPlace") }}
-					</td>
-
-					<template v-if="indexC < maxDepth - 1">
-						<td
-							v-if="
-								interColumnCellType(indexR, indexC) === interCellType.topRight
-							"
-							class="topRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) ===
-								interCellType.bottomRight
-							"
-							class="bottomRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.right
-							"
-							class="rightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.blank
-							"
-							class="interCell"
-						></td>
-
-						<td
-							v-if="isBottomInterCell(indexR, indexC)"
-							class="bottomInterCell interCell"
-						></td>
-						<td v-else class="interCell"></td>
-					</template>
-				</template>
-			</tr>
-		</table>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { useI18n } from "vue-i18n"
-import { Mode } from "@/interfaces/competition"
-import { computed } from "vue"
-import ViewMatchView from "@/components/views/competition/knockoutSystem/ViewMatchView.vue"
-
-const { t } = useI18n({ inheritLocale: true })
-
-const props = defineProps<{
-	match: KnockoutMatch
-	thirdPlace: KnockoutMatch
-	mode: Mode
-}>()
-
-const maxDepth = computed(() => calcMaxDepth(props.match))
-const teamsCount = computed(() => Math.pow(2, maxDepth.value))
-const height = computed(() => tableHeight())
-
-function getMatch(indexR: number, indexC: number): KnockoutMatch {
-	// detect semifinal
-	if (indexC === maxDepth.value - 1 && indexR > height.value / 2) {
-		return props.thirdPlace
-	}
-
-	let curMatch = props.match
-	let curHeight = height.value
-	for (let i = 0; i < maxDepth.value - indexC - 1; i++) {
-		curHeight /= 2
-		if (curMatch.prevMatch === undefined)
-			throw new Error("prevMatch is undefined")
-		if (indexR < curHeight) {
-			curMatch = curMatch.prevMatch.a
-		} else {
-			curMatch = curMatch.prevMatch.b
-			indexR -= curHeight
-		}
-	}
-	return curMatch
-}
-
-function tableHeight(): number {
-	if (teamsCount.value === 3 || teamsCount.value === 4) return 17
-	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
-}
-
-function roundTitle(round: number, totalRounds: number): string {
-	if (round === totalRounds) return t("ViewKnockout.finale")
-	else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
-	else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
-	else return t("ViewKnockout.round") + " " + round
-}
-
-function matchColumnCellType(indexR: number, indexC: number): cellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexC === 0) {
-			if (indexR === 0) return cellType.match
-			else if (indexR < 5) return cellType.empty
-			else if (indexR < 12) return cellType.emptyCell
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
-		} else {
-			if (indexR === 6) return cellType.match
-			else if (indexR < 11) return cellType.empty
-			else if (indexR === 11) return cellType.thirdPlace
-			else if (indexR === 12) return cellType.match
-			else return cellType.empty
-		}
-	}
-
-	if (indexC === 0) {
-		const mod = indexR % 6
-		if (mod === 0) return cellType.match
-		else if (mod < 5) return cellType.empty
-		else return cellType.emptyCell
-	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC - 1)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
-
-	const countMatchesLeft = Math.pow(2, indexC)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return cellType.emptyCell
-	const mod = (indexR - heightLeftTop) % heightLeft
-	if (mod === 0) return cellType.match
-	else if (mod < 5) return cellType.empty
-	else {
-		if (indexC < maxDepth.value - 1) return cellType.emptyCell
-		else {
-			if (mod === 5) return cellType.emptyCell
-			else if (mod === 6) return cellType.thirdPlace
-			else if (mod === 7) return cellType.match
-			else if (mod < 11) return cellType.empty
-			else return cellType.emptyCell
-		}
-	}
-}
-
-function interColumnCellType(indexR: number, indexC: number): interCellType {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		if (indexR < 2) return interCellType.blank
-		else if (indexR === 2) return interCellType.topRight
-		else if (indexR < 13) return interCellType.right
-		else if (indexR === 13) return interCellType.bottomRight
-		else return interCellType.blank
-	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
-
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft =
-		4 * countMatchesLeft + 2 * (countMatchesLeft - 1) - heightLeftTop
-
-	const mod = (indexR - heightLeftTop / 2) % (2 * heightLeft)
-	if (indexR < heightLeftTop / 2) return interCellType.blank
-	if (mod === 0) return interCellType.topRight
-	if (mod === heightLeft - 1) return interCellType.bottomRight
-	if (mod < heightLeft) return interCellType.right
-	else return interCellType.blank
-}
-
-function isBottomInterCell(indexR: number, indexC: number): boolean {
-	if (teamsCount.value === 3 || teamsCount.value === 4) {
-		return indexR === 7
-	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
-
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return false
-	const mod = (indexR - heightLeftTop) % heightLeft
-	return mod === 1
-}
-
-function calcMaxDepth(match: KnockoutMatch): number {
-	if (match.prevMatch === undefined) return 1
-
-	return (
-		1 +
-		Math.max(calcMaxDepth(match.prevMatch.a), calcMaxDepth(match.prevMatch.b))
-	)
-}
-
-enum cellType {
-	match,
-	empty,
-	emptyCell,
-	thirdPlace,
-}
-
-enum interCellType {
-	topRight,
-	bottomRight,
-	right,
-	blank,
-}
-
-function rangeArr(r: number) {
-	return Array.from({ length: r }, (value, index) => index)
-}
-</script>
-
-<style scoped>
-table {
-	table-layout: fixed;
-	border-collapse: collapse;
-}
-
-th {
-	text-align: center;
-}
-
-td {
-	padding: 0;
-}
-
-.tableSingles > tr > td {
-	height: 20px;
-	font-size: 13px;
-}
-
-.tableDoubles > tr > td {
-	height: 28px;
-}
-
-.matchCol {
-}
-
-.topRightInterCell {
-	border-top: solid black 2px;
-	border-right: solid black 2px;
-}
-
-.bottomRightInterCell {
-	border-right: solid black 2px;
-	border-bottom: solid black 2px;
-}
-
-.rightInterCell {
-	border-right: solid black 2px;
-}
-
-.bottomInterCell {
-	border-bottom: solid black 2px;
-}
-
-.interCell {
-	min-width: 25px;
-}
-</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index a7c0c7f2..dba39afc 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -52,7 +52,6 @@
 			</template>
 		</tr>
 	</table>
-
 </template>
 
 <script setup lang="ts">
@@ -63,14 +62,6 @@ const props = defineProps<{
 	match: KnockoutMatch
 	mode: Mode
 }>()
-
-const dateOptions: Intl.DateTimeFormatOptions = {
-	year: "2-digit",
-	month: "numeric",
-	day: "numeric",
-	hour: "numeric",
-	minute: "numeric",
-}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
index 5ed5d2f1..76db2365 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
@@ -1,7 +1,5 @@
 <template>
-	<div
-		id="date"
-	>
+	<div id="date">
 		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
 	</div>
 </template>
@@ -31,4 +29,4 @@ const dateOptions: Intl.DateTimeFormatOptions = {
 	padding-right: 20px;
 	font-style: italic;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
deleted file mode 100644
index 124e42ab..00000000
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchEdit.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-	<ViewMatch
-		:sets="null"
-		:finished="true"
-		:winner="false"
-		:single="props.single"
-	>
-		<template #teamA-name>
-			<TeamTableElementDraggable
-				:teams="teamA"
-				:animated="false"
-				:competition="competition"
-			>
-			</TeamTableElementDraggable>
-		</template>
-		<template #teamB-name>
-			<TeamTableElementDraggable
-				:teams="teamB"
-				:animated="false"
-				:competition="competition"
-			>
-			</TeamTableElementDraggable>
-		</template>
-	</ViewMatch>
-	<div
-		id="date"
-		:class="{
-			dateSingles: props.single,
-			dateDoubles: !props.single,
-		}"
-	/>
-</template>
-
-<script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
-import { Competition } from "@/interfaces/competition"
-import { Team } from "@/interfaces/team"
-import TeamTableElementDraggable from "@/components/views/prepare/components/TeamTableElementDraggable.vue"
-
-const props = defineProps<{
-	teamA: Team[]
-	teamB: Team[]
-	single: boolean
-	competition: Competition
-}>()
-</script>
-
-<style scoped>
-#date {
-	text-align: right;
-	padding-right: 1rem;
-	font-style: italic;
-}
-
-.dateSingles {
-	height: 1rem;
-}
-
-.dateDoubles {
-	height: 1rem;
-}
-</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
deleted file mode 100644
index 6cb59f9f..00000000
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchView.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-	<ViewMatch
-		:sets="props.sets"
-		:finished="props.finished"
-		:winner="props.winner"
-		:single="props.single"
-	>
-		<template #teamA-name>
-			<td class="name">
-				{{
-					props.teamA?.playerA
-						? `${props.teamA.playerA.lastName}, ${props.teamA.playerA.firstName}`
-						: ""
-				}}
-				<template v-if="!props.single">
-					<br />
-					{{
-						props.teamA?.playerB
-							? `${props.teamA.playerB.lastName}, ${props.teamA.playerB.firstName}`
-							: ""
-					}}
-				</template>
-			</td>
-		</template>
-
-		<template #teamB-name>
-			<td class="name">
-				{{
-					props.teamB?.playerA
-						? `${props.teamB.playerA.lastName}, ${props.teamB.playerA.firstName}`
-						: ""
-				}}
-				<template v-if="!props.single">
-					<br />
-					{{
-						props.teamB?.playerB
-							? `${props.teamB.playerB.lastName}, ${props.teamB.playerB.firstName}`
-							: ""
-					}}
-				</template>
-			</td>
-		</template>
-	</ViewMatch>
-	<div
-		id="date"
-		:class="{
-			dateSingles: props.single,
-			dateDoubles: !props.single,
-		}"
-	>
-		{{ props.match.begin?.toLocaleString(t("lang"), dateOptions) || "" }}
-	</div>
-</template>
-
-<script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { Mode } from "@/interfaces/competition"
-import { Team } from "@/interfaces/team"
-import { Set } from "@/interfaces/match"
-import { useI18n } from "vue-i18n"
-
-const { t } = useI18n({ inheritLocale: true })
-
-const props = defineProps<{
-	match: KnockoutMatch
-	mode: Mode
-	teamA: Team | null
-	teamB: Team | null
-	sets: Array<Set> | null
-	single: boolean
-	finished: boolean
-	winner: boolean | null
-}>()
-
-const dateOptions: Intl.DateTimeFormatOptions = {
-	year: "2-digit",
-	month: "numeric",
-	day: "numeric",
-	hour: "numeric",
-	minute: "numeric",
-}
-</script>
-
-<style scoped>
-#date {
-	text-align: right;
-	padding-right: 1rem;
-	font-style: italic;
-}
-
-.dateSingles {
-	height: 1rem;
-}
-
-.dateDoubles {
-	height: 1rem;
-}
-
-.name {
-	text-align: left;
-	padding-left: 20px;
-}
-</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
deleted file mode 100644
index 68722541..00000000
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchViewArray.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<ViewMatch
-		:sets="props.sets"
-		:finished="props.finished"
-		:winner="props.winner"
-		:single="props.single"
-	>
-		<template #teamA-name>
-			<td class="name">
-				{{
-					props.teamA.length === 1
-						? `${props.teamA[0].playerA?.lastName}, ${props.teamA[0].playerA?.firstName}`
-						: ""
-				}}
-				<template v-if="!props.single">
-					<br />
-					{{
-						props.teamA.length === 1
-							? `${props.teamA[0].playerB?.lastName}, ${props.teamA[0].playerB?.firstName}`
-							: ""
-					}}
-				</template>
-			</td>
-		</template>
-
-		<template #teamB-name>
-			<td class="name">
-				{{
-					props.teamB.length === 1
-						? `${props.teamB[0].playerA?.lastName}, ${props.teamB[0].playerA?.firstName}`
-						: ""
-				}}
-				<template v-if="!props.single">
-					<br />
-					{{
-						props.teamB.length === 1
-							? `${props.teamB[0].playerB?.lastName}, ${props.teamB[0].playerB?.firstName}`
-							: ""
-					}}
-				</template>
-			</td>
-		</template>
-	</ViewMatch>
-	<div
-		id="date"
-		:class="{
-			dateSingles: props.single,
-			dateDoubles: !props.single,
-		}"
-	></div>
-</template>
-
-<script setup lang="ts">
-import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch_old.vue"
-import { Mode } from "@/interfaces/competition"
-import { Team } from "@/interfaces/team"
-import { Set } from "@/interfaces/match"
-
-const props = defineProps<{
-	mode: Mode
-	teamA: Team[]
-	teamB: Team[]
-	sets: Array<Set> | null
-	single: boolean
-	finished: boolean
-	winner: boolean | null
-}>()
-</script>
-
-<style scoped>
-#date {
-	text-align: right;
-	padding-right: 1rem;
-	font-style: italic;
-}
-
-.dateSingles {
-	height: 1rem;
-}
-
-.dateDoubles {
-	height: 1rem;
-}
-
-.name {
-	text-align: left;
-	padding-left: 20px;
-}
-</style>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue
deleted file mode 100644
index 0efd2585..00000000
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch_old.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-	<table
-		:class="{
-			tableSingles: props.single,
-			tableDoubles: !props.single,
-		}"
-	>
-		<tr :class="{ winner: props.finished && !props.winner }">
-			<td class="name">
-				<slot name="teamA-name"></slot>
-			</td>
-			<template v-if="props.sets !== null">
-				<td v-for="set in props.sets" :key="set.index" class="result">
-					{{ set.scoreA }}
-				</td>
-			</template>
-		</tr>
-		<tr :class="{ winner: props.finished && props.winner }">
-			<td class="name">
-				<slot name="teamB-name" />
-			</td>
-
-			<template v-if="props.sets !== null">
-				<td v-for="set in props.sets" :key="set.index" class="result">
-					{{ set.scoreB }}
-				</td>
-			</template>
-		</tr>
-	</table>
-</template>
-
-<script setup lang="ts">
-import { Set } from "@/interfaces/match"
-
-const props = defineProps<{
-	sets: Array<Set> | null
-	single: boolean
-	finished: boolean
-	winner: boolean | null
-}>()
-</script>
-
-<style scoped>
-table {
-	table-layout: fixed;
-	width: 300px;
-	background-color: #e0e0e0;
-	margin: 0;
-	border: solid black 2px;
-}
-
-.tableSingles {
-	height: 80px;
-}
-
-.tableDoubles {
-	height: 108px;
-}
-
-table > tr {
-	height: 50%;
-}
-
-.winner {
-	background-color: #c0c0c0;
-}
-
-tr {
-	border: solid black 2px;
-}
-
-td {
-	border: solid black 1px;
-}
-
-.name {
-	text-align: left;
-	padding-left: 20px;
-}
-
-.result {
-	text-align: center;
-	width: 25px;
-	background-color: #fdfdfd;
-}
-
-.winner > .result {
-	background-color: #e0e0e0;
-}
-</style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 01ce964a..79d3676e 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -31,56 +31,43 @@
 			</Card>
 		</div>
 		<div class="col-8 flex flex-column gap-3">
-			<template v-if="competition?.tourType === TourType.GROUPS">
-				<Card v-for="(group, i) in groups" :key="i">
-					<template #title
-						>{{ t("ViewPrepare.assignMatches.Group") }} {{ i + 1 }}
-					</template>
-					<template #content>
-						<TeamContainerDraggable
-							v-if="competition"
-							:animated="animated"
-							:teams="group"
-							:competition="competition"
-						/>
-					</template>
-				</Card>
-				<div class="flex flex-row gap-2">
-					<Button
-						:label="t('ViewPrepare.assignMatches.remove')"
-						:disabled="noGroups <= 2 || disabled"
-						severity="danger"
-						@click="
-							() => {
-								noGroups /= 2
-								adjustSize(noGroups)
-							}
-						"
-					></Button>
-					<Button
-						:label="t('ViewPrepare.assignMatches.add')"
-						:disabled="noGroups >= 64 || disabled"
-						severity="success"
-						@click="
-							() => {
-								noGroups *= 2
-								adjustSize(noGroups)
-							}
-						"
-					></Button>
-				</div>
-			</template>
-			<template v-else>
-				<Card v-if="competition">
-					<template #content>
-						<ViewKnockoutTree
-							:mode="competition.mode"
-							:match="knockoutSystem.finale"
-							:third-place="knockoutSystem.thirdPlace"
-						/>
-					</template>
-				</Card>
-			</template>
+			<Card v-for="(group, i) in groups" :key="i">
+				<template #title
+					>{{ t("ViewPrepare.assignMatches.Group") }} {{ i + 1 }}
+				</template>
+				<template #content>
+					<TeamContainerDraggable
+						v-if="competition"
+						:animated="animated"
+						:teams="group"
+						:competition="competition"
+					/>
+				</template>
+			</Card>
+			<div class="flex flex-row gap-2">
+				<Button
+					:label="t('ViewPrepare.assignMatches.remove')"
+					:disabled="noGroups <= 2 || disabled"
+					severity="danger"
+					@click="
+						() => {
+							noGroups /= 2
+							adjustSize(noGroups)
+						}
+					"
+				></Button>
+				<Button
+					:label="t('ViewPrepare.assignMatches.add')"
+					:disabled="noGroups >= 64 || disabled"
+					severity="success"
+					@click="
+						() => {
+							noGroups *= 2
+							adjustSize(noGroups)
+						}
+					"
+				></Button>
+			</div>
 		</div>
 	</div>
 </template>
@@ -89,11 +76,8 @@
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { computed, Ref, ref, watch } from "vue"
 import { Team } from "@/interfaces/team"
-import { TourType } from "@/interfaces/competition"
-import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree_old.vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
 import { getGroupsDivision, useInitGroups } from "@/backend/group"
@@ -207,33 +191,6 @@ async function reset() {
 	animated.value = false
 }
 
-function generateTree(size: number): KnockoutMatch {
-	return {
-		court: "a",
-		begin: new Date(),
-		end: new Date(),
-		finished: false,
-		winner: null,
-		teamA: null,
-		teamB: null,
-		sets: null,
-		curGame: null,
-		prevMatch:
-			size > 0
-				? {
-						winner: true,
-						a: generateTree(size - 1),
-						b: generateTree(size - 1),
-					}
-				: undefined,
-	}
-}
-
-const knockoutSystem = {
-	finale: generateTree(1),
-	thirdPlace: generateTree(0),
-}
-
 function adjustUnsorted() {
 	teams.value = teams.value.filter(
 		(t) => !groups.value.some((group) => group.some((st) => st.id === t.id)),
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 1df819c9..b674c332 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="grid">
+	<div v-if="competition" class="grid">
 		<div class="col-3 flex flex-column gap-3">
 			<Card>
 				<!-- TODO i18n -->
@@ -22,7 +22,7 @@
 				</template>
 				<template #content>
 					<TeamContainerDraggable
-						v-if="competition"
+						v-if="competition && signedUp"
 						:animated="animated"
 						:teams="teams"
 						:competition="competition"
@@ -35,14 +35,16 @@
 				<template #title>{{ t("general.tournament_tree") }}</template>
 				<template #content>
 					<ScrollPanel style="width: 100%; height: 1000px">
-						<ViewKnockoutTreeDraggable
-							v-if="competition && !animated"
-							:mode="competition.mode"
-							:depth="size + 1"
-							:third-place="thirdPlace"
-							:competition="competition"
-							:assignedTeams="assignedTeams"
-						/>
+						<ViewKnockoutTree
+							:finale="tree"
+							:border-thickness="2"
+							:border-radius="0"
+						>
+							<template #match="{ match, level }">
+								<ViewMatchEdit v-if="level === 0" :match="match" />
+								<ViewMatch v-else :match="match" :mode="competition.mode" />
+							</template>
+						</ViewKnockoutTree>
 					</ScrollPanel>
 				</template>
 			</Card>
@@ -54,23 +56,63 @@
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
-import { computed, Ref, ref } from "vue"
+import { computed, Ref, ref, watch } from "vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
-import { Team, teamClientToServer, teamServerToClient } from "@/interfaces/team"
+import { Team, teamClientToServer } from "@/interfaces/team"
 import axios from "axios"
-import { KnockoutOrder, Progress } from "@/interfaces/competition"
+import { KnockoutOrder } from "@/interfaces/competition"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import ViewKnockoutTreeDraggable from "@/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue"
+import { getSignedUp } from "@/backend/signup"
+import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import ViewMatchEdit from "@/components/views/prepare/assignMatches/ViewMatchEdit.vue"
 
 const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
+const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: signedUp } = getSignedUp(route, t, toast)
+
 const teams = ref<Team[]>([])
+
+const tree = ref(genTree(0))
+watch([signedUp], () => {
+	if (!signedUp.value) return
+
+	teams.value = []
+	signedUp.value.forEach((t) => teams.value.push(t))
+	tree.value = genTree(Math.ceil(Math.log2(signedUp.value.length)))
+})
+
 //  [row number in the tree][ upper or lower part of a bracket ][just in an array for draggable]
 const assignedTeams = ref<Team[][][]>([])
 
+function genTree(height: number): KnockoutMatch {
+	const default_game = {
+		court: null,
+		begin: null,
+		end: null,
+		finished: false,
+		winner: null,
+		teamA: null,
+		teamB: null,
+		sets: null,
+		curGame: null,
+	}
+	if (height === 0) return default_game
+
+	return {
+		...default_game,
+		prevMatch: {
+			winner: true,
+			a: genTree(height - 1),
+			b: genTree(height - 1),
+		},
+	}
+}
+
 const animated = ref<boolean>(true)
 
 const duration = 2000
@@ -88,13 +130,6 @@ function $t(name: string) {
 	return computed(() => t(name))
 }
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-		update()
-	},
-})
-
 const randomizeItems = ref([
 	{
 		label: $t("ViewPrepare.editTeams.reroll"),
@@ -159,115 +194,69 @@ async function reset() {
 
 let firstUpdate = true
 
-async function update() {
-	animated.value = true
-	teams.value = []
-	while (assignedTeams.value.length > 0) {
-		assignedTeams.value.pop()
-	}
-	// const anFin = sleep(firstUpdate ? 0 : 500)
-	firstUpdate = false
-	teamCount.value = 0
-	if (
-		competition.value?.cProgress === Progress.GAMES ||
-		competition.value?.cProgress === Progress.SCHEDULING
-	) {
-		axios
-			.get<KnockoutOrder>(
-				`tournament/${route.params.tourId}/competition/${route.params.compId}/knockoutOrder`,
-			)
-			.then(async (response) => {
-				let sortedTeams = response.data.teams.map((t) => teamServerToClient(t))
-				teamCount.value += sortedTeams.length
-				// initialize the knockout order
-				for (let i = 0; i < nearestPowerOf2(sortedTeams.length) / 2; i++) {
-					assignedTeams.value.push([
-						[sortedTeams[i * 2]],
-						[sortedTeams[i * 2 + 1]],
-					])
-				}
-				animated.value = false
-			})
-			.catch(() => {})
-	} else {
-		axios
-			.get<Team[]>(
-				`tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
-			)
-			.then(async (response) => {
-				// await anFin
-				response.data.forEach((team) => {
-					teams.value.push(teamServerToClient(team))
-					teamCount.value++
-				})
-				// await sleep(500)
-				if (competition.value?.cProgress === Progress.TEAMS) {
-					for (let i = 0; i < nearestPowerOf2(teams.value.length) / 2; i++) {
-						assignedTeams.value.push([[], []])
-					}
-				}
-				animated.value = false
-			})
-			.catch((error) => {
-				console.log(error)
-			})
-	}
-}
-
-function nearestPowerOf2(n: number): number {
-	return 1 << (31 - Math.clz32(n))
-}
-
-function split(size: number, teams: Team[]): Team[][] {
-	if (size === 0) {
-		return [[teams[0]], [teams[1]]]
-	}
-
-	const count = 2 ** (size + 1)
-	const first = split(size - 1, teams.slice(0, count / 2))
-	const second = split(size - 1, teams.slice(count / 2, count).toReversed())
-	return [
-		first[0].concat(second[0].toReversed()),
-		first[1].concat(second[1].toReversed()),
-	]
-}
+// async function update() {
+// 	animated.value = true
+// 	teams.value = []
+// 	while (assignedTeams.value.length > 0) {
+// 		assignedTeams.value.pop()
+// 	}
+// 	// const anFin = sleep(firstUpdate ? 0 : 500)
+// 	firstUpdate = false
+// 	teamCount.value = 0
+// 	if (
+// 		competition.value?.cProgress === Progress.GAMES ||
+// 		competition.value?.cProgress === Progress.SCHEDULING
+// 	) {
+// 		axios
+// 			.get<KnockoutOrder>(
+// 				`tournament/${route.params.tourId}/competition/${route.params.compId}/knockoutOrder`,
+// 			)
+// 			.then(async (response) => {
+// 				let sortedTeams = response.data.teams.map((t) => teamServerToClient(t))
+// 				teamCount.value += sortedTeams.length
+// 				// initialize the knockout order
+// 				for (let i = 0; i < nearestPowerOf2(sortedTeams.length) / 2; i++) {
+// 					assignedTeams.value.push([
+// 						[sortedTeams[i * 2]],
+// 						[sortedTeams[i * 2 + 1]],
+// 					])
+// 				}
+// 				animated.value = false
+// 			})
+// 			.catch(() => {})
+// 	} else {
+// 		axios
+// 			.get<Team[]>(
+// 				`tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
+// 			)
+// 			.then(async (response) => {
+// 				// await anFin
+// 				response.data.forEach((team) => {
+// 					teams.value.push(teamServerToClient(team))
+// 					teamCount.value++
+// 				})
+// 				// await sleep(500)
+// 				if (competition.value?.cProgress === Progress.TEAMS) {
+// 					for (let i = 0; i < nearestPowerOf2(teams.value.length) / 2; i++) {
+// 						assignedTeams.value.push([[], []])
+// 					}
+// 				}
+// 				animated.value = false
+// 			})
+// 			.catch((error) => {
+// 				console.log(error)
+// 			})
+// 	}
+// }
 
-function generateTree(
-	size: number,
-	teams: Team[],
-	reversed = false,
-): KnockoutMatch {
-	const f = reversed ? 1 : 0
-	const s = reversed ? 0 : 1
-
-	const splits = split(size, teams)
-	return {
-		court: null,
-		begin: null,
-		end: null,
-		finished: false,
-		winner: null,
-		teamA: size === 0 ? teams[f] : null,
-		teamB: size === 0 ? teams[s] : null,
-		sets: null,
-		curGame: null,
-		prevMatch:
-			size > 0
-				? {
-						winner: true,
-						a: generateTree(size - 1, splits[f]),
-						b: generateTree(size - 1, splits[s], true),
-					}
-				: undefined,
-	}
-}
+// function nearestPowerOf2(n: number): number {
+// 	return 1 << (31 - Math.clz32(n))
+// }
 
 const size = computed(() =>
 	Math.max(0, Math.ceil(Math.log2(teamCount.value)) - 1),
 )
 
-const thirdPlace = computed(() => generateTree(0, []))
-
 function knockoutTreeCompletelyAssigned(): boolean {
 	console.log(assignedTeams.value)
 	for (let i = 0; i < assignedTeams.value.length; i++) {
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
deleted file mode 100644
index 1dee9cf3..00000000
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewKnockoutTreeDraggable.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-	<div>
-		<table
-			:class="props.mode === Mode.SINGLE ? 'tableSingles' : 'tableDoubles'"
-		>
-			<tr>
-				<template v-for="index in rangeArr(maxDepth)" :key="index">
-					<th>
-						{{ roundTitle(index + 1, maxDepth) }}
-					</th>
-					<template v-if="index < maxDepth - 1">
-						<th class="interCell"></th>
-						<th class="interCell"></th>
-					</template>
-				</template>
-			</tr>
-			<tr v-for="indexR in rangeArr(height)" :key="indexR">
-				<template v-for="indexC in rangeArr(maxDepth)" :key="indexC">
-					<td
-						v-if="
-							matchColumnCellType(indexR, indexC) === cellType.match &&
-							indexC === 0
-						"
-						rowspan="5"
-						class="matchCol"
-					>
-						<ViewMatchEdit
-							:teamA="props.assignedTeams[indexR / 6][0]"
-							:teamB="props.assignedTeams[indexR / 6][1]"
-							:single="props.mode === Mode.SINGLE"
-							:competition="props.competition"
-						>
-						</ViewMatchEdit>
-						{{ indexR }} {{ indexC }}
-					</td>
-					<td
-						v-else-if="matchColumnCellType(indexR, indexC) === cellType.match"
-						rowspan="5"
-						class="matchCol"
-					>
-						<ViewMatchViewArray
-							:teamA="props.assignedTeams[Math.floor((indexR - 3) / 6)][0]"
-							:teamB="props.assignedTeams[Math.floor((indexR - 3) / 6)][1]"
-							:mode="props.mode"
-							:single="props.mode === Mode.SINGLE"
-							:sets="null"
-							:winner="false"
-							:finished="true"
-						>
-						</ViewMatchViewArray>
-						{{ indexR }} {{ indexC }}
-					</td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.emptyCell
-						"
-					></td>
-					<td
-						v-else-if="
-							matchColumnCellType(indexR, indexC) === cellType.thirdPlace
-						"
-						class="fixHeight"
-					>
-						{{ t("ViewKnockout.thirdPlace") }}
-					</td>
-
-					<template v-if="indexC < maxDepth - 1">
-						<td
-							v-if="
-								interColumnCellType(indexR, indexC) === interCellType.topRight
-							"
-							class="topRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) ===
-								interCellType.bottomRight
-							"
-							class="bottomRightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.right
-							"
-							class="rightInterCell interCell"
-						></td>
-						<td
-							v-else-if="
-								interColumnCellType(indexR, indexC) === interCellType.blank
-							"
-							class="interCell"
-						></td>
-
-						<td
-							v-if="isBottomInterCell(indexR, indexC)"
-							class="bottomInterCell interCell"
-						></td>
-						<td v-else class="interCell"></td>
-					</template>
-				</template>
-			</tr>
-		</table>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { useI18n } from "vue-i18n"
-import ViewMatchEdit from "@/components/views/competition/knockoutSystem/ViewMatchEdit.vue"
-import ViewMatchViewArray from "@/components/views/competition/knockoutSystem/ViewMatchViewArray.vue"
-import { Competition, Mode } from "@/interfaces/competition"
-import { computed } from "vue"
-import { Team } from "@/interfaces/team"
-
-const { t } = useI18n({ inheritLocale: true })
-
-const props = defineProps<{
-	depth: number
-	// match: KnockoutMatch
-	thirdPlace: KnockoutMatch
-	mode: Mode
-	competition: Competition
-	assignedTeams: Team[][][]
-}>()
-
-const maxDepth = computed(() => props.depth)
-const teamsCount = computed(() => Math.pow(2, maxDepth.value))
-const height = computed(() => tableHeight())
-
-function tableHeight(): number {
-	return 2 * teamsCount.value + 2 * (teamsCount.value / 2 - 1) + 1
-}
-
-function roundTitle(round: number, totalRounds: number): string {
-	if (round === totalRounds) return t("ViewKnockout.finale")
-	else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
-	else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
-	else return t("ViewKnockout.round") + " " + round
-}
-
-function matchColumnCellType(indexR: number, indexC: number): cellType {
-	// if (teamsCount.value === 3 || teamsCount.value === 4) {
-	// 	if (indexC === 0) {
-	// 		if (indexR === 0) return cellType.match
-	// 		else if (indexR < 5) return cellType.empty
-	// 		else if (indexR < 12) return cellType.emptyCell
-	// 		else if (indexR === 12) return cellType.match
-	// 		else return cellType.empty
-	// 	} else {
-	// 		if (indexR === 3) return cellType.match
-	// 		else if (indexR < 11) return cellType.empty
-	// 		else if (indexR === 11) return cellType.thirdPlace
-	// 		else if (indexR === 12) return cellType.match
-	// 		else return cellType.empty
-	// 	}
-	// }
-
-	if (indexC === 0) {
-		const mod = indexR % 6
-		if (mod === 0) return cellType.match
-		else if (mod < 5) return cellType.empty
-		else return cellType.emptyCell
-	}
-
-	const countMatchesLeftTop = Math.pow(2, indexC - 1)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
-
-	const countMatchesLeft = Math.pow(2, indexC)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return cellType.emptyCell
-	const mod = (indexR - heightLeftTop) % heightLeft
-	if (mod === 0) return cellType.match
-	else if (mod < 5) return cellType.empty
-	else {
-		if (indexC < maxDepth.value - 1) return cellType.emptyCell
-		else {
-			if (mod === 5) return cellType.emptyCell
-			else if (mod === 6) return cellType.thirdPlace
-			else if (mod === 7) return cellType.match
-			else if (mod < 11) return cellType.empty
-			else return cellType.emptyCell
-		}
-	}
-}
-
-function interColumnCellType(indexR: number, indexC: number): interCellType {
-	// if (teamsCount.value === 3 || teamsCount.value === 4) {
-	// 	if (indexR < 2) return interCellType.blank
-	// 	else if (indexR === 2) return interCellType.topRight
-	// 	else if (indexR < 13) return interCellType.right
-	// 	else if (indexR === 13) return interCellType.bottomRight
-	// 	else return interCellType.blank
-	// }
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop = 4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1)
-
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft =
-		4 * countMatchesLeft + 2 * (countMatchesLeft - 1) - heightLeftTop
-
-	const mod = (indexR - heightLeftTop / 2) % (2 * heightLeft)
-	if (indexR < heightLeftTop / 2) return interCellType.blank
-	if (mod === 0) return interCellType.topRight
-	if (mod === heightLeft - 1) return interCellType.bottomRight
-	if (mod < heightLeft) return interCellType.right
-	else return interCellType.blank
-}
-
-function isBottomInterCell(indexR: number, indexC: number): boolean {
-	// if (teamsCount.value === 3 || teamsCount.value === 4) {
-	// 	return indexR === 7
-	// }
-
-	const countMatchesLeftTop = Math.pow(2, indexC)
-	const heightLeftTop =
-		4 * countMatchesLeftTop + 2 * (countMatchesLeftTop - 1) - 1
-
-	const countMatchesLeft = Math.pow(2, indexC + 1)
-	const heightLeft = 4 * countMatchesLeft + 2 * countMatchesLeft
-
-	if (indexR < heightLeftTop) return false
-	const mod = (indexR - heightLeftTop) % heightLeft
-	return mod === 1
-}
-
-function calcMaxDepth(match: KnockoutMatch): number {
-	if (match.prevMatch === undefined) return 1
-
-	return (
-		1 +
-		Math.max(calcMaxDepth(match.prevMatch.a), calcMaxDepth(match.prevMatch.b))
-	)
-}
-
-enum cellType {
-	match,
-	empty,
-	emptyCell,
-	thirdPlace,
-}
-
-enum interCellType {
-	topRight,
-	bottomRight,
-	right,
-	blank,
-}
-
-function rangeArr(r: number) {
-	return Array.from({ length: r }, (value, index) => index)
-}
-</script>
-
-<style scoped>
-table {
-	table-layout: fixed;
-	border-collapse: collapse;
-}
-
-th {
-	text-align: center;
-}
-
-td {
-	padding: 0;
-}
-
-.tableSingles > tr > td {
-	height: 20px;
-	font-size: 13px;
-}
-
-.tableDoubles > tr > td {
-	height: 28px;
-}
-
-.matchCol {
-}
-
-.topRightInterCell {
-	border-top: solid black 2px;
-	border-right: solid black 2px;
-}
-
-.bottomRightInterCell {
-	border-right: solid black 2px;
-	border-bottom: solid black 2px;
-}
-
-.rightInterCell {
-	border-right: solid black 2px;
-}
-
-.bottomInterCell {
-	border-bottom: solid black 2px;
-}
-
-.interCell {
-	min-width: 25px;
-}
-</style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
new file mode 100644
index 00000000..b71fbd1b
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
@@ -0,0 +1,66 @@
+<template>
+	<MatchBox :different="false" style="width: 250px">
+		<template #playerA>
+			<DraggablePanel
+				id="playerA"
+				:component-data="{
+					tag: 'div',
+					type: 'transition',
+				}"
+				:list="teamA"
+				:tag="TransitionGroup"
+				group="team"
+				item-key="id"
+				style="width: 100%; height: 100%"
+				single
+			>
+				<template #default="{ item: team }">
+					<TeamCard :team="team" />
+				</template>
+			</DraggablePanel>
+		</template>
+		<template #playerB>
+			<DraggablePanel
+				id="playerA"
+				:component-data="{
+					tag: 'div',
+					type: 'transition',
+				}"
+				:list="teamB"
+				:tag="TransitionGroup"
+				group="team"
+				item-key="id"
+				style="width: 100%; height: 100%"
+				single
+			>
+				<template #default="{ item: team }">
+					<TeamCard :team="team" />
+				</template>
+			</DraggablePanel>
+		</template>
+	</MatchBox>
+</template>
+
+<script setup lang="ts">
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { ref, TransitionGroup, watch } from "vue"
+import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import TeamCard from "@/components/views/prepare/components/TeamCard.vue"
+import MatchBox from "@/components/views/prepare/components/MatchBox.vue"
+
+const match = defineModel<KnockoutMatch>()
+
+const teamA = ref([])
+const teamB = ref([])
+
+watch(teamA.value, () => {
+	if (!match.value) return
+	match.value.teamA = teamA.value[0]
+})
+watch(teamB.value, () => {
+	if (!match.value) return
+	match.value.teamB = teamB.value[0]
+})
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/components/MatchBox.vue b/frontend/app/src/components/views/prepare/components/MatchBox.vue
new file mode 100644
index 00000000..b927e0ad
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/components/MatchBox.vue
@@ -0,0 +1,36 @@
+<template>
+	<div>
+		<div
+			id="top"
+			class="border-3 h-3rem border-dashed border-round-top content-box"
+		>
+			<slot name="playerA" />
+		</div>
+		<div
+			id="bottom"
+			class="border-3 h-3rem border-top-none border-dashed border-round-bottom content-box"
+		>
+			<slot name="playerB" />
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup></script>
+
+<style scoped>
+.content-box {
+	box-sizing: content-box;
+}
+
+#top {
+	border-left-color: var(--primary-400);
+	border-top-color: var(--primary-400);
+	border-right-color: var(--primary-400);
+}
+
+#bottom {
+	border-left-color: var(--primary-400);
+	border-bottom-color: var(--primary-400);
+	border-right-color: var(--primary-400);
+}
+</style>
diff --git a/frontend/app/src/components/views/prepare/components/TeamCard.vue b/frontend/app/src/components/views/prepare/components/TeamCard.vue
new file mode 100644
index 00000000..3c3f1201
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/components/TeamCard.vue
@@ -0,0 +1,20 @@
+<template>
+	<div
+		class="h-3rem border-round select-none cursor-pointer pl-3 pr-3 inline text-50 flex justify-content-center flex-column bg-primary-400"
+		:class="{
+			'align-items-start': props.team.playerB,
+			'align-items-center': !props.team.playerB,
+		}"
+	>
+		<span v-if="props.team.playerA">{{ props.team.playerA.name }}</span>
+		<span v-if="props.team.playerB">{{ props.team.playerB.name }}</span>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { Team } from "@/interfaces/team"
+
+const props = defineProps<{ team: Team }>()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
index a59d1929..0a190283 100644
--- a/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
@@ -22,21 +22,10 @@
 				v-if="item.playerA && competition?.mode === Mode.SINGLE"
 				:player="item.playerA"
 			></PlayerCard>
-			<TeamBox
+			<TeamCard
 				v-else-if="competition?.mode === Mode.DOUBLE"
-				:different="competition?.playerB.different || false"
-			>
-				<template #playerA>
-					<PlayerCard v-if="item.playerA" :player="item.playerA"></PlayerCard>
-				</template>
-				<template #playerB>
-					<PlayerCard
-						v-if="item.playerB"
-						:player="item.playerB"
-						:secondary="competition?.playerB.different || false"
-					></PlayerCard>
-				</template>
-			</TeamBox>
+				:team="item"
+			></TeamCard>
 		</template>
 	</DraggablePanel>
 </template>
@@ -46,8 +35,8 @@ import { TransitionGroup } from "vue"
 import { Competition, Mode } from "@/interfaces/competition"
 import { Team } from "@/interfaces/team"
 import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
-import TeamBox from "@/components/views/prepare/components/TeamBox.vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import TeamCard from "@/components/views/prepare/components/TeamCard.vue"
 
 const props = defineProps<{
 	teams: Team[]
diff --git a/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue b/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
deleted file mode 100644
index 99ce306f..00000000
--- a/frontend/app/src/components/views/prepare/components/TeamTableElementDraggable.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-	<DraggablePanel
-		:list="teams"
-		:put="true"
-		item-key="id"
-		:tag="TransitionGroup"
-		:component-data="{
-			tag: 'div',
-			name: props.animated ? 'playerList' : 'default',
-			type: 'transition',
-		}"
-		single
-		group="teams"
-		class="flex justify-content-start"
-		:class="{
-			'min-player-height': competition?.mode === Mode.SINGLE,
-			'min-team-height': competition?.mode === Mode.DOUBLE,
-		}"
-		style="box-sizing: content-box"
-	>
-		<template #default="{ item }">
-			<td
-				class="border-round select-none cursor-pointer font-bold pl-3 pr-3 min-player-height inline text-900 flex align-items-center justify-content-center"
-			>
-				{{
-					props.teams[0]?.playerA
-						? `${props.teams[0].playerA.lastName}, ${props.teams[0].playerA.firstName}`
-						: ""
-				}}
-				<br />
-				{{
-					props.teams[0]?.playerB
-						? `${props.teams[0].playerB.lastName}, ${props.teams[0].playerB.firstName}`
-						: ""
-				}}
-			</td>
-		</template>
-	</DraggablePanel>
-</template>
-
-<script setup lang="ts">
-import { TransitionGroup } from "vue"
-import { Competition, Mode } from "@/interfaces/competition"
-import { Team } from "@/interfaces/team"
-import DraggablePanel from "@/draggable/DraggablePanel.vue"
-
-const props = defineProps<{
-	teams: Team[]
-	competition: Competition
-	animated: boolean
-}>()
-</script>
-
-<style scoped>
-table {
-	table-layout: fixed;
-	width: 300px;
-	background-color: #e0e0e0;
-	margin: 0;
-	border: solid black 2px;
-}
-
-.tableSingles {
-	height: 80px;
-}
-
-.tableDoubles {
-	height: 108px;
-}
-
-table > tr {
-	height: 50%;
-}
-
-.winner {
-	background-color: #c0c0c0;
-}
-
-tr {
-	border: solid black 2px;
-}
-
-td {
-	border: solid black 1px;
-}
-
-.name {
-	text-align: left;
-	padding-left: 20px;
-}
-
-.result {
-	text-align: center;
-	width: 25px;
-	background-color: #fdfdfd;
-}
-.fill {
-	width: 100%;
-	height: 100%;
-}
-
-.winner > .result {
-	background-color: #e0e0e0;
-}
-</style>

From b6fa3abc170dd2d2301677497f1bfcb265dd43a2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 26 Jul 2024 12:43:02 +0200
Subject: [PATCH 019/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20loading=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutTree.vue       |  6 +++--
 .../assignMatches/AssignMatchesKnockout.vue   | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index ac9af5a5..1d673666 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -163,7 +163,8 @@ function setEl(level: number, index: number, el: HTMLElement) {
 	if (!resizeObserver.value[level][index])
 		resizeObserver.value[level][index] = new ResizeObserver(update)
 	matchRefs.value[level][index] = el
-	resizeObserver.value[level][index].observe(el)
+	if (el)
+		resizeObserver.value[level][index].observe(el)
 }
 
 const maxHeight = ref(0)
@@ -174,7 +175,8 @@ function update() {
 	let mH = 0
 	for (const row of matchRefs.value) {
 		for (const match of row ?? []) {
-			mH = Math.max(mH, match.getBoundingClientRect().height)
+			if (match)
+				mH = Math.max(mH, match.getBoundingClientRect().height)
 		}
 	}
 	maxHeight.value = mH
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index b674c332..95a50c48 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -72,19 +72,31 @@ const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
-const { data: signedUp } = getSignedUp(route, t, toast)
+let firstUpdate = true
+const { data: competition } = getCompetitionDetails(route, t, toast, {
+	suc: () => {
+		if (competition.value === null) return
+		loadFromServer()
+	},
+})
+const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(route, t, toast)
 
 const teams = ref<Team[]>([])
 
 const tree = ref(genTree(0))
-watch([signedUp], () => {
+watch([signedUp], loadFromServer)
+if (!signedUpPlaceholder.value) loadFromServer()
+
+async  function loadFromServer() {
 	if (!signedUp.value) return
 
 	teams.value = []
-	signedUp.value.forEach((t) => teams.value.push(t))
 	tree.value = genTree(Math.ceil(Math.log2(signedUp.value.length)))
-})
+	await sleep(firstUpdate ? 0 : 400)
+	firstUpdate = false
+
+	signedUp.value.forEach((t) => teams.value.push(t))
+}
 
 //  [row number in the tree][ upper or lower part of a bracket ][just in an array for draggable]
 const assignedTeams = ref<Team[][][]>([])
@@ -192,7 +204,6 @@ async function reset() {
 	animated.value = false
 }
 
-let firstUpdate = true
 
 // async function update() {
 // 	animated.value = true

From 40a0830470aa354a253fc3a528b112145b32fc27 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 27 Jul 2024 15:07:08 +0200
Subject: [PATCH 020/247] =?UTF-8?q?=E2=9C=A8=20Correctly=20sync=20selected?=
 =?UTF-8?q?=20team=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutTree.vue       | 65 ++++++++++++++-----
 .../assignMatches/AssignMatchesKnockout.vue   | 61 +++++++++++------
 .../prepare/assignMatches/ViewMatchEdit.vue   | 34 +++++++---
 3 files changed, 114 insertions(+), 46 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index 1d673666..43a1d25e 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -23,7 +23,14 @@
 						>
 							<slot
 								name="match"
-								v-bind="{ match: getMatch(level, index), level, index }"
+								:match="getMatch(level, index)"
+								:level="level"
+								:index="index"
+								@update:teamA="(team: Team | null) => {
+									console.log('update teamA')
+									getMatch(level, index).teamA = team
+								}"
+								@update:teamB="(team: Team | null) => getMatch(level, index).teamB = team"
 							>
 								Fallback
 							</slot>
@@ -36,7 +43,9 @@
 						<div class="additionalCont">
 							<slot
 								name="additional"
-								v-bind="{ match: getMatch(level, index), level, index }"
+								:match="getMatch(level, index)"
+								:level="level"
+								:index="index"
 							>
 							</slot>
 						</div>
@@ -61,6 +70,14 @@
 							<slot
 								name="match"
 								v-bind="{ match: thirdPlace, level, index: 1 }"
+								@update:teamA="(team: Team | null) => {
+									if (thirdPlace)
+										thirdPlace.teamA = team
+								}"
+								@update:teamB="(team: Team | null) => {
+									if (thirdPlace)
+										thirdPlace.teamB = team
+								}"
 							>
 								Fallback
 							</slot>
@@ -117,6 +134,8 @@
 <script setup lang="ts">
 import { computed, Ref, ref, watch } from "vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Match } from "@/interfaces/match"
+import { Team } from "@/interfaces/team"
 
 const finale = defineModel<KnockoutMatch>("finale")
 const thirdPlace = defineModel<KnockoutMatch | undefined>("thirdPlace")
@@ -169,7 +188,7 @@ function setEl(level: number, index: number, el: HTMLElement) {
 
 const maxHeight = ref(0)
 
-watch([props, matchRefs], update)
+watch([props, matchRefs, finale, thirdPlace], update)
 
 function update() {
 	let mH = 0
@@ -280,21 +299,33 @@ function getSafeValue(level: number, index: number, array: number[][]) {
 	return array[level][index]
 }
 
-function getMatch(level: number, index: number): KnockoutMatch {
-	let curMatch = finale.value
-	if (!curMatch) throw new Error("Finale is undefined")
-	let curHeight = Math.pow(2, treeHeight.value)
-	for (let i = 0; i < treeHeight.value - level - 1; i++) {
-		curHeight /= 2
-		if (!curMatch.prevMatch) throw new Error("prevMatch is undefined")
-		if (index < curHeight) {
-			curMatch = curMatch.prevMatch.a
-		} else {
-			curMatch = curMatch.prevMatch.b
-			index -= curHeight
-		}
+function getMatches(level: number): (KnockoutMatch | undefined)[] {
+	let cur = [finale.value]
+	for (let i = 0; i < treeHeight.value-level-1; i++) {
+		cur = cur.map(m => m?.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : [])
+			.flat()
 	}
-	return curMatch
+	return cur
+}
+
+function getMatch(level: number, index: number): KnockoutMatch {
+	// let curMatch = finale.value
+	// if (!curMatch) throw new Error("Finale is undefined")
+	const match = getMatches(level)[index]
+	if (!match) throw new Error("Match is undefined")
+	return match
+	// let curHeight = Math.pow(2, treeHeight.value)
+	// for (let i = 0; i < treeHeight.value - level - 1; i++) {
+	// 	curHeight /= 2
+	// 	if (!curMatch.prevMatch) throw new Error("prevMatch is undefined")
+	// 	if (index < curHeight) {
+	// 		curMatch = curMatch.prevMatch.a
+	// 	} else {
+	// 		curMatch = curMatch.prevMatch.b
+	// 		index -= curHeight
+	// 	}
+	// }
+	// return curMatch
 }
 </script>
 
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 95a50c48..0a9994cf 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -40,8 +40,8 @@
 							:border-thickness="2"
 							:border-radius="0"
 						>
-							<template #match="{ match, level }">
-								<ViewMatchEdit v-if="level === 0" :match="match" />
+							<template #match="{ match, level, 'onUpdate:teamA': updateTeamA, 'onUpdate:teamB': updateTeamB}">
+								<ViewMatchEdit v-if="level === 0" :match="match" @update:teamA="updateTeamA" @update:teamB="updateTeamB" />
 								<ViewMatch v-else :match="match" :mode="competition.mode" />
 							</template>
 						</ViewKnockoutTree>
@@ -67,12 +67,14 @@ import { getSignedUp } from "@/backend/signup"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import ViewMatchEdit from "@/components/views/prepare/assignMatches/ViewMatchEdit.vue"
+import { Match } from "@/interfaces/match"
 
 const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
 let firstUpdate = true
+let treeDepth = 0
 const { data: competition } = getCompetitionDetails(route, t, toast, {
 	suc: () => {
 		if (competition.value === null) return
@@ -91,7 +93,9 @@ async  function loadFromServer() {
 	if (!signedUp.value) return
 
 	teams.value = []
-	tree.value = genTree(Math.ceil(Math.log2(signedUp.value.length)))
+	treeDepth = Math.ceil(Math.log2(signedUp.value.length))-1
+	tree.value = genTree(treeDepth)
+	console.log(tree.value)
 	await sleep(firstUpdate ? 0 : 400)
 	firstUpdate = false
 
@@ -156,33 +160,51 @@ const randomizeItems = ref([
 ])
 
 function selectRandomElement<T>(players: Ref<T[]>) {
+	if (players.value.length === 0)
+		return null
+
 	const r = Math.floor(Math.random() * players.value.length)
 	const element = players.value[r]
 	players.value.splice(r, 1)
 	return element
 }
 
+function getMatches(): Match[] {
+	let cur = [tree.value]
+	for (let i = 0; i < treeDepth; i++) {
+		cur = cur.map(m => m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : [])
+			.flat()
+	}
+	return cur
+}
+
 async function randomize() {
 	animated.value = true
 	let knockOutListIndex = 0
-	while (teams.value.length) {
-		const element = selectRandomElement(teams)
-		await sleep(delayBetween.value)
-		while (
-			assignedTeams.value[knockOutListIndex][0].length === 1 &&
-			assignedTeams.value[knockOutListIndex][1].length === 1
-		) {
-			knockOutListIndex++
+	const matches = getMatches()
+	while (teams.value.length && knockOutListIndex < matches.length) {
+
+		if (!matches[knockOutListIndex].teamA) {
+			const teamA = selectRandomElement(teams)
+			await sleep(delayBetween.value)
+
+			matches[knockOutListIndex].teamA = teamA
+			await sleep(delay.value)
 		}
-		if (assignedTeams.value[knockOutListIndex][0].length === 0) {
-			assignedTeams.value[knockOutListIndex][0].push(element)
-		} else {
-			assignedTeams.value[knockOutListIndex][1].push(element)
-			knockOutListIndex++
+
+		if (!matches[knockOutListIndex].teamB) {
+			const teamB = selectRandomElement(teams)
+			if (!teamB)
+				break
+			matches[knockOutListIndex].teamB = teamB
+			await sleep(delayBetween.value)
 		}
+
+		knockOutListIndex++;
 		await sleep(delay.value)
 	}
 	animated.value = false
+	console.log(tree.value)
 }
 
 async function reroll() {
@@ -264,9 +286,9 @@ async function reset() {
 // 	return 1 << (31 - Math.clz32(n))
 // }
 
-const size = computed(() =>
-	Math.max(0, Math.ceil(Math.log2(teamCount.value)) - 1),
-)
+// const size = computed(() =>
+// 	Math.max(0, Math.ceil(Math.log2(teamCount.value)) - 1),
+// )
 
 function knockoutTreeCompletelyAssigned(): boolean {
 	console.log(assignedTeams.value)
@@ -282,6 +304,7 @@ function knockoutTreeCompletelyAssigned(): boolean {
 }
 
 function save() {
+	// TODO send new save as a tree?
 	if (!knockoutTreeCompletelyAssigned()) {
 		toast.add({
 			severity: "error",
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
index b71fbd1b..198beac9 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
@@ -12,6 +12,8 @@
 				group="team"
 				item-key="id"
 				style="width: 100%; height: 100%"
+				:wrap="updateA"
+				@onRemove="() => updateA(null, '')"
 				single
 			>
 				<template #default="{ item: team }">
@@ -31,6 +33,8 @@
 				group="team"
 				item-key="id"
 				style="width: 100%; height: 100%"
+				:wrap="updateB"
+				@onRemove="() => updateB(null, '')"
 				single
 			>
 				<template #default="{ item: team }">
@@ -47,19 +51,29 @@ import { ref, TransitionGroup, watch } from "vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import TeamCard from "@/components/views/prepare/components/TeamCard.vue"
 import MatchBox from "@/components/views/prepare/components/MatchBox.vue"
+import { Team } from "@/interfaces/team"
 
-const match = defineModel<KnockoutMatch>()
+const props = defineProps<{ match: KnockoutMatch }>()
+const emit = defineEmits(['update:teamA', 'update:teamB'])
 
-const teamA = ref([])
-const teamB = ref([])
+const teamA = ref<Team[]>([])
+const teamB = ref<Team[]>([])
 
-watch(teamA.value, () => {
-	if (!match.value) return
-	match.value.teamA = teamA.value[0]
-})
-watch(teamB.value, () => {
-	if (!match.value) return
-	match.value.teamB = teamB.value[0]
+function updateA(val: Team | null, _: string) {
+	emit('update:teamA', val)
+	return val
+}
+function updateB(val: Team | null, _: string) {
+	emit('update:teamB', val)
+	return val
+}
+
+watch(props, () => {
+	console.log("update")
+	if (teamA.value !== (props.match.teamA ? [props.match.teamA] : []))
+		teamA.value = props.match.teamA ? [props.match.teamA] : []
+	if (teamB.value !== (props.match.teamB ? [props.match.teamB] : []))
+		teamB.value = props.match.teamB ? [props.match.teamB] : []
 })
 </script>
 

From 9b506b625eac6fbea99d360619ede7aa5117630a Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 27 Jul 2024 15:07:41 +0200
Subject: [PATCH 021/247] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockoutSystem/ViewKnockoutTree.vue       | 44 ++++++++++---------
 .../assignMatches/AssignMatchesKnockout.vue   | 39 ++++++++++------
 .../prepare/assignMatches/ViewMatchEdit.vue   | 20 ++++++---
 .../components/PlayerContainerDraggable.vue   |  1 +
 4 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index 43a1d25e..29455a6a 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -26,11 +26,15 @@
 								:match="getMatch(level, index)"
 								:level="level"
 								:index="index"
-								@update:teamA="(team: Team | null) => {
-									console.log('update teamA')
-									getMatch(level, index).teamA = team
-								}"
-								@update:teamB="(team: Team | null) => getMatch(level, index).teamB = team"
+								@update:teamA="
+									(team: Team | null) => {
+										console.log('update teamA')
+										getMatch(level, index).teamA = team
+									}
+								"
+								@update:teamB="
+									(team: Team | null) => (getMatch(level, index).teamB = team)
+								"
 							>
 								Fallback
 							</slot>
@@ -70,14 +74,16 @@
 							<slot
 								name="match"
 								v-bind="{ match: thirdPlace, level, index: 1 }"
-								@update:teamA="(team: Team | null) => {
-									if (thirdPlace)
-										thirdPlace.teamA = team
-								}"
-								@update:teamB="(team: Team | null) => {
-									if (thirdPlace)
-										thirdPlace.teamB = team
-								}"
+								@update:teamA="
+									(team: Team | null) => {
+										if (thirdPlace) thirdPlace.teamA = team
+									}
+								"
+								@update:teamB="
+									(team: Team | null) => {
+										if (thirdPlace) thirdPlace.teamB = team
+									}
+								"
 							>
 								Fallback
 							</slot>
@@ -134,7 +140,6 @@
 <script setup lang="ts">
 import { computed, Ref, ref, watch } from "vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
 
 const finale = defineModel<KnockoutMatch>("finale")
@@ -182,8 +187,7 @@ function setEl(level: number, index: number, el: HTMLElement) {
 	if (!resizeObserver.value[level][index])
 		resizeObserver.value[level][index] = new ResizeObserver(update)
 	matchRefs.value[level][index] = el
-	if (el)
-		resizeObserver.value[level][index].observe(el)
+	if (el) resizeObserver.value[level][index].observe(el)
 }
 
 const maxHeight = ref(0)
@@ -194,8 +198,7 @@ function update() {
 	let mH = 0
 	for (const row of matchRefs.value) {
 		for (const match of row ?? []) {
-			if (match)
-				mH = Math.max(mH, match.getBoundingClientRect().height)
+			if (match) mH = Math.max(mH, match.getBoundingClientRect().height)
 		}
 	}
 	maxHeight.value = mH
@@ -301,8 +304,9 @@ function getSafeValue(level: number, index: number, array: number[][]) {
 
 function getMatches(level: number): (KnockoutMatch | undefined)[] {
 	let cur = [finale.value]
-	for (let i = 0; i < treeHeight.value-level-1; i++) {
-		cur = cur.map(m => m?.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : [])
+	for (let i = 0; i < treeHeight.value - level - 1; i++) {
+		cur = cur
+			.map((m) => (m?.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : []))
 			.flat()
 	}
 	return cur
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 0a9994cf..0511862f 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -40,8 +40,20 @@
 							:border-thickness="2"
 							:border-radius="0"
 						>
-							<template #match="{ match, level, 'onUpdate:teamA': updateTeamA, 'onUpdate:teamB': updateTeamB}">
-								<ViewMatchEdit v-if="level === 0" :match="match" @update:teamA="updateTeamA" @update:teamB="updateTeamB" />
+							<template
+								#match="{
+									match,
+									level,
+									'onUpdate:teamA': updateTeamA,
+									'onUpdate:teamB': updateTeamB,
+								}"
+							>
+								<ViewMatchEdit
+									v-if="level === 0"
+									:match="match"
+									@update:team-a="updateTeamA"
+									@update:team-b="updateTeamB"
+								/>
 								<ViewMatch v-else :match="match" :mode="competition.mode" />
 							</template>
 						</ViewKnockoutTree>
@@ -81,7 +93,11 @@ const { data: competition } = getCompetitionDetails(route, t, toast, {
 		loadFromServer()
 	},
 })
-const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(route, t, toast)
+const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
+	route,
+	t,
+	toast,
+)
 
 const teams = ref<Team[]>([])
 
@@ -89,11 +105,11 @@ const tree = ref(genTree(0))
 watch([signedUp], loadFromServer)
 if (!signedUpPlaceholder.value) loadFromServer()
 
-async  function loadFromServer() {
+async function loadFromServer() {
 	if (!signedUp.value) return
 
 	teams.value = []
-	treeDepth = Math.ceil(Math.log2(signedUp.value.length))-1
+	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
 	tree.value = genTree(treeDepth)
 	console.log(tree.value)
 	await sleep(firstUpdate ? 0 : 400)
@@ -160,8 +176,7 @@ const randomizeItems = ref([
 ])
 
 function selectRandomElement<T>(players: Ref<T[]>) {
-	if (players.value.length === 0)
-		return null
+	if (players.value.length === 0) return null
 
 	const r = Math.floor(Math.random() * players.value.length)
 	const element = players.value[r]
@@ -172,7 +187,8 @@ function selectRandomElement<T>(players: Ref<T[]>) {
 function getMatches(): Match[] {
 	let cur = [tree.value]
 	for (let i = 0; i < treeDepth; i++) {
-		cur = cur.map(m => m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : [])
+		cur = cur
+			.map((m) => (m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : []))
 			.flat()
 	}
 	return cur
@@ -183,7 +199,6 @@ async function randomize() {
 	let knockOutListIndex = 0
 	const matches = getMatches()
 	while (teams.value.length && knockOutListIndex < matches.length) {
-
 		if (!matches[knockOutListIndex].teamA) {
 			const teamA = selectRandomElement(teams)
 			await sleep(delayBetween.value)
@@ -194,13 +209,12 @@ async function randomize() {
 
 		if (!matches[knockOutListIndex].teamB) {
 			const teamB = selectRandomElement(teams)
-			if (!teamB)
-				break
+			if (!teamB) break
 			matches[knockOutListIndex].teamB = teamB
 			await sleep(delayBetween.value)
 		}
 
-		knockOutListIndex++;
+		knockOutListIndex++
 		await sleep(delay.value)
 	}
 	animated.value = false
@@ -226,7 +240,6 @@ async function reset() {
 	animated.value = false
 }
 
-
 // async function update() {
 // 	animated.value = true
 // 	teams.value = []
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
index 198beac9..ce831cd1 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
@@ -13,8 +13,8 @@
 				item-key="id"
 				style="width: 100%; height: 100%"
 				:wrap="updateA"
-				@onRemove="() => updateA(null, '')"
 				single
+				@on-remove="removeA"
 			>
 				<template #default="{ item: team }">
 					<TeamCard :team="team" />
@@ -34,8 +34,8 @@
 				item-key="id"
 				style="width: 100%; height: 100%"
 				:wrap="updateB"
-				@onRemove="() => updateB(null, '')"
 				single
+				@on-remove="removeB"
 			>
 				<template #default="{ item: team }">
 					<TeamCard :team="team" />
@@ -54,19 +54,25 @@ import MatchBox from "@/components/views/prepare/components/MatchBox.vue"
 import { Team } from "@/interfaces/team"
 
 const props = defineProps<{ match: KnockoutMatch }>()
-const emit = defineEmits(['update:teamA', 'update:teamB'])
+const emit = defineEmits(["update:teamA", "update:teamB"])
 
 const teamA = ref<Team[]>([])
 const teamB = ref<Team[]>([])
 
-function updateA(val: Team | null, _: string) {
-	emit('update:teamA', val)
+function updateA(val: Team) {
+	emit("update:teamA", val)
 	return val
 }
-function updateB(val: Team | null, _: string) {
-	emit('update:teamB', val)
+function removeA() {
+	emit("update:teamA", null)
+}
+function updateB(val: Team) {
+	emit("update:teamB", val)
 	return val
 }
+function removeB() {
+	emit("update:teamB", null)
+}
 
 watch(props, () => {
 	console.log("update")
diff --git a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
index ab9965f3..212c9d0e 100644
--- a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
@@ -39,6 +39,7 @@ const props = withDefaults(
 		isUpdating: boolean
 	}>(),
 	{
+		id: "default",
 		isUpdating: false,
 		secondary: false,
 	},

From 1466f682746720943b716d42f778130de63eea96 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 27 Jul 2024 15:19:56 +0200
Subject: [PATCH 022/247] =?UTF-8?q?=F0=9F=92=A1=20Add=20TODOs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/assignMatches/AssignMatchesKnockout.vue       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 0511862f..b02065ae 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -227,6 +227,7 @@ async function reroll() {
 }
 
 async function reset() {
+	// TODO adapt to new structure
 	animated.value = true
 	for (let i = 0; i < assignedTeams.value.length; i++) {
 		let team1 = assignedTeams.value[i][0].pop()
@@ -240,6 +241,7 @@ async function reset() {
 	animated.value = false
 }
 
+// TODO adapt to new structure
 // async function update() {
 // 	animated.value = true
 // 	teams.value = []

From 09675d22f4e840bce4cf047fc72745d59d7ba6ba Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 28 Jul 2024 14:28:00 +0200
Subject: [PATCH 023/247] =?UTF-8?q?=F0=9F=9A=A7=20implement=20check=20for?=
 =?UTF-8?q?=20fully=20assigned=20tree=20in=20draggable=20knockout=20tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssignMatchesKnockout.vue   | 45 +++++++------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index b02065ae..2f185943 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -71,9 +71,8 @@ import { useI18n } from "vue-i18n"
 import { computed, Ref, ref, watch } from "vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
-import { Team, teamClientToServer } from "@/interfaces/team"
+import { Team } from "@/interfaces/team"
 import axios from "axios"
-import { KnockoutOrder } from "@/interfaces/competition"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { getSignedUp } from "@/backend/signup"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
@@ -118,9 +117,6 @@ async function loadFromServer() {
 	signedUp.value.forEach((t) => teams.value.push(t))
 }
 
-//  [row number in the tree][ upper or lower part of a bracket ][just in an array for draggable]
-const assignedTeams = ref<Team[][][]>([])
-
 function genTree(height: number): KnockoutMatch {
 	const default_game = {
 		court: null,
@@ -229,14 +225,6 @@ async function reroll() {
 async function reset() {
 	// TODO adapt to new structure
 	animated.value = true
-	for (let i = 0; i < assignedTeams.value.length; i++) {
-		let team1 = assignedTeams.value[i][0].pop()
-		let team2 = assignedTeams.value[i][1].pop()
-		if (team1) teams.value.push(team1)
-		if (team2) teams.value.push(team2)
-		await sleep(delay.value)
-		console.log(assignedTeams.value.length)
-	}
 
 	animated.value = false
 }
@@ -306,16 +294,13 @@ async function reset() {
 // )
 
 function knockoutTreeCompletelyAssigned(): boolean {
-	console.log(assignedTeams.value)
-	for (let i = 0; i < assignedTeams.value.length; i++) {
-		if (
-			assignedTeams.value[i][0].length === 0 ||
-			assignedTeams.value[i][1].length === 0
-		) {
-			return false
-		}
+	// check that tree is completely assigned
+	const check = (m: KnockoutMatch): boolean => {
+		if (m.prevMatch) {
+			return check(m.prevMatch.a) && check(m.prevMatch.b)
+		} else return m.teamA !== null && m.teamB !== null
 	}
-	return true
+	return check(tree.value)
 }
 
 function save() {
@@ -331,17 +316,19 @@ function save() {
 		return
 	}
 
-	const req: KnockoutOrder = {
-		teams: assignedTeams.value
-			.flat()
-			.flat()
-			.map((t) => teamClientToServer(t)),
-	}
+	console.log("tree", tree.value)
 
+	// const req: KnockoutOrder = {
+	// 	teams: assignedTeams.value
+	// 		.flat()
+	// 		.flat()
+	// 		.map((t) => teamClientToServer(t)),
+	// }
+	// console.log("assignedTeams: ", req)
 	axios
 		.post<boolean>(
 			`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
-			req,
+			tree.value,
 		)
 		.then(() => {
 			toast.add({

From 7d300ea98c9a5acf1371e52e47acf834fda9b8ad Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 31 Jul 2024 12:07:36 +0200
Subject: [PATCH 024/247] =?UTF-8?q?=F0=9F=9A=A7=20introduce=20new=20class?=
 =?UTF-8?q?=20for=20with=20String=20instead=20UUID=20for=20response=20as?=
 =?UTF-8?q?=20matches=20can=20have=20empty=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knockout/jUserKnockoutMatchResponse.java  | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java
new file mode 100644
index 00000000..e34ae3ee
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java
@@ -0,0 +1,68 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.user.knockout;
+
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class jUserKnockoutMatchResponse {
+    private String court;
+    private LocalDateTime begin;
+    private LocalDateTime end;
+
+    private Boolean finished;
+    private Boolean winner;
+
+    private String teamA_id;
+    private String teamB_id;
+
+    private boolean winningPlayer;
+    private jUserKnockoutMatchResponse previousA;
+    private jUserKnockoutMatchResponse previousB;
+
+    private List<jUserSet> sets;
+
+    public String getCourt() {
+        return court;
+    }
+
+    public Boolean getFinished() {
+        return finished;
+    }
+
+    public Boolean getWinner() {
+        return winner;
+    }
+
+    public boolean isWinningPlayer() {
+        return winningPlayer;
+    }
+
+    public jUserKnockoutMatchResponse getPreviousA() {
+        return previousA;
+    }
+
+    public jUserKnockoutMatchResponse getPreviousB() {
+        return previousB;
+    }
+
+    public List<jUserSet> getSets() {
+        return sets;
+    }
+
+    public LocalDateTime getBegin() {
+        return begin;
+    }
+
+    public LocalDateTime getEnd() {
+        return end;
+    }
+
+    public String getTeamA_id() {
+        return teamA_id;
+    }
+
+    public String getTeamB_id() {
+        return teamB_id;
+    }
+}

From ee38485b67b0da01e4a7892926c1287cd4a16e97 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 31 Jul 2024 12:08:21 +0200
Subject: [PATCH 025/247] =?UTF-8?q?=F0=9F=9A=A7=20implement=20saving=20of?=
 =?UTF-8?q?=20teams?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/entities/competition/Team.java         |   7 +-
 .../turnierplaner/modifier/KnockoutTools.java | 177 +++++++++++-------
 .../assignMatches/AssignMatchesKnockout.vue   |  11 +-
 frontend/app/src/interfaces/knockoutSystem.ts |  24 +++
 4 files changed, 143 insertions(+), 76 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
index 8d76200f..9d5ab91d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
@@ -2,6 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.Player;
 
+import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import jakarta.persistence.*;
 
 import java.util.Objects;
@@ -17,7 +18,7 @@ JOIN Match m ON (t = m.teamA OR t = m.teamB)
                                JOIN MatchOfGroup mog ON m = mog.match
                                JOIN Group g ON mog.group = g
                                WHERE g = :group""")})
-public class Team {
+public class Team extends PanacheEntityBase {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -79,4 +80,8 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    public static Team findById(UUID id){
+        return find("id", id).firstResult();
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index a2d4937e..6d213f95 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -6,11 +6,13 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.NextMatchRepository;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatchResponse;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.InternalServerErrorException;
 
 import java.util.Arrays;
+import java.util.UUID;
 
 @ApplicationScoped
 public class KnockoutTools {
@@ -20,82 +22,115 @@ public class KnockoutTools {
     @Inject
     NextMatchRepository nextMatches;
 
-    public void generateKnockoutTree(Competition competition, int size, Team[] teams) {
-        Match finale = matches.getFinal(competition);
-
-        if (finale == null) {
-            generateTree(competition, true, size, false, teams);
-        } else {
-            int curSize = 0;
-            Match curMatch = finale;
-            while (curMatch.getDependentOn() != null) {
-                curMatch = curMatch.getDependentOn().getPreviousA();
-                curSize++;
-            }
-
-            if (curSize != size) {
-                matches.deleteByComp(competition);
-
-                generateTree(competition, true, size, false, teams);
-            } else {
-                updateTree(size, false, finale, teams);
-            }
-        }
+public Match updateKnockoutTree(Competition competition, jUserKnockoutMatchResponse tree) {
+    if(tree == null){
+        return null;
     }
-
-    private Match generateTree(Competition competition, boolean finale, int size, boolean reversed, Team[] teams) {
-        var splits = split(size, teams);
-
-        Match match = new Match();
-        match.setCompetition(competition);
-        if (size == 0) {
-            match.setTeamA(teams[reversed ? 1 : 0]);
-            match.setTeamB(teams[reversed ? 0 : 1]);
-        }
-        matches.persist(match);
-
-        if (size > 0) {
-            Match matchA = generateTree(competition, false, size - 1, false, reversed ? splits.y : splits.x);
-            Match matchB = generateTree(competition, false, size - 1, true, reversed ? splits.x : splits.y);
-
-            NextMatch nMatch = new NextMatch();
-            nMatch.setPreviousA(matchA);
-            nMatch.setPreviousB(matchB);
-            nMatch.setNextMatch(match);
-
-            if (finale) {
-                Match thirdPlace = new Match();
-                thirdPlace.setCompetition(competition);
-                matches.persist(thirdPlace);
-
-                NextMatch nextMatchThird = new NextMatch();
-                nextMatchThird.setPreviousA(matchA);
-                nextMatchThird.setPreviousB(matchB);
-                nextMatchThird.setNextMatch(thirdPlace);
-                nextMatchThird.setWinner(false);
-                nextMatches.persist(nextMatchThird);
-            }
-
-            nextMatches.persist(nMatch);
-        }
-
-        return match;
+    Match match = new Match();
+    match.setBegin(tree.getBegin());
+    match.setEnd(tree.getEnd());
+    if(!tree.getTeamA_id().isEmpty()){
+        UUID teamA_id = UUID.fromString(tree.getTeamA_id());
+        match.setTeamA(Team.findById(teamA_id));
+    }
+    if(!tree.getTeamB_id().isEmpty()){
+        UUID teamB_id = UUID.fromString(tree.getTeamB_id());
+        match.setTeamB(Team.findById(teamB_id));
     }
+    match.setFinished(tree.getFinished());
+    match.setCompetition(competition);
+    match.setWinner(tree.getWinner());
 
-    private void updateTree(int size, boolean reversed, Match match, Team[] teams) {
-        var splits = split(size, teams);
 
-        if (size == 0) {
-            match.setTeamA(teams[reversed ? 1 : 0]);
-            match.setTeamB(teams[reversed ? 0 : 1]);
-            matches.persist(match);
-        }
+    NextMatch nMatch = new NextMatch();
+    nMatch.setNextMatch(match);
+    Match a = updateKnockoutTree(competition, tree.getPreviousA());
+    nMatch.setPreviousA(a);
+    Match b = updateKnockoutTree(competition, tree.getPreviousB());
+    nMatch.setPreviousB(b);
 
-        if (size > 0) {
-            updateTree(size - 1, false, match.getDependentOn().getPreviousA(), reversed ? splits.y : splits.x);
-            updateTree(size - 1, true, match.getDependentOn().getPreviousB(), reversed ? splits.x : splits.y);
-        }
-    }
+    nextMatches.persist(nMatch);
+    matches.persist(match);
+    return match;
+}
+
+    /// TODO - to be deleted?
+//    public void generateKnockoutTree(Competition competition, int size, Team[] teams) {
+//        Match finale = matches.getFinal(competition);
+//
+//        if (finale == null) {
+//            generateTree(competition, true, size, false, teams);
+//        } else {
+//            int curSize = 0;
+//            Match curMatch = finale;
+//            while (curMatch.getDependentOn() != null) {
+//                curMatch = curMatch.getDependentOn().getPreviousA();
+//                curSize++;
+//            }
+//
+//            if (curSize != size) {
+//                matches.deleteByComp(competition);
+//
+//                generateTree(competition, true, size, false, teams);
+//            } else {
+//                updateTree(size, false, finale, teams);
+//            }
+//        }
+//    }
+//
+//    private Match generateTree(Competition competition, boolean finale, int size, boolean reversed, Team[] teams) {
+//        var splits = split(size, teams);
+//
+//        Match match = new Match();
+//        match.setCompetition(competition);
+//        if (size == 0) {
+//            match.setTeamA(teams[reversed ? 1 : 0]);
+//            match.setTeamB(teams[reversed ? 0 : 1]);
+//        }
+//        matches.persist(match);
+//
+//        if (size > 0) {
+//            Match matchA = generateTree(competition, false, size - 1, false, reversed ? splits.y : splits.x);
+//            Match matchB = generateTree(competition, false, size - 1, true, reversed ? splits.x : splits.y);
+//
+//            NextMatch nMatch = new NextMatch();
+//            nMatch.setPreviousA(matchA);
+//            nMatch.setPreviousB(matchB);
+//            nMatch.setNextMatch(match);
+//
+//            if (finale) {
+//                Match thirdPlace = new Match();
+//                thirdPlace.setCompetition(competition);
+//                matches.persist(thirdPlace);
+//
+//                NextMatch nextMatchThird = new NextMatch();
+//                nextMatchThird.setPreviousA(matchA);
+//                nextMatchThird.setPreviousB(matchB);
+//                nextMatchThird.setNextMatch(thirdPlace);
+//                nextMatchThird.setWinner(false);
+//                nextMatches.persist(nextMatchThird);
+//            }
+//
+//            nextMatches.persist(nMatch);
+//        }
+//
+//        return match;
+//    }
+//
+//    private void updateTree(int size, boolean reversed, Match match, Team[] teams) {
+//        var splits = split(size, teams);
+//
+//        if (size == 0) {
+//            match.setTeamA(teams[reversed ? 1 : 0]);
+//            match.setTeamB(teams[reversed ? 0 : 1]);
+//            matches.persist(match);
+//        }
+//
+//        if (size > 0) {
+//            updateTree(size - 1, false, match.getDependentOn().getPreviousA(), reversed ? splits.y : splits.x);
+//            updateTree(size - 1, true, match.getDependentOn().getPreviousB(), reversed ? splits.x : splits.y);
+//        }
+//    }
 
     public Team[] knockoutOrder(Competition competition) {
         Match finale = matches.getFinal(competition);
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 2f185943..4bb12700 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -73,7 +73,10 @@ import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { Team } from "@/interfaces/team"
 import axios from "axios"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import {
+	KnockoutMatch,
+	knockoutMatchClientToServer,
+} from "@/interfaces/knockoutSystem"
 import { getSignedUp } from "@/backend/signup"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
@@ -316,8 +319,6 @@ function save() {
 		return
 	}
 
-	console.log("tree", tree.value)
-
 	// const req: KnockoutOrder = {
 	// 	teams: assignedTeams.value
 	// 		.flat()
@@ -325,10 +326,12 @@ function save() {
 	// 		.map((t) => teamClientToServer(t)),
 	// }
 	// console.log("assignedTeams: ", req)
+	console.log("tree", tree.value)
+	console.log("tree: ", knockoutMatchClientToServer(tree.value))
 	axios
 		.post<boolean>(
 			`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
-			tree.value,
+			knockoutMatchClientToServer(tree.value),
 		)
 		.then(() => {
 			toast.add({
diff --git a/frontend/app/src/interfaces/knockoutSystem.ts b/frontend/app/src/interfaces/knockoutSystem.ts
index 05d9cf98..1ccae5cb 100644
--- a/frontend/app/src/interfaces/knockoutSystem.ts
+++ b/frontend/app/src/interfaces/knockoutSystem.ts
@@ -59,3 +59,27 @@ function knockoutMatchServerToClient(
 	}
 	return match
 }
+
+export function knockoutMatchClientToServer(
+	match: KnockoutMatch,
+): KnockoutMatchServer {
+	return {
+		court: match.court ? match.court : "",
+		begin: match.begin ? match.begin.toString() : "2024-04-01T23:15:30",
+		end: match.end ? match.end.toISOString() : "2024-04-01T23:15:30",
+		finished: match.finished,
+		winner: match.winner,
+		teamA: match.teamA && match.teamA.id ? match.teamA.id : null,
+		teamB: match.teamB && match.teamB.id ? match.teamB.id : null,
+		sets: match.sets ? match.sets : [],
+
+		winningPlayer: match.prevMatch?.winner ?? false,
+
+		previousA: match.prevMatch?.a
+			? knockoutMatchClientToServer(match.prevMatch.a)
+			: null,
+		previousB: match.prevMatch?.b
+			? knockoutMatchClientToServer(match.prevMatch.b)
+			: null,
+	}
+}

From 44066768e72bce987b1e790b7932e4d9183b49d6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 6 Aug 2024 00:19:55 +0200
Subject: [PATCH 026/247] =?UTF-8?q?=F0=9F=90=9B=20Allow=20swapping=20of=20?=
 =?UTF-8?q?teams=20in=20KnockoutTree=20Draggable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/draggable/DraggablePanel.vue | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index c9eb2612..9c7139e6 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -33,7 +33,7 @@ const props = withDefaults(
 		ghost?: string
 		single?: boolean
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		wrap?: ((el: any, id: string) => T) | null
+		wrap?: ((el: any, id: string) => T)
 	}>(),
 	{
 		componentData: {},
@@ -44,7 +44,7 @@ const props = withDefaults(
 		put: true,
 		ghost: "ghost",
 		single: false,
-		wrap: null,
+		wrap: (e, _) => e,
 	},
 )
 
@@ -91,32 +91,26 @@ function create() {
 			if (targetSingle) {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				props.list.splice(event.oldIndex, 1, selectedElement)
+				props.list.splice(event.oldIndex, 1, props.wrap(selectedElement, event.from.id))
 			} else {
 				props.list.splice(event.oldIndex, 1)
+				emit("onRemove")
 			}
-			emit("onRemove")
 			reload()
 		},
 		onAdd: (event: Sortable.SortableEvent) => {
 			if (event.newIndex === undefined) return
 
 			targetSingle = props.single && props.list.length === 1
-			if (props.wrap) {
-				if (selectedElement != null)
-					props.list.splice(
-						event.newIndex,
-						0,
-						props.wrap(selectedElement, event.from.id),
-					)
-			} else if (props.single && props.list.length === 1) {
+
+			if (props.single && props.list.length === 1) {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				selectedElement = props.list.splice(0, 1, selectedElement)[0]
+				selectedElement = props.list.splice(0, 1, props.wrap(selectedElement, event.from.id))[0]
 			} else {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				props.list.splice(event.newIndex, 0, selectedElement)
+				props.list.splice(event.newIndex, 0, props.wrap(selectedElement, event.from.id))
 			}
 			reload()
 		},

From 36d64dabb702dd19603b1e48f623c4950e69ffc3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 7 Aug 2024 18:20:11 +0200
Subject: [PATCH 027/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Implement=20new=20?=
 =?UTF-8?q?saving=20of=20knockout=20tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |  16 ++
 .../db/entities/competition/Team.java         |   2 +-
 .../turnierplaner/modifier/KnockoutTools.java | 213 +++---------------
 .../resources/CompetitionResource.java        |  36 +--
 .../jsonEntities/user/jUserMatch.java         |   3 +
 .../user/knockout/jUserKnockoutMatch.java     |   3 +
 .../knockout/jUserKnockoutMatchResponse.java  |  68 ------
 .../assignMatches/AssignMatchesKnockout.vue   |   9 +-
 .../prepare/assignMatches/ViewMatchEdit.vue   |   1 -
 frontend/app/src/draggable/DraggablePanel.vue |  20 +-
 frontend/app/src/interfaces/knockoutSystem.ts |  18 +-
 frontend/app/src/interfaces/match.ts          |  20 +-
 12 files changed, 111 insertions(+), 298 deletions(-)
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 2aed96ad..56785dda 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -171,6 +171,22 @@ public void setDependentOn(NextMatch dependentOn) {
         this.dependentOn = dependentOn;
     }
 
+    public Collection<NextMatch> getPreviousOfA() {
+        return previousOfA;
+    }
+
+    public void setPreviousOfA(Collection<NextMatch> previousOfA) {
+        this.previousOfA = previousOfA;
+    }
+
+    public Collection<NextMatch> getPreviousOfB() {
+        return previousOfB;
+    }
+
+    public void setPreviousOfB(Collection<NextMatch> previousOfB) {
+        this.previousOfB = previousOfB;
+    }
+
     public FinalOfGroup getFinalOfGroup() {
         return finalOfGroup;
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
index 9d5ab91d..108f888f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
@@ -81,7 +81,7 @@ public int hashCode() {
         return Objects.hash(id);
     }
 
-    public static Team findById(UUID id){
+    public static Team findById(UUID id) {
         return find("id", id).firstResult();
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 6d213f95..c06f1080 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -6,13 +6,9 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.NextMatchRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatchResponse;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.InternalServerErrorException;
-
-import java.util.Arrays;
-import java.util.UUID;
 
 @ApplicationScoped
 public class KnockoutTools {
@@ -22,188 +18,47 @@ public class KnockoutTools {
     @Inject
     NextMatchRepository nextMatches;
 
-public Match updateKnockoutTree(Competition competition, jUserKnockoutMatchResponse tree) {
-    if(tree == null){
-        return null;
-    }
-    Match match = new Match();
-    match.setBegin(tree.getBegin());
-    match.setEnd(tree.getEnd());
-    if(!tree.getTeamA_id().isEmpty()){
-        UUID teamA_id = UUID.fromString(tree.getTeamA_id());
-        match.setTeamA(Team.findById(teamA_id));
-    }
-    if(!tree.getTeamB_id().isEmpty()){
-        UUID teamB_id = UUID.fromString(tree.getTeamB_id());
-        match.setTeamB(Team.findById(teamB_id));
-    }
-    match.setFinished(tree.getFinished());
-    match.setCompetition(competition);
-    match.setWinner(tree.getWinner());
-
-
-    NextMatch nMatch = new NextMatch();
-    nMatch.setNextMatch(match);
-    Match a = updateKnockoutTree(competition, tree.getPreviousA());
-    nMatch.setPreviousA(a);
-    Match b = updateKnockoutTree(competition, tree.getPreviousB());
-    nMatch.setPreviousB(b);
-
-    nextMatches.persist(nMatch);
-    matches.persist(match);
-    return match;
-}
-
-    /// TODO - to be deleted?
-//    public void generateKnockoutTree(Competition competition, int size, Team[] teams) {
-//        Match finale = matches.getFinal(competition);
-//
-//        if (finale == null) {
-//            generateTree(competition, true, size, false, teams);
-//        } else {
-//            int curSize = 0;
-//            Match curMatch = finale;
-//            while (curMatch.getDependentOn() != null) {
-//                curMatch = curMatch.getDependentOn().getPreviousA();
-//                curSize++;
-//            }
-//
-//            if (curSize != size) {
-//                matches.deleteByComp(competition);
-//
-//                generateTree(competition, true, size, false, teams);
-//            } else {
-//                updateTree(size, false, finale, teams);
-//            }
-//        }
-//    }
-//
-//    private Match generateTree(Competition competition, boolean finale, int size, boolean reversed, Team[] teams) {
-//        var splits = split(size, teams);
-//
-//        Match match = new Match();
-//        match.setCompetition(competition);
-//        if (size == 0) {
-//            match.setTeamA(teams[reversed ? 1 : 0]);
-//            match.setTeamB(teams[reversed ? 0 : 1]);
-//        }
-//        matches.persist(match);
-//
-//        if (size > 0) {
-//            Match matchA = generateTree(competition, false, size - 1, false, reversed ? splits.y : splits.x);
-//            Match matchB = generateTree(competition, false, size - 1, true, reversed ? splits.x : splits.y);
-//
-//            NextMatch nMatch = new NextMatch();
-//            nMatch.setPreviousA(matchA);
-//            nMatch.setPreviousB(matchB);
-//            nMatch.setNextMatch(match);
-//
-//            if (finale) {
-//                Match thirdPlace = new Match();
-//                thirdPlace.setCompetition(competition);
-//                matches.persist(thirdPlace);
-//
-//                NextMatch nextMatchThird = new NextMatch();
-//                nextMatchThird.setPreviousA(matchA);
-//                nextMatchThird.setPreviousB(matchB);
-//                nextMatchThird.setNextMatch(thirdPlace);
-//                nextMatchThird.setWinner(false);
-//                nextMatches.persist(nextMatchThird);
-//            }
-//
-//            nextMatches.persist(nMatch);
-//        }
-//
-//        return match;
-//    }
-//
-//    private void updateTree(int size, boolean reversed, Match match, Team[] teams) {
-//        var splits = split(size, teams);
-//
-//        if (size == 0) {
-//            match.setTeamA(teams[reversed ? 1 : 0]);
-//            match.setTeamB(teams[reversed ? 0 : 1]);
-//            matches.persist(match);
-//        }
-//
-//        if (size > 0) {
-//            updateTree(size - 1, false, match.getDependentOn().getPreviousA(), reversed ? splits.y : splits.x);
-//            updateTree(size - 1, true, match.getDependentOn().getPreviousB(), reversed ? splits.x : splits.y);
-//        }
-//    }
-
-    public Team[] knockoutOrder(Competition competition) {
-        Match finale = matches.getFinal(competition);
-
-        return knockoutOrder(finale, false);
-    }
-
-    private Team[] knockoutOrder(Match match, boolean reversed) {
-        Team[] A;
-        Team[] B;
-        if (match.getDependentOn() == null) {
-            A = new Team[]{match.getTeamA()};
-            B = new Team[]{match.getTeamB()};
-        } else {
-            A = knockoutOrder(match.getDependentOn().getPreviousA(), false);
-            B = knockoutOrder(match.getDependentOn().getPreviousB(), true);
+    public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match) {
+        if (tree == null) {
+            return null;
         }
+        match.setTeamA(Team.findById(tree.getTeamA()));
+        match.setTeamB(Team.findById(tree.getTeamA()));
 
-        if (reversed) {
-            return merge(B, A);
-        } else {
-            return merge(A, B);
-        }
-    }
+        match.setFinished(false);
+        match.setCompetition(competition);
+        match.setWinner(true);
+        matches.persist(match);
 
-    private Pair<Team[], Team[]> split(int size, Team[] teams) {
-        if (teams.length < 2) {
-            throw new InternalServerErrorException("Wrong size of teams list");
-        }
-        if (size == 0) {
-            return new Pair<>(new Team[]{teams[0]}, new Team[]{teams[1]});
+        if (tree.getPreviousA() == null || tree.getPreviousB() == null) {
+            deletePrevious(match);
         }
 
-        int count = (int) Math.pow(2, size + 1);
-        var fst = split(size - 1, Arrays.copyOfRange(teams, 0, count / 2));
-        var snd = split(size - 1, copyOfRangeReversed(teams, count / 2, count));
-
-        return new Pair<>(concatRev(fst.x, snd.x), concatRev(fst.y, snd.y));
-    }
-
-    private Team[] merge(Team[] teamsA, Team[] teamsB) {
-        if (teamsA.length == 1 && teamsB.length == 1) {
-            return new Team[]{teamsA[0], teamsB[0]};
+        if (match.getDependentOn() != null) {
+            Match a = match.getDependentOn().getPreviousA();
+            updateKnockoutTree(competition, tree.getPreviousA(), a);
+            Match b = match.getDependentOn().getPreviousB();
+            updateKnockoutTree(competition, tree.getPreviousB(), b);
+        } else if (tree.getPreviousA() != null && tree.getPreviousB() != null) {
+            NextMatch nMatch = new NextMatch();
+            Match a = updateKnockoutTree(competition, tree.getPreviousA(), new Match());
+            Match b = updateKnockoutTree(competition, tree.getPreviousB(), new Match());
+            nMatch.setPreviousA(a);
+            nMatch.setPreviousB(b);
+            nMatch.setNextMatch(match);
+            nextMatches.persist(nMatch);
         }
-        int lA = teamsA.length;
-        int lB = teamsB.length;
-
-        Team[] x = merge(Arrays.copyOfRange(teamsA, 0, lA / 2), Arrays.copyOfRange(teamsB, 0, lB / 2));
-        Team[] y = merge(Arrays.copyOfRange(teamsA, lA / 2, lA), Arrays.copyOfRange(teamsB, lB / 2, lB));
 
-        return concat(x, y);
+        return match;
     }
 
-    public record Pair<X, Y>(X x, Y y) {
-    }
-
-    private static Team[] copyOfRangeReversed(Team[] array, int x, int y) {
-        Team[] rev = new Team[y - x];
-        for (int i = 0; i < y - x; i++)
-            rev[i] = array[y - i - 1];
-        return rev;
-    }
-
-    private static Team[] concatRev(Team[] a, Team[] b) {
-        Team[] merge = Arrays.copyOf(a, a.length + b.length);
-        for (int i = 0; i < b.length; i++)
-            merge[i + a.length] = b[b.length - i - 1];
-        return merge;
-    }
-
-    private static Team[] concat(Team[] a, Team[] b) {
-        Team[] merge = Arrays.copyOf(a, a.length + b.length);
-        System.arraycopy(b, 0, merge, a.length, b.length);
-        return merge;
+    private void deletePrevious(Match match) {
+        if (match.getDependentOn() != null) {
+            deletePrevious(match.getDependentOn().getPreviousA());
+            matches.delete(match.getDependentOn().getPreviousA());
+            deletePrevious(match.getDependentOn().getPreviousB());
+            matches.delete(match.getDependentOn().getPreviousB());
+            nextMatches.delete(match.getDependentOn());
+        }
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 5005e186..2016a40b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -12,13 +12,13 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionUpdate;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorGroupsDivision;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorKnockoutOrder;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.group.jUserGroupSystem;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerSignUpForm;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutSystem;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -30,7 +30,10 @@
 import jakarta.ws.rs.core.Response;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Path("/tournament/{tourName}/competition")
@@ -434,23 +437,17 @@ private void checkTournamentAccessibility(String tourName) {
 
     @POST
     @Transactional
-    @RolesAllowed("director")
     @Path("/{compName}/initKnockout")
     @Produces(MediaType.TEXT_PLAIN)
     public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
-                                             @PathParam("compName") String compName, jDirectorKnockoutOrder init) {
+                                             @PathParam("compName") String compName, jUserKnockoutMatch tree) {
         checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
-        int size = (int) Math.max(0, Math.ceil((Math.log(competition.getTeams().size()) / Math.log(2)) - 1));
-        int teamsCount = (int) Math.pow(2, size + 1);
-
-        Team[] teamOrder = init.getTeams().stream()
-            .map(t -> teams.getById(t.getId()))
-            .toArray((i) -> new Team[teamsCount]);
-        if (Arrays.stream(teamOrder).anyMatch(Objects::isNull)) throw new NotFoundException("Player not found");
-
-        knockoutTools.generateKnockoutTree(competition, size, teamOrder);
+        Match finale = matches.getFinal(competition);
+        if (finale == null)
+            finale = new Match();
+        knockoutTools.updateKnockoutTree(competition, tree, finale);
 
         competition.setcProgress(CreationProgress.GAMES);
         competitions.persist(competition);
@@ -460,15 +457,18 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
     @GET
     @Transactional
     @RolesAllowed("director")
-    @Path("/{compName}/knockoutOrder")
+    @Path("/{compName}/knockoutTree")
     @Produces(MediaType.APPLICATION_JSON)
-    public jDirectorKnockoutOrder knockoutOrder(@PathParam("tourName") String tourName,
-                                                @PathParam("compName") String compName) {
+    public jUserKnockoutMatch knockoutTree(@PathParam("tourName") String tourName,
+                                           @PathParam("compName") String compName) {
         checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
-        List<Team> teams = Arrays.stream(knockoutTools.knockoutOrder(competition)).filter(Objects::nonNull).toList();
-        return new jDirectorKnockoutOrder(teams);
+        Match finale = matches.getFinal(competition);
+        if (finale == null)
+            return null;
+
+        return new jUserKnockoutMatch(finale);
     }
 
     @POST
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index e773625d..49a014a9 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -20,6 +20,9 @@ public class jUserMatch {
 
     private List<jUserSet> sets;
 
+    public jUserMatch() {
+    }
+
     public jUserMatch(Match match) {
         this.court = match.getCourt() != null ? match.getCourt().getName() : null;
         this.begin = match.getBegin();
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java
index d281ccbb..14ea5d66 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java
@@ -9,6 +9,9 @@ public class jUserKnockoutMatch extends jUserMatch {
     private jUserKnockoutMatch previousA;
     private jUserKnockoutMatch previousB;
 
+    public jUserKnockoutMatch() {
+    }
+
     public jUserKnockoutMatch(Match match) {
         this(match, true);
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java
deleted file mode 100644
index e34ae3ee..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatchResponse.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.knockout;
-
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public class jUserKnockoutMatchResponse {
-    private String court;
-    private LocalDateTime begin;
-    private LocalDateTime end;
-
-    private Boolean finished;
-    private Boolean winner;
-
-    private String teamA_id;
-    private String teamB_id;
-
-    private boolean winningPlayer;
-    private jUserKnockoutMatchResponse previousA;
-    private jUserKnockoutMatchResponse previousB;
-
-    private List<jUserSet> sets;
-
-    public String getCourt() {
-        return court;
-    }
-
-    public Boolean getFinished() {
-        return finished;
-    }
-
-    public Boolean getWinner() {
-        return winner;
-    }
-
-    public boolean isWinningPlayer() {
-        return winningPlayer;
-    }
-
-    public jUserKnockoutMatchResponse getPreviousA() {
-        return previousA;
-    }
-
-    public jUserKnockoutMatchResponse getPreviousB() {
-        return previousB;
-    }
-
-    public List<jUserSet> getSets() {
-        return sets;
-    }
-
-    public LocalDateTime getBegin() {
-        return begin;
-    }
-
-    public LocalDateTime getEnd() {
-        return end;
-    }
-
-    public String getTeamA_id() {
-        return teamA_id;
-    }
-
-    public String getTeamB_id() {
-        return teamB_id;
-    }
-}
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 4bb12700..8ae830d8 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -113,7 +113,7 @@ async function loadFromServer() {
 	teams.value = []
 	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
 	tree.value = genTree(treeDepth)
-	console.log(tree.value)
+
 	await sleep(firstUpdate ? 0 : 400)
 	firstUpdate = false
 
@@ -319,13 +319,6 @@ function save() {
 		return
 	}
 
-	// const req: KnockoutOrder = {
-	// 	teams: assignedTeams.value
-	// 		.flat()
-	// 		.flat()
-	// 		.map((t) => teamClientToServer(t)),
-	// }
-	// console.log("assignedTeams: ", req)
 	console.log("tree", tree.value)
 	console.log("tree: ", knockoutMatchClientToServer(tree.value))
 	axios
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
index ce831cd1..3278e717 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
@@ -75,7 +75,6 @@ function removeB() {
 }
 
 watch(props, () => {
-	console.log("update")
 	if (teamA.value !== (props.match.teamA ? [props.match.teamA] : []))
 		teamA.value = props.match.teamA ? [props.match.teamA] : []
 	if (teamB.value !== (props.match.teamB ? [props.match.teamB] : []))
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index 9c7139e6..2fbfd0e3 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -33,7 +33,7 @@ const props = withDefaults(
 		ghost?: string
 		single?: boolean
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		wrap?: ((el: any, id: string) => T)
+		wrap?: (el: any, id: string) => T
 	}>(),
 	{
 		componentData: {},
@@ -91,7 +91,11 @@ function create() {
 			if (targetSingle) {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				props.list.splice(event.oldIndex, 1, props.wrap(selectedElement, event.from.id))
+				props.list.splice(
+					event.oldIndex,
+					1,
+					props.wrap(selectedElement, event.from.id),
+				)
 			} else {
 				props.list.splice(event.oldIndex, 1)
 				emit("onRemove")
@@ -106,11 +110,19 @@ function create() {
 			if (props.single && props.list.length === 1) {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				selectedElement = props.list.splice(0, 1, props.wrap(selectedElement, event.from.id))[0]
+				selectedElement = props.list.splice(
+					0,
+					1,
+					props.wrap(selectedElement, event.from.id),
+				)[0]
 			} else {
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				props.list.splice(event.newIndex, 0, props.wrap(selectedElement, event.from.id))
+				props.list.splice(
+					event.newIndex,
+					0,
+					props.wrap(selectedElement, event.from.id),
+				)
 			}
 			reload()
 		},
diff --git a/frontend/app/src/interfaces/knockoutSystem.ts b/frontend/app/src/interfaces/knockoutSystem.ts
index 1ccae5cb..5e521148 100644
--- a/frontend/app/src/interfaces/knockoutSystem.ts
+++ b/frontend/app/src/interfaces/knockoutSystem.ts
@@ -23,8 +23,8 @@ export interface KnockoutMatch extends Match {
 
 export interface KnockoutMatchServer extends MatchServer {
 	winningPlayer: boolean
-	previousA: KnockoutMatchServer | null
-	previousB: KnockoutMatchServer | null
+	previousA: KnockoutMatchServer | undefined
+	previousB: KnockoutMatchServer | undefined
 }
 
 export function knockoutSystemServerToClient(
@@ -50,7 +50,7 @@ function knockoutMatchServerToClient(
 	teams: Map<string, Team>,
 ): KnockoutMatch {
 	const match: KnockoutMatch = matchServerToClient(matchServer, teams)
-	if (matchServer.previousA !== null && matchServer.previousB !== null) {
+	if (matchServer.previousA && matchServer.previousB) {
 		match.prevMatch = {
 			winner: matchServer.winningPlayer,
 			a: knockoutMatchServerToClient(matchServer.previousA, teams),
@@ -64,11 +64,11 @@ export function knockoutMatchClientToServer(
 	match: KnockoutMatch,
 ): KnockoutMatchServer {
 	return {
-		court: match.court ? match.court : "",
-		begin: match.begin ? match.begin.toString() : "2024-04-01T23:15:30",
-		end: match.end ? match.end.toISOString() : "2024-04-01T23:15:30",
+		court: match.court ? match.court : undefined,
+		begin: match.begin ? match.begin.toString() : undefined,
+		end: match.end ? match.end.toISOString() : undefined,
 		finished: match.finished,
-		winner: match.winner,
+		winner: match.winner ? match.winner : undefined,
 		teamA: match.teamA && match.teamA.id ? match.teamA.id : null,
 		teamB: match.teamB && match.teamB.id ? match.teamB.id : null,
 		sets: match.sets ? match.sets : [],
@@ -77,9 +77,9 @@ export function knockoutMatchClientToServer(
 
 		previousA: match.prevMatch?.a
 			? knockoutMatchClientToServer(match.prevMatch.a)
-			: null,
+			: undefined,
 		previousB: match.prevMatch?.b
 			? knockoutMatchClientToServer(match.prevMatch.b)
-			: null,
+			: undefined,
 	}
 }
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index a006f365..8abecf74 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -24,11 +24,11 @@ export interface Match {
 }
 
 export interface MatchServer {
-	court: string
-	begin: string
-	end: string
-	finished: boolean
-	winner: boolean | null
+	court: string | undefined
+	begin: string | undefined
+	end: string | undefined
+	finished: boolean | undefined
+	winner: boolean | undefined
 	teamA: string | null
 	teamB: string | null
 	// TODO add result
@@ -62,11 +62,11 @@ export function matchServerToClient(
 	}
 
 	return {
-		court: match.court,
-		begin: new Date(match.begin),
-		end: new Date(match.end),
-		finished: match.finished,
-		winner: match.winner,
+		court: match.court ? match.court : null,
+		begin: match.begin ? new Date(match.begin) : null,
+		end: match.end ? new Date(match.end) : null,
+		finished: !!match.finished,
+		winner: match.winner ? match.winner : null,
 		teamA: teamA,
 		teamB: teamB,
 		sets: sets,

From 6ae8785dd83b0e4a263cebeabae89cd37e2fd490 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 7 Aug 2024 18:33:10 +0200
Subject: [PATCH 028/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20double=20loading?=
 =?UTF-8?q?=20of=20signed=20up=20in=20knockout=20tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssignMatchesKnockout.vue   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 8ae830d8..65e2c45c 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -87,6 +87,8 @@ const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
+let loadFromServerRunning = false
+let loadFromServerRefresh = false
 let firstUpdate = true
 let treeDepth = 0
 const { data: competition } = getCompetitionDetails(route, t, toast, {
@@ -100,6 +102,7 @@ const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 	t,
 	toast,
 )
+const animated = ref<boolean>(true)
 
 const teams = ref<Team[]>([])
 
@@ -109,6 +112,13 @@ if (!signedUpPlaceholder.value) loadFromServer()
 
 async function loadFromServer() {
 	if (!signedUp.value) return
+	if (loadFromServerRunning) {
+		loadFromServerRefresh = true
+		return
+	}
+	loadFromServerRunning = true
+
+	animated.value = true
 
 	teams.value = []
 	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
@@ -118,6 +128,13 @@ async function loadFromServer() {
 	firstUpdate = false
 
 	signedUp.value.forEach((t) => teams.value.push(t))
+	await sleep(400)
+	animated.value = false
+	if (loadFromServerRefresh) {
+		loadFromServerRefresh = false
+		await loadFromServer()
+	}
+	loadFromServerRunning = false
 }
 
 function genTree(height: number): KnockoutMatch {
@@ -144,8 +161,6 @@ function genTree(height: number): KnockoutMatch {
 	}
 }
 
-const animated = ref<boolean>(true)
-
 const duration = 2000
 const teamCount = ref(0)
 const delay = computed(() =>
@@ -319,8 +334,6 @@ function save() {
 		return
 	}
 
-	console.log("tree", tree.value)
-	console.log("tree: ", knockoutMatchClientToServer(tree.value))
 	axios
 		.post<boolean>(
 			`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,

From a9e73ba0686199dd03a7943ad9dd6dff88a51bec Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 7 Aug 2024 18:50:05 +0200
Subject: [PATCH 029/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Implement=20reset?=
 =?UTF-8?q?=20for=20assign=20knockout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/knockout.ts          | 44 ++++++++++++++-
 .../assignMatches/AssignMatchesKnockout.vue   | 56 ++++++-------------
 .../prepare/assignMatches/ViewMatchEdit.vue   |  4 +-
 3 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/frontend/app/src/backend/knockout.ts b/frontend/app/src/backend/knockout.ts
index 2b8e22f3..8208c217 100644
--- a/frontend/app/src/backend/knockout.ts
+++ b/frontend/app/src/backend/knockout.ts
@@ -3,14 +3,18 @@ import { useQuery } from "vue-query/esm"
 import { computed } from "vue"
 import axios from "axios"
 import {
+	KnockoutMatch,
+	knockoutMatchClientToServer,
 	KnockoutSystemServer,
 	knockoutSystemServerToClient,
 } from "@/interfaces/knockoutSystem"
+import { ToastServiceMethods } from "primevue/toastservice"
+import { useMutation, useQueryClient } from "vue-query"
 
 export function getKnockout(route: RouteLocationNormalizedLoaded) {
 	return useQuery(
 		[
-			"group",
+			"knockout",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
@@ -22,3 +26,41 @@ export function getKnockout(route: RouteLocationNormalizedLoaded) {
 				.then((response) => knockoutSystemServerToClient(response.data)),
 	)
 }
+
+export function useInitKnockout(
+	route: RouteLocationNormalizedLoaded,
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	const queryClient = useQueryClient()
+	return useMutation(async (tree: KnockoutMatch) => {
+		return axios
+			.post<boolean>(
+				`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
+				knockoutMatchClientToServer(tree),
+			)
+			.then(() => {
+				queryClient.invalidateQueries([
+					"signedUp",
+					route.params.tourId,
+					route.params.compId,
+				])
+				toast.add({
+					severity: "success",
+					summary: t("general.success"),
+					detail: t("general.saved"),
+					life: 3000,
+					closable: false,
+				})
+			})
+			.catch(() => {
+				toast.add({
+					severity: "error",
+					summary: t("general.failure"),
+					detail: t("general.save_failed"),
+					life: 3000,
+					closable: false,
+				})
+			})
+	})
+}
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 65e2c45c..072246b6 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -2,7 +2,6 @@
 	<div v-if="competition" class="grid">
 		<div class="col-3 flex flex-column gap-3">
 			<Card>
-				<!-- TODO i18n -->
 				<template #title>
 					<div class="flex flex-row justify-content-between">
 						<div>{{ t("ViewPrepare.assignMatches.teams") }}</div>
@@ -34,7 +33,7 @@
 			<Card class="w-full">
 				<template #title>{{ t("general.tournament_tree") }}</template>
 				<template #content>
-					<ScrollPanel style="width: 100%; height: 1000px">
+					<ScrollPanel style="width: 100%; height: 500px">
 						<ViewKnockoutTree
 							:finale="tree"
 							:border-thickness="2"
@@ -51,6 +50,7 @@
 								<ViewMatchEdit
 									v-if="level === 0"
 									:match="match"
+									:animated="animated"
 									@update:team-a="updateTeamA"
 									@update:team-b="updateTeamB"
 								/>
@@ -72,16 +72,13 @@ import { computed, Ref, ref, watch } from "vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { Team } from "@/interfaces/team"
-import axios from "axios"
-import {
-	KnockoutMatch,
-	knockoutMatchClientToServer,
-} from "@/interfaces/knockoutSystem"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { getSignedUp } from "@/backend/signup"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import ViewMatchEdit from "@/components/views/prepare/assignMatches/ViewMatchEdit.vue"
 import { Match } from "@/interfaces/match"
+import { useInitKnockout } from "@/backend/knockout"
 
 const route = useRoute()
 const toast = useToast()
@@ -102,6 +99,7 @@ const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 	t,
 	toast,
 )
+const { mutate: initKnockout } = useInitKnockout(route, t, toast)
 const animated = ref<boolean>(true)
 
 const teams = ref<Team[]>([])
@@ -232,19 +230,22 @@ async function randomize() {
 		await sleep(delay.value)
 	}
 	animated.value = false
-	console.log(tree.value)
-}
-
-async function reroll() {
-	await reset()
-	await randomize()
 }
 
 async function reset() {
-	// TODO adapt to new structure
 	animated.value = true
+	const matches = getMatches()
+	matches.forEach((m) => {
+		m.teamA = null
+		m.teamB = null
+	})
+	await loadFromServer()
+	await sleep(400)
+}
 
-	animated.value = false
+async function reroll() {
+	await reset()
+	await randomize()
 }
 
 // TODO adapt to new structure
@@ -322,7 +323,6 @@ function knockoutTreeCompletelyAssigned(): boolean {
 }
 
 function save() {
-	// TODO send new save as a tree?
 	if (!knockoutTreeCompletelyAssigned()) {
 		toast.add({
 			severity: "error",
@@ -334,29 +334,7 @@ function save() {
 		return
 	}
 
-	axios
-		.post<boolean>(
-			`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
-			knockoutMatchClientToServer(tree.value),
-		)
-		.then(() => {
-			toast.add({
-				severity: "success",
-				summary: t("general.success"),
-				detail: t("general.saved"),
-				life: 3000,
-				closable: false,
-			})
-		})
-		.catch(() => {
-			toast.add({
-				severity: "error",
-				summary: t("general.failure"),
-				detail: t("general.save_failed"),
-				life: 3000,
-				closable: false,
-			})
-		})
+	initKnockout(tree.value)
 }
 
 defineExpose({ save })
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
index 3278e717..70d55146 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
@@ -6,6 +6,7 @@
 				:component-data="{
 					tag: 'div',
 					type: 'transition',
+					name: props.animated ? 'playerList' : 'default',
 				}"
 				:list="teamA"
 				:tag="TransitionGroup"
@@ -27,6 +28,7 @@
 				:component-data="{
 					tag: 'div',
 					type: 'transition',
+					name: props.animated ? 'playerList' : 'default',
 				}"
 				:list="teamB"
 				:tag="TransitionGroup"
@@ -53,7 +55,7 @@ import TeamCard from "@/components/views/prepare/components/TeamCard.vue"
 import MatchBox from "@/components/views/prepare/components/MatchBox.vue"
 import { Team } from "@/interfaces/team"
 
-const props = defineProps<{ match: KnockoutMatch }>()
+const props = defineProps<{ match: KnockoutMatch; animated: boolean }>()
 const emit = defineEmits(["update:teamA", "update:teamB"])
 
 const teamA = ref<Team[]>([])

From 67dfca4d259bba636db6baf5015c1ce7d32d7097 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 8 Aug 2024 00:33:34 +0200
Subject: [PATCH 030/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Implement=20saving?=
 =?UTF-8?q?=20and=20loading=20for=20assign=20knockout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/KnockoutTools.java |   2 +-
 .../resources/CompetitionResource.java        |  23 +---
 .../user/knockout/jUserKnockoutSystem.java    |  16 ++-
 frontend/app/src/backend/knockout.ts          |  10 +-
 .../assignMatches/AssignMatchesGroups.vue     |   2 +-
 .../assignMatches/AssignMatchesKnockout.vue   | 121 +++++-------------
 frontend/app/src/interfaces/knockoutSystem.ts |  20 +--
 7 files changed, 65 insertions(+), 129 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index c06f1080..9be64deb 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -23,7 +23,7 @@ public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree
             return null;
         }
         match.setTeamA(Team.findById(tree.getTeamA()));
-        match.setTeamB(Team.findById(tree.getTeamA()));
+        match.setTeamB(Team.findById(tree.getTeamB()));
 
         match.setFinished(false);
         match.setCompetition(competition);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 2016a40b..66ff442c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -397,13 +397,13 @@ public jUserKnockoutSystem getKnockoutMatches(@PathParam("tourName") String tour
         checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
-        if (competition == null) throw new NotFoundException("Could not found competition");
+        if (competition == null) throw new NotFoundException("Could not find competition");
         if (competition.getType() != CompetitionType.KNOCKOUT)
             throw new WebApplicationException("Competition does not have type knockout", Response.Status.METHOD_NOT_ALLOWED);
 
         Match finale = matches.getFinal(competition);
         Match thirdPlace = matches.getThirdPlace(competition);
-        return new jUserKnockoutSystem(finale, thirdPlace);
+        return new jUserKnockoutSystem(finale, thirdPlace, securityIdentity.hasRole("director"));
     }
 
     @GET
@@ -437,6 +437,7 @@ private void checkTournamentAccessibility(String tourName) {
 
     @POST
     @Transactional
+    @RolesAllowed("director")
     @Path("/{compName}/initKnockout")
     @Produces(MediaType.TEXT_PLAIN)
     public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
@@ -448,29 +449,13 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         if (finale == null)
             finale = new Match();
         knockoutTools.updateKnockoutTree(competition, tree, finale);
+        // TODO third place
 
         competition.setcProgress(CreationProgress.GAMES);
         competitions.persist(competition);
         return true;
     }
 
-    @GET
-    @Transactional
-    @RolesAllowed("director")
-    @Path("/{compName}/knockoutTree")
-    @Produces(MediaType.APPLICATION_JSON)
-    public jUserKnockoutMatch knockoutTree(@PathParam("tourName") String tourName,
-                                           @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
-
-        Competition competition = competitions.getByName(tourName, compName);
-        Match finale = matches.getFinal(competition);
-        if (finale == null)
-            return null;
-
-        return new jUserKnockoutMatch(finale);
-    }
-
     @POST
     @Transactional
     @RolesAllowed("director")
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
index b3a78233..ac4e4448 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
@@ -13,16 +13,18 @@ public class jUserKnockoutSystem {
     private jUserKnockoutMatch finale;
     private jUserKnockoutMatch thirdPlace;
 
-    public jUserKnockoutSystem(Match finale, Match thirdPlace) {
-        if (finale == null)
+    public jUserKnockoutSystem(Match finale, Match thirdPlace, boolean nullable) {
+        if (finale == null && !nullable)
             throw new NotFoundException("Finale was not found");
-        if (thirdPlace == null)
+        if (thirdPlace == null && !nullable)
             throw new NotFoundException("Game for third place was not found");
 
         Set<Team> teams = new HashSet<>();
         Queue<Match> matchQueue = new ArrayDeque<>();
-        matchQueue.add(finale);
-        matchQueue.add(thirdPlace);
+        if (finale != null)
+            matchQueue.add(finale);
+        if (thirdPlace != null)
+            matchQueue.add(thirdPlace);
         Match match;
         while ((match = matchQueue.poll()) != null) {
             teams.add(match.getTeamA());
@@ -33,8 +35,8 @@ public jUserKnockoutSystem(Match finale, Match thirdPlace) {
             }
         }
         this.teams = teams.stream().filter(Objects::nonNull).map(jUserTeam::new).toList();
-        this.finale = new jUserKnockoutMatch(finale);
-        this.thirdPlace = new jUserKnockoutMatch(thirdPlace, false);
+        this.finale = finale == null ? null : new jUserKnockoutMatch(finale);
+        this.thirdPlace = thirdPlace == null ? null : new jUserKnockoutMatch(thirdPlace, false);
     }
 
     public List<jUserTeam> getTeams() {
diff --git a/frontend/app/src/backend/knockout.ts b/frontend/app/src/backend/knockout.ts
index 8208c217..549d86bf 100644
--- a/frontend/app/src/backend/knockout.ts
+++ b/frontend/app/src/backend/knockout.ts
@@ -33,15 +33,15 @@ export function useInitKnockout(
 	toast: ToastServiceMethods,
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(async (tree: KnockoutMatch) => {
-		return axios
+	return useMutation(async (tree: KnockoutMatch) =>
+		axios
 			.post<boolean>(
 				`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
 				knockoutMatchClientToServer(tree),
 			)
 			.then(() => {
 				queryClient.invalidateQueries([
-					"signedUp",
+					"knockout",
 					route.params.tourId,
 					route.params.compId,
 				])
@@ -61,6 +61,6 @@ export function useInitKnockout(
 					life: 3000,
 					closable: false,
 				})
-			})
-	})
+			}),
+	)
 }
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 79d3676e..efa90212 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -222,7 +222,7 @@ async function loadFromServer() {
 }
 
 watch([signedUpTeams, groupsServer], loadFromServer)
-if (!signedUpPlaceholder.value && !groupsServer.value) loadFromServer()
+if (!signedUpPlaceholder.value && groupsServer.value) loadFromServer()
 
 function save() {
 	if (disabled.value) return
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 072246b6..c9712263 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -54,7 +54,7 @@
 									@update:team-a="updateTeamA"
 									@update:team-b="updateTeamB"
 								/>
-								<ViewMatch v-else :match="match" :mode="competition.mode" />
+								<ViewMatch v-else :match="match" :mode="Mode.SINGLE" />
 							</template>
 						</ViewKnockoutTree>
 					</ScrollPanel>
@@ -78,72 +78,83 @@ import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/View
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import ViewMatchEdit from "@/components/views/prepare/assignMatches/ViewMatchEdit.vue"
 import { Match } from "@/interfaces/match"
-import { useInitKnockout } from "@/backend/knockout"
+import { getKnockout, useInitKnockout } from "@/backend/knockout"
+import { Mode } from "@/interfaces/competition"
 
 const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
+// TODO refactoring for the whole file for smoother loading and clearer code
+
 let loadFromServerRunning = false
 let loadFromServerRefresh = false
 let firstUpdate = true
 let treeDepth = 0
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-		loadFromServer()
-	},
-})
+const { data: competition } = getCompetitionDetails(route, t, toast, {})
 const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 	route,
 	t,
 	toast,
 )
+const { data: knockoutSystem } = getKnockout(route)
 const { mutate: initKnockout } = useInitKnockout(route, t, toast)
 const animated = ref<boolean>(true)
 
 const teams = ref<Team[]>([])
 
-const tree = ref(genTree(0))
-watch([signedUp], loadFromServer)
-if (!signedUpPlaceholder.value) loadFromServer()
+const tree = ref(
+	genTree(treeDepth, knockoutSystem.value ? knockoutSystem.value.finale : null),
+)
+watch([signedUp, competition, knockoutSystem], loadFromServer)
+// if (!signedUpPlaceholder.value && knockoutSystem.value) loadFromServer()
 
 async function loadFromServer() {
-	if (!signedUp.value) return
+	if (!signedUp.value || signedUpPlaceholder.value || !knockoutSystem.value)
+		return
+
 	if (loadFromServerRunning) {
 		loadFromServerRefresh = true
 		return
 	}
 	loadFromServerRunning = true
+	loadFromServerRefresh = false
 
 	animated.value = true
-
-	teams.value = []
 	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
-	tree.value = genTree(treeDepth)
-
+	teams.value = []
+	tree.value = genTree(treeDepth, null)
 	await sleep(firstUpdate ? 0 : 400)
 	firstUpdate = false
-
+	tree.value = genTree(
+		treeDepth,
+		knockoutSystem.value ? knockoutSystem.value.finale : null,
+	)
 	signedUp.value.forEach((t) => teams.value.push(t))
+	getMatches().forEach((m) => {
+		teams.value = teams.value.filter(
+			(t) => t.id !== m.teamA?.id && t.id !== m.teamB?.id,
+		)
+	})
 	await sleep(400)
 	animated.value = false
+
+	loadFromServerRunning = false
 	if (loadFromServerRefresh) {
 		loadFromServerRefresh = false
 		await loadFromServer()
 	}
-	loadFromServerRunning = false
 }
 
-function genTree(height: number): KnockoutMatch {
+function genTree(height: number, tree: KnockoutMatch | null): KnockoutMatch {
 	const default_game = {
 		court: null,
 		begin: null,
 		end: null,
 		finished: false,
 		winner: null,
-		teamA: null,
-		teamB: null,
+		teamA: tree ? tree.teamA : null,
+		teamB: tree ? tree.teamB : null,
 		sets: null,
 		curGame: null,
 	}
@@ -153,8 +164,8 @@ function genTree(height: number): KnockoutMatch {
 		...default_game,
 		prevMatch: {
 			winner: true,
-			a: genTree(height - 1),
-			b: genTree(height - 1),
+			a: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.a : null),
+			b: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.b : null),
 		},
 	}
 }
@@ -248,70 +259,6 @@ async function reroll() {
 	await randomize()
 }
 
-// TODO adapt to new structure
-// async function update() {
-// 	animated.value = true
-// 	teams.value = []
-// 	while (assignedTeams.value.length > 0) {
-// 		assignedTeams.value.pop()
-// 	}
-// 	// const anFin = sleep(firstUpdate ? 0 : 500)
-// 	firstUpdate = false
-// 	teamCount.value = 0
-// 	if (
-// 		competition.value?.cProgress === Progress.GAMES ||
-// 		competition.value?.cProgress === Progress.SCHEDULING
-// 	) {
-// 		axios
-// 			.get<KnockoutOrder>(
-// 				`tournament/${route.params.tourId}/competition/${route.params.compId}/knockoutOrder`,
-// 			)
-// 			.then(async (response) => {
-// 				let sortedTeams = response.data.teams.map((t) => teamServerToClient(t))
-// 				teamCount.value += sortedTeams.length
-// 				// initialize the knockout order
-// 				for (let i = 0; i < nearestPowerOf2(sortedTeams.length) / 2; i++) {
-// 					assignedTeams.value.push([
-// 						[sortedTeams[i * 2]],
-// 						[sortedTeams[i * 2 + 1]],
-// 					])
-// 				}
-// 				animated.value = false
-// 			})
-// 			.catch(() => {})
-// 	} else {
-// 		axios
-// 			.get<Team[]>(
-// 				`tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
-// 			)
-// 			.then(async (response) => {
-// 				// await anFin
-// 				response.data.forEach((team) => {
-// 					teams.value.push(teamServerToClient(team))
-// 					teamCount.value++
-// 				})
-// 				// await sleep(500)
-// 				if (competition.value?.cProgress === Progress.TEAMS) {
-// 					for (let i = 0; i < nearestPowerOf2(teams.value.length) / 2; i++) {
-// 						assignedTeams.value.push([[], []])
-// 					}
-// 				}
-// 				animated.value = false
-// 			})
-// 			.catch((error) => {
-// 				console.log(error)
-// 			})
-// 	}
-// }
-
-// function nearestPowerOf2(n: number): number {
-// 	return 1 << (31 - Math.clz32(n))
-// }
-
-// const size = computed(() =>
-// 	Math.max(0, Math.ceil(Math.log2(teamCount.value)) - 1),
-// )
-
 function knockoutTreeCompletelyAssigned(): boolean {
 	// check that tree is completely assigned
 	const check = (m: KnockoutMatch): boolean => {
diff --git a/frontend/app/src/interfaces/knockoutSystem.ts b/frontend/app/src/interfaces/knockoutSystem.ts
index 5e521148..37477196 100644
--- a/frontend/app/src/interfaces/knockoutSystem.ts
+++ b/frontend/app/src/interfaces/knockoutSystem.ts
@@ -1,14 +1,13 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
-import { Team } from "@/interfaces/team"
+import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 
 export interface KnockoutSystem {
-	teams: Team[]
-	finale: KnockoutMatch
-	thirdPlace: KnockoutMatch
+	finale: KnockoutMatch | null
+	thirdPlace: KnockoutMatch | null
 }
 
 export interface KnockoutSystemServer {
-	teams: Team[]
+	teams: TeamServer[]
 	finale: KnockoutMatchServer
 	thirdPlace: KnockoutMatchServer
 }
@@ -36,12 +35,15 @@ export function knockoutSystemServerToClient(
 			console.error("Team without id:", team)
 			return
 		}
-		teams.set(team.id, team)
+		teams.set(team.id, teamServerToClient(team))
 	})
 	return {
-		teams: knockoutSystem.teams,
-		finale: knockoutMatchServerToClient(knockoutSystem.finale, teams),
-		thirdPlace: knockoutMatchServerToClient(knockoutSystem.thirdPlace, teams),
+		finale: knockoutSystem.finale
+			? knockoutMatchServerToClient(knockoutSystem.finale, teams)
+			: null,
+		thirdPlace: knockoutSystem.thirdPlace
+			? knockoutMatchServerToClient(knockoutSystem.thirdPlace, teams)
+			: null,
 	}
 }
 

From 155c124a1bbc53b78ee0d97d8c977d0ba3c9d779 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 17 Aug 2024 13:44:15 +0200
Subject: [PATCH 031/247] =?UTF-8?q?=E2=9C=A8=20Also=20generate=20third=20p?=
 =?UTF-8?q?lace=20match?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/KnockoutTools.java | 38 +++++++++++++++++++
 .../resources/CompetitionResource.java        |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 9be64deb..e9777167 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -47,11 +47,49 @@ public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree
             nMatch.setPreviousB(b);
             nMatch.setNextMatch(match);
             nextMatches.persist(nMatch);
+            match.setDependentOn(nMatch);
         }
 
         return match;
     }
 
+    public void updateThirdPlace(Competition competition, Match finale) {
+        Match thirdPlace = matches.getThirdPlace(competition);
+
+        // cover deletion of third place
+        if (finale.getDependentOn() == null) {
+            if (thirdPlace != null) {
+                nextMatches.delete(thirdPlace.getDependentOn());
+                matches.delete(thirdPlace);
+            }
+
+            return;
+        }
+
+        if (thirdPlace == null) {
+            // create third place if didn't exist before
+            thirdPlace = new Match();
+            thirdPlace.setCompetition(competition);
+            NextMatch nMatch = new NextMatch();
+            nMatch.setWinner(false);
+            nMatch.setNextMatch(thirdPlace);
+
+            nMatch.setPreviousA(finale.getDependentOn().getPreviousA());
+            nMatch.setPreviousB(finale.getDependentOn().getPreviousB());
+
+            matches.persist(thirdPlace);
+            nextMatches.persist(nMatch);
+        } else {
+            // update third place if already existing
+            NextMatch nMatch = thirdPlace.getDependentOn();
+
+            nMatch.setPreviousA(finale.getDependentOn().getPreviousA());
+            nMatch.setPreviousB(finale.getDependentOn().getPreviousB());
+
+            nextMatches.persist(nMatch);
+        }
+    }
+
     private void deletePrevious(Match match) {
         if (match.getDependentOn() != null) {
             deletePrevious(match.getDependentOn().getPreviousA());
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 66ff442c..79199087 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -449,7 +449,7 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         if (finale == null)
             finale = new Match();
         knockoutTools.updateKnockoutTree(competition, tree, finale);
-        // TODO third place
+        knockoutTools.updateThirdPlace(competition, finale);
 
         competition.setcProgress(CreationProgress.GAMES);
         competitions.persist(competition);

From 942a76d2faa153fb26c0ed66bce0f94532b219d2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 17 Aug 2024 13:51:14 +0200
Subject: [PATCH 032/247] =?UTF-8?q?=E2=9C=A8=20Show=20third=20place=20if?=
 =?UTF-8?q?=20more=20than=202=20players=20signed=20up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/knockoutSystem/ViewKnockoutSystem.vue  | 4 ++--
 .../views/prepare/assignMatches/AssignMatchesKnockout.vue    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 5e78c2d5..0b927cf0 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -2,8 +2,8 @@
 	<p>Knockout system</p>
 	<template v-if="knockoutSystem">
 		<ViewKnockoutTree
-			:finale="knockoutSystem.finale"
-			:third-place="knockoutSystem.thirdPlace"
+			:finale="knockoutSystem.finale ?? undefined"
+			:third-place="knockoutSystem.thirdPlace ?? undefined"
 			:border-radius="0"
 			:border-thickness="2"
 			:margin-small="30"
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index c9712263..17858f4c 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -36,6 +36,7 @@
 					<ScrollPanel style="width: 100%; height: 500px">
 						<ViewKnockoutTree
 							:finale="tree"
+							:third-place="thirdPlace"
 							:border-thickness="2"
 							:border-radius="0"
 						>
@@ -106,6 +107,10 @@ const teams = ref<Team[]>([])
 const tree = ref(
 	genTree(treeDepth, knockoutSystem.value ? knockoutSystem.value.finale : null),
 )
+const thirdPlace = computed(() => {
+	if (signedUp.value && signedUp.value.length > 2) return genTree(0, null)
+	else return null
+})
 watch([signedUp, competition, knockoutSystem], loadFromServer)
 // if (!signedUpPlaceholder.value && knockoutSystem.value) loadFromServer()
 

From 72f4f9a2818ca22a4d0642c78d09d05bb87a275d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 00:27:28 +0200
Subject: [PATCH 033/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Layout=20refactori?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/ViewPrepareMatches.vue      | 53 +++++++++----------
 .../views/prepare/ViewScheduleMatches.vue     | 40 ++++++++++----
 .../assignMatches/AssignMatchesKnockout.vue   |  2 +-
 .../assignMatches/ViewAssignMatches.vue       | 18 ++-----
 4 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index e4a3a5ec..51c792c7 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -1,31 +1,29 @@
 <template>
-	<div id="button">
-		<Card class="w-12">
-			<template #header>
-				<TabMenu
-					:active-index="activeTab"
-					:model="competitions || []"
-					@tab-change="tabChange"
-				>
-					<template #item="{ item, props }">
-						<div v-bind="props.action" class="cursor-pointer">
-							<span v-bind="props.label">{{ item.name }}</span>
-						</div>
-					</template>
-				</TabMenu>
-				<Steps
-					:active-step="<number>route.meta.step - 1"
-					:model="stepList"
-					:readonly="true"
-					class="mt-5"
-				>
-				</Steps>
-			</template>
-			<template #content>
-				<router-view />
-			</template>
-		</Card>
-	</div>
+	<Card class="w-full m-2" style="margin-top: -10px !important">
+		<template #header>
+			<TabMenu
+				:active-index="activeTab"
+				:model="competitions || []"
+				@tab-change="tabChange"
+			>
+				<template #item="{ item, props }">
+					<div v-bind="props.action" class="cursor-pointer">
+						<span v-bind="props.label">{{ item.name }}</span>
+					</div>
+				</template>
+			</TabMenu>
+			<Steps
+				:active-step="<number>route.meta.step - 1"
+				:model="stepList"
+				:readonly="true"
+				class="mt-5"
+			>
+			</Steps>
+		</template>
+		<template #content>
+			<router-view />
+		</template>
+	</Card>
 </template>
 
 <script setup lang="ts">
@@ -139,6 +137,7 @@ const stepList = ref([
 	flex-wrap: wrap;
 	flex-direction: row;
 	justify-content: center;
+	overflow: hidden;
 }
 
 ::v-deep(b) {
diff --git a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
index 224bef01..5d5009ca 100644
--- a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
@@ -1,15 +1,34 @@
 <template>
-	Schedule matches: {{ competition?.name }}
+	<div class="flex flex-column gap-1">
+		<div class="grid">
+			<div class="col-4">
+				<Card>
+					<template #title>Matches</template>
+					<template #content>
+						<MatchesContainerDraggable :competition="competition" />
+					</template>
+				</Card>
+			</div>
+			<div class="col-8">
+				<Card>
+					<template #title>Calendar</template>
+					<template #content>
+						The calendar should be shown here
+					</template>
+				</Card>
+			</div>
+		</div>
 
-	<div class="grid grid-nogutter justify-content-between mt-4">
-		<Button label="Back" icon="pi pi-angle-left" @click="prevPage" />
-		<Button
-			label="Complete"
-			icon="pi pi-check"
-			icon-pos="right"
-			class="p-button-success"
-			@click="complete"
-		/>
+		<div class="grid grid-nogutter justify-content-between mt-4">
+			<Button label="Back" icon="pi pi-angle-left" @click="prevPage" />
+			<Button
+				label="Complete"
+				icon="pi pi-check"
+				icon-pos="right"
+				class="p-button-success"
+				@click="complete"
+			/>
+		</div>
 	</div>
 </template>
 
@@ -18,6 +37,7 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
+import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
 
 const route = useRoute()
 const router = useRouter()
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 17858f4c..ea3bac18 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -36,7 +36,7 @@
 					<ScrollPanel style="width: 100%; height: 500px">
 						<ViewKnockoutTree
 							:finale="tree"
-							:third-place="thirdPlace"
+							:third-place="thirdPlace ?? undefined"
 							:border-thickness="2"
 							:border-radius="0"
 						>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index 13cff658..5fbdbcfc 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -1,19 +1,9 @@
 <template>
 	<div class="flex flex-column gap-1">
-		<div
-			v-if="competition"
-			class="flex flex-row overflow-hidden"
-			style="flex-wrap: nowrap"
-		>
-			<Transition>
-				<Groups
-					v-if="competition.tourType === TourType.GROUPS"
-					ref="groupsRef"
-					class="w-full flex-shrink-0"
-				/>
-				<Knockout v-else ref="knockoutRef" class="w-full flex-shrink-0" />
-			</Transition>
-		</div>
+		<Transition v-if="competition">
+			<Groups v-if="competition.tourType === TourType.GROUPS" ref="groupsRef" />
+			<Knockout v-else ref="knockoutRef" />
+		</Transition>
 
 		<div class="grid grid-nogutter justify-content-between mt-4">
 			<Button

From 6a0aec24d6a72997c4c4f80c536163098c0301d0 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 01:14:15 +0200
Subject: [PATCH 034/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Streamline=20prepa?=
 =?UTF-8?q?re=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/signup.ts            |  2 +-
 .../views/prepare/ViewEditCompetition.vue     | 40 +++------
 .../views/prepare/ViewPrepareMatches.vue      | 83 ++++++++++++++++---
 .../views/prepare/ViewScheduleMatches.vue     | 37 ++++-----
 .../assignMatches/AssignMatchesGroups.vue     | 35 ++++----
 .../assignMatches/AssignMatchesKnockout.vue   | 17 ++--
 .../assignMatches/ViewAssignMatches.vue       | 32 ++-----
 .../views/prepare/editTeams/ViewEditTeams.vue | 33 +-------
 frontend/app/src/routes.ts                    |  8 +-
 9 files changed, 141 insertions(+), 146 deletions(-)

diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index 696e5410..c8bc5768 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -168,7 +168,7 @@ export function useUpdateTeams(
 ) {
 	const queryClient = useQueryClient()
 	return useMutation(
-		async (req) => {
+		async (req: TeamServer[]) => {
 			return axios.post(
 				`/tournament/${route.params.tourId}/competition/${route.params.compId}/updateTeams`,
 				req,
diff --git a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
index f10fc386..aab7c0c2 100644
--- a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
@@ -3,43 +3,21 @@
 		<Card id="card">
 			<template #content>
 				<FormCompetition
-					v-if="!competition || reload"
+					v-if="!competition || isUpdating"
 					:competition="CompetitionDefault"
 					:disabled="true"
-					@submit="submit"
+					@submit="save"
 				/>
 				<FormCompetition
 					v-else
 					ref="form"
 					:competition="competition"
 					:disabled="false"
-					@submit="submit"
+					@submit="save"
 				/>
 			</template>
 		</Card>
 	</div>
-
-	<div class="mt-5 grid grid-nogutter justify-content-between">
-		<Button
-			:disabled="true"
-			:label="t('general.back')"
-			icon="pi pi-angle-left"
-			icon-pos="left"
-		/>
-		<Button
-			:disabled="competition === null"
-			:label="t('general.save')"
-			severity="success"
-			@click="() => form !== null && form.onSubmit()"
-		/>
-		<Button
-			v-if="route.params.step !== 'scheduleMatches'"
-			:label="t('general.next')"
-			icon="pi pi-angle-right"
-			icon-pos="right"
-			@click="nextPage"
-		/>
-	</div>
 </template>
 
 <script lang="ts" setup>
@@ -51,7 +29,6 @@ import { CompetitionDefault, CompetitionServer } from "@/interfaces/competition"
 import { getCompetitionDetails, updateCompetition } from "@/backend/competition"
 import { useToast } from "primevue/usetoast"
 import { ref } from "vue"
-import Button from "primevue/button"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
@@ -59,23 +36,24 @@ const toast = useToast()
 const route = useRoute()
 const form = ref<InstanceType<typeof FormCompetition> | null>(null)
 
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
+
 function sleep(milliseconds: number) {
 	return new Promise((resolve) => setTimeout(resolve, milliseconds))
 }
 
-const reload = ref(false)
 const { data: competition } = getCompetitionDetails(route, t, toast, {
 	suc: async () => {
-		reload.value = true
+		isUpdating.value = true
 		await sleep(100)
-		reload.value = false
+		isUpdating.value = false
 	},
 	err: () => {
 		router.back()
 	},
 })
 
-function submit(server_data: CompetitionServer) {
+function save(server_data: CompetitionServer) {
 	updateCompetition(server_data, <string>route.params.tourId, t, toast, {})
 }
 
@@ -85,6 +63,8 @@ function nextPage() {
 		params: { tourId: route.params.tourId, compId: route.params.compId },
 	})
 }
+
+defineExpose({ save, nextPage })
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 51c792c7..b9a5249c 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -21,7 +21,56 @@
 			</Steps>
 		</template>
 		<template #content>
-			<router-view />
+			<router-view v-slot="{ Component }">
+				<component
+					:is="Component"
+					ref="curPrepStep"
+					v-model:is-updating="isUpdating"
+				/>
+			</router-view>
+
+			<div class="mt-2 grid grid-nogutter justify-content-between">
+				<Button
+					:style="{
+						visibility: route.meta.step !== 1 ? 'visible' : 'hidden',
+					}"
+					:disabled="route.meta.step === 1 || isUpdating"
+					:label="t('general.back')"
+					icon="pi pi-angle-left"
+					icon-pos="left"
+					@click="prevPage"
+				/>
+				<Button
+					v-if="route.meta.reset"
+					:disabled="isUpdating"
+					:label="t('general.reset')"
+					severity="danger"
+					@click="reset"
+				/>
+				<Button
+					:disabled="isUpdating"
+					:label="t('general.save')"
+					severity="success"
+					@click="save"
+				/>
+				<Button
+					v-if="route.meta.step !== 4"
+					:disabled="isUpdating"
+					icon="pi pi-angle-right"
+					icon-pos="right"
+					:label="t('general.next')"
+					@click="nextPage"
+				/>
+				<Button
+					v-else
+					:disabled="isUpdating"
+					label="Complete"
+					icon="pi pi-check"
+					icon-pos="right"
+					class="p-button-success"
+					@click="nextPage"
+				/>
+			</div>
 		</template>
 	</Card>
 </template>
@@ -35,6 +84,8 @@ import { TabMenuChangeEvent } from "primevue/tabmenu"
 import { getCompetitionsList } from "@/backend/competition"
 import Steps from "primevue/steps"
 import { Progress } from "@/interfaces/competition"
+import Button from "primevue/button"
+import ViewEditTeams from "@/components/views/prepare/editTeams/ViewEditTeams.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
@@ -46,6 +97,9 @@ const router = useRouter()
 const route = useRoute()
 const toast = useToast()
 
+const isUpdating = ref(false)
+const curPrepStep = ref<InstanceType<typeof ViewEditTeams> | null>()
+
 const isLoggedIn = inject("loggedIn", ref(false))
 const { data: competitions } = getCompetitionsList(
 	route,
@@ -104,7 +158,22 @@ function tabChange(event: TabMenuChangeEvent) {
 	updateRoute(competitions.value[event.index].name)
 }
 
-// TODO internalization
+function prevPage() {
+	if (curPrepStep.value) curPrepStep.value.prevPage()
+}
+
+function reset() {
+	if (curPrepStep.value) curPrepStep.value.reset()
+}
+
+function save() {
+	if (curPrepStep.value) curPrepStep.value.save()
+}
+
+function nextPage() {
+	if (curPrepStep.value) curPrepStep.value.nextPage()
+}
+
 const stepList = ref([
 	{
 		label: $t("ViewPrepare.steps.settings"),
@@ -130,16 +199,6 @@ const stepList = ref([
 </script>
 
 <style scoped>
-#button {
-	width: 100%;
-	margin: -10px 10px 10px 10px;
-	display: flex;
-	flex-wrap: wrap;
-	flex-direction: row;
-	justify-content: center;
-	overflow: hidden;
-}
-
 ::v-deep(b) {
 	display: block;
 }
diff --git a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
index 5d5009ca..02cc25b7 100644
--- a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
@@ -4,31 +4,16 @@
 			<div class="col-4">
 				<Card>
 					<template #title>Matches</template>
-					<template #content>
-						<MatchesContainerDraggable :competition="competition" />
-					</template>
+					<template #content> We show the matches here </template>
 				</Card>
 			</div>
 			<div class="col-8">
 				<Card>
 					<template #title>Calendar</template>
-					<template #content>
-						The calendar should be shown here
-					</template>
+					<template #content> The calendar should be shown here </template>
 				</Card>
 			</div>
 		</div>
-
-		<div class="grid grid-nogutter justify-content-between mt-4">
-			<Button label="Back" icon="pi pi-angle-left" @click="prevPage" />
-			<Button
-				label="Complete"
-				icon="pi pi-check"
-				icon-pos="right"
-				class="p-button-success"
-				@click="complete"
-			/>
-		</div>
 	</div>
 </template>
 
@@ -37,13 +22,13 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
-import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
 
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 const { data: competition } = getCompetitionDetails(route, t, toast, {
 	suc: () => {
 		if (competition.value === null) return
@@ -57,7 +42,7 @@ function prevPage() {
 	})
 }
 
-function complete() {
+function nextPage() {
 	// TODO
 	toast.add({
 		severity: "success",
@@ -66,6 +51,20 @@ function complete() {
 		life: 3000,
 	})
 }
+
+function save() {
+	// TODO
+	isUpdating.value = true
+	toast.add({
+		severity: "success",
+		summary: "Scheduling saved",
+		detail: "TODO",
+		life: 3000,
+	})
+	isUpdating.value = false
+}
+
+defineExpose({ prevPage, save, nextPage })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index efa90212..250f8817 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -7,7 +7,7 @@
 						<div>Teams</div>
 						<SplitButton
 							:model="randomizeItems"
-							:disabled="disabled"
+							:disabled="isUpdating"
 							class="w-fit"
 							:label="t('ViewPrepare.editTeams.randomize')"
 							@click="randomize"
@@ -23,7 +23,7 @@
 				<template #content>
 					<TeamContainerDraggable
 						v-if="competition"
-						:animated="animated"
+						:animated="isUpdating"
 						:teams="teams"
 						:competition="competition"
 					/>
@@ -38,7 +38,7 @@
 				<template #content>
 					<TeamContainerDraggable
 						v-if="competition"
-						:animated="animated"
+						:animated="isUpdating"
 						:teams="group"
 						:competition="competition"
 					/>
@@ -47,7 +47,7 @@
 			<div class="flex flex-row gap-2">
 				<Button
 					:label="t('ViewPrepare.assignMatches.remove')"
-					:disabled="noGroups <= 2 || disabled"
+					:disabled="noGroups <= 2 || isUpdating"
 					severity="danger"
 					@click="
 						() => {
@@ -58,7 +58,7 @@
 				></Button>
 				<Button
 					:label="t('ViewPrepare.assignMatches.add')"
-					:disabled="noGroups >= 64 || disabled"
+					:disabled="noGroups >= 64 || isUpdating"
 					severity="success"
 					@click="
 						() => {
@@ -106,8 +106,7 @@ const noGroups = ref<number>(2)
 
 const teams = ref<Team[]>([])
 const groups = ref<Team[][]>([[], []])
-const disabled = ref<boolean>(false)
-const animated = ref<boolean>(false)
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const duration = 2000
 const teamCount = ref(0)
@@ -121,7 +120,7 @@ function sleep(milliseconds: number) {
 }
 
 function adjustSize(size: number) {
-	disabled.value = true
+	isUpdating.value = true
 	if (groups.value.length > size) {
 		for (let i = size; i < groups.value.length; i++) {
 			groups.value[i].forEach((e) => teams.value.push(e))
@@ -134,7 +133,7 @@ function adjustSize(size: number) {
 			...Array.from({ length: size - groups.value.length }, () => []),
 		)
 	}
-	disabled.value = false
+	isUpdating.value = false
 }
 
 const randomizeItems = ref([
@@ -159,7 +158,7 @@ function selectRandomElement<T>(players: Ref<T[]>) {
 }
 
 async function randomize() {
-	animated.value = true
+	isUpdating.value = true
 	while (teams.value.length) {
 		const min = Math.min(...groups.value.map((group) => group.length))
 		const minInd = groups.value.findIndex((group) => group.length === min)
@@ -169,7 +168,7 @@ async function randomize() {
 		groups.value[minInd].push(element)
 		await sleep(delay.value)
 	}
-	animated.value = false
+	isUpdating.value = false
 }
 
 async function reroll() {
@@ -178,7 +177,7 @@ async function reroll() {
 }
 
 async function reset() {
-	animated.value = true
+	isUpdating.value = true
 	for (const group of groups.value) {
 		while (group.length) {
 			let i = group.length - 1
@@ -188,7 +187,7 @@ async function reset() {
 			await sleep(delay.value)
 		}
 	}
-	animated.value = false
+	isUpdating.value = false
 }
 
 function adjustUnsorted() {
@@ -202,8 +201,7 @@ let firstUpdate = true
 async function loadFromServer() {
 	if (!signedUpTeams.value) return
 
-	animated.value = true
-	disabled.value = true
+	isUpdating.value = true
 	teams.value = []
 	groups.value = [[], []]
 	const anFin = sleep(firstUpdate ? 0 : 400)
@@ -217,15 +215,14 @@ async function loadFromServer() {
 	)
 	adjustUnsorted()
 	await sleep(400)
-	animated.value = false
-	disabled.value = false
+	isUpdating.value = false
 }
 
 watch([signedUpTeams, groupsServer], loadFromServer)
 if (!signedUpPlaceholder.value && groupsServer.value) loadFromServer()
 
 function save() {
-	if (disabled.value) return
+	if (isUpdating.value) return
 
 	if (groups.value.some((g) => g.length <= 1)) {
 		toast.add({
@@ -241,7 +238,7 @@ function save() {
 	initGroups(groups.value)
 }
 
-defineExpose({ save, disabled })
+defineExpose({ save, disabled: isUpdating })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index ea3bac18..f0fe5d17 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -22,7 +22,7 @@
 				<template #content>
 					<TeamContainerDraggable
 						v-if="competition && signedUp"
-						:animated="animated"
+						:animated="isUpdating"
 						:teams="teams"
 						:competition="competition"
 					/>
@@ -51,7 +51,7 @@
 								<ViewMatchEdit
 									v-if="level === 0"
 									:match="match"
-									:animated="animated"
+									:animated="isUpdating"
 									@update:team-a="updateTeamA"
 									@update:team-b="updateTeamB"
 								/>
@@ -100,7 +100,8 @@ const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 )
 const { data: knockoutSystem } = getKnockout(route)
 const { mutate: initKnockout } = useInitKnockout(route, t, toast)
-const animated = ref<boolean>(true)
+
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const teams = ref<Team[]>([])
 
@@ -125,7 +126,7 @@ async function loadFromServer() {
 	loadFromServerRunning = true
 	loadFromServerRefresh = false
 
-	animated.value = true
+	isUpdating.value = true
 	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
 	teams.value = []
 	tree.value = genTree(treeDepth, null)
@@ -142,7 +143,7 @@ async function loadFromServer() {
 		)
 	})
 	await sleep(400)
-	animated.value = false
+	isUpdating.value = false
 
 	loadFromServerRunning = false
 	if (loadFromServerRefresh) {
@@ -223,7 +224,7 @@ function getMatches(): Match[] {
 }
 
 async function randomize() {
-	animated.value = true
+	isUpdating.value = true
 	let knockOutListIndex = 0
 	const matches = getMatches()
 	while (teams.value.length && knockOutListIndex < matches.length) {
@@ -245,11 +246,11 @@ async function randomize() {
 		knockOutListIndex++
 		await sleep(delay.value)
 	}
-	animated.value = false
+	isUpdating.value = false
 }
 
 async function reset() {
-	animated.value = true
+	isUpdating.value = true
 	const matches = getMatches()
 	matches.forEach((m) => {
 		m.teamA = null
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index 5fbdbcfc..843f0579 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -1,30 +1,13 @@
 <template>
 	<div class="flex flex-column gap-1">
 		<Transition v-if="competition">
-			<Groups v-if="competition.tourType === TourType.GROUPS" ref="groupsRef" />
-			<Knockout v-else ref="knockoutRef" />
-		</Transition>
-
-		<div class="grid grid-nogutter justify-content-between mt-4">
-			<Button
-				:label="t('general.back')"
-				icon="pi pi-angle-left"
-				@click="prevPage"
-			/>
-			<Button
-				:label="t('general.save')"
-				severity="success"
-				:disabled="groupsRef?.disabled"
-				@click="save"
-			></Button>
-			<Button
-				v-if="route.params.step !== 'scheduleMatches'"
-				:label="t('general.next')"
-				icon="pi pi-angle-right"
-				icon-pos="right"
-				@click="nextPage"
+			<Groups
+				v-if="competition.tourType === TourType.GROUPS"
+				ref="groupsRef"
+				v-model:is-updating="isUpdating"
 			/>
-		</div>
+			<Knockout v-else ref="knockoutRef" v-model:is-updating="isUpdating" />
+		</Transition>
 	</div>
 </template>
 
@@ -45,6 +28,7 @@ const router = useRouter()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 const knockoutRef = ref<InstanceType<typeof AssignMatchesKnockout> | null>(null)
 const groupsRef = ref<InstanceType<typeof AssignMatchesGroups> | null>(null)
 
@@ -77,6 +61,8 @@ function save() {
 		knockoutRef.value.save()
 	}
 }
+
+defineExpose({ prevPage, save, nextPage })
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index c209f41a..910192aa 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -71,39 +71,10 @@
 				<Skeleton class="h-30rem" />
 			</div>
 		</div>
-
-		<div class="mt-2 grid grid-nogutter justify-content-between">
-			<Button
-				:label="t('general.back')"
-				icon="pi pi-angle-left"
-				icon-pos="left"
-				@click="prevPage"
-			/>
-			<Button
-				:disabled="isUpdating"
-				:label="t('general.reset')"
-				severity="danger"
-				@click="reset"
-			/>
-			<Button
-				:disabled="isUpdating"
-				:label="t('general.save')"
-				severity="success"
-				@click="save"
-			/>
-			<Button
-				v-if="route.params.step !== 'scheduleMatches'"
-				icon="pi pi-angle-right"
-				icon-pos="right"
-				:label="t('general.next')"
-				@click="nextPage"
-			/>
-		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import Button from "primevue/button"
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
@@ -131,7 +102,7 @@ function $t(name: string) {
 	return computed(() => t(name))
 }
 
-const isUpdating = ref(false)
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const teams = ref<TeamArray[]>([])
 const playersA = ref<Player[]>([])
@@ -364,6 +335,8 @@ async function loadFromServer() {
 
 watch(signedUpTeams, loadFromServer)
 if (!signedUpPlaceholder.value) loadFromServer()
+
+defineExpose({ prevPage, reset, save, nextPage })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 959d6658..a93a874f 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -50,25 +50,25 @@ export default [
 				path: "settings",
 				name: "settings",
 				component: ViewEditCompetition,
-				meta: { step: 1 },
+				meta: { step: 1, reset: false },
 			},
 			{
 				path: "editTeams",
 				name: "editTeams",
 				component: ViewEditTeams,
-				meta: { step: 2 },
+				meta: { step: 2, reset: true },
 			},
 			{
 				path: "assignMatches",
 				name: "assignMatches",
 				component: ViewAssignMatches,
-				meta: { step: 3 },
+				meta: { step: 3, reset: false },
 			},
 			{
 				path: "scheduleMatches",
 				name: "scheduleMatches",
 				component: ViewScheduleMatches,
-				meta: { step: 4 },
+				meta: { step: 4, reset: false },
 			},
 		],
 	},

From 590422672fad61977ea19c39ee833ed777d4908f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 14:00:05 +0200
Subject: [PATCH 035/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Improve=20loading?=
 =?UTF-8?q?=20of=20data=20for=20assign=20matches=20-=20groups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/Tracker.ts           |  57 ++++++++
 frontend/app/src/backend/group.ts             |   1 -
 .../assignMatches/AssignMatchesGroups.vue     | 137 +++++++++---------
 3 files changed, 127 insertions(+), 68 deletions(-)
 create mode 100644 frontend/app/src/backend/Tracker.ts

diff --git a/frontend/app/src/backend/Tracker.ts b/frontend/app/src/backend/Tracker.ts
new file mode 100644
index 00000000..35383b75
--- /dev/null
+++ b/frontend/app/src/backend/Tracker.ts
@@ -0,0 +1,57 @@
+import { ref, Ref, watch } from "vue"
+
+export function sleep(milliseconds: number) {
+	return new Promise((resolve) => setTimeout(resolve, milliseconds))
+}
+
+export function track<T, U>(
+	func: (a: T) => U | null,
+	def: U,
+	data: T,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	toWatch: Ref<any>[],
+	isLoadings: Ref<boolean>[],
+	isUpdating: Ref<boolean>,
+	delay: number,
+): Ref<U> {
+	const editableData = <Ref<U>>ref<U>(def)
+
+	let buffer: U | null = null
+	let running = false
+	async function set(data: U) {
+		buffer = data
+		if (running) return
+
+		running = true
+		isUpdating.value = true
+		while (buffer) {
+			if (editableData.value) {
+				editableData.value = def
+				await sleep(delay)
+			}
+			editableData.value = buffer
+			buffer = null
+			await sleep(delay)
+		}
+		running = false
+		isUpdating.value = false
+	}
+
+	watch(
+		toWatch,
+		() => {
+			if (isLoadings.some((l) => l.value)) {
+				set(def)
+				return
+			}
+
+			const conv = func(data)
+			if (editableData.value !== conv) set(conv ?? def)
+		},
+		{
+			immediate: true,
+		},
+	)
+
+	return editableData
+}
diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index abcd7dde..b62f3d52 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -52,7 +52,6 @@ export function getGroupsDivision(
 				})
 		},
 		{
-			placeholderData: [[], []],
 			onError() {
 				toast.add({
 					severity: "error",
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 250f8817..4b617ac6 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -24,14 +24,14 @@
 					<TeamContainerDraggable
 						v-if="competition"
 						:animated="isUpdating"
-						:teams="teams"
+						:teams="data.teams"
 						:competition="competition"
 					/>
 				</template>
 			</Card>
 		</div>
 		<div class="col-8 flex flex-column gap-3">
-			<Card v-for="(group, i) in groups" :key="i">
+			<Card v-for="(group, i) in data.groups" :key="i">
 				<template #title
 					>{{ t("ViewPrepare.assignMatches.Group") }} {{ i + 1 }}
 				</template>
@@ -76,12 +76,13 @@
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { computed, Ref, ref, watch } from "vue"
+import { computed, Ref, ref } from "vue"
 import { Team } from "@/interfaces/team"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
 import { getGroupsDivision, useInitGroups } from "@/backend/group"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
+import { sleep, track } from "@/backend/Tracker"
 
 const route = useRoute()
 const toast = useToast()
@@ -94,43 +95,77 @@ function $t(name: string) {
 const { data: competition } = getCompetitionDetails(route, t, toast, {
 	suc: () => {
 		if (competition.value === null) return
-		loadFromServer()
 	},
 })
-const { data: signedUpTeams, isPlaceholderData: signedUpPlaceholder } =
-	getSignedUp(route, t, toast)
-const { data: groupsServer } = getGroupsDivision(route, t, toast)
+const { data: signedUpTeams, isLoading: signedUpLoading } = getSignedUp(
+	route,
+	t,
+	toast,
+)
+const { data: groupsServer, isLoading: groupsLoading } = getGroupsDivision(
+	route,
+	t,
+	toast,
+)
 const { mutate: initGroups } = useInitGroups(route, t, toast)
 
 const noGroups = ref<number>(2)
 
-const teams = ref<Team[]>([])
-const groups = ref<Team[][]>([[], []])
-const isUpdating = defineModel<boolean>("isUpdating", { default: false })
-
 const duration = 2000
-const teamCount = ref(0)
 const delay = computed(() =>
-	Math.min((duration * 2) / 3 / teamCount.value, 100),
+	Math.min((duration * 2) / 3 / data.value.teamCount, 50),
 )
 const delayBetween = computed(() => delay.value / 2)
 
-function sleep(milliseconds: number) {
-	return new Promise((resolve) => setTimeout(resolve, milliseconds))
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
+const data = track(
+	loadFromServer,
+	{
+		teams: [],
+		groups: [[], []],
+		teamCount: 0,
+	},
+	{ signedUpTeams, groupsServer },
+	[signedUpTeams, groupsServer],
+	[signedUpLoading, groupsLoading],
+	isUpdating,
+	400,
+)
+
+function loadFromServer({
+	signedUpTeams,
+	groupsServer,
+}: {
+	signedUpTeams: Ref<undefined> | Ref<Team[]>
+	groupsServer: Ref<undefined> | Ref<Team[][]>
+}) {
+	if (!signedUpTeams.value || !groupsServer.value) return null
+
+	const groups: Team[][] = JSON.parse(
+		JSON.stringify(groupsServer.value ?? [[], []]),
+	).map((g: Team[]) => g.sort())
+	const teams: Team[] = signedUpTeams.value
+		.filter((t) => !groups.some((group) => group.some((st) => st.id === t.id)))
+		.sort()
+	return {
+		teams,
+		groups,
+		teamCount: signedUpTeams.value.length,
+	}
 }
 
 function adjustSize(size: number) {
 	isUpdating.value = true
-	if (groups.value.length > size) {
-		for (let i = size; i < groups.value.length; i++) {
-			groups.value[i].forEach((e) => teams.value.push(e))
+	if (data.value.groups.length > size) {
+		for (let i = size; i < data.value.groups.length; i++) {
+			data.value.groups[i].forEach((e) => data.value.teams.push(e))
 		}
-		groups.value.splice(size, groups.value.length - size)
+		data.value.groups.splice(size, data.value.groups.length - size)
 	} else {
-		groups.value.splice(
-			groups.value.length,
+		data.value.groups.splice(
+			data.value.groups.length,
 			0,
-			...Array.from({ length: size - groups.value.length }, () => []),
+			...Array.from({ length: size - data.value.groups.length }, () => []),
 		)
 	}
 	isUpdating.value = false
@@ -149,23 +184,22 @@ const randomizeItems = ref([
 	},
 ])
 
-function selectRandomElement<T>(players: Ref<T[]>) {
-	const r = Math.floor(Math.random() * players.value.length)
-	const element = players.value[r]
-	players.value.splice(r, 1)
-	//players.value = players.value.filter((v, i) => i !== r)
+function selectRandomElement<T>(players: T[]) {
+	const r = Math.floor(Math.random() * players.length)
+	const element = players[r]
+	players.splice(r, 1)
 	return element
 }
 
 async function randomize() {
 	isUpdating.value = true
-	while (teams.value.length) {
-		const min = Math.min(...groups.value.map((group) => group.length))
-		const minInd = groups.value.findIndex((group) => group.length === min)
+	while (data.value.teams.length) {
+		const min = Math.min(...data.value.groups.map((group) => group.length))
+		const minInd = data.value.groups.findIndex((group) => group.length === min)
 
-		const element = selectRandomElement(teams)
+		const element = selectRandomElement(data.value.teams)
 		await sleep(delayBetween.value)
-		groups.value[minInd].push(element)
+		data.value.groups[minInd].push(element)
 		await sleep(delay.value)
 	}
 	isUpdating.value = false
@@ -178,53 +212,22 @@ async function reroll() {
 
 async function reset() {
 	isUpdating.value = true
-	for (const group of groups.value) {
+	for (const group of data.value.groups) {
 		while (group.length) {
 			let i = group.length - 1
 			const team = group.splice(i, 1)[0]
 			await sleep(delayBetween.value)
-			teams.value.push(team)
+			data.value.teams.push(team)
 			await sleep(delay.value)
 		}
 	}
 	isUpdating.value = false
 }
 
-function adjustUnsorted() {
-	teams.value = teams.value.filter(
-		(t) => !groups.value.some((group) => group.some((st) => st.id === t.id)),
-	)
-}
-
-let firstUpdate = true
-
-async function loadFromServer() {
-	if (!signedUpTeams.value) return
-
-	isUpdating.value = true
-	teams.value = []
-	groups.value = [[], []]
-	const anFin = sleep(firstUpdate ? 0 : 400)
-	firstUpdate = false
-
-	await anFin
-	teams.value = signedUpTeams.value
-	teamCount.value = teams.value.length
-	groups.value = JSON.parse(JSON.stringify(groupsServer.value ?? [[], []])).map(
-		(g: Team[]) => g.sort(),
-	)
-	adjustUnsorted()
-	await sleep(400)
-	isUpdating.value = false
-}
-
-watch([signedUpTeams, groupsServer], loadFromServer)
-if (!signedUpPlaceholder.value && groupsServer.value) loadFromServer()
-
 function save() {
 	if (isUpdating.value) return
 
-	if (groups.value.some((g) => g.length <= 1)) {
+	if (data.value.groups.some((g) => g.length <= 1)) {
 		toast.add({
 			severity: "error",
 			summary: t("ViewPrepare.assignMatches.emptyGroupSum"),
@@ -235,7 +238,7 @@ function save() {
 		return
 	}
 
-	initGroups(groups.value)
+	initGroups(data.value.groups)
 }
 
 defineExpose({ save, disabled: isUpdating })

From 697b24e401c1806ce79e60c66a0af3e319fd742b Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 14:14:32 +0200
Subject: [PATCH 036/247] =?UTF-8?q?=E2=9C=A8=20Add=20reset=20button=20for?=
 =?UTF-8?q?=20group=20assign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/Tracker.ts                  |  8 ++++++--
 .../prepare/assignMatches/AssignMatchesGroups.vue    |  4 ++--
 .../prepare/assignMatches/ViewAssignMatches.vue      | 12 +++++++++++-
 frontend/app/src/routes.ts                           |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/frontend/app/src/backend/Tracker.ts b/frontend/app/src/backend/Tracker.ts
index 35383b75..5ba08972 100644
--- a/frontend/app/src/backend/Tracker.ts
+++ b/frontend/app/src/backend/Tracker.ts
@@ -13,7 +13,7 @@ export function track<T, U>(
 	isLoadings: Ref<boolean>[],
 	isUpdating: Ref<boolean>,
 	delay: number,
-): Ref<U> {
+): { data: Ref<U>; reload: () => void } {
 	const editableData = <Ref<U>>ref<U>(def)
 
 	let buffer: U | null = null
@@ -53,5 +53,9 @@ export function track<T, U>(
 		},
 	)
 
-	return editableData
+	function reload() {
+		set(func(data) ?? def)
+	}
+
+	return { data: editableData, reload }
 }
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 4b617ac6..22998e92 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -118,7 +118,7 @@ const delay = computed(() =>
 const delayBetween = computed(() => delay.value / 2)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
-const data = track(
+const { data, reload } = track(
 	loadFromServer,
 	{
 		teams: [],
@@ -241,7 +241,7 @@ function save() {
 	initGroups(data.value.groups)
 }
 
-defineExpose({ save, disabled: isUpdating })
+defineExpose({ save, reload, disabled: isUpdating })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index 843f0579..e427b7a2 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -62,7 +62,17 @@ function save() {
 	}
 }
 
-defineExpose({ prevPage, save, nextPage })
+function reset() {
+	if (competition.value?.tourType === TourType.GROUPS) {
+		if (groupsRef.value === null) return
+		groupsRef.value.reload()
+	} else {
+		if (knockoutRef.value === null) return
+		// knockoutRef.value.reload()
+	}
+}
+
+defineExpose({ prevPage, save, reset, nextPage })
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index a93a874f..a1ae041d 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -62,7 +62,7 @@ export default [
 				path: "assignMatches",
 				name: "assignMatches",
 				component: ViewAssignMatches,
-				meta: { step: 3, reset: false },
+				meta: { step: 3, reset: true },
 			},
 			{
 				path: "scheduleMatches",

From 63f80eeff831b55f1f62c14bf6c73971a14d7b2f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 14:50:32 +0200
Subject: [PATCH 037/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Reorder=20and=20re?=
 =?UTF-8?q?structure=20code=20for=20group=20prepare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignMatches/AssginMatchesHelper.ts      |  40 +++++
 .../assignMatches/AssignMatchesGroups.vue     |  88 +++++------
 .../assignMatches/AssignMatchesKnockout.vue   | 137 ++++++++----------
 3 files changed, 130 insertions(+), 135 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts

diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts b/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
new file mode 100644
index 00000000..cae555a3
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
@@ -0,0 +1,40 @@
+import { computed, ref, Ref, unref } from "vue"
+
+export function selectRandomElement<T>(players: T[] | Ref<T[]>) {
+	if (unref(players).length === 0) return null
+
+	const r = Math.floor(Math.random() * unref(players).length)
+	const element = unref(players)[r]
+	unref(players).splice(r, 1)
+	return element
+}
+
+export function genRandomizeItems(
+	t: (_: string) => string,
+	reroll: () => void,
+	reset: () => void,
+) {
+	return ref([
+		{
+			label: computed(() => t("ViewPrepare.editTeams.reroll")),
+			icon: "pi pi-refresh",
+			command: reroll,
+		},
+		{
+			label: computed(() => t("ViewPrepare.editTeams.reset")),
+			icon: "pi pi-times",
+			command: reset,
+		},
+	])
+}
+
+const duration = 2000
+export function getDelays(data: Ref<{ teamCount: number }>) {
+	const delay = computed(() =>
+		Math.min((duration * 2) / 3 / data.value.teamCount, 50),
+	)
+	return {
+		delay,
+		delayBetween: computed(() => delay.value / 2),
+	}
+}
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 22998e92..8103c547 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -76,21 +76,25 @@
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { computed, Ref, ref } from "vue"
+import { Ref, ref } from "vue"
 import { Team } from "@/interfaces/team"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
 import { getGroupsDivision, useInitGroups } from "@/backend/group"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { sleep, track } from "@/backend/Tracker"
+import {
+	genRandomizeItems,
+	getDelays,
+	selectRandomElement,
+} from "@/components/views/prepare/assignMatches/AssginMatchesHelper"
 
 const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
+const randomizeItems = genRandomizeItems(t, reroll, reset)
 
-function $t(name: string) {
-	return computed(() => t(name))
-}
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const { data: competition } = getCompetitionDetails(route, t, toast, {
 	suc: () => {
@@ -110,14 +114,6 @@ const { data: groupsServer, isLoading: groupsLoading } = getGroupsDivision(
 const { mutate: initGroups } = useInitGroups(route, t, toast)
 
 const noGroups = ref<number>(2)
-
-const duration = 2000
-const delay = computed(() =>
-	Math.min((duration * 2) / 3 / data.value.teamCount, 50),
-)
-const delayBetween = computed(() => delay.value / 2)
-
-const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 const { data, reload } = track(
 	loadFromServer,
 	{
@@ -154,42 +150,7 @@ function loadFromServer({
 	}
 }
 
-function adjustSize(size: number) {
-	isUpdating.value = true
-	if (data.value.groups.length > size) {
-		for (let i = size; i < data.value.groups.length; i++) {
-			data.value.groups[i].forEach((e) => data.value.teams.push(e))
-		}
-		data.value.groups.splice(size, data.value.groups.length - size)
-	} else {
-		data.value.groups.splice(
-			data.value.groups.length,
-			0,
-			...Array.from({ length: size - data.value.groups.length }, () => []),
-		)
-	}
-	isUpdating.value = false
-}
-
-const randomizeItems = ref([
-	{
-		label: $t("ViewPrepare.editTeams.reroll"),
-		icon: "pi pi-refresh",
-		command: reroll,
-	},
-	{
-		label: $t("ViewPrepare.editTeams.reset"),
-		icon: "pi pi-times",
-		command: reset,
-	},
-])
-
-function selectRandomElement<T>(players: T[]) {
-	const r = Math.floor(Math.random() * players.length)
-	const element = players[r]
-	players.splice(r, 1)
-	return element
-}
+const { delay, delayBetween } = getDelays(data)
 
 async function randomize() {
 	isUpdating.value = true
@@ -199,17 +160,12 @@ async function randomize() {
 
 		const element = selectRandomElement(data.value.teams)
 		await sleep(delayBetween.value)
-		data.value.groups[minInd].push(element)
+		if (element) data.value.groups[minInd].push(element)
 		await sleep(delay.value)
 	}
 	isUpdating.value = false
 }
 
-async function reroll() {
-	await reset()
-	await randomize()
-}
-
 async function reset() {
 	isUpdating.value = true
 	for (const group of data.value.groups) {
@@ -224,6 +180,11 @@ async function reset() {
 	isUpdating.value = false
 }
 
+async function reroll() {
+	await reset()
+	await randomize()
+}
+
 function save() {
 	if (isUpdating.value) return
 
@@ -241,7 +202,24 @@ function save() {
 	initGroups(data.value.groups)
 }
 
-defineExpose({ save, reload, disabled: isUpdating })
+function adjustSize(size: number) {
+	isUpdating.value = true
+	if (data.value.groups.length > size) {
+		for (let i = size; i < data.value.groups.length; i++) {
+			data.value.groups[i].forEach((e) => data.value.teams.push(e))
+		}
+		data.value.groups.splice(size, data.value.groups.length - size)
+	} else {
+		data.value.groups.splice(
+			data.value.groups.length,
+			0,
+			...Array.from({ length: size - data.value.groups.length }, () => []),
+		)
+	}
+	isUpdating.value = false
+}
+
+defineExpose({ save, reload })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index f0fe5d17..291cef70 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -69,7 +69,7 @@
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
-import { computed, Ref, ref, watch } from "vue"
+import { computed, ref, watch } from "vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { Team } from "@/interfaces/team"
@@ -81,17 +81,21 @@ import ViewMatchEdit from "@/components/views/prepare/assignMatches/ViewMatchEdi
 import { Match } from "@/interfaces/match"
 import { getKnockout, useInitKnockout } from "@/backend/knockout"
 import { Mode } from "@/interfaces/competition"
+import {
+	genRandomizeItems,
+	selectRandomElement,
+} from "@/components/views/prepare/assignMatches/AssginMatchesHelper"
+import { sleep } from "@/backend/Tracker"
 
 const route = useRoute()
 const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
+const randomizeItems = genRandomizeItems(t, reroll, reset)
+
+const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 // TODO refactoring for the whole file for smoother loading and clearer code
 
-let loadFromServerRunning = false
-let loadFromServerRefresh = false
-let firstUpdate = true
-let treeDepth = 0
 const { data: competition } = getCompetitionDetails(route, t, toast, {})
 const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 	route,
@@ -101,7 +105,10 @@ const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
 const { data: knockoutSystem } = getKnockout(route)
 const { mutate: initKnockout } = useInitKnockout(route, t, toast)
 
-const isUpdating = defineModel<boolean>("isUpdating", { default: false })
+let loadFromServerRunning = false
+let loadFromServerRefresh = false
+let firstUpdate = true
+let treeDepth = 0
 
 const teams = ref<Team[]>([])
 
@@ -152,30 +159,6 @@ async function loadFromServer() {
 	}
 }
 
-function genTree(height: number, tree: KnockoutMatch | null): KnockoutMatch {
-	const default_game = {
-		court: null,
-		begin: null,
-		end: null,
-		finished: false,
-		winner: null,
-		teamA: tree ? tree.teamA : null,
-		teamB: tree ? tree.teamB : null,
-		sets: null,
-		curGame: null,
-	}
-	if (height === 0) return default_game
-
-	return {
-		...default_game,
-		prevMatch: {
-			winner: true,
-			a: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.a : null),
-			b: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.b : null),
-		},
-	}
-}
-
 const duration = 2000
 const teamCount = ref(0)
 const delay = computed(() =>
@@ -183,46 +166,6 @@ const delay = computed(() =>
 )
 const delayBetween = computed(() => delay.value / 2)
 
-function sleep(milliseconds: number) {
-	return new Promise((resolve) => setTimeout(resolve, milliseconds))
-}
-
-function $t(name: string) {
-	return computed(() => t(name))
-}
-
-const randomizeItems = ref([
-	{
-		label: $t("ViewPrepare.editTeams.reroll"),
-		icon: "pi pi-refresh",
-		command: reroll,
-	},
-	{
-		label: $t("ViewPrepare.editTeams.reset"),
-		icon: "pi pi-times",
-		command: reset,
-	},
-])
-
-function selectRandomElement<T>(players: Ref<T[]>) {
-	if (players.value.length === 0) return null
-
-	const r = Math.floor(Math.random() * players.value.length)
-	const element = players.value[r]
-	players.value.splice(r, 1)
-	return element
-}
-
-function getMatches(): Match[] {
-	let cur = [tree.value]
-	for (let i = 0; i < treeDepth; i++) {
-		cur = cur
-			.map((m) => (m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : []))
-			.flat()
-	}
-	return cur
-}
-
 async function randomize() {
 	isUpdating.value = true
 	let knockOutListIndex = 0
@@ -265,16 +208,6 @@ async function reroll() {
 	await randomize()
 }
 
-function knockoutTreeCompletelyAssigned(): boolean {
-	// check that tree is completely assigned
-	const check = (m: KnockoutMatch): boolean => {
-		if (m.prevMatch) {
-			return check(m.prevMatch.a) && check(m.prevMatch.b)
-		} else return m.teamA !== null && m.teamB !== null
-	}
-	return check(tree.value)
-}
-
 function save() {
 	if (!knockoutTreeCompletelyAssigned()) {
 		toast.add({
@@ -290,6 +223,50 @@ function save() {
 	initKnockout(tree.value)
 }
 
+function knockoutTreeCompletelyAssigned(): boolean {
+	// check that tree is completely assigned
+	const check = (m: KnockoutMatch): boolean => {
+		if (m.prevMatch) {
+			return check(m.prevMatch.a) && check(m.prevMatch.b)
+		} else return m.teamA !== null && m.teamB !== null
+	}
+	return check(tree.value)
+}
+
+function getMatches(): Match[] {
+	let cur = [tree.value]
+	for (let i = 0; i < treeDepth; i++) {
+		cur = cur
+			.map((m) => (m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : []))
+			.flat()
+	}
+	return cur
+}
+
+function genTree(height: number, tree: KnockoutMatch | null): KnockoutMatch {
+	const default_game = {
+		court: null,
+		begin: null,
+		end: null,
+		finished: false,
+		winner: null,
+		teamA: tree ? tree.teamA : null,
+		teamB: tree ? tree.teamB : null,
+		sets: null,
+		curGame: null,
+	}
+	if (height === 0) return default_game
+
+	return {
+		...default_game,
+		prevMatch: {
+			winner: true,
+			a: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.a : null),
+			b: genTree(height - 1, tree?.prevMatch ? tree.prevMatch.b : null),
+		},
+	}
+}
+
 defineExpose({ save })
 </script>
 

From 9c11cad29ab136d47525fac5d3f61dea99e4bcaa Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 15:59:59 +0200
Subject: [PATCH 038/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Reorder=20and=20re?=
 =?UTF-8?q?structure=20code=20for=20knockout=20prepare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/signup.ts            |   1 -
 .../assignMatches/AssignMatchesKnockout.vue   | 119 +++++++++---------
 .../assignMatches/ViewAssignMatches.vue       |   2 +-
 3 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index c8bc5768..cf376002 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -37,7 +37,6 @@ export function getSignedUp(
 					life: 3000,
 				})
 			},
-			placeholderData: [],
 		},
 	)
 }
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 291cef70..085cd163 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -21,9 +21,9 @@
 				</template>
 				<template #content>
 					<TeamContainerDraggable
-						v-if="competition && signedUp"
+						v-if="competition && signedUpTeams"
 						:animated="isUpdating"
-						:teams="teams"
+						:teams="data.teams"
 						:competition="competition"
 					/>
 				</template>
@@ -35,7 +35,7 @@
 				<template #content>
 					<ScrollPanel style="width: 100%; height: 500px">
 						<ViewKnockoutTree
-							:finale="tree"
+							:finale="data.tree"
 							:third-place="thirdPlace ?? undefined"
 							:border-thickness="2"
 							:border-radius="0"
@@ -69,11 +69,11 @@
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
-import { computed, ref, watch } from "vue"
+import { computed, Ref, ref } from "vue"
 import { getCompetitionDetails } from "@/backend/competition"
 import TeamContainerDraggable from "@/components/views/prepare/components/TeamContainerDraggable.vue"
 import { Team } from "@/interfaces/team"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { KnockoutMatch, KnockoutSystem } from "@/interfaces/knockoutSystem"
 import { getSignedUp } from "@/backend/signup"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
@@ -85,7 +85,7 @@ import {
 	genRandomizeItems,
 	selectRandomElement,
 } from "@/components/views/prepare/assignMatches/AssginMatchesHelper"
-import { sleep } from "@/backend/Tracker"
+import { sleep, track } from "@/backend/Tracker"
 
 const route = useRoute()
 const toast = useToast()
@@ -94,68 +94,62 @@ const randomizeItems = genRandomizeItems(t, reroll, reset)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
-// TODO refactoring for the whole file for smoother loading and clearer code
-
 const { data: competition } = getCompetitionDetails(route, t, toast, {})
-const { data: signedUp, isPlaceholderData: signedUpPlaceholder } = getSignedUp(
+const { data: signedUpTeams, isLoading: signedUpLoading } = getSignedUp(
 	route,
 	t,
 	toast,
 )
-const { data: knockoutSystem } = getKnockout(route)
+const { data: knockoutSystem, isLoading: knockoutSystemLoading } =
+	getKnockout(route)
 const { mutate: initKnockout } = useInitKnockout(route, t, toast)
 
-let loadFromServerRunning = false
-let loadFromServerRefresh = false
-let firstUpdate = true
-let treeDepth = 0
-
-const teams = ref<Team[]>([])
-
-const tree = ref(
-	genTree(treeDepth, knockoutSystem.value ? knockoutSystem.value.finale : null),
+const { data, reload } = track(
+	loadFromServer,
+	{
+		teams: [],
+		tree: genTree(0, null),
+		treeDepth: 0,
+		teamCount: 0,
+	},
+	{ signedUpTeams, knockoutSystem },
+	[signedUpTeams, knockoutSystem],
+	[signedUpLoading, knockoutSystemLoading],
+	isUpdating,
+	400,
 )
 const thirdPlace = computed(() => {
-	if (signedUp.value && signedUp.value.length > 2) return genTree(0, null)
+	if (signedUpTeams.value && signedUpTeams.value.length > 2)
+		return genTree(0, null)
 	else return null
 })
-watch([signedUp, competition, knockoutSystem], loadFromServer)
-// if (!signedUpPlaceholder.value && knockoutSystem.value) loadFromServer()
-
-async function loadFromServer() {
-	if (!signedUp.value || signedUpPlaceholder.value || !knockoutSystem.value)
-		return
 
-	if (loadFromServerRunning) {
-		loadFromServerRefresh = true
-		return
-	}
-	loadFromServerRunning = true
-	loadFromServerRefresh = false
+function loadFromServer({
+	signedUpTeams,
+	knockoutSystem,
+}: {
+	signedUpTeams: Ref<undefined> | Ref<Team[]>
+	knockoutSystem: Ref<undefined> | Ref<KnockoutSystem>
+}) {
+	if (!signedUpTeams.value || !knockoutSystem.value) return null
 
-	isUpdating.value = true
-	treeDepth = Math.ceil(Math.log2(signedUp.value.length)) - 1
-	teams.value = []
-	tree.value = genTree(treeDepth, null)
-	await sleep(firstUpdate ? 0 : 400)
-	firstUpdate = false
-	tree.value = genTree(
+	const treeDepth = Math.ceil(Math.log2(signedUpTeams.value.length)) - 1
+	let teams: Team[] = []
+	const tree = genTree(
 		treeDepth,
 		knockoutSystem.value ? knockoutSystem.value.finale : null,
 	)
-	signedUp.value.forEach((t) => teams.value.push(t))
-	getMatches().forEach((m) => {
-		teams.value = teams.value.filter(
-			(t) => t.id !== m.teamA?.id && t.id !== m.teamB?.id,
-		)
-	})
-	await sleep(400)
-	isUpdating.value = false
-
-	loadFromServerRunning = false
-	if (loadFromServerRefresh) {
-		loadFromServerRefresh = false
-		await loadFromServer()
+	signedUpTeams.value.forEach((t) => teams.push(t))
+	if (knockoutSystem.value.finale)
+		getMatches(knockoutSystem.value.finale, treeDepth).forEach((m) => {
+			teams = teams.filter((t) => t.id !== m.teamA?.id && t.id !== m.teamB?.id)
+		})
+	const teamCount = signedUpTeams.value.length
+	return {
+		teams,
+		treeDepth,
+		tree,
+		teamCount,
 	}
 }
 
@@ -170,9 +164,9 @@ async function randomize() {
 	isUpdating.value = true
 	let knockOutListIndex = 0
 	const matches = getMatches()
-	while (teams.value.length && knockOutListIndex < matches.length) {
+	while (data.value.teams.length && knockOutListIndex < matches.length) {
 		if (!matches[knockOutListIndex].teamA) {
-			const teamA = selectRandomElement(teams)
+			const teamA = selectRandomElement(data.value.teams)
 			await sleep(delayBetween.value)
 
 			matches[knockOutListIndex].teamA = teamA
@@ -180,7 +174,7 @@ async function randomize() {
 		}
 
 		if (!matches[knockOutListIndex].teamB) {
-			const teamB = selectRandomElement(teams)
+			const teamB = selectRandomElement(data.value.teams)
 			if (!teamB) break
 			matches[knockOutListIndex].teamB = teamB
 			await sleep(delayBetween.value)
@@ -196,10 +190,11 @@ async function reset() {
 	isUpdating.value = true
 	const matches = getMatches()
 	matches.forEach((m) => {
+		if (m.teamA) data.value.teams.push(m.teamA)
+		if (m.teamB) data.value.teams.push(m.teamB)
 		m.teamA = null
 		m.teamB = null
 	})
-	await loadFromServer()
 	await sleep(400)
 }
 
@@ -220,7 +215,7 @@ function save() {
 		return
 	}
 
-	initKnockout(tree.value)
+	initKnockout(data.value.tree)
 }
 
 function knockoutTreeCompletelyAssigned(): boolean {
@@ -230,12 +225,12 @@ function knockoutTreeCompletelyAssigned(): boolean {
 			return check(m.prevMatch.a) && check(m.prevMatch.b)
 		} else return m.teamA !== null && m.teamB !== null
 	}
-	return check(tree.value)
+	return check(data.value.tree)
 }
 
-function getMatches(): Match[] {
-	let cur = [tree.value]
-	for (let i = 0; i < treeDepth; i++) {
+function getMatches(tree?: KnockoutMatch, treeDepth?: number): Match[] {
+	let cur = [tree ?? data.value.tree]
+	for (let i = 0; i < (treeDepth ?? data.value.treeDepth); i++) {
 		cur = cur
 			.map((m) => (m.prevMatch ? [m.prevMatch.a, m.prevMatch.b] : []))
 			.flat()
@@ -267,7 +262,7 @@ function genTree(height: number, tree: KnockoutMatch | null): KnockoutMatch {
 	}
 }
 
-defineExpose({ save })
+defineExpose({ save, reload })
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index e427b7a2..6dca19e5 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -68,7 +68,7 @@ function reset() {
 		groupsRef.value.reload()
 	} else {
 		if (knockoutRef.value === null) return
-		// knockoutRef.value.reload()
+		knockoutRef.value.reload()
 	}
 }
 

From 26315ff8664f96d02b86104ee1305edfa3aa8de8 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 20 Aug 2024 19:01:02 +0200
Subject: [PATCH 039/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20vue-query=20?=
 =?UTF-8?q?for=20tournament=20and=20competition=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/competition.ts       | 143 ++++++++++++------
 frontend/app/src/backend/tournament.ts        | 105 +++++++------
 .../competitions/ViewCreateCompetition.vue    |  22 +--
 .../views/prepare/ViewEditCompetition.vue     |  18 ++-
 .../tournaments/ViewCreateTournament.vue      |  23 +--
 .../views/tournaments/ViewEditTournament.vue  |  10 +-
 6 files changed, 202 insertions(+), 119 deletions(-)

diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index e88a47d3..0e9ceb08 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -7,7 +7,7 @@ import {
 } from "@/interfaces/competition"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useQuery } from "vue-query/esm"
-import { QueryClient, useMutation } from "vue-query"
+import { QueryClient, useMutation, useQueryClient } from "vue-query"
 import { Player, playerClientToServer } from "@/interfaces/player"
 import { TeamServer } from "@/interfaces/team"
 
@@ -93,41 +93,66 @@ export function getCompetitionDetails(
 	)
 }
 
-export function updateCompetition(
-	competition: CompetitionServer,
-	tourId: string,
+export function useUpdateCompetition(
+	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 	handler: {
-		suc?: () => void
+		suc?: (competition: CompetitionServer) => void
 		err?: () => void
 	},
 ) {
-	axios
-		.post(`/tournament/${tourId}/competition/update`, competition)
-		.then(() => {
-			toast.add({
-				severity: "success",
-				summary: t("ViewEditCompetition.competitionUpdate"),
-				detail: t("ViewEditCompetition.competitionUpdated"),
-				life: 3000,
-			})
-			if (handler.suc) handler.suc()
-		})
-		.catch((error) => {
-			toast.add({
-				severity: "error",
-				summary: t("ViewEditCompetition.tournamentUpdateFailed"),
-				detail: error,
-				life: 3000,
-			})
-			if (handler.err) handler.err()
-		})
+	const queryClient = useQueryClient()
+	return useMutation(
+		(competition: CompetitionServer) =>
+			axios.post(
+				`/tournament/${<string>route.params.tourId}/competition/update`,
+				competition,
+			),
+		{
+			onSuccess(_, competition) {
+				toast.add({
+					severity: "success",
+					summary: t("ViewEditCompetition.competitionUpdate"),
+					detail: t("ViewEditCompetition.competitionUpdated"),
+					life: 3000,
+				})
+
+				Promise.all([
+					queryClient.invalidateQueries([
+						"competitionList",
+						route.params.tourId,
+						true,
+					]),
+					queryClient.invalidateQueries([
+						"competitionList",
+						route.params.tourId,
+						false,
+					]),
+					queryClient.invalidateQueries([
+						"competitionDetails",
+						route.params.tourId,
+						competition.id,
+					]),
+				]).then(() => {
+					if (handler.suc) handler.suc(competition)
+				})
+			},
+			onError(error) {
+				toast.add({
+					severity: "error",
+					summary: t("ViewEditCompetition.tournamentUpdateFailed"),
+					detail: error,
+					life: 3000,
+				})
+				if (handler.err) handler.err()
+			},
+		},
+	)
 }
 
-export function addCompetition(
-	competition: CompetitionServer,
-	tourId: string,
+export function useAddCompetition(
+	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 	handler: {
@@ -135,28 +160,46 @@ export function addCompetition(
 		err?: () => void
 	},
 ) {
-	axios
-		.post(`/tournament/${tourId}/competition/add`, competition)
-		.then(() => {
-			toast.add({
-				severity: "success",
-				summary: t("ViewCreateCompetition.competitionCreation"),
-				detail: t("ViewCreateCompetition.competitionCreated"),
-				life: 3000,
-				closable: false,
-			})
-			if (handler.suc) handler.suc()
-		})
-		.catch(() => {
-			toast.add({
-				severity: "error",
-				summary: t("ViewCreateCompetition.competitionCreation"),
-				detail: t("ViewCreateCompetition.creationFailed"),
-				life: 3000,
-				closable: false,
-			})
-			if (handler.err) handler.err()
-		})
+	const queryClient = useQueryClient()
+	return useMutation(
+		(competition: CompetitionServer) =>
+			axios.post(
+				`/tournament/${<string>route.params.tourId}/competition/add`,
+				competition,
+			),
+		{
+			onSuccess() {
+				toast.add({
+					severity: "success",
+					summary: t("ViewCreateCompetition.competitionCreation"),
+					detail: t("ViewCreateCompetition.competitionCreated"),
+					life: 3000,
+					closable: false,
+				})
+				queryClient.invalidateQueries([
+					"competitionList",
+					route.params.tourId,
+					true,
+				])
+				queryClient.invalidateQueries([
+					"competitionList",
+					route.params.tourId,
+					false,
+				])
+				if (handler.suc) handler.suc()
+			},
+			onError() {
+				toast.add({
+					severity: "error",
+					summary: t("ViewCreateCompetition.competitionCreation"),
+					detail: t("ViewCreateCompetition.creationFailed"),
+					life: 3000,
+					closable: false,
+				})
+				if (handler.err) handler.err()
+			},
+		},
+	)
 }
 
 export function useSignUpSingle(
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 44ea488b..86d5ed92 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -8,6 +8,7 @@ import {
 import { ToastServiceMethods } from "primevue/toastservice"
 import { useQuery } from "vue-query/esm"
 import { RouteLocationNormalizedLoaded } from "vue-router"
+import { useMutation, useQueryClient } from "vue-query"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
@@ -71,8 +72,7 @@ export function getTournamentDetails(
 	)
 }
 
-export function updateTournament(
-	tournament: TournamentServer,
+export function useUpdateTournament(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 	handler: {
@@ -80,30 +80,37 @@ export function updateTournament(
 		err?: () => void
 	},
 ) {
-	axios
-		.post("/tournament/update", tournament)
-		.then(() => {
-			toast.add({
-				severity: "success",
-				summary: t("ViewEditTournament.tournamentUpdating"),
-				detail: t("ViewEditTournament.tournamentUpdated"),
-				life: 3000,
-			})
-			if (handler.suc) handler.suc()
-		})
-		.catch((error) => {
-			toast.add({
-				severity: "error",
-				summary: t("ViewEditTournament.tournamentUpdateFailed"),
-				detail: error,
-				life: 3000,
-			})
-			if (handler.err) handler.err()
-		})
+	const queryClient = useQueryClient()
+	return useMutation(
+		(tournament: TournamentServer) =>
+			axios.post("/tournament/update", tournament),
+		{
+			onSuccess(__, tournament) {
+				toast.add({
+					severity: "success",
+					summary: t("ViewEditTournament.tournamentUpdating"),
+					detail: t("ViewEditTournament.tournamentUpdated"),
+					life: 3000,
+				})
+				queryClient.invalidateQueries(["tournamentList", true])
+				queryClient.invalidateQueries(["tournamentList", false])
+				queryClient.invalidateQueries(["tournament", tournament.name])
+				if (handler.suc) handler.suc()
+			},
+			onError(error) {
+				toast.add({
+					severity: "error",
+					summary: t("ViewEditTournament.tournamentUpdateFailed"),
+					detail: error,
+					life: 3000,
+				})
+				if (handler.err) handler.err()
+			},
+		},
+	)
 }
 
-export function addTournament(
-	tournament: TournamentServer,
+export function useAddTournament(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 	handler: {
@@ -111,26 +118,32 @@ export function addTournament(
 		err?: () => void
 	},
 ) {
-	axios
-		.post("/tournament/add", tournament)
-		.then(() => {
-			toast.add({
-				severity: "success",
-				summary: t("ViewCreateTournament.tournamentCreating"),
-				detail: t("ViewCreateTournament.tournamentCreated"),
-				life: 3000,
-				closable: false,
-			})
-			if (handler.suc) handler.suc()
-		})
-		.catch(() => {
-			toast.add({
-				severity: "error",
-				summary: t("ViewCreateTournament.tournamentCreating"),
-				detail: t("ViewCreateTournament.tournamentCreationFailed"),
-				life: 3000,
-				closable: false,
-			})
-			if (handler.err) handler.err()
-		})
+	const queryClient = useQueryClient()
+	return useMutation(
+		(tournament: TournamentServer) => axios.post("/tournament/add", tournament),
+		{
+			onSuccess() {
+				toast.add({
+					severity: "success",
+					summary: t("ViewCreateTournament.tournamentCreating"),
+					detail: t("ViewCreateTournament.tournamentCreated"),
+					life: 3000,
+					closable: false,
+				})
+				queryClient.invalidateQueries(["tournamentList", true])
+				queryClient.invalidateQueries(["tournamentList", false])
+				if (handler.suc) handler.suc()
+			},
+			onError() {
+				toast.add({
+					severity: "error",
+					summary: t("ViewCreateTournament.tournamentCreating"),
+					detail: t("ViewCreateTournament.tournamentCreationFailed"),
+					life: 3000,
+					closable: false,
+				})
+				if (handler.err) handler.err()
+			},
+		},
+	)
 }
diff --git a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
index 6ba4fa0e..628c1b4c 100644
--- a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
+++ b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
@@ -32,12 +32,13 @@ import {
 	Competition,
 	CompetitionServer,
 	Mode,
+	Progress,
 	Sex,
 	SignUp,
 	TourType,
 } from "@/interfaces/competition"
 import { useToast } from "primevue/usetoast"
-import { addCompetition } from "@/backend/competition"
+import { useAddCompetition } from "@/backend/competition"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
@@ -66,17 +67,20 @@ const competition = reactive<Competition>({
 		hasMaxAge: false,
 		maxAge: null,
 	},
+	cProgress: Progress.TEAMS,
+})
+
+const { mutate } = useAddCompetition(route, t, toast, {
+	suc: () => {
+		router.push({
+			name: "Competitions",
+			params: { tourId: route.params.tourId },
+		})
+	},
 })
 
 function submit(server_data: CompetitionServer) {
-	addCompetition(server_data, <string>route.params.tourId, t, toast, {
-		suc: () => {
-			router.push({
-				name: "Competitions",
-				params: { tourId: route.params.tourId },
-			})
-		},
-	})
+	mutate(server_data)
 }
 </script>
 
diff --git a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
index aab7c0c2..1a52e3c4 100644
--- a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
@@ -26,7 +26,10 @@ import { useRoute } from "vue-router"
 import FormCompetition from "@/components/views/competitions/FormCompetition.vue"
 import { useI18n } from "vue-i18n"
 import { CompetitionDefault, CompetitionServer } from "@/interfaces/competition"
-import { getCompetitionDetails, updateCompetition } from "@/backend/competition"
+import {
+	getCompetitionDetails,
+	useUpdateCompetition,
+} from "@/backend/competition"
 import { useToast } from "primevue/usetoast"
 import { ref } from "vue"
 
@@ -49,12 +52,21 @@ const { data: competition } = getCompetitionDetails(route, t, toast, {
 		isUpdating.value = false
 	},
 	err: () => {
-		router.back()
+		// router.back()
+	},
+})
+
+const { mutate } = useUpdateCompetition(route, t, toast, {
+	suc(competition) {
+		router.replace({
+			name: "settings",
+			params: { tourId: route.params.tourid, compId: competition.name },
+		})
 	},
 })
 
 function save(server_data: CompetitionServer) {
-	updateCompetition(server_data, <string>route.params.tourId, t, toast, {})
+	mutate(server_data)
 }
 
 function nextPage() {
diff --git a/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue b/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
index 92e05989..f7b17f6a 100644
--- a/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
+++ b/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
@@ -13,20 +13,25 @@ import { useToast } from "primevue/usetoast"
 import FormTournament from "@/components/views/tournaments/FormTournament.vue"
 import { TournamentServer } from "@/interfaces/tournament"
 import { useI18n } from "vue-i18n"
-import { addTournament } from "@/backend/tournament"
+import { useAddTournament } from "@/backend/tournament"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
 
+let tourName: string | null = null
+const { mutate } = useAddTournament(t, toast, {
+	suc: () => {
+		if (!tourName) return
+		router.push({
+			name: "Competitions",
+			params: { tourId: tourName },
+		})
+	},
+})
+
 function submit(server_data: TournamentServer) {
-	addTournament(server_data, t, toast, {
-		suc: () => {
-			router.push({
-				name: "Competitions",
-				params: { tourId: server_data.name },
-			})
-		},
-	})
+	tourName = server_data.name
+	mutate(server_data)
 }
 </script>
 
diff --git a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
index 3d59ff93..0e7c84b7 100644
--- a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
+++ b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
@@ -23,7 +23,7 @@ import { TournamentDefault, TournamentServer } from "@/interfaces/tournament"
 import FormTournament from "@/components/views/tournaments/FormTournament.vue"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { getTournamentDetails, updateTournament } from "@/backend/tournament"
+import { getTournamentDetails, useUpdateTournament } from "@/backend/tournament"
 import { router } from "@/main"
 
 const { t } = useI18n({ inheritLocale: true })
@@ -41,8 +41,14 @@ const {
 	},
 })
 
+const { mutate } = useUpdateTournament(t, toast, {
+	err: () => {
+		router.back()
+	},
+})
+
 function submit(server_data: TournamentServer) {
-	updateTournament(server_data, t, toast, {})
+	mutate(server_data)
 }
 </script>
 

From cbb8e2401158d47c6fe3c094f6c4f1208fd10521 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 21 Aug 2024 21:21:22 +0200
Subject: [PATCH 040/247] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20to=20new?=
 =?UTF-8?q?=20vue-query=20version=20to=20reloading=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json                     |   3 +-
 frontend/app/src/backend/competition.ts       | 247 ++++++++----------
 frontend/app/src/backend/group.ts             |  89 +++----
 frontend/app/src/backend/knockout.ts          |  69 +++--
 frontend/app/src/backend/player.ts            |  45 ++--
 frontend/app/src/backend/registration.ts      |  48 ++--
 frontend/app/src/backend/security.ts          |  22 +-
 frontend/app/src/backend/signup.ts            |  72 +++--
 frontend/app/src/backend/tournament.ts        | 171 ++++++------
 .../app/src/components/header/LoadingBar.vue  |   2 +-
 .../views/competition/ViewCompetition.vue     |   3 +-
 .../competition/signup/ViewConditions.vue     |   4 +-
 .../competition/signup/ViewSignUpForm.vue     |   8 +-
 .../views/competition/signup/ViewTable.vue    |   2 +-
 .../views/competitions/ViewCompetitions.vue   |  14 +-
 .../views/prepare/ViewEditCompetition.vue     |  26 +-
 .../views/prepare/ViewEditPlayer.vue          |   6 +-
 .../views/prepare/ViewPrepareMatches.vue      |  16 +-
 .../views/prepare/ViewScheduleMatches.vue     |   7 +-
 .../assignMatches/AssignMatchesGroups.vue     |   6 +-
 .../assignMatches/AssignMatchesKnockout.vue   |   2 +-
 .../assignMatches/ViewAssignMatches.vue       |   6 +-
 .../views/prepare/editTeams/AddPlayer.vue     |   4 +-
 .../views/prepare/editTeams/ViewEditTeams.vue |   3 +-
 .../views/tournaments/ViewEditTournament.vue  |   6 +-
 frontend/app/src/main.ts                      |   4 +-
 frontend/app/src/routes.ts                    |   4 +-
 27 files changed, 409 insertions(+), 480 deletions(-)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index 205df9ec..0919a4b8 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -14,6 +14,8 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"@tanstack/vue-query": "^5.52.0",
+		"@tanstack/vue-query-devtools": "^5.52.0",
 		"@vee-validate/yup": "^4.12.3",
 		"@vue/cli": "^5.0.8",
 		"axios": "^1.6.2",
@@ -32,7 +34,6 @@
 		"vue-axios": "^3.5.2",
 		"vue-i18n": "^9.8.0",
 		"vue-password": "^3.1.0",
-		"vue-query": "^1.26.0",
 		"vue-router": "^4.2.5"
 	},
 	"devDependencies": {
diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index 0e9ceb08..560b821e 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -6,66 +6,61 @@ import {
 	competitionServerToClient,
 } from "@/interfaces/competition"
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { useQuery } from "vue-query/esm"
-import { QueryClient, useMutation, useQueryClient } from "vue-query"
 import { Player, playerClientToServer } from "@/interfaces/player"
 import { TeamServer } from "@/interfaces/team"
+import {
+	QueryClient,
+	useMutation,
+	useQuery,
+	useQueryClient,
+} from "@tanstack/vue-query"
 
 export function getCompetitionsList(
 	route: RouteLocationNormalizedLoaded,
 	isLoggedIn: Ref<boolean>,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
-	handler: {
-		suc?: () => void
-		err?: () => void
-	},
 ) {
-	return useQuery(
-		["competitionList", computed(() => route.params.tourId), isLoggedIn],
-		async () => {
+	return useQuery({
+		queryKey: [
+			"competitionList",
+			computed(() => route.params.tourId),
+			isLoggedIn,
+		],
+		queryFn: async () => {
 			return axios
-				.get<
-					CompetitionServer[]
-				>(`/tournament/${route.params.tourId}/competition/list`)
+				.get<CompetitionServer[]>(
+					`/tournament/${route.params.tourId}/competition/list`,
+				)
 				.then((response) => {
 					return response.data.map(competitionServerToClient)
 				})
-		},
-		{
-			onSuccess() {
-				if (handler.suc) handler.suc()
-			},
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewCompetitions.loadingFailed"),
-					detail: error,
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewCompetitions.loadingFailed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-				console.log(error)
-				if (handler.err) handler.err()
-			},
 		},
-	)
+	})
 }
 
 export function getCompetitionDetails(
 	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
-	handler: {
-		suc?: () => void
-		err?: () => void
-	},
 ) {
-	return useQuery(
-		[
+	return useQuery({
+		queryKey: [
 			"competitionDetails",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		async () => {
+		queryFn: async () => {
 			return axios
 				.get<CompetitionServer>(
 					`/tournament/${route.params.tourId}/competition/${route.params.compId}/details`,
@@ -73,24 +68,18 @@ export function getCompetitionDetails(
 				.then((response) => {
 					return competitionServerToClient(response.data)
 				})
-		},
-		{
-			onSuccess() {
-				if (handler.suc) handler.suc()
-			},
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewEditCompetition.loadingDetailsFailed"),
-					detail: error,
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewEditCompetition.loadingDetailsFailed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-				console.log(error)
-				if (handler.err) handler.err()
-			},
-			keepPreviousData: true,
 		},
-	)
+	})
 }
 
 export function useUpdateCompetition(
@@ -103,52 +92,43 @@ export function useUpdateCompetition(
 	},
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		(competition: CompetitionServer) =>
+	return useMutation({
+		mutationFn: (competition: CompetitionServer) =>
 			axios.post(
 				`/tournament/${<string>route.params.tourId}/competition/update`,
 				competition,
 			),
-		{
-			onSuccess(_, competition) {
-				toast.add({
-					severity: "success",
-					summary: t("ViewEditCompetition.competitionUpdate"),
-					detail: t("ViewEditCompetition.competitionUpdated"),
-					life: 3000,
-				})
+		onSuccess(_, competition) {
+			toast.add({
+				severity: "success",
+				summary: t("ViewEditCompetition.competitionUpdate"),
+				detail: t("ViewEditCompetition.competitionUpdated"),
+				life: 3000,
+			})
 
-				Promise.all([
-					queryClient.invalidateQueries([
-						"competitionList",
-						route.params.tourId,
-						true,
-					]),
-					queryClient.invalidateQueries([
-						"competitionList",
-						route.params.tourId,
-						false,
-					]),
-					queryClient.invalidateQueries([
-						"competitionDetails",
-						route.params.tourId,
-						competition.id,
-					]),
-				]).then(() => {
-					if (handler.suc) handler.suc(competition)
-				})
-			},
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewEditCompetition.tournamentUpdateFailed"),
-					detail: error,
-					life: 3000,
-				})
-				if (handler.err) handler.err()
-			},
+			Promise.all([
+				queryClient.invalidateQueries({
+					queryKey: ["competitionList"],
+					refetchType: "all",
+				}),
+				queryClient.invalidateQueries({
+					queryKey: ["competitionDetails", route.params.tourId, competition.id],
+					refetchType: "all",
+				}),
+			]).then(() => {
+				if (handler.suc) handler.suc(competition)
+			})
 		},
-	)
+		onError(error) {
+			toast.add({
+				severity: "error",
+				summary: t("ViewEditCompetition.tournamentUpdateFailed"),
+				detail: error,
+				life: 3000,
+			})
+			if (handler.err) handler.err()
+		},
+	})
 }
 
 export function useAddCompetition(
@@ -161,45 +141,40 @@ export function useAddCompetition(
 	},
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		(competition: CompetitionServer) =>
+	return useMutation({
+		mutationFn: (competition: CompetitionServer) =>
 			axios.post(
 				`/tournament/${<string>route.params.tourId}/competition/add`,
 				competition,
 			),
-		{
-			onSuccess() {
-				toast.add({
-					severity: "success",
-					summary: t("ViewCreateCompetition.competitionCreation"),
-					detail: t("ViewCreateCompetition.competitionCreated"),
-					life: 3000,
-					closable: false,
+		onSuccess() {
+			toast.add({
+				severity: "success",
+				summary: t("ViewCreateCompetition.competitionCreation"),
+				detail: t("ViewCreateCompetition.competitionCreated"),
+				life: 3000,
+				closable: false,
+			})
+			queryClient
+				.invalidateQueries({
+					queryKey: ["competitionList", route.params.tourId],
+					refetchType: "all",
 				})
-				queryClient.invalidateQueries([
-					"competitionList",
-					route.params.tourId,
-					true,
-				])
-				queryClient.invalidateQueries([
-					"competitionList",
-					route.params.tourId,
-					false,
-				])
-				if (handler.suc) handler.suc()
-			},
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("ViewCreateCompetition.competitionCreation"),
-					detail: t("ViewCreateCompetition.creationFailed"),
-					life: 3000,
-					closable: false,
+				.then(() => {
+					if (handler.suc) handler.suc()
 				})
-				if (handler.err) handler.err()
-			},
 		},
-	)
+		onError() {
+			toast.add({
+				severity: "error",
+				summary: t("ViewCreateCompetition.competitionCreation"),
+				detail: t("ViewCreateCompetition.creationFailed"),
+				life: 3000,
+				closable: false,
+			})
+			if (handler.err) handler.err()
+		},
+	})
 }
 
 export function useSignUpSingle(
@@ -208,8 +183,11 @@ export function useSignUpSingle(
 	toast: ToastServiceMethods,
 	queryClient: QueryClient,
 ) {
-	return useMutation(
-		async (data: { player: Ref<Player | null>; playerB: boolean }) => {
+	return useMutation({
+		mutationFn: async (data: {
+			player: Ref<Player | null>
+			playerB: boolean
+		}) => {
 			if (!data.player.value) {
 				toast.add({
 					severity: "error",
@@ -232,8 +210,8 @@ export function useSignUpSingle(
 				form,
 			)
 		},
-		signUpOptions(route, t, toast, queryClient),
-	)
+		...signUpOptions(route, t, toast, queryClient),
+	})
 }
 
 export function useSignUpDoubleTog(
@@ -242,8 +220,8 @@ export function useSignUpDoubleTog(
 	toast: ToastServiceMethods,
 	queryClient: QueryClient,
 ) {
-	return useMutation(
-		async (data: {
+	return useMutation({
+		mutationFn: async (data: {
 			playerA: Ref<Player | null>
 			playerB: Ref<Player | null>
 		}) => {
@@ -267,8 +245,8 @@ export function useSignUpDoubleTog(
 				form,
 			)
 		},
-		signUpOptions(route, t, toast, queryClient),
-	)
+		...signUpOptions(route, t, toast, queryClient),
+	})
 }
 
 function signUpOptions(
@@ -279,11 +257,10 @@ function signUpOptions(
 ) {
 	return {
 		onSuccess() {
-			queryClient.invalidateQueries([
-				"signedUp",
-				route.params.tourId,
-				route.params.compId,
-			])
+			queryClient.invalidateQueries({
+				queryKey: ["signedUp", route.params.tourId, route.params.compId],
+				refetchType: "all",
+			})
 			toast.add({
 				severity: "success",
 				summary: t("Player.register_success"),
diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index b62f3d52..9e882ce3 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -1,5 +1,4 @@
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { useQuery } from "vue-query/esm"
 import { computed } from "vue"
 import axios from "axios"
 import {
@@ -9,22 +8,22 @@ import {
 import { ToastServiceMethods } from "primevue/toastservice"
 import { GroupsDivision } from "@/interfaces/competition"
 import { Team, teamClientToServer, teamServerToClient } from "@/interfaces/team"
-import { useMutation, useQueryClient } from "vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
 export function getGroup(route: RouteLocationNormalizedLoaded) {
-	return useQuery(
-		[
+	return useQuery({
+		queryKey: [
 			"group",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		async () =>
+		queryFn: async () =>
 			axios
 				.get<GroupSystemServer>(
 					`tournament/${route.params.tourId}/competition/${route.params.compId}/groupMatches`,
 				)
 				.then((response) => groupSystemServerToClient(response.data)),
-	)
+	})
 }
 
 export function getGroupsDivision(
@@ -32,13 +31,13 @@ export function getGroupsDivision(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	return useQuery(
-		[
+	return useQuery({
+		queryKey: [
 			"groupsDivision",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		async () => {
+		queryFn: async () => {
 			return axios
 				.get<GroupsDivision>(
 					`tournament/${route.params.tourId}/competition/${route.params.compId}/groupsDivision`,
@@ -50,19 +49,18 @@ export function getGroupsDivision(
 						group.map((team) => teamServerToClient(team)),
 					)
 				})
-		},
-		{
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("general.failure"),
-					detail: t("general.loading_failed"),
-					life: 3000,
-					closable: false,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("general.failure"),
+						detail: t("general.loading_failed"),
+						life: 3000,
+						closable: false,
+					})
+					throw error
 				})
-			},
 		},
-	)
+	})
 }
 
 export function useInitGroups(
@@ -71,8 +69,8 @@ export function useInitGroups(
 	toast: ToastServiceMethods,
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		async (groups: Team[][]) => {
+	return useMutation({
+		mutationFn: async (groups: Team[][]) => {
 			return axios.post<boolean>(
 				`/tournament/${route.params.tourId}/competition/${route.params.compId}/initGroups`,
 				{
@@ -82,30 +80,27 @@ export function useInitGroups(
 				},
 			)
 		},
-		{
-			onSuccess() {
-				queryClient.invalidateQueries([
-					"groupsDivision",
-					route.params.tourId,
-					route.params.compId,
-				])
-				toast.add({
-					severity: "success",
-					summary: t("general.success"),
-					detail: t("general.saved"),
-					life: 3000,
-					closable: false,
-				})
-			},
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("general.failure"),
-					detail: t("general.save_failed"),
-					life: 3000,
-					closable: false,
-				})
-			},
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["groupsDivision", route.params.tourId, route.params.compId],
+				refetchType: "all",
+			})
+			toast.add({
+				severity: "success",
+				summary: t("general.success"),
+				detail: t("general.saved"),
+				life: 3000,
+				closable: false,
+			})
+		},
+		onError() {
+			toast.add({
+				severity: "error",
+				summary: t("general.failure"),
+				detail: t("general.save_failed"),
+				life: 3000,
+				closable: false,
+			})
 		},
-	)
+	})
 }
diff --git a/frontend/app/src/backend/knockout.ts b/frontend/app/src/backend/knockout.ts
index 549d86bf..6a5cb386 100644
--- a/frontend/app/src/backend/knockout.ts
+++ b/frontend/app/src/backend/knockout.ts
@@ -1,5 +1,4 @@
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { useQuery } from "vue-query/esm"
 import { computed } from "vue"
 import axios from "axios"
 import {
@@ -9,22 +8,22 @@ import {
 	knockoutSystemServerToClient,
 } from "@/interfaces/knockoutSystem"
 import { ToastServiceMethods } from "primevue/toastservice"
-import { useMutation, useQueryClient } from "vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
 export function getKnockout(route: RouteLocationNormalizedLoaded) {
-	return useQuery(
-		[
+	return useQuery({
+		queryKey: [
 			"knockout",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		async () =>
+		queryFn: async () =>
 			axios
 				.get<KnockoutSystemServer>(
 					`tournament/${route.params.tourId}/competition/${route.params.compId}/knockoutMatches`,
 				)
 				.then((response) => knockoutSystemServerToClient(response.data)),
-	)
+	})
 }
 
 export function useInitKnockout(
@@ -33,34 +32,34 @@ export function useInitKnockout(
 	toast: ToastServiceMethods,
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(async (tree: KnockoutMatch) =>
-		axios
-			.post<boolean>(
-				`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
-				knockoutMatchClientToServer(tree),
-			)
-			.then(() => {
-				queryClient.invalidateQueries([
-					"knockout",
-					route.params.tourId,
-					route.params.compId,
-				])
-				toast.add({
-					severity: "success",
-					summary: t("general.success"),
-					detail: t("general.saved"),
-					life: 3000,
-					closable: false,
-				})
-			})
-			.catch(() => {
-				toast.add({
-					severity: "error",
-					summary: t("general.failure"),
-					detail: t("general.save_failed"),
-					life: 3000,
-					closable: false,
+	return useMutation({
+		mutationFn: async (tree: KnockoutMatch) =>
+			axios
+				.post<boolean>(
+					`/tournament/${route.params.tourId}/competition/${route.params.compId}/initKnockout`,
+					knockoutMatchClientToServer(tree),
+				)
+				.then(() => {
+					queryClient.invalidateQueries({
+						queryKey: ["knockout", route.params.tourId, route.params.compId],
+						refetchType: "all",
+					})
+					toast.add({
+						severity: "success",
+						summary: t("general.success"),
+						detail: t("general.saved"),
+						life: 3000,
+						closable: false,
+					})
 				})
-			}),
-	)
+				.catch(() => {
+					toast.add({
+						severity: "error",
+						summary: t("general.failure"),
+						detail: t("general.save_failed"),
+						life: 3000,
+						closable: false,
+					})
+				}),
+	})
 }
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 1dfb185b..9998f41c 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -1,9 +1,9 @@
 import { Competition, Sex } from "@/interfaces/competition"
-import { useQuery } from "vue-query/esm"
 import axios from "axios"
 import { Player, playerServerToClient } from "@/interfaces/player"
 import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
+import { useQuery } from "@tanstack/vue-query"
 
 export interface searchPlayer {
 	sex: Sex
@@ -47,28 +47,35 @@ export function getPlayer(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	return useQuery(
-		["searchPlayer", search, searchPlayer],
-		async () => {
+	return useQuery({
+		queryKey: ["searchPlayer", search, searchPlayer],
+		queryFn: async () => {
 			return axios
-				.get<
-					Player[]
-				>(`/player/find?search=${search.value.toLowerCase()}` + (searchPlayer.value.sex !== Sex.ANY ? `&sex=${searchPlayer.value.sex}` : "") + (searchPlayer.value.hasMinAge && searchPlayer.value.minAge !== null ? `&minAge=${searchPlayer.value.minAge.toISOString().slice(0, 10)}` : "") + (searchPlayer.value.hasMaxAge && searchPlayer.value.maxAge !== null ? `&maxAge=${searchPlayer.value.maxAge.toISOString().slice(0, 10)}` : ""))
+				.get<Player[]>(
+					`/player/find?search=${search.value.toLowerCase()}` +
+						(searchPlayer.value.sex !== Sex.ANY
+							? `&sex=${searchPlayer.value.sex}`
+							: "") +
+						(searchPlayer.value.hasMinAge && searchPlayer.value.minAge !== null
+							? `&minAge=${searchPlayer.value.minAge.toISOString().slice(0, 10)}`
+							: "") +
+						(searchPlayer.value.hasMaxAge && searchPlayer.value.maxAge !== null
+							? `&maxAge=${searchPlayer.value.maxAge.toISOString().slice(0, 10)}`
+							: ""),
+				)
 				.then((result) => {
 					return result.data.map(playerServerToClient)
 				})
-		},
-		{
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewCompetition.query_search_failed"),
-					detail: error,
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewCompetition.query_search_failed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-				console.log(error)
-			},
-			keepPreviousData: true,
 		},
-	)
+	})
 }
diff --git a/frontend/app/src/backend/registration.ts b/frontend/app/src/backend/registration.ts
index 28314811..872eeb0a 100644
--- a/frontend/app/src/backend/registration.ts
+++ b/frontend/app/src/backend/registration.ts
@@ -1,14 +1,14 @@
 import { ToastServiceMethods } from "primevue/toastservice"
-import { useMutation } from "vue-query"
 import axios from "axios"
 import { PlayerRegistration } from "@/interfaces/player"
+import { useMutation } from "@tanstack/vue-query"
 
 export function useRegisterPlayer(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	return useMutation(
-		async (reg: PlayerRegistration) => {
+	return useMutation({
+		mutationFn: async (reg: PlayerRegistration) => {
 			return axios.post("/player/registration", {
 				firstName: reg.firstName,
 				lastName: reg.lastName,
@@ -18,31 +18,31 @@ export function useRegisterPlayer(
 				phone: reg.phone,
 			})
 		},
-		{
-			onSuccess() {
-				toast.add({
-					severity: "success",
-					summary: t("ViewPlayerRegistration.registration_successful"),
-					detail: t("ViewPlayerRegistration.after"),
-					life: 3000,
-				})
-			},
-			onError(error) {
-				console.log(error)
-				toast.add({
-					severity: "error",
-					summary: t("ViewPlayerRegistration.registration_failed"),
-					detail: t("ViewPlayerRegistration.registration_failed_detail"),
-					life: 3000,
-				})
-			},
+		onSuccess() {
+			toast.add({
+				severity: "success",
+				summary: t("ViewPlayerRegistration.registration_successful"),
+				detail: t("ViewPlayerRegistration.after"),
+				life: 3000,
+			})
+		},
+		onError(error) {
+			console.log(error)
+			toast.add({
+				severity: "error",
+				summary: t("ViewPlayerRegistration.registration_failed"),
+				detail: t("ViewPlayerRegistration.registration_failed_detail"),
+				life: 3000,
+			})
 		},
-	)
+	})
 }
 
 export function useVerify() {
-	return useMutation(async (code: string) => {
-		return axios.get(`/player/verification?code=${code}`)
+	return useMutation({
+		mutationFn: async (code: string) => {
+			return axios.get(`/player/verification?code=${code}`)
+		},
 	})
 }
 
diff --git a/frontend/app/src/backend/security.ts b/frontend/app/src/backend/security.ts
index 05e5019a..02e241c0 100644
--- a/frontend/app/src/backend/security.ts
+++ b/frontend/app/src/backend/security.ts
@@ -1,13 +1,14 @@
 import { Ref } from "vue"
 import { auth } from "@/security/AuthService"
 import axios from "axios"
-import { useQuery } from "vue-query/esm"
+import { useQuery } from "@tanstack/vue-query"
 
 export function getCanCreate(isLoggedIn: Ref<boolean>) {
-	return useQuery(["can_create", isLoggedIn], fetchCanCreate, {
+	return useQuery({
+		queryKey: ["can_create", isLoggedIn],
+		queryFn: fetchCanCreate,
 		placeholderData: false,
 		staleTime: 0,
-		keepPreviousData: false,
 	})
 }
 
@@ -26,15 +27,12 @@ async function fetchCanCreate() {
 }
 
 export function getCanEdit(tourId: string, isLoggedIn: Ref<boolean>) {
-	return useQuery(
-		["can_edit", tourId, isLoggedIn],
-		() => fetchCanEdit(tourId),
-		{
-			placeholderData: false,
-			staleTime: 0,
-			keepPreviousData: false,
-		},
-	)
+	return useQuery({
+		queryKey: ["can_edit", tourId, isLoggedIn],
+		queryFn: () => fetchCanEdit(tourId),
+		placeholderData: false,
+		staleTime: 0,
+	})
 }
 
 async function fetchCanEdit(tourId: string) {
diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index cf376002..9ad7fa2f 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -1,44 +1,43 @@
 import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 import { Player, playerServerToClient } from "@/interfaces/player"
 import { ToastServiceMethods } from "primevue/toastservice"
-import { useMutation, useQuery } from "vue-query/esm"
 import axios from "axios"
 import { Competition, Mode, SignUp } from "@/interfaces/competition"
 import { getCompetitionDetails } from "@/backend/competition"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { computed, Ref } from "vue"
-import { useQueryClient } from "vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
 export function getSignedUp(
 	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	return useQuery(
-		[
+	return useQuery({
+		queryKey: [
 			"signedUp",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		async () => {
+		queryFn: async () => {
 			return axios
-				.get<
-					TeamServer[]
-				>(`/tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`)
+				.get<TeamServer[]>(
+					`/tournament/${route.params.tourId}/competition/${route.params.compId}/signedUpTeams`,
+				)
 				.then<Team[]>((response) => {
 					return response.data.map(teamServerToClient)
 				})
-		},
-		{
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("ViewCompetition.query_player_failed"),
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewCompetition.query_player_failed"),
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-			},
 		},
-	)
+	})
 }
 
 export function getSignedUpSepByComp(
@@ -46,7 +45,7 @@ export function getSignedUpSepByComp(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	const { data: competition } = getCompetitionDetails(route, t, toast, {})
+	const { data: competition } = getCompetitionDetails(route, t, toast)
 	const signedUp = getSignedUp(route, t, toast)
 
 	return {
@@ -166,30 +165,27 @@ export function useUpdateTeams(
 	toast: ToastServiceMethods,
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		async (req: TeamServer[]) => {
+	return useMutation({
+		mutationFn: async (req: TeamServer[]) => {
 			return axios.post(
 				`/tournament/${route.params.tourId}/competition/${route.params.compId}/updateTeams`,
 				req,
 			)
 		},
-		{
-			onSuccess() {
-				return queryClient.invalidateQueries([
-					"signedUp",
-					route.params.tourId,
-					route.params.compId,
-				])
-			},
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("general.failure"),
-					detail: t("general.save_failed"),
-					life: 3000,
-					closable: false,
-				})
-			},
+		onSuccess() {
+			return queryClient.invalidateQueries({
+				queryKey: ["signedUp", route.params.tourId, route.params.compId],
+				refetchType: "all",
+			})
+		},
+		onError() {
+			toast.add({
+				severity: "error",
+				summary: t("general.failure"),
+				detail: t("general.save_failed"),
+				life: 3000,
+				closable: false,
+			})
 		},
-	)
+	})
 }
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 86d5ed92..d5b045ef 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -6,70 +6,61 @@ import {
 	tournamentServerToClient,
 } from "@/interfaces/tournament"
 import { ToastServiceMethods } from "primevue/toastservice"
-import { useQuery } from "vue-query/esm"
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { useMutation, useQueryClient } from "vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
-	return useQuery(
-		["tournamentList", isLoggedIn],
-		async () => {
+	return useQuery({
+		queryKey: ["tournamentList", isLoggedIn],
+		queryFn: async () => {
 			return axios
 				.get<TournamentServer[]>("/tournament/list")
 				.then<Tournament[]>((response) => {
 					return response.data.map(tournamentServerToClient)
 				})
-		},
-		{
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewTournaments.loadingFailed"),
-					detail: error,
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewTournaments.loadingFailed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-				console.log(error)
-			},
 		},
-	)
+	})
 }
 
 export function getTournamentDetails(
 	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
-	handler: {
-		suc?: () => void
-		err?: () => void
-	},
 ) {
-	return useQuery(
-		["tournament", computed(() => route.params.tourId)],
-		async () => {
+	return useQuery({
+		queryKey: ["tournament", computed(() => route.params.tourId)],
+		queryFn: async () => {
 			return axios
 				.get<TournamentServer>(`/tournament/${route.params.tourId}/details`)
 				.then<Tournament>((response) => {
 					return tournamentServerToClient(response.data)
 				})
-		},
-		{
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewEditTournament.loadingDetailsFailed"),
-					detail: error,
-					life: 3000,
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewEditTournament.loadingDetailsFailed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
 				})
-				console.log(error)
-				if (handler.err) handler.err()
-			},
-			onSuccess: handler.suc,
 		},
-	)
+	})
 }
 
 export function useUpdateTournament(
@@ -81,33 +72,39 @@ export function useUpdateTournament(
 	},
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		(tournament: TournamentServer) =>
+	return useMutation({
+		mutationFn: (tournament: TournamentServer) =>
 			axios.post("/tournament/update", tournament),
-		{
-			onSuccess(__, tournament) {
-				toast.add({
-					severity: "success",
-					summary: t("ViewEditTournament.tournamentUpdating"),
-					detail: t("ViewEditTournament.tournamentUpdated"),
-					life: 3000,
-				})
-				queryClient.invalidateQueries(["tournamentList", true])
-				queryClient.invalidateQueries(["tournamentList", false])
-				queryClient.invalidateQueries(["tournament", tournament.name])
+		onSuccess(__, tournament) {
+			toast.add({
+				severity: "success",
+				summary: t("ViewEditTournament.tournamentUpdating"),
+				detail: t("ViewEditTournament.tournamentUpdated"),
+				life: 3000,
+			})
+			Promise.all([
+				queryClient.invalidateQueries({
+					queryKey: ["tournamentList"],
+					refetchType: "all",
+				}),
+				queryClient.invalidateQueries({
+					queryKey: ["tournament", tournament.name],
+					refetchType: "all",
+				}),
+			]).then(() => {
 				if (handler.suc) handler.suc()
-			},
-			onError(error) {
-				toast.add({
-					severity: "error",
-					summary: t("ViewEditTournament.tournamentUpdateFailed"),
-					detail: error,
-					life: 3000,
-				})
-				if (handler.err) handler.err()
-			},
+			})
+		},
+		onError(error) {
+			toast.add({
+				severity: "error",
+				summary: t("ViewEditTournament.tournamentUpdateFailed"),
+				detail: error,
+				life: 3000,
+			})
+			if (handler.err) handler.err()
 		},
-	)
+	})
 }
 
 export function useAddTournament(
@@ -119,31 +116,33 @@ export function useAddTournament(
 	},
 ) {
 	const queryClient = useQueryClient()
-	return useMutation(
-		(tournament: TournamentServer) => axios.post("/tournament/add", tournament),
-		{
-			onSuccess() {
-				toast.add({
-					severity: "success",
-					summary: t("ViewCreateTournament.tournamentCreating"),
-					detail: t("ViewCreateTournament.tournamentCreated"),
-					life: 3000,
-					closable: false,
-				})
-				queryClient.invalidateQueries(["tournamentList", true])
-				queryClient.invalidateQueries(["tournamentList", false])
-				if (handler.suc) handler.suc()
-			},
-			onError() {
-				toast.add({
-					severity: "error",
-					summary: t("ViewCreateTournament.tournamentCreating"),
-					detail: t("ViewCreateTournament.tournamentCreationFailed"),
-					life: 3000,
-					closable: false,
-				})
-				if (handler.err) handler.err()
-			},
+	return useMutation({
+		mutationFn: (tournament: TournamentServer) =>
+			axios.post("/tournament/add", tournament),
+
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["tournamentList"],
+				refetchType: "all",
+			})
+			toast.add({
+				severity: "success",
+				summary: t("ViewCreateTournament.tournamentCreating"),
+				detail: t("ViewCreateTournament.tournamentCreated"),
+				life: 3000,
+				closable: false,
+			})
+			if (handler.suc) handler.suc()
+		},
+		onError() {
+			toast.add({
+				severity: "error",
+				summary: t("ViewCreateTournament.tournamentCreating"),
+				detail: t("ViewCreateTournament.tournamentCreationFailed"),
+				life: 3000,
+				closable: false,
+			})
+			if (handler.err) handler.err()
 		},
-	)
+	})
 }
diff --git a/frontend/app/src/components/header/LoadingBar.vue b/frontend/app/src/components/header/LoadingBar.vue
index c18371fd..8db4574f 100644
--- a/frontend/app/src/components/header/LoadingBar.vue
+++ b/frontend/app/src/components/header/LoadingBar.vue
@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import { ref } from "vue"
 import axios from "axios"
-import { useIsFetching } from "vue-query"
+import { useIsFetching } from "@tanstack/vue-query"
 
 const isFetching = useIsFetching()
 
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index bd0e366e..db07ed19 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -71,9 +71,8 @@ const { data: tournament, isSuccess: tournamentSuc } = getTournamentDetails(
 	route,
 	t,
 	toast,
-	{},
 )
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 
 function settings() {
 	router.push({
diff --git a/frontend/app/src/components/views/competition/signup/ViewConditions.vue b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
index 5f78c088..6a4595fd 100644
--- a/frontend/app/src/components/views/competition/signup/ViewConditions.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
@@ -49,8 +49,8 @@ const toast = useToast()
 
 const route = useRoute()
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
-const { data: tournament } = getTournamentDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
+const { data: tournament } = getTournamentDetails(route, t, toast)
 
 const player = computed(() =>
 	props.second ? competition.value?.playerB : competition.value?.playerA,
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
index 16a13794..4ad80870 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
@@ -219,7 +219,7 @@ import {
 	useSignUpDoubleTog,
 	useSignUpSingle,
 } from "@/backend/competition"
-import { useQueryClient } from "vue-query"
+import { useQueryClient } from "@tanstack/vue-query"
 import { extractSearchPlayer, getPlayer } from "@/backend/player"
 
 const { t } = useI18n({ inheritLocale: true })
@@ -228,7 +228,7 @@ const toast = useToast()
 const route = useRoute()
 const queryClient = useQueryClient()
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 
 const selectedPlayerA = ref<Player | null>(null)
 const searchA = ref<string>("")
@@ -247,9 +247,9 @@ const { data: suggestionsPlayerB, isFetching: loadingB } = getPlayer(
 	toast,
 )
 
-const { mutate: mutateSignUpSingle, isLoading: mutSingleLoading } =
+const { mutate: mutateSignUpSingle, isPending: mutSingleLoading } =
 	useSignUpSingle(route, t, toast, queryClient)
-const { mutate: mutateSignUpDoubleTog, isLoading: mutDoubleLoading } =
+const { mutate: mutateSignUpDoubleTog, isPending: mutDoubleLoading } =
 	useSignUpDoubleTog(route, t, toast, queryClient)
 
 function queryPlayerA(event: DropdownFilterEvent) {
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index 6a2245a1..441c0516 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -191,7 +191,7 @@ const route = useRoute()
 const isLoggedIn = inject("loggedIn", ref(false))
 const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: signedUp } = getSignedUpSepByComp(route, t, toast)
 
 function deletePlayer(player: Player) {
diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
index 933ed169..28ee048b 100644
--- a/frontend/app/src/components/views/competitions/ViewCompetitions.vue
+++ b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
@@ -102,17 +102,7 @@ const route = useRoute()
 
 const isLoggedIn = inject("loggedIn", ref(false))
 const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
-const { data: competitions } = getCompetitionsList(
-	route,
-	isLoggedIn,
-	t,
-	toast,
-	{
-		err: () => {
-			router.push({ name: "Tournaments" })
-		},
-	},
-)
+const { data: competitions } = getCompetitionsList(route, isLoggedIn, t, toast)
 
 const options: Intl.DateTimeFormatOptions = {
 	weekday: "long",
@@ -137,7 +127,7 @@ const status = ref([
 ])
 
 const openRegistration = ref(false)
-const { data, isLoading } = getTournamentDetails(route, t, toast, {})
+const { data, isLoading } = getTournamentDetails(route, t, toast)
 
 watch(data, () => {
 	if (data.value === undefined) return
diff --git a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
index 1a52e3c4..31726d65 100644
--- a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
@@ -6,14 +6,14 @@
 					v-if="!competition || isUpdating"
 					:competition="CompetitionDefault"
 					:disabled="true"
-					@submit="save"
+					@submit="submit"
 				/>
 				<FormCompetition
 					v-else
 					ref="form"
 					:competition="competition"
 					:disabled="false"
-					@submit="save"
+					@submit="submit"
 				/>
 			</template>
 		</Card>
@@ -31,7 +31,7 @@ import {
 	useUpdateCompetition,
 } from "@/backend/competition"
 import { useToast } from "primevue/usetoast"
-import { ref } from "vue"
+import { ref, watch } from "vue"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
@@ -45,15 +45,11 @@ function sleep(milliseconds: number) {
 	return new Promise((resolve) => setTimeout(resolve, milliseconds))
 }
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: async () => {
-		isUpdating.value = true
-		await sleep(100)
-		isUpdating.value = false
-	},
-	err: () => {
-		// router.back()
-	},
+const { data: competition } = getCompetitionDetails(route, t, toast)
+watch(competition, async () => {
+	isUpdating.value = true
+	await sleep(100)
+	isUpdating.value = false
 })
 
 const { mutate } = useUpdateCompetition(route, t, toast, {
@@ -65,7 +61,11 @@ const { mutate } = useUpdateCompetition(route, t, toast, {
 	},
 })
 
-function save(server_data: CompetitionServer) {
+function save() {
+	form.value?.onSubmit()
+}
+
+function submit(server_data: CompetitionServer) {
 	mutate(server_data)
 }
 
diff --git a/frontend/app/src/components/views/prepare/ViewEditPlayer.vue b/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
index ddb07989..36d44e2e 100644
--- a/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
@@ -44,11 +44,7 @@ const router = useRouter()
 const route = useRoute()
 const toast = useToast()
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-	},
-})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 
 onUpdated(() => {})
 
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index b9a5249c..1cd7c47a 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -101,25 +101,13 @@ const isUpdating = ref(false)
 const curPrepStep = ref<InstanceType<typeof ViewEditTeams> | null>()
 
 const isLoggedIn = inject("loggedIn", ref(false))
-const { data: competitions } = getCompetitionsList(
-	route,
-	isLoggedIn,
-	t,
-	toast,
-	{
-		err: () => {
-			router.push({
-				name: "Tournaments",
-			})
-		},
-	},
-)
+const { data: competitions } = getCompetitionsList(route, isLoggedIn, t, toast)
 const activeTab = ref<number>(0)
 watch([competitions, route], () => updateRoute())
 updateRoute()
 
 function updateRoute(compId?: string) {
-	if (!competitions.value) return
+	if (!competitions.value || competitions.value.length === 0) return
 
 	if (!compId) compId = <string>route.params.compId
 	if (compId === "" || !competitions.value.find((c) => c.name === compId))
diff --git a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
index 02cc25b7..7a062ac3 100644
--- a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
@@ -29,11 +29,8 @@ const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-	},
-})
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { data: competition } = getCompetitionDetails(route, t, toast)
 
 function prevPage() {
 	router.replace({
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 8103c547..94fd8cdc 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -96,11 +96,7 @@ const randomizeItems = genRandomizeItems(t, reroll, reset)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-	},
-})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: signedUpTeams, isLoading: signedUpLoading } = getSignedUp(
 	route,
 	t,
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 085cd163..516df6a4 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -94,7 +94,7 @@ const randomizeItems = genRandomizeItems(t, reroll, reset)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: signedUpTeams, isLoading: signedUpLoading } = getSignedUp(
 	route,
 	t,
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index 6dca19e5..d0430c15 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -32,11 +32,7 @@ const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 const knockoutRef = ref<InstanceType<typeof AssignMatchesKnockout> | null>(null)
 const groupsRef = ref<InstanceType<typeof AssignMatchesGroups> | null>(null)
 
-const { data: competition } = getCompetitionDetails(route, t, toast, {
-	suc: () => {
-		if (competition.value === null) return
-	},
-})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 
 function prevPage() {
 	router.replace({
diff --git a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
index a029a294..4e802d66 100644
--- a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
@@ -54,8 +54,8 @@ const props = defineProps<{
 const emit = defineEmits(["addPlayer"])
 
 const route = useRoute()
-const { data: tournament } = getTournamentDetails(route, t, toast, {})
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const selectedPlayer = ref<Player | null>(null)
 const search = ref<string>("")
 const { data: suggestionsPlayer, isFetching: loading } = getPlayer(
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index 910192aa..27dab58a 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -113,9 +113,8 @@ const { data: tournament, isSuccess: tournamentSuc } = getTournamentDetails(
 	route,
 	t,
 	toast,
-	{},
 )
-const { data: competition } = getCompetitionDetails(route, t, toast, {})
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: signedUpTeams, isPlaceholderData: signedUpPlaceholder } =
 	getSignedUpSeparated(route, t, toast)
 
diff --git a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
index 0e7c84b7..c4cc5f66 100644
--- a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
+++ b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
@@ -35,11 +35,7 @@ const {
 	data: tourDetails,
 	isLoading,
 	isError,
-} = getTournamentDetails(route, t, toast, {
-	err: () => {
-		router.back()
-	},
-})
+} = getTournamentDetails(route, t, toast)
 
 const { mutate } = useUpdateTournament(t, toast, {
 	err: () => {
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index e73c65a0..80029e25 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -60,7 +60,7 @@ import "material-symbols"
 
 /* yup validation */
 import { setLocale } from "yup"
-import { VueQueryPlugin, VueQueryPluginOptions } from "vue-query"
+import { VueQueryPlugin, VueQueryPluginOptions } from "@tanstack/vue-query"
 
 axios.defaults.baseURL = settings.BACKEND
 
@@ -125,10 +125,10 @@ const vueQueryPluginOptions: VueQueryPluginOptions = {
 				refetchOnWindowFocus: false,
 				refetchOnReconnect: false,
 				refetchOnMount: false,
-				keepPreviousData: true,
 			},
 		},
 	},
+	enableDevtoolsV6Plugin: true,
 }
 
 app
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index a1ae041d..8096e3b0 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -1,5 +1,4 @@
 import viewTournaments from "@/components/views/tournaments/ViewTournaments.vue"
-import viewCompetitions from "@/components/views/competitions/ViewCompetitions.vue"
 import viewCompetition from "@/components/views/competition/ViewCompetition.vue"
 import viewPrepareMatches from "@/components/views/prepare/ViewPrepareMatches.vue"
 import ViewAssignMatches from "@/components/views/prepare/assignMatches/ViewAssignMatches.vue"
@@ -28,7 +27,8 @@ export default [
 	{
 		path: "/tournament/:tourId",
 		name: "Competitions",
-		component: viewCompetitions,
+		component: () =>
+			import("@/components/views/competitions/ViewCompetitions.vue"),
 	},
 	{
 		path: "/tournament/:tourId/createCompetition",

From 9453b581ca6f2839b0adf899c65dfbc4a3c9a949 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 14 Aug 2024 22:34:50 +0200
Subject: [PATCH 041/247] =?UTF-8?q?=F0=9F=93=9D=20add=20documentation=20to?=
 =?UTF-8?q?=20swagger-ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/ApiInformation.java         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
new file mode 100644
index 00000000..958ca672
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
@@ -0,0 +1,27 @@
+package de.secretj12.turnierplaner;
+
+import jakarta.ws.rs.core.Application;
+import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition;
+import org.eclipse.microprofile.openapi.annotations.info.Contact;
+import org.eclipse.microprofile.openapi.annotations.info.Info;
+import org.eclipse.microprofile.openapi.annotations.info.License;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+
+@OpenAPIDefinition(
+        tags = {
+                @Tag(name="widget", description="Widget operations."),
+                @Tag(name="gasket", description="Operations related to gaskets")
+        },
+        info = @Info(
+                title="Tournament planer backend API",
+                version = "1.0.0",
+                contact = @Contact(
+                        name = "Jonas and Oliver",
+                        url = "http://exampleurl.com/contact",
+                        email = "techsupport@example.com"),
+                license = @License(
+                        name = "Apache 2.0",
+                        url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
+)
+public class ApiInformation extends Application {
+}

From 07386c679f561651dc7b111f5f8eb934a0b6a27c Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 12:59:56 +0200
Subject: [PATCH 042/247] =?UTF-8?q?=F0=9F=94=A5=20remove=20obsolete=20vers?=
 =?UTF-8?q?ion=20attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/docker-compose.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/keycloak/docker-compose.yaml b/keycloak/docker-compose.yaml
index 6c53c250..e9a47c31 100644
--- a/keycloak/docker-compose.yaml
+++ b/keycloak/docker-compose.yaml
@@ -1,13 +1,10 @@
-version: "2"
-
 services:
-
   keycloak:
     image: quay.io/keycloak/keycloak-x
     command:
       - start-dev --http-enabled=true
     environment:
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
+      KEYCLOAK_ADMIN: admin2
+      KEYCLOAK_ADMIN_PASSWORD: admin2
     ports:
       - 8080:8080

From 98520700dd708bdca581b92688e99645be5c928f Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 13:02:33 +0200
Subject: [PATCH 043/247] =?UTF-8?q?=F0=9F=99=88=20update=20gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f49cdffd..da7485b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,5 @@ nb-configuration.xml
 node_modules/**
 package-lock.json
 
-keycloak/**
 keycloak-19.0.1/**
 backend/.mvn
\ No newline at end of file

From c8aa1c7a86758f0bc0c2bd3f78deea0003b56a1e Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 13:03:13 +0200
Subject: [PATCH 044/247] =?UTF-8?q?=F0=9F=9A=9A=20rename=20file=20to=20new?=
 =?UTF-8?q?=20docker=20compose=20naming=20convention=20(https://docs.docke?=
 =?UTF-8?q?r.com/compose/gettingstarted/)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/{docker-compose.yaml => compose.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename keycloak/{docker-compose.yaml => compose.yaml} (100%)

diff --git a/keycloak/docker-compose.yaml b/keycloak/compose.yaml
similarity index 100%
rename from keycloak/docker-compose.yaml
rename to keycloak/compose.yaml

From aba78f6e069e3f92275127e29983da1ddc8873f9 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 13:09:36 +0200
Subject: [PATCH 045/247] :package: fix warning of moved dependency

---
 backend/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f3bcf52f..74672378 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -38,11 +38,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <artifactId>quarkus-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+            <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
 
         <!-- Testing -->

From 54062cd93e40c24fcfef1224cb6be6c0f6afb566 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 23:02:52 +0200
Subject: [PATCH 046/247] =?UTF-8?q?=F0=9F=9A=9A=20move=20keycloak=5Frealm.?=
 =?UTF-8?q?json=20to=20keycloak=20folder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {backend/src/main/resources => keycloak}/keycloak_realm.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {backend/src/main/resources => keycloak}/keycloak_realm.json (100%)

diff --git a/backend/src/main/resources/keycloak_realm.json b/keycloak/keycloak_realm.json
similarity index 100%
rename from backend/src/main/resources/keycloak_realm.json
rename to keycloak/keycloak_realm.json

From 3c38fa2e9733b17597a9716ffde330ae53886886 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 23:03:50 +0200
Subject: [PATCH 047/247] =?UTF-8?q?=F0=9F=9A=9A=20rename=20Read.me=20to=20?=
 =?UTF-8?q?be=20consistent=20with=20READ.me=20in=20backend=20and=20add=20m?=
 =?UTF-8?q?ore=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Readme.md | 49 --------------------------------
 2 files changed, 85 insertions(+), 49 deletions(-)
 create mode 100644 README.md
 delete mode 100644 Readme.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..89c42a35
--- /dev/null
+++ b/README.md
@@ -0,0 +1,85 @@
+# Tournament planer
+
+# Tournament Planner
+
+This project is a comprehensive tournament planning application that leverages modern web technologies like Vue3 (in the frontend), 
+Quarkus (for the backend), Keycloak (for authentication) to provide a seamless user experience.
+
+## Getting Started
+This application is a monorepo that contains both the frontend and backend code. The frontend is a Vue3 application that 
+is located in the `frontend/app` directory, while the backend is a Quarkus application located in the `backend` directory.
+The application supports mail sending for verification and reminder mails.
+
+For this create a `.env` file under backend with the following content:
+```
+MAIL_FROM=${ your mail address }
+MAIL_HOST=${ your mail host }
+MAIL_USER=${ your mail address }
+MAIL_PASS=${ your mail password }
+```
+For admin verification the application uses keycloak before deploying this application for production you need to 
+set up the admin username and password. For this create a `.env` file under the folder `keycloak` with the following content:
+```env
+KEYCLOAK_ADMIN_USER=${ your keycloak admin user }
+KEYCLOAK_ADMIN_PASS=${ your keycloak admin password }
+
+KC_DB_USERNAME=${the username for the keycloak database}
+KC_DB_PASSWORD=${the password for the keycloak database}
+```
+
+# Quarkus + Vue
+
+## Vue
+
+Edit your VueJs app inside of `frontend/app`
+
+To setup the project use
+
+```shell
+mvn compile -DfrontendDev -DnoFrontendComp
+```
+
+```shell
+cd frontend/app
+npm install
+```
+
+For compilation and hot reload
+```shell
+npm run dev
+```
+
+## Quarkus
+
+For testing run
+```shell
+cd backend
+mvn compile quarkus:dev -DbackendDev
+```
+
+For just building and running the quarkus application in production mode:
+```shell
+cd backend
+./mvnw install
+java -jar target/quarkus-app/quarkus-run.jar
+```
+
+## Build Quarkus+Vue
+To build the whole application:
+```shell
+mvn package
+```
+
+Don't compile frontend
+```shell
+mvn package -DnoFrontendComp
+```
+Don't compile backend
+```shell
+mvn package -DnoBackendComp
+```
+
+## Clean
+```shell
+mvn clean
+```
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
deleted file mode 100644
index 095cc3ca..00000000
--- a/Readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Quarkus + Vue
-
-## Vue
-
-Edit your VueJs app inside of `frontend/app`
-
-To setup the project use
-
-```shell
-mvn compile -DfrontendDev -DnoFrontendComp
-```
-
-```shell
-cd frontend/app
-npm install
-```
-
-For compilation and hot reload
-```shell
-npm run dev
-```
-
-## Quarkus
-
-For testing run
-```shell
-cd backend
-mvn compile quarkus:dev -DbackendDev
-```
-
-## Build Quarkus+Vue
-
-```shell
-mvn package
-```
-
-Don't compile frontend
-```shell
-mvn package -DnoFrontendComp
-```
-Don't compile backend
-```shell
-mvn package -DnoBackendComp
-```
-
-## Clean
-```shell
-mvn clean
-```
\ No newline at end of file

From c27d23e72746aa7febb6b2f45673f3b073611541 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 23:04:50 +0200
Subject: [PATCH 048/247] =?UTF-8?q?=F0=9F=9A=A7=20configure=20production?=
 =?UTF-8?q?=20keycloak=20instance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties |  2 +-
 keycloak/Dockerfile                           | 24 +++++++++++++++++++
 keycloak/compose.yaml                         |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 keycloak/Dockerfile

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index d2b9244a..44f30f00 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -17,7 +17,7 @@ quarkus.oidc.credentials.secret=**********
 quarkus.oidc.tls.verification=none
 
 quarkus.keycloak.devservices.port=7777
-quarkus.keycloak.devservices.realm-path=keycloak_realm.json
+quarkus.keycloak.devservices.realm-path=../../../../keycloak/keycloak-realm.json
 quarkus.swagger-ui.oauth-client-id=frontend-swagger
 
 # test setup
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
new file mode 100644
index 00000000..0ff5eaec
--- /dev/null
+++ b/keycloak/Dockerfile
@@ -0,0 +1,24 @@
+FROM quay.io/keycloak/keycloak:latest as builder
+
+# Enable health and metrics support
+ENV KC_HEALTH_ENABLED=true
+ENV KC_METRICS_ENABLED=true
+
+# Configure a database vendor
+ENV KC_DB=postgres
+
+WORKDIR /opt/keycloak
+# for demonstration purposes only, please make sure to use proper certificates in production instead
+RUN keytool -genkeypair -storepass password -storetype PKCS12 -keyalg RSA -keysize 2048 -dname "CN=server" -alias server -ext "SAN:c=DNS:localhost,IP:127.0.0.1" -keystore conf/server.keystore
+RUN /opt/keycloak/bin/kc.sh build
+
+FROM quay.io/keycloak/keycloak:latest
+COPY --from=builder /opt/keycloak/ /opt/keycloak/
+
+# change these values to point to a running postgres instance
+ENV KC_DB=postgres
+ENV KC_DB_URL=jdbc:postgresql://localhost:5432/hibernate
+ENV KC_DB_USERNAME=${KC_DB_USERNAME}
+ENV KC_DB_PASSWORD=${KC_DB_PASSWORD}
+ENV KC_HOSTNAME=localhost
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
\ No newline at end of file
diff --git a/keycloak/compose.yaml b/keycloak/compose.yaml
index e9a47c31..654d1ff6 100644
--- a/keycloak/compose.yaml
+++ b/keycloak/compose.yaml
@@ -4,7 +4,7 @@ services:
     command:
       - start-dev --http-enabled=true
     environment:
-      KEYCLOAK_ADMIN: admin2
-      KEYCLOAK_ADMIN_PASSWORD: admin2
+      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
+      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
     ports:
       - 8080:8080

From 93797053ca6dffaee8a8e351dc97343d605e23f1 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 18 Aug 2024 23:13:07 +0200
Subject: [PATCH 049/247] =?UTF-8?q?=F0=9F=9A=A7=20add=20keycloak=20configu?=
 =?UTF-8?q?ration=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 0ff5eaec..af198a33 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -14,11 +14,11 @@ RUN /opt/keycloak/bin/kc.sh build
 
 FROM quay.io/keycloak/keycloak:latest
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
-
+COPY keycloak_realm.json /data/import/keycloak_realm.jsonk
 # change these values to point to a running postgres instance
 ENV KC_DB=postgres
-ENV KC_DB_URL=jdbc:postgresql://localhost:5432/hibernate
+ENV KC_DB_URL=jdbc:postgresql://localhost:5432/keycloak
 ENV KC_DB_USERNAME=${KC_DB_USERNAME}
 ENV KC_DB_PASSWORD=${KC_DB_PASSWORD}
 ENV KC_HOSTNAME=localhost
-ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
\ No newline at end of file
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--import-realm"]
\ No newline at end of file

From 9fb60b08adfbd3e01632485d322d455fda261d76 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 20 Aug 2024 22:44:36 +0200
Subject: [PATCH 050/247] =?UTF-8?q?=F0=9F=9A=A7=20add=20keycloak=5Frealm?=
 =?UTF-8?q?=20to=20Dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index af198a33..79649629 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -15,6 +15,7 @@ RUN /opt/keycloak/bin/kc.sh build
 FROM quay.io/keycloak/keycloak:latest
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
 COPY keycloak_realm.json /data/import/keycloak_realm.jsonk
+
 # change these values to point to a running postgres instance
 ENV KC_DB=postgres
 ENV KC_DB_URL=jdbc:postgresql://localhost:5432/keycloak

From a29130994db327eee0e1d78c7c5dd95006bc680c Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 20 Aug 2024 22:44:52 +0200
Subject: [PATCH 051/247] =?UTF-8?q?=F0=9F=9A=A7=20fix=20access=20to=20loca?=
 =?UTF-8?q?l=20database=20for=20keycloak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/compose.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/keycloak/compose.yaml b/keycloak/compose.yaml
index 654d1ff6..e70c5db9 100644
--- a/keycloak/compose.yaml
+++ b/keycloak/compose.yaml
@@ -1,10 +1,4 @@
 services:
   keycloak:
-    image: quay.io/keycloak/keycloak-x
-    command:
-      - start-dev --http-enabled=true
-    environment:
-      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
-    ports:
-      - 8080:8080
+    build: .
+    network_mode: host

From 69661128e2a539c39de93f2d3c48d565aca8f59e Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 21 Aug 2024 22:40:24 +0200
Subject: [PATCH 052/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20this=20documentati?=
 =?UTF-8?q?on=20doesn't=20make=20sense?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keycloak/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 79649629..68463b47 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:latest as builder
+FROM quay.io/keycloak/keycloak:latest AS builder
 
 # Enable health and metrics support
 ENV KC_HEALTH_ENABLED=true
@@ -14,7 +14,7 @@ RUN /opt/keycloak/bin/kc.sh build
 
 FROM quay.io/keycloak/keycloak:latest
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
-COPY keycloak_realm.json /data/import/keycloak_realm.jsonk
+COPY keycloak_realm.json /opt/keycloak/data/import/
 
 # change these values to point to a running postgres instance
 ENV KC_DB=postgres
@@ -22,4 +22,5 @@ ENV KC_DB_URL=jdbc:postgresql://localhost:5432/keycloak
 ENV KC_DB_USERNAME=${KC_DB_USERNAME}
 ENV KC_DB_PASSWORD=${KC_DB_PASSWORD}
 ENV KC_HOSTNAME=localhost
+
 ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--import-realm"]
\ No newline at end of file

From 23018bbf234c093b255911129e25a860e8602474 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 21 Aug 2024 22:57:20 +0200
Subject: [PATCH 053/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20update=20READE.me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 89c42a35..24cf38ec 100644
--- a/README.md
+++ b/README.md
@@ -27,14 +27,9 @@ KC_DB_USERNAME=${the username for the keycloak database}
 KC_DB_PASSWORD=${the password for the keycloak database}
 ```
 
-# Quarkus + Vue
-
+# Starting the application in development mode
+The application can be started in development mode by following the steps below:
 ## Vue
-
-Edit your VueJs app inside of `frontend/app`
-
-To setup the project use
-
 ```shell
 mvn compile -DfrontendDev -DnoFrontendComp
 ```
@@ -50,20 +45,12 @@ npm run dev
 ```
 
 ## Quarkus
-
-For testing run
+The Quarkus application starts in development mode also a keycloak container, which is used for user authentication:
 ```shell
 cd backend
 mvn compile quarkus:dev -DbackendDev
 ```
 
-For just building and running the quarkus application in production mode:
-```shell
-cd backend
-./mvnw install
-java -jar target/quarkus-app/quarkus-run.jar
-```
-
 ## Build Quarkus+Vue
 To build the whole application:
 ```shell
@@ -82,4 +69,26 @@ mvn package -DnoBackendComp
 ## Clean
 ```shell
 mvn clean
-```
\ No newline at end of file
+```
+
+# Starting the application in production mode
+First start the keycloak service by running the following command in the `keycloak` directory:
+```shell
+docker compose up
+```
+Then you need to import the Quarkus realm under:
+- Realm settings in the menu.
+- Point to the Action menu in the top right corner of the realm settings screen, and select Partial import.
+- A prompt then appears where you can select the file you want to import. 
+  Based on this file, you see the resources you can import along with the realm settings.
+- Click Import.
+
+After that you can start the Quarkus application by running the following command in the `backend` directory:
+```shell
+./mvnw install
+java -jar target/quarkus-app/quarkus-run.jar
+```
+
+Finally, start the Vue application by running the following command in the `frontend/app` directory:
+TBD
+

From d6a48c87efddcd359acdcce42b3775255d02fd36 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 21 Aug 2024 23:11:27 +0200
Subject: [PATCH 054/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20format=20ApiInform?=
 =?UTF-8?q?ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/de/secretj12/turnierplaner/ApiInformation.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
index 958ca672..7f60f962 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
@@ -9,11 +9,11 @@
 
 @OpenAPIDefinition(
         tags = {
-                @Tag(name="widget", description="Widget operations."),
-                @Tag(name="gasket", description="Operations related to gaskets")
+                @Tag(name = "widget", description = "Widget operations."),
+                @Tag(name = "gasket", description = "Operations related to gaskets")
         },
         info = @Info(
-                title="Tournament planer backend API",
+                title = "Tournament planer backend API",
                 version = "1.0.0",
                 contact = @Contact(
                         name = "Jonas and Oliver",

From 6b595edf7c8abab9f3198e180ebf95d8ec4d664f Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 21 Aug 2024 23:16:15 +0200
Subject: [PATCH 055/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20format=20ApiInform?=
 =?UTF-8?q?ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/ApiInformation.java         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
index 7f60f962..27a2401a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
@@ -8,20 +8,20 @@
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 
 @OpenAPIDefinition(
-        tags = {
-                @Tag(name = "widget", description = "Widget operations."),
-                @Tag(name = "gasket", description = "Operations related to gaskets")
-        },
-        info = @Info(
-                title = "Tournament planer backend API",
-                version = "1.0.0",
-                contact = @Contact(
-                        name = "Jonas and Oliver",
-                        url = "http://exampleurl.com/contact",
-                        email = "techsupport@example.com"),
-                license = @License(
-                        name = "Apache 2.0",
-                        url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
+                   tags = {
+                           @Tag(name = "widget", description = "Widget operations."),
+                           @Tag(name = "gasket", description = "Operations related to gaskets")
+                   },
+                   info = @Info(
+                                title = "Tournament planer backend API",
+                                version = "1.0.0",
+                                contact = @Contact(
+                                                   name = "Jonas and Oliver",
+                                                   url = "http://exampleurl.com/contact",
+                                                   email = "techsupport@example.com"),
+                                license = @License(
+                                                   name = "Apache 2.0",
+                                                   url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
 )
 public class ApiInformation extends Application {
 }

From bc4986615b51116e06138970e2a95fc618d576d3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 21 Aug 2024 23:21:37 +0200
Subject: [PATCH 056/247] =?UTF-8?q?=F0=9F=8E=A8=20microformat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 24cf38ec..f62e3cee 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,8 @@ set up the admin username and password. For this create a `.env` file under the
 KEYCLOAK_ADMIN_USER=${ your keycloak admin user }
 KEYCLOAK_ADMIN_PASS=${ your keycloak admin password }
 
-KC_DB_USERNAME=${the username for the keycloak database}
-KC_DB_PASSWORD=${the password for the keycloak database}
+KC_DB_USERNAME=${ the username for the keycloak database }
+KC_DB_PASSWORD=${ the password for the keycloak database }
 ```
 
 # Starting the application in development mode

From a324f7379e99eb259ad608852c27b1933c12216b Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 22 Aug 2024 23:24:37 +0200
Subject: [PATCH 057/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20keycloak=20not=20i?=
 =?UTF-8?q?mporting=20the=20realm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/application.properties            | 2 +-
 {keycloak => backend/src/main/resources}/keycloak_realm.json | 0
 keycloak/Dockerfile                                          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {keycloak => backend/src/main/resources}/keycloak_realm.json (100%)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 44f30f00..efd0127c 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -17,7 +17,7 @@ quarkus.oidc.credentials.secret=**********
 quarkus.oidc.tls.verification=none
 
 quarkus.keycloak.devservices.port=7777
-quarkus.keycloak.devservices.realm-path=../../../../keycloak/keycloak-realm.json
+quarkus.keycloak.devservices.realm-path='keycloak_realm.json'
 quarkus.swagger-ui.oauth-client-id=frontend-swagger
 
 # test setup
diff --git a/keycloak/keycloak_realm.json b/backend/src/main/resources/keycloak_realm.json
similarity index 100%
rename from keycloak/keycloak_realm.json
rename to backend/src/main/resources/keycloak_realm.json
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 68463b47..1bb7f63e 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -14,7 +14,7 @@ RUN /opt/keycloak/bin/kc.sh build
 
 FROM quay.io/keycloak/keycloak:latest
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
-COPY keycloak_realm.json /opt/keycloak/data/import/
+COPY ../backend/src/main/resources/keycloak_realm.json /opt/keycloak/data/import/
 
 # change these values to point to a running postgres instance
 ENV KC_DB=postgres

From 00fb3679226c7e81fc95b7cdb5696ef868431bf4 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 22 Aug 2024 23:30:06 +0200
Subject: [PATCH 058/247] =?UTF-8?q?=F0=9F=90=9B=20remove=20quotation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index efd0127c..d2b9244a 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -17,7 +17,7 @@ quarkus.oidc.credentials.secret=**********
 quarkus.oidc.tls.verification=none
 
 quarkus.keycloak.devservices.port=7777
-quarkus.keycloak.devservices.realm-path='keycloak_realm.json'
+quarkus.keycloak.devservices.realm-path=keycloak_realm.json
 quarkus.swagger-ui.oauth-client-id=frontend-swagger
 
 # test setup

From 669009a9a5daec46e146ce7de250d3c210acc216 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 21 Aug 2024 21:21:22 +0200
Subject: [PATCH 059/247] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20to=20new?=
 =?UTF-8?q?=20vue-query=20version=20to=20reloading=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/views/prepare/ViewScheduleMatches.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
index 7a062ac3..05c97fb1 100644
--- a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
@@ -29,7 +29,6 @@ const toast = useToast()
 const { t } = useI18n({ inheritLocale: true })
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { data: competition } = getCompetitionDetails(route, t, toast)
 
 function prevPage() {

From 5ef26c4e224a9b0f6efd237355c8c013f2235bf8 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 17 Aug 2024 17:32:42 +0200
Subject: [PATCH 060/247] =?UTF-8?q?=E2=9E=95=20Add=20calendar=20and=20try?=
 =?UTF-8?q?=20around?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json                     |  1 +
 .../MatchesContainerDraggable.vue             | 13 ++++
 .../scheduleMatches/SchedulingCalendar.vue    | 65 +++++++++++++++++++
 .../ViewScheduleMatches.vue                   |  6 +-
 frontend/app/src/routes.ts                    |  2 +-
 5 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
 create mode 100644 frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
 rename frontend/app/src/components/views/prepare/{ => scheduleMatches}/ViewScheduleMatches.vue (90%)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index 0919a4b8..9c33d3bc 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -32,6 +32,7 @@
 		"vee-validate": "^4.12.3",
 		"vue": "^3.3.12",
 		"vue-axios": "^3.5.2",
+		"vue-cal": "^4.9.0",
 		"vue-i18n": "^9.8.0",
 		"vue-password": "^3.1.0",
 		"vue-router": "^4.2.5"
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
new file mode 100644
index 00000000..2ed4c27c
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -0,0 +1,13 @@
+<template>
+<p>
+	Hallo, ich zeige alle Matches an
+</p>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
new file mode 100644
index 00000000..d1bd86b6
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -0,0 +1,65 @@
+<template>
+	<vue-cal
+		active-view="week"
+		hide-view-selector
+		:disable-views="['years', 'year', 'month', 'day']"
+		:locale="$i18n.locale"
+		:time-from="8 * 60"
+		:time-to="20 * 60"
+		:split-days="splitDays"
+		:sticky-split-labels="true"
+		:min-split-width="150"
+		snapToTime="15"
+	/>
+</template>
+
+<script setup lang="ts">
+// @ts-ignore
+import VueCal from "vue-cal"
+import "vue-cal/dist/vuecal.css"
+
+const splitDays = [
+	{ id: 1, label: "Platz 1", class: "court1" },
+	{ id: 2, label: "Platz 2", class: "court2" },
+	{ id: 3, label: "Platz 3", class: "court3" },
+	{ id: 4, label: "Platz 4", class: "court4" },
+	{ id: 5, label: "Platz 5", class: "court5" },
+	{ id: 6, label: "Platz 6", class: "court6" },
+]
+</script>
+
+<style>
+.court1 {
+	background-color: rgba(221, 238, 255, 0.5);
+	border-width: 2px 0;
+}
+
+.court2 {
+	background-color: rgba(255, 232, 251, 0.5);
+	border-width: 2px 0;
+}
+
+.court3 {
+	background-color: rgba(221, 255, 239, 0.5);
+	border-width: 2px 0;
+}
+
+.court4 {
+	background-color: rgba(255, 250, 196, 0.5);
+	border-width: 2px 0;
+}
+
+.court5 {
+	background-color: rgba(255, 206, 178, 0.5);
+	border-width: 2px 0;
+}
+
+.court6 {
+	background-color: rgba(0, 0, 0, 0.1);
+	border-width: 2px 0;
+}
+
+.vuecal__no-event {
+	display: none;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
similarity index 90%
rename from frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
rename to frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 05c97fb1..404f7c0e 100644
--- a/frontend/app/src/components/views/prepare/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -8,10 +8,7 @@
 				</Card>
 			</div>
 			<div class="col-8">
-				<Card>
-					<template #title>Calendar</template>
-					<template #content> The calendar should be shown here </template>
-				</Card>
+				<SchedulingCalendar />
 			</div>
 		</div>
 	</div>
@@ -22,6 +19,7 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
+import SchedulingCalendar from "@/components/views/prepare/scheduleMatches/SchedulingCalendar.vue"
 
 const route = useRoute()
 const router = useRouter()
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 8096e3b0..af0169de 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -2,7 +2,7 @@ import viewTournaments from "@/components/views/tournaments/ViewTournaments.vue"
 import viewCompetition from "@/components/views/competition/ViewCompetition.vue"
 import viewPrepareMatches from "@/components/views/prepare/ViewPrepareMatches.vue"
 import ViewAssignMatches from "@/components/views/prepare/assignMatches/ViewAssignMatches.vue"
-import ViewScheduleMatches from "@/components/views/prepare/ViewScheduleMatches.vue"
+import ViewScheduleMatches from "@/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue"
 import ViewEditTeams from "@/components/views/prepare/editTeams/ViewEditTeams.vue"
 import ViewEditCompetition from "@/components/views/prepare/ViewEditCompetition.vue"
 

From 490f8838e2613554202374821d0b0f18abf9cdf7 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 19 Aug 2024 17:36:13 +0200
Subject: [PATCH 061/247] =?UTF-8?q?=F0=9F=92=84=20Fix=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/ViewPrepareMatches.vue      | 150 +++++++++---------
 .../MatchesContainerDraggable.vue             |  12 +-
 .../scheduleMatches/SchedulingCalendar.vue    |   6 +-
 .../scheduleMatches/ViewScheduleMatches.vue   |  20 ++-
 4 files changed, 91 insertions(+), 97 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 1cd7c47a..1cc3a034 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -1,78 +1,80 @@
 <template>
-	<Card class="w-full m-2" style="margin-top: -10px !important">
-		<template #header>
-			<TabMenu
-				:active-index="activeTab"
-				:model="competitions || []"
-				@tab-change="tabChange"
-			>
-				<template #item="{ item, props }">
-					<div v-bind="props.action" class="cursor-pointer">
-						<span v-bind="props.label">{{ item.name }}</span>
-					</div>
-				</template>
-			</TabMenu>
-			<Steps
-				:active-step="<number>route.meta.step - 1"
-				:model="stepList"
-				:readonly="true"
-				class="mt-5"
-			>
-			</Steps>
-		</template>
-		<template #content>
-			<router-view v-slot="{ Component }">
-				<component
-					:is="Component"
-					ref="curPrepStep"
-					v-model:is-updating="isUpdating"
-				/>
-			</router-view>
-
-			<div class="mt-2 grid grid-nogutter justify-content-between">
-				<Button
-					:style="{
-						visibility: route.meta.step !== 1 ? 'visible' : 'hidden',
-					}"
-					:disabled="route.meta.step === 1 || isUpdating"
-					:label="t('general.back')"
-					icon="pi pi-angle-left"
-					icon-pos="left"
-					@click="prevPage"
-				/>
-				<Button
-					v-if="route.meta.reset"
-					:disabled="isUpdating"
-					:label="t('general.reset')"
-					severity="danger"
-					@click="reset"
-				/>
-				<Button
-					:disabled="isUpdating"
-					:label="t('general.save')"
-					severity="success"
-					@click="save"
-				/>
-				<Button
-					v-if="route.meta.step !== 4"
-					:disabled="isUpdating"
-					icon="pi pi-angle-right"
-					icon-pos="right"
-					:label="t('general.next')"
-					@click="nextPage"
-				/>
-				<Button
-					v-else
-					:disabled="isUpdating"
-					label="Complete"
-					icon="pi pi-check"
-					icon-pos="right"
-					class="p-button-success"
-					@click="nextPage"
-				/>
-			</div>
-		</template>
-	</Card>
+	<div class="w-full p-2">
+		<Card style="margin-top: -10px !important">
+			<template #header>
+				<TabMenu
+					:active-index="activeTab"
+					:model="competitions || []"
+					@tab-change="tabChange"
+				>
+					<template #item="{ item, props }">
+						<div v-bind="props.action" class="cursor-pointer">
+							<span v-bind="props.label">{{ item.name }}</span>
+						</div>
+					</template>
+				</TabMenu>
+				<Steps
+					:active-step="<number>route.meta.step - 1"
+					:model="stepList"
+					:readonly="true"
+					class="mt-5"
+				>
+				</Steps>
+			</template>
+			<template #content>
+				<router-view v-slot="{ Component }">
+					<component
+						:is="Component"
+						ref="curPrepStep"
+						v-model:is-updating="isUpdating"
+					/>
+				</router-view>
+
+				<div class="mt-2 grid grid-nogutter justify-content-between">
+					<Button
+						:style="{
+							visibility: route.meta.step !== 1 ? 'visible' : 'hidden',
+						}"
+						:disabled="route.meta.step === 1 || isUpdating"
+						:label="t('general.back')"
+						icon="pi pi-angle-left"
+						icon-pos="left"
+						@click="prevPage"
+					/>
+					<Button
+						v-if="route.meta.reset"
+						:disabled="isUpdating"
+						:label="t('general.reset')"
+						severity="danger"
+						@click="reset"
+					/>
+					<Button
+						:disabled="isUpdating"
+						:label="t('general.save')"
+						severity="success"
+						@click="save"
+					/>
+					<Button
+						v-if="route.meta.step !== 4"
+						:disabled="isUpdating"
+						icon="pi pi-angle-right"
+						icon-pos="right"
+						:label="t('general.next')"
+						@click="nextPage"
+					/>
+					<Button
+						v-else
+						:disabled="isUpdating"
+						label="Complete"
+						icon="pi pi-check"
+						icon-pos="right"
+						class="p-button-success"
+						@click="nextPage"
+					/>
+				</div>
+			</template>
+		</Card>
+	</div>
 </template>
 
 <script setup lang="ts">
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 2ed4c27c..f0717422 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -1,13 +1,7 @@
 <template>
-<p>
-	Hallo, ich zeige alle Matches an
-</p>
+	<p>Hallo, ich zeige alle Matches an</p>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts"></script>
 
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index d1bd86b6..b58dc8d4 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -9,12 +9,12 @@
 		:split-days="splitDays"
 		:sticky-split-labels="true"
 		:min-split-width="150"
-		snapToTime="15"
+		snap-to-time="15"
 	/>
 </template>
 
 <script setup lang="ts">
-// @ts-ignore
+// @ts-expect-error vue-cal does not have proper typescript support
 import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 
@@ -62,4 +62,4 @@ const splitDays = [
 .vuecal__no-event {
 	display: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 404f7c0e..f729a2bc 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -1,15 +1,13 @@
 <template>
-	<div class="flex flex-column gap-1">
-		<div class="grid">
-			<div class="col-4">
-				<Card>
-					<template #title>Matches</template>
-					<template #content> We show the matches here </template>
-				</Card>
-			</div>
-			<div class="col-8">
-				<SchedulingCalendar />
-			</div>
+	<div class="grid">
+		<div class="col-4">
+			<Card>
+				<template #title> Matches </template>
+				<template #content> We show the matches here </template>
+			</Card>
+		</div>
+		<div class="col-8">
+			<SchedulingCalendar v-if="true" />
 		</div>
 	</div>
 </template>

From e602a70293da24ef7ba2d7a98154f9ca79a61760 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 20 Aug 2024 16:58:14 +0200
Subject: [PATCH 062/247] =?UTF-8?q?=E2=9C=A8=20Add=20endpoints=20to=20mana?=
 =?UTF-8?q?ge=20existing=20courts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Tournament.java | 17 ++++++
 .../db/repositories/CourtRepositiory.java     |  4 ++
 .../resources/CourtResource.java              | 58 +++++++++++++++++++
 .../jsonEntities/user/jUserCourt.java         | 41 +++++++++++++
 4 files changed, 120 insertions(+)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
index e6e75746..a576d91f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
@@ -4,6 +4,7 @@
 
 import java.time.LocalDateTime;
 import java.util.UUID;
+import java.util.Set;
 
 @Entity
 @Table(name = "tournaments")
@@ -31,6 +32,14 @@ public class Tournament {
     @Column(name = "visible")
     private boolean visible;
 
+    @ManyToMany(cascade = {CascadeType.ALL})
+    @JoinTable(
+               name = "court_of_tournament",
+               joinColumns = {@JoinColumn(name = "id")},
+               inverseJoinColumns = {@JoinColumn(name = "name")}
+    )
+    private Set<Court> courts;
+
     public UUID getId() {
         return id;
     }
@@ -94,4 +103,12 @@ public boolean isVisible() {
     public void setVisible(boolean visible) {
         this.visible = visible;
     }
+
+    public Set<Court> getCourts() {
+        return courts;
+    }
+
+    public void setCourts(Set<Court> courts) {
+        this.courts = courts;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
index cb8d1179..54b9b3d7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
@@ -7,4 +7,8 @@
 
 @ApplicationScoped
 public class CourtRepositiory implements PanacheRepository<Court> {
+
+    public Court findByName(String name) {
+        return find("name", name).firstResult();
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
new file mode 100644
index 00000000..bd69222b
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -0,0 +1,58 @@
+package de.secretj12.turnierplaner.resources;
+
+import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+
+import java.util.List;
+
+@Path("/court")
+public class CourtResource {
+
+    @Inject
+    CourtRepositiory courtRepositiory;
+
+    @GET
+    public List<jUserCourt> getCourts() {
+        return courtRepositiory.findAll().stream().map(jUserCourt::new).toList();
+    }
+
+    @PUT
+    @Transactional
+    public String create(jUserCourt court) {
+        Court exCourt = courtRepositiory.findByName(court.getName());
+        if (exCourt != null)
+            throw new WebApplicationException("Court already exists", Response.Status.CONFLICT);
+
+        courtRepositiory.persist(court.toCourt());
+        return "Created";
+    }
+
+    @POST
+    @Transactional
+    public String update(jUserCourt court) {
+        Court exCourt = courtRepositiory.findByName(court.getName());
+        if (exCourt == null)
+            throw new NotFoundException("Court not found");
+
+        exCourt.setName(court.getName());
+        exCourt.setCourtType(court.getCourtType());
+        courtRepositiory.persist(exCourt);
+        return "Updated";
+    }
+
+    @DELETE
+    @Transactional
+    public String delete(jUserCourt court) {
+        Court exCourt = courtRepositiory.findByName(court.getName());
+        if (exCourt == null)
+            throw new NotFoundException("Court does not exist");
+
+        courtRepositiory.delete(exCourt);
+        return "Deleted";
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
new file mode 100644
index 00000000..b0c49c76
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
@@ -0,0 +1,41 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.user;
+
+import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.entities.CourtType;
+
+public class jUserCourt {
+
+    private String name;
+    private CourtType courtType;
+
+    public jUserCourt() {
+    }
+
+    public jUserCourt(Court court) {
+        this.name = court.getName();
+        this.courtType = court.getCourtType();
+    }
+
+    public Court toCourt() {
+        Court court = new Court();
+        court.setName(name);
+        court.setCourtType(courtType);
+        return court;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public CourtType getCourtType() {
+        return courtType;
+    }
+
+    public void setCourtType(CourtType courtType) {
+        this.courtType = courtType;
+    }
+}

From c413138fb4e1c93f1e1d2d48f87ceeb10c9f7b69 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 20 Aug 2024 17:18:56 +0200
Subject: [PATCH 063/247] =?UTF-8?q?=E2=9C=A8=20Add=20court=20selection=20a?=
 =?UTF-8?q?nd=20creation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CourtResource.java              |  5 +-
 frontend/app/src/backend/court.ts             | 50 +++++++++++++++++++
 .../views/court/ViewCreateCourtSmall.vue      | 40 +++++++++++++++
 .../scheduleMatches/SchedulingCalendar.vue    | 25 ++++++----
 .../scheduleMatches/ViewScheduleMatches.vue   | 46 ++++++++++++++---
 frontend/app/src/i18n/de.json                 |  8 +++
 frontend/app/src/i18n/en.json                 |  8 +++
 frontend/app/src/interfaces/court.ts          | 10 ++++
 frontend/app/src/main.ts                      |  4 ++
 9 files changed, 177 insertions(+), 19 deletions(-)
 create mode 100644 frontend/app/src/backend/court.ts
 create mode 100644 frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
 create mode 100644 frontend/app/src/interfaces/court.ts

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index bd69222b..80a87601 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -46,9 +46,10 @@ public String update(jUserCourt court) {
     }
 
     @DELETE
+    @Path("/{name}")
     @Transactional
-    public String delete(jUserCourt court) {
-        Court exCourt = courtRepositiory.findByName(court.getName());
+    public String delete(@PathParam("name") String courtName) {
+        Court exCourt = courtRepositiory.findByName(courtName);
         if (exCourt == null)
             throw new NotFoundException("Court does not exist");
 
diff --git a/frontend/app/src/backend/court.ts b/frontend/app/src/backend/court.ts
new file mode 100644
index 00000000..8dd8500d
--- /dev/null
+++ b/frontend/app/src/backend/court.ts
@@ -0,0 +1,50 @@
+import axios from "axios"
+import { Court } from "@/interfaces/court"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
+
+export function getCourts() {
+	return useQuery({
+		queryKey: ["courts"],
+		queryFn: () =>
+			axios.get(`/court`).then<Court[]>((response) => response.data),
+	})
+}
+
+export function useCreateCourt() {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: (court: Court) => axios.put(`/court`, court),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["courts"],
+				refetchType: "all",
+			})
+		},
+	})
+}
+
+export function useUpdateCourt() {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: (court: Court) => axios.post(`/court`, court),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["courts"],
+				refetchType: "all",
+			})
+		},
+	})
+}
+
+export function useDeleteCourt() {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: (court: Court) => axios.delete(`/court/${court.name}`),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["courts"],
+				refetchType: "all",
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
new file mode 100644
index 00000000..bdaa2968
--- /dev/null
+++ b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
@@ -0,0 +1,40 @@
+<template>
+	<InputGroup>
+		<InputText v-model="name" size="small" />
+		<Dropdown
+			v-model="type"
+			:options="options"
+			option-label="name"
+			placeholder="Platztyp"
+		/>
+		<Button size="small" @click="add">Add</Button>
+	</InputGroup>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue"
+import { useCreateCourt } from "@/backend/court"
+import { useI18n } from "vue-i18n"
+import { courttype } from "@/interfaces/court"
+
+const { t } = useI18n({ inheritLocale: true })
+const { mutate: addCourt } = useCreateCourt()
+
+const name = ref("")
+const type = ref("HARD")
+
+const options = [
+	{ id: "HARD", name: t("court.courtTypes.HARD") },
+	{ id: "CLAY", name: t("court.courtTypes.CLAY") },
+	{ id: "GRASS", name: t("court.courtTypes.GRASS") },
+]
+
+function add() {
+	addCourt({
+		name: name.value,
+		type: courttype.HARD,
+	})
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index b58dc8d4..450cb025 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -9,7 +9,7 @@
 		:split-days="splitDays"
 		:sticky-split-labels="true"
 		:min-split-width="150"
-		snap-to-time="15"
+		:snap-to-time="15"
 	/>
 </template>
 
@@ -17,15 +17,22 @@
 // @ts-expect-error vue-cal does not have proper typescript support
 import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
+import { Court } from "@/interfaces/court"
+import { computed } from "vue"
 
-const splitDays = [
-	{ id: 1, label: "Platz 1", class: "court1" },
-	{ id: 2, label: "Platz 2", class: "court2" },
-	{ id: 3, label: "Platz 3", class: "court3" },
-	{ id: 4, label: "Platz 4", class: "court4" },
-	{ id: 5, label: "Platz 5", class: "court5" },
-	{ id: 6, label: "Platz 6", class: "court6" },
-]
+const props = defineProps<{
+	courts: Court[]
+}>()
+
+const splitDays = computed(() => {
+	return props.courts.map((court, index) => {
+		return {
+			id: index + 1,
+			label: court.name,
+			class: "court" + (index + 1),
+		}
+	})
+})
 </script>
 
 <style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index f729a2bc..e304e8d5 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -1,31 +1,61 @@
 <template>
 	<div class="grid">
-		<div class="col-4">
+		<div class="col-4 flex flex-column gap-3">
 			<Card>
-				<template #title> Matches </template>
-				<template #content> We show the matches here </template>
+				<template #title>Options</template>
+				<template #content>
+					<MultiSelect
+						v-model="selectedCourts"
+						:loading="!courts || !selectedCourts"
+						:options="courts"
+						option-label="name"
+						placeholder="Select courts"
+						class="w-full"
+					>
+						<template #footer>
+							<div class="w-full flex align-items-center p-2">
+								<ViewCreateCourtSmall />
+							</div>
+						</template>
+					</MultiSelect>
+				</template>
+			</Card>
+			<Card>
+				<template #title> Matches</template>
+				<template #content> We show the matches here</template>
 			</Card>
 		</div>
 		<div class="col-8">
-			<SchedulingCalendar v-if="true" />
+			<div class="flex flex-column gap-3">
+				<SchedulingCalendar :courts="selectedCourts" />
+			</div>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
-import { useI18n } from "vue-i18n"
 import SchedulingCalendar from "@/components/views/prepare/scheduleMatches/SchedulingCalendar.vue"
+import { getCourts } from "@/backend/court"
+import { ref, watch } from "vue"
+import { Court } from "@/interfaces/court"
+import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
 
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
-const { t } = useI18n({ inheritLocale: true })
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
-const { data: competition } = getCompetitionDetails(route, t, toast)
+
+const { data: courts } = getCourts()
+
+const selectedCourts = ref<Court[]>([])
+watch(selectedCourts, () => {
+	selectedCourts.value = selectedCourts.value.sort((a, b) =>
+		a.name < b.name ? -1 : 1,
+	)
+})
 
 function prevPage() {
 	router.replace({
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 723a9ec1..74d784c5 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -218,5 +218,13 @@
 		"field_invalid_number": "Bitte geben Sie eine gültige Zahl an",
 		"field_invalid_url": "Bitte geben Sie eine gültige URL an",
 		"date_missing": "Bitte wähle ein Anfangs- und Enddatum"
+	},
+	"court": {
+		"type": "Typ",
+		"courtTypes": {
+			"HARD": "Hart",
+			"CLAY": "Sand",
+			"GRASS": "Gras"
+		}
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 2aea5468..76e7ec67 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -220,5 +220,13 @@
 		"field_invalid_number": "Field is not a valid number",
 		"field_invalid_url": "Field is not a valid URL",
 		"date_missing": "Please choose start and end date"
+	},
+	"court": {
+		"type": "Type",
+		"courtTypes": {
+			"HARD": "Hard",
+			"CLAY": "Sand",
+			"GRASS": "Grass"
+		}
 	}
 }
diff --git a/frontend/app/src/interfaces/court.ts b/frontend/app/src/interfaces/court.ts
new file mode 100644
index 00000000..81db65f3
--- /dev/null
+++ b/frontend/app/src/interfaces/court.ts
@@ -0,0 +1,10 @@
+export enum courttype {
+	HARD,
+	CLAY,
+	GRASS,
+}
+
+export interface Court {
+	name: string
+	type: courttype
+}
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 80029e25..612b8f93 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -47,6 +47,8 @@ import Fieldset from "primevue/fieldset"
 import SplitButton from "primevue/splitbutton"
 import OverlayPanel from "primevue/overlaypanel"
 import Dialog from "primevue/dialog"
+import MultiSelect from "primevue/multiselect"
+import InputGroup from "primevue/inputgroup"
 
 /* Primevue styling */
 import "primeflex/primeflex.css"
@@ -144,6 +146,7 @@ app
 	.component("TabMenu", TabMenu)
 	.component("TabPanel", TabPanel)
 	.component("Card", Card)
+	.component("MultiSelect", MultiSelect)
 	.component("Button", Button)
 	.component("Toolbar", Toolbar)
 	.component("InputText", InputText)
@@ -158,6 +161,7 @@ app
 	.component("Skeleton", Skeleton)
 	.component("Panel", Panel)
 	.component("ScrollPanel", ScrollPanel)
+	.component("InputGroup", InputGroup)
 	.component("DataTable", DataTable)
 	.component("Column", Column)
 	.component("Tag", Tag)

From a995b0f85613eff2a9d5445d6166b9add77aa26d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 21 Aug 2024 23:10:02 +0200
Subject: [PATCH 064/247] =?UTF-8?q?=E2=9C=A8=20Also=20send=20id=20of=20mat?=
 =?UTF-8?q?ches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsonEntities/user/jUserMatch.java         | 10 ++++
 .../assignMatches/AssignMatchesKnockout.vue   |  2 +-
 .../MatchesContainerDraggable.vue             | 47 ++++++++++++++++++-
 .../scheduleMatches/ViewScheduleMatches.vue   |  3 +-
 frontend/app/src/interfaces/match.ts          |  3 ++
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index 49a014a9..c1b30565 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -8,6 +8,7 @@
 
 public class jUserMatch {
 
+    private UUID id;
     private String court;
     private LocalDateTime begin;
     private LocalDateTime end;
@@ -24,6 +25,7 @@ public jUserMatch() {
     }
 
     public jUserMatch(Match match) {
+        this.id = match.getId();
         this.court = match.getCourt() != null ? match.getCourt().getName() : null;
         this.begin = match.getBegin();
         this.end = match.getEnd();
@@ -39,6 +41,14 @@ public jUserMatch(Match match) {
         this.sets = match.getSets().stream().map(jUserSet::new).toList();
     }
 
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
     public String getCourt() {
         return court;
     }
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 516df6a4..f44cd8a4 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -239,7 +239,7 @@ function getMatches(tree?: KnockoutMatch, treeDepth?: number): Match[] {
 }
 
 function genTree(height: number, tree: KnockoutMatch | null): KnockoutMatch {
-	const default_game = {
+	const default_game: KnockoutMatch = {
 		court: null,
 		begin: null,
 		end: null,
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index f0717422..ae32b5f6 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -1,7 +1,50 @@
 <template>
-	<p>Hallo, ich zeige alle Matches an</p>
+	<DraggablePanel
+		v-if="knockout"
+		id="match"
+		:component-data="{
+			tag: 'div',
+			name: props.isUpdating || isUpdating ? 'playerList' : 'default',
+			type: 'transition',
+		}"
+		group="match"
+		:list="[knockout.finale, knockout.thirdPlace]"
+		:tag="TransitionGroup"
+		class="flex flex-row flex-wrap gap-2 border-3 min-player-height border-round border-dashed"
+		item-key="id"
+		style="box-sizing: content-box; width: calc(100% - 6px)"
+	>
+		<template #default="{ item }">
+			<div
+				v-if="item"
+				class="bg-primary-400 text-black border-round select-none cursor-pointer pl-3 pr-3 h-3rem inline text-50 flex align-items-center justify-content-center"
+			>
+				<span>{{ item.id }}</span>
+			</div>
+		</template>
+	</DraggablePanel>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { TransitionGroup } from "vue"
+import { Player } from "@/interfaces/player"
+import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
+import DraggablePanel from "@/draggable/DraggablePanel.vue"
+import { getKnockout } from "@/backend/knockout"
+import { useRoute } from "vue-router"
+
+const route = useRoute()
+const props = withDefaults(
+	defineProps<{
+		isUpdating: boolean
+	}>(),
+	{
+		isUpdating: false,
+	},
+)
+
+const { data: knockout } = getKnockout(route)
+
+</script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index e304e8d5..21f41ff3 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -22,7 +22,7 @@
 			</Card>
 			<Card>
 				<template #title> Matches</template>
-				<template #content> We show the matches here</template>
+				<template #content><MatchesContainerDraggable :isUpdating="isUpdating" /></template>
 			</Card>
 		</div>
 		<div class="col-8">
@@ -41,6 +41,7 @@ import { getCourts } from "@/backend/court"
 import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
 import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
+import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
 
 const route = useRoute()
 const router = useRouter()
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 8abecf74..16f4ad38 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -12,6 +12,7 @@ export interface Set {
 }
 
 export interface Match {
+	id?: string
 	court: string | null
 	begin: Date | null
 	end: Date | null
@@ -24,6 +25,7 @@ export interface Match {
 }
 
 export interface MatchServer {
+	id?: string
 	court: string | undefined
 	begin: string | undefined
 	end: string | undefined
@@ -62,6 +64,7 @@ export function matchServerToClient(
 	}
 
 	return {
+		id: match.id,
 		court: match.court ? match.court : null,
 		begin: match.begin ? new Date(match.begin) : null,
 		end: match.end ? new Date(match.end) : null,

From c9413d67692a4f1f12f9ba21bffbcabe1a2e19ee Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 24 Aug 2024 00:27:18 +0200
Subject: [PATCH 065/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20groupMatches=20wit?=
 =?UTF-8?q?hout=20thirdPlace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/CompetitionResource.java   |  2 +-
 .../jsonEntities/user/group/jUserGroupSystem.java      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 79199087..02fcc67c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -423,7 +423,7 @@ public jUserGroupSystem getGroupMatches(@PathParam("tourName") String tourName,
 
         Match finale = matches.getFinal(competition);
         Match thirdPlace = matches.getThirdPlace(competition);
-        if (finale == null || thirdPlace == null)
+        if (finale == null || (groups.size() > 2 && thirdPlace == null))
             throw new InternalServerErrorException("Finale or thirdPlace is null");
         return new jUserGroupSystem(groups, finale, thirdPlace);
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
index c51b7a96..d9f5b59f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
@@ -28,10 +28,12 @@ public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace) {
             this.finale = new jUserGroupMatchAfterGroup(finale);
         else
             this.finale = new jUserGroupMatchAfterMatch(finale, finale.getDependentOn().isWinner());
-        if (thirdPlace.getFinalOfGroup() != null)
-            this.thirdPlace = new jUserGroupMatchAfterGroup(thirdPlace);
-        else
-            this.thirdPlace = new jUserGroupMatchAfterMatch(thirdPlace, thirdPlace.getDependentOn().isWinner(), false);
+        if (thirdPlace != null)
+            if (thirdPlace.getFinalOfGroup() != null)
+                this.thirdPlace = new jUserGroupMatchAfterGroup(thirdPlace);
+            else
+                this.thirdPlace = new jUserGroupMatchAfterMatch(thirdPlace, thirdPlace.getDependentOn()
+                    .isWinner(), false);
     }
 
     public List<jUserTeam> getTeams() {

From 1df448fcddf343b5d725cb789f68e7db09751678 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 24 Aug 2024 00:28:45 +0200
Subject: [PATCH 066/247] =?UTF-8?q?=E2=9C=A8=20Implement=20dragging=20into?=
 =?UTF-8?q?=20calendar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/group.ts             | 13 +++-
 frontend/app/src/backend/knockout.ts          |  8 ++-
 .../competition/signup/ViewConditions.vue     |  1 -
 .../MatchesContainerDraggable.vue             | 64 ++++++++++++++++---
 .../scheduleMatches/SchedulingCalendar.vue    | 18 ++++++
 .../scheduleMatches/ViewScheduleMatches.vue   | 23 ++++++-
 frontend/app/src/draggable/DraggablePanel.vue |  6 +-
 7 files changed, 116 insertions(+), 17 deletions(-)

diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index 9e882ce3..24821de1 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -1,7 +1,8 @@
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { computed } from "vue"
+import { computed, ref, Ref } from "vue"
 import axios from "axios"
 import {
+	GroupSystem,
 	GroupSystemServer,
 	groupSystemServerToClient,
 } from "@/interfaces/groupSystem"
@@ -10,8 +11,12 @@ import { GroupsDivision } from "@/interfaces/competition"
 import { Team, teamClientToServer, teamServerToClient } from "@/interfaces/team"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
-export function getGroup(route: RouteLocationNormalizedLoaded) {
+export function getGroup(
+	route: RouteLocationNormalizedLoaded,
+	load: Ref<boolean> = ref(true),
+) {
 	return useQuery({
+		enabled: load,
 		queryKey: [
 			"group",
 			computed(() => route.params.tourId),
@@ -22,7 +27,9 @@ export function getGroup(route: RouteLocationNormalizedLoaded) {
 				.get<GroupSystemServer>(
 					`tournament/${route.params.tourId}/competition/${route.params.compId}/groupMatches`,
 				)
-				.then((response) => groupSystemServerToClient(response.data)),
+				.then<GroupSystem>((response) =>
+					groupSystemServerToClient(response.data),
+				),
 	})
 }
 
diff --git a/frontend/app/src/backend/knockout.ts b/frontend/app/src/backend/knockout.ts
index 6a5cb386..e1aa1990 100644
--- a/frontend/app/src/backend/knockout.ts
+++ b/frontend/app/src/backend/knockout.ts
@@ -1,5 +1,5 @@
 import { RouteLocationNormalizedLoaded } from "vue-router"
-import { computed } from "vue"
+import { computed, ref, Ref } from "vue"
 import axios from "axios"
 import {
 	KnockoutMatch,
@@ -10,8 +10,12 @@ import {
 import { ToastServiceMethods } from "primevue/toastservice"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 
-export function getKnockout(route: RouteLocationNormalizedLoaded) {
+export function getKnockout(
+	route: RouteLocationNormalizedLoaded,
+	load: Ref<boolean> = ref(true),
+) {
 	return useQuery({
+		enabled: load,
 		queryKey: [
 			"knockout",
 			computed(() => route.params.tourId),
diff --git a/frontend/app/src/components/views/competition/signup/ViewConditions.vue b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
index 6a4595fd..bcd70c13 100644
--- a/frontend/app/src/components/views/competition/signup/ViewConditions.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
@@ -46,7 +46,6 @@ import { computed } from "vue"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
-
 const route = useRoute()
 
 const { data: competition } = getCompetitionDetails(route, t, toast)
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index ae32b5f6..6bdad3a5 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -1,6 +1,5 @@
 <template>
 	<DraggablePanel
-		v-if="knockout"
 		id="match"
 		:component-data="{
 			tag: 'div',
@@ -8,7 +7,7 @@
 			type: 'transition',
 		}"
 		group="match"
-		:list="[knockout.finale, knockout.thirdPlace]"
+		:list="matches"
 		:tag="TransitionGroup"
 		class="flex flex-row flex-wrap gap-2 border-3 min-player-height border-round border-dashed"
 		item-key="id"
@@ -26,14 +25,66 @@
 </template>
 
 <script setup lang="ts">
-import { TransitionGroup } from "vue"
-import { Player } from "@/interfaces/player"
-import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
+import { computed, TransitionGroup, watch } from "vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import { getKnockout } from "@/backend/knockout"
 import { useRoute } from "vue-router"
+import { Match } from "@/interfaces/match"
+import { getCompetitionDetails } from "@/backend/competition"
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+import { getGroup } from "@/backend/group"
+import { TourType } from "@/interfaces/competition"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { GroupMatch } from "@/interfaces/groupSystem"
 
 const route = useRoute()
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+
+const { data: competition } = getCompetitionDetails(route, t, toast)
+const { data: knockout } = getKnockout(
+	route,
+	computed(() => competition.value?.tourType === TourType.KNOCKOUT),
+)
+const { data: groups } = getGroup(
+	route,
+	computed(() => competition.value?.tourType === TourType.GROUPS),
+)
+
+const matches = defineModel<Match[]>({ default: [] })
+watch([knockout, groups], () => {
+	matches.value.splice(0, matches.value.length)
+	if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
+		const queue: KnockoutMatch[] = []
+		if (knockout.value?.finale) queue.push(knockout.value.finale)
+		if (knockout.value?.thirdPlace) queue.push(knockout.value.thirdPlace)
+		while (queue.length > 0) {
+			matches.value.push(queue[0])
+			if (queue[0].prevMatch) {
+				queue.push(queue[0].prevMatch.a)
+				queue.push(queue[0].prevMatch.b)
+			}
+			queue.splice(0, 1)
+		}
+	} else if (competition.value?.tourType === TourType.GROUPS && groups.value) {
+		const queue: GroupMatch[] = []
+		if (groups.value?.finale) queue.push(groups.value.finale)
+		if (groups.value?.thirdPlace) queue.push(groups.value.thirdPlace)
+		while (queue.length > 0) {
+			matches.value.push(queue[0])
+			if (queue[0].prevMatch) {
+				queue.push(queue[0].prevMatch.a)
+				queue.push(queue[0].prevMatch.b)
+			}
+			queue.splice(0, 1)
+		}
+		groups.value?.groups.forEach((group) =>
+			matches.value.push(...group.matches),
+		)
+	}
+})
+
 const props = withDefaults(
 	defineProps<{
 		isUpdating: boolean
@@ -42,9 +93,6 @@ const props = withDefaults(
 		isUpdating: false,
 	},
 )
-
-const { data: knockout } = getKnockout(route)
-
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 450cb025..5c7bbfb1 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -10,16 +10,34 @@
 		:sticky-split-labels="true"
 		:min-split-width="150"
 		:snap-to-time="15"
+		editable-events
+		@event-drop="onEventDrop"
 	/>
 </template>
 
 <script setup lang="ts">
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 // @ts-expect-error vue-cal does not have proper typescript support
 import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 import { Court } from "@/interfaces/court"
 import { computed } from "vue"
 
+const emit = defineEmits<{ removeId: [id: string] }>()
+
+function onEventDrop({
+	originalEvent,
+	external,
+}: {
+	originalEvent: { match: KnockoutMatch }
+	external: boolean
+}) {
+	if (external) {
+		if (originalEvent.match.id) emit("removeId", originalEvent.match.id)
+		else throw "Match id is missing"
+	}
+}
+
 const props = defineProps<{
 	courts: Court[]
 }>()
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 21f41ff3..dec363af 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -22,12 +22,28 @@
 			</Card>
 			<Card>
 				<template #title> Matches</template>
-				<template #content><MatchesContainerDraggable :isUpdating="isUpdating" /></template>
+				<template #content>
+					<MatchesContainerDraggable
+						v-model="matches"
+						:is-updating="isUpdating"
+					/>
+				</template>
 			</Card>
 		</div>
 		<div class="col-8">
 			<div class="flex flex-column gap-3">
-				<SchedulingCalendar :courts="selectedCourts" />
+				<SchedulingCalendar
+					:courts="selectedCourts"
+					@remove-id="
+						(id) => {
+							const extEventToDeletePos = matches.findIndex(
+								(match) => id === match.id,
+							)
+							if (extEventToDeletePos > -1)
+								matches.splice(extEventToDeletePos, 1)
+						}
+					"
+				/>
 			</div>
 		</div>
 	</div>
@@ -42,6 +58,7 @@ import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
 import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
 import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
+import { Match } from "@/interfaces/match"
 
 const route = useRoute()
 const router = useRouter()
@@ -51,6 +68,8 @@ const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const { data: courts } = getCourts()
 
+const matches = ref<Match[]>([])
+
 const selectedCourts = ref<Court[]>([])
 watch(selectedCourts, () => {
 	selectedCourts.value = selectedCourts.value.sort((a, b) =>
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index 2fbfd0e3..3c3fe353 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -81,6 +81,9 @@ function create() {
 		disabled: props.disabled,
 		sort: props.sort,
 		revertOnSpill: true,
+		setData(dataTransfer) {
+			dataTransfer.setData("event", JSON.stringify({ match: selectedElement }))
+		},
 		onChoose: (event: Sortable.SortableEvent) => {
 			if (event.oldIndex === undefined) return
 			selectedElement = props.list[event.oldIndex]
@@ -160,6 +163,7 @@ watch(
 )
 
 watch(() => [props.ghost, props.single, props.list], setGhost)
+
 function setGhost() {
 	if (!sortable.value) return
 	sortable.value?.option(
@@ -179,7 +183,7 @@ function reload() {
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 // eslint-disable-next-line
-let selectedElement: T = null
+let selectedElement: T | null = null
 let targetSingle = false
 </script>
 

From af7ad3073c5cfad806feebc9c91f8a125cb9f8aa Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 15:07:19 +0200
Subject: [PATCH 067/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20groupMatches=20wit?=
 =?UTF-8?q?hout=20thirdPlace=20in=20frontend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/interfaces/groupSystem.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 2ba3c9d5..3e18f71e 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -5,7 +5,7 @@ export interface GroupSystem {
 	teams: Team[]
 	groups: Group[]
 	finale: GroupMatch
-	thirdPlace: GroupMatch
+	thirdPlace?: GroupMatch
 }
 
 export interface Group {
@@ -67,7 +67,9 @@ export function groupSystemServerToClient(
 			groupServerToClient(group, teams),
 		),
 		finale: groupMatchServerToClient(groupSystem.finale, teams),
-		thirdPlace: groupMatchServerToClient(groupSystem.thirdPlace, teams),
+		thirdPlace: groupSystem.thirdPlace
+			? groupMatchServerToClient(groupSystem.thirdPlace, teams)
+			: undefined,
 	}
 }
 

From 3621cc1bbcd3cc5a908bd52c579a5fbcc2bdf3fd Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 15:07:43 +0200
Subject: [PATCH 068/247] =?UTF-8?q?=F0=9F=90=9B=20Process=20already=20load?=
 =?UTF-8?q?ed=20data=20in=20matches=20draggable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MatchesContainerDraggable.vue             | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 6bdad3a5..4289a07e 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -53,37 +53,44 @@ const { data: groups } = getGroup(
 )
 
 const matches = defineModel<Match[]>({ default: [] })
-watch([knockout, groups], () => {
-	matches.value.splice(0, matches.value.length)
-	if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
-		const queue: KnockoutMatch[] = []
-		if (knockout.value?.finale) queue.push(knockout.value.finale)
-		if (knockout.value?.thirdPlace) queue.push(knockout.value.thirdPlace)
-		while (queue.length > 0) {
-			matches.value.push(queue[0])
-			if (queue[0].prevMatch) {
-				queue.push(queue[0].prevMatch.a)
-				queue.push(queue[0].prevMatch.b)
+watch(
+	[knockout, groups],
+	() => {
+		matches.value.splice(0, matches.value.length)
+		if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
+			const queue: KnockoutMatch[] = []
+			if (knockout.value?.finale) queue.push(knockout.value.finale)
+			if (knockout.value?.thirdPlace) queue.push(knockout.value.thirdPlace)
+			while (queue.length > 0) {
+				matches.value.push(queue[0])
+				if (queue[0].prevMatch) {
+					queue.push(queue[0].prevMatch.a)
+					queue.push(queue[0].prevMatch.b)
+				}
+				queue.splice(0, 1)
 			}
-			queue.splice(0, 1)
-		}
-	} else if (competition.value?.tourType === TourType.GROUPS && groups.value) {
-		const queue: GroupMatch[] = []
-		if (groups.value?.finale) queue.push(groups.value.finale)
-		if (groups.value?.thirdPlace) queue.push(groups.value.thirdPlace)
-		while (queue.length > 0) {
-			matches.value.push(queue[0])
-			if (queue[0].prevMatch) {
-				queue.push(queue[0].prevMatch.a)
-				queue.push(queue[0].prevMatch.b)
+		} else if (
+			competition.value?.tourType === TourType.GROUPS &&
+			groups.value
+		) {
+			const queue: GroupMatch[] = []
+			if (groups.value?.finale) queue.push(groups.value.finale)
+			if (groups.value?.thirdPlace) queue.push(groups.value.thirdPlace)
+			while (queue.length > 0) {
+				matches.value.push(queue[0])
+				if (queue[0].prevMatch) {
+					queue.push(queue[0].prevMatch.a)
+					queue.push(queue[0].prevMatch.b)
+				}
+				queue.splice(0, 1)
 			}
-			queue.splice(0, 1)
+			groups.value?.groups.forEach((group) =>
+				matches.value.push(...group.matches),
+			)
 		}
-		groups.value?.groups.forEach((group) =>
-			matches.value.push(...group.matches),
-		)
-	}
-})
+	},
+	{ immediate: true },
+)
 
 const props = withDefaults(
 	defineProps<{

From 7c2d69dc6435c13f827643cf69d43646adfbcc3d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 18:11:00 +0200
Subject: [PATCH 069/247] =?UTF-8?q?=F0=9F=90=9B=20Add=20titles=20to=20knoc?=
 =?UTF-8?q?kout=20tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition/knockoutSystem/KnockoutTitleGenerator.ts | 9 +++++++++
 .../competition/knockoutSystem/ViewKnockoutSystem.vue    | 5 +++++
 .../prepare/assignMatches/AssignMatchesKnockout.vue      | 2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts b/frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts
new file mode 100644
index 00000000..f514aec4
--- /dev/null
+++ b/frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts
@@ -0,0 +1,9 @@
+export function knockoutTitle(t: (_: string) => string) {
+	return (round: number, totalRounds: number) => {
+		round += 1
+		if (round === totalRounds) return t("ViewKnockout.finale")
+		else if (round === totalRounds - 1) return t("ViewKnockout.semifinals")
+		else if (round === totalRounds - 2) return t("ViewKnockout.quarterfinals")
+		else return t("ViewKnockout.round") + " " + round
+	}
+}
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 0b927cf0..5a3c38e3 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -8,6 +8,7 @@
 			:border-thickness="2"
 			:margin-small="30"
 			:margin-big="40"
+			:titles="knockoutTitle(t)"
 		>
 			<template #match="{ match }">
 				<ViewMatch v-if="match" :match="match" :mode="props.mode" />
@@ -26,6 +27,10 @@ import { Mode } from "@/interfaces/competition"
 import { getKnockout } from "@/backend/knockout"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
+import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
 
 const props = defineProps<{
 	mode: Mode
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index f44cd8a4..44428b4d 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -39,6 +39,7 @@
 							:third-place="thirdPlace ?? undefined"
 							:border-thickness="2"
 							:border-radius="0"
+							:titles="knockoutTitle(t)"
 						>
 							<template
 								#match="{
@@ -86,6 +87,7 @@ import {
 	selectRandomElement,
 } from "@/components/views/prepare/assignMatches/AssginMatchesHelper"
 import { sleep, track } from "@/backend/Tracker"
+import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 
 const route = useRoute()
 const toast = useToast()

From 2ad2a859e3fd90992870e12cdb398feb4ba97d55 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 18:01:16 +0200
Subject: [PATCH 070/247] =?UTF-8?q?=E2=9C=A8=20Extract=20dates=20from=20lo?=
 =?UTF-8?q?aded=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MatchesContainerDraggable.vue             | 50 ++++------
 .../scheduleMatches/ScheduleMatchesHelper.ts  | 58 +++++++++++
 .../scheduleMatches/SchedulingCalendar.vue    | 95 +++++++++++++++++--
 frontend/app/src/draggable/DraggablePanel.vue |  2 +-
 frontend/app/src/interfaces/groupSystem.ts    | 12 +--
 5 files changed, 172 insertions(+), 45 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 4289a07e..13f556c8 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -18,7 +18,7 @@
 				v-if="item"
 				class="bg-primary-400 text-black border-round select-none cursor-pointer pl-3 pr-3 h-3rem inline text-50 flex align-items-center justify-content-center"
 			>
-				<span>{{ item.id }}</span>
+				<span>{{ item.title }}</span>
 			</div>
 		</template>
 	</DraggablePanel>
@@ -35,8 +35,11 @@ import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
 import { getGroup } from "@/backend/group"
 import { TourType } from "@/interfaces/competition"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { GroupMatch } from "@/interfaces/groupSystem"
+import {
+	EventMatch,
+	extractGroupMatches,
+	extractKnockoutMatches,
+} from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
@@ -52,46 +55,33 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === TourType.GROUPS),
 )
 
-const matches = defineModel<Match[]>({ default: [] })
+const matches = defineModel<EventMatch[]>({ default: [] })
 watch(
 	[knockout, groups],
 	() => {
 		matches.value.splice(0, matches.value.length)
 		if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
-			const queue: KnockoutMatch[] = []
-			if (knockout.value?.finale) queue.push(knockout.value.finale)
-			if (knockout.value?.thirdPlace) queue.push(knockout.value.thirdPlace)
-			while (queue.length > 0) {
-				matches.value.push(queue[0])
-				if (queue[0].prevMatch) {
-					queue.push(queue[0].prevMatch.a)
-					queue.push(queue[0].prevMatch.b)
-				}
-				queue.splice(0, 1)
-			}
+			extractKnockoutMatches(knockout.value, t, addMatch)
 		} else if (
 			competition.value?.tourType === TourType.GROUPS &&
 			groups.value
 		) {
-			const queue: GroupMatch[] = []
-			if (groups.value?.finale) queue.push(groups.value.finale)
-			if (groups.value?.thirdPlace) queue.push(groups.value.thirdPlace)
-			while (queue.length > 0) {
-				matches.value.push(queue[0])
-				if (queue[0].prevMatch) {
-					queue.push(queue[0].prevMatch.a)
-					queue.push(queue[0].prevMatch.b)
-				}
-				queue.splice(0, 1)
-			}
-			groups.value?.groups.forEach((group) =>
-				matches.value.push(...group.matches),
-			)
+			extractGroupMatches(groups.value, t, addMatch)
 		}
 	},
-	{ immediate: true },
+	{
+		immediate: true,
+	},
 )
 
+function addMatch(match: Match, title: string) {
+	if (!match.begin)
+		matches.value.push({
+			title,
+			...match,
+		})
+}
+
 const props = withDefaults(
 	defineProps<{
 		isUpdating: boolean
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
new file mode 100644
index 00000000..607967a3
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -0,0 +1,58 @@
+import { Match } from "@/interfaces/match"
+import { KnockoutMatch, KnockoutSystem } from "@/interfaces/knockoutSystem"
+import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
+import { GroupMatch, GroupSystem } from "@/interfaces/groupSystem"
+
+export interface EventMatch extends Match {
+	title: string
+}
+
+export function extractKnockoutMatches(
+	knockout: KnockoutSystem,
+	t: (_: string) => string,
+	add: (match: KnockoutMatch, title: string) => void,
+) {
+	const rounds: KnockoutMatch[][] = []
+	let queue: KnockoutMatch[] = []
+	let nQueue: KnockoutMatch[] = []
+	if (knockout.finale) queue.push(knockout.finale)
+	if (knockout.thirdPlace) queue.push(knockout.thirdPlace)
+
+	while (queue.length) {
+		queue.forEach((match) => {
+			if (match.prevMatch) {
+				nQueue.push(match.prevMatch.a)
+				nQueue.push(match.prevMatch.b)
+			}
+		})
+		if (nQueue.length) rounds.push(nQueue)
+		queue = nQueue
+		nQueue = []
+	}
+
+	rounds.toReversed().forEach((round, i) => {
+		round.forEach((match) => {
+			add(match, knockoutTitle(t)(i, rounds.length + 1))
+		})
+	})
+	if (knockout.thirdPlace)
+		add(knockout.thirdPlace, t("ViewKnockout.thirdPlace"))
+	if (knockout.finale) add(knockout.finale, t("ViewKnockout.finale"))
+}
+
+export function extractGroupMatches(
+	groupSystem: GroupSystem,
+	t: (_: string) => string,
+	add: (match: GroupMatch, title: string) => void,
+) {
+	groupSystem.groups.forEach((group, i) => {
+		group.matches.forEach((match) => {
+			add(match, t("ViewGroupSystem.group") + " " + (i + 1))
+		})
+	})
+	extractKnockoutMatches(
+		{ finale: groupSystem.finale, thirdPlace: groupSystem.thirdPlace },
+		t,
+		add,
+	)
+}
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 5c7bbfb1..9616c15a 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,5 +1,6 @@
 <template>
 	<vue-cal
+		v-if="tournament"
 		active-view="week"
 		hide-view-selector
 		:disable-views="['years', 'year', 'month', 'day']"
@@ -11,30 +12,108 @@
 		:min-split-width="150"
 		:snap-to-time="15"
 		editable-events
+		:events="events"
 		@event-drop="onEventDrop"
-	/>
+	>
+		<template #event="{ event }">
+			<div class="w-full flex flex-column">
+				<p>test</p>
+			</div>
+		</template>
+	</vue-cal>
 </template>
 
 <script setup lang="ts">
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 // @ts-expect-error vue-cal does not have proper typescript support
 import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 import { Court } from "@/interfaces/court"
-import { computed } from "vue"
+import { computed, ref, watch } from "vue"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { getTournamentDetails } from "@/backend/tournament"
+import { useRoute } from "vue-router"
+import { useToast } from "primevue/usetoast"
+import { useI18n } from "vue-i18n"
+import { getCompetitionDetails } from "@/backend/competition"
+import { getKnockout } from "@/backend/knockout"
+import { TourType } from "@/interfaces/competition"
+import { getGroup } from "@/backend/group"
+import { Match } from "@/interfaces/match"
+import {
+	EventMatch,
+	extractGroupMatches,
+	extractKnockoutMatches,
+} from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 
 const emit = defineEmits<{ removeId: [id: string] }>()
 
+const { t } = useI18n({ inheritLocale: true })
+const route = useRoute()
+const toast = useToast()
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: competition } = getCompetitionDetails(route, t, toast)
+const { data: knockout } = getKnockout(
+	route,
+	computed(() => competition.value?.tourType === TourType.KNOCKOUT),
+)
+const { data: groups } = getGroup(
+	route,
+	computed(() => competition.value?.tourType === TourType.GROUPS),
+)
+
+const events = ref<
+	{
+		start: Date
+		end: Date
+		split: string
+		data: EventMatch
+	}[]
+>([])
+watch(
+	[knockout, groups],
+	() => {
+		if (events.value.length) return
+
+		events.value.splice(0, events.value.length)
+		if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
+			extractKnockoutMatches(knockout.value, t, addMatch)
+		} else if (
+			competition.value?.tourType === TourType.GROUPS &&
+			groups.value
+		) {
+			extractGroupMatches(groups.value, t, addMatch)
+		}
+	},
+	{ immediate: true },
+)
+
+function addMatch(match: Match, title: string) {
+	if (match.begin && match.end && match.court)
+		events.value.push({
+			start: match.begin,
+			end: match.end,
+			split: match.court,
+			data: {
+				title,
+				...match,
+			},
+		})
+}
+
 function onEventDrop({
+	event,
 	originalEvent,
 	external,
 }: {
-	originalEvent: { match: KnockoutMatch }
+	originalEvent: { data: KnockoutMatch }
 	external: boolean
 }) {
 	if (external) {
-		if (originalEvent.match.id) emit("removeId", originalEvent.match.id)
+		if (originalEvent.data.id) emit("removeId", originalEvent.data.id)
 		else throw "Match id is missing"
+
+		console.log(event)
+		console.log(originalEvent)
 	}
 }
 
@@ -45,7 +124,7 @@ const props = defineProps<{
 const splitDays = computed(() => {
 	return props.courts.map((court, index) => {
 		return {
-			id: index + 1,
+			id: court.name,
 			label: court.name,
 			class: "court" + (index + 1),
 		}
@@ -87,4 +166,8 @@ const splitDays = computed(() => {
 .vuecal__no-event {
 	display: none;
 }
+
+.vuecal__event {
+	background-color: rgba(164, 230, 210, 0.9);
+}
 </style>
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index 3c3fe353..c2bc34dd 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -82,7 +82,7 @@ function create() {
 		sort: props.sort,
 		revertOnSpill: true,
 		setData(dataTransfer) {
-			dataTransfer.setData("event", JSON.stringify({ match: selectedElement }))
+			dataTransfer.setData("event", JSON.stringify({ data: selectedElement }))
 		},
 		onChoose: (event: Sortable.SortableEvent) => {
 			if (event.oldIndex === undefined) return
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 3e18f71e..8c47a70c 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -1,11 +1,12 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
+import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 
 export interface GroupSystem {
 	teams: Team[]
 	groups: Group[]
 	finale: GroupMatch
-	thirdPlace?: GroupMatch
+	thirdPlace: GroupMatch | null
 }
 
 export interface Group {
@@ -36,17 +37,12 @@ export interface GroupMatchServer extends MatchServer {
 	previousB?: GroupMatchServer
 }
 
-export interface GroupMatch extends Match {
+export interface GroupMatch extends KnockoutMatch {
 	prevGroups?: {
 		pos: number
 		a: number
 		b: number
 	}
-	prevMatch?: {
-		winner: boolean
-		a: GroupMatch
-		b: GroupMatch
-	}
 }
 
 export function groupSystemServerToClient(
@@ -69,7 +65,7 @@ export function groupSystemServerToClient(
 		finale: groupMatchServerToClient(groupSystem.finale, teams),
 		thirdPlace: groupSystem.thirdPlace
 			? groupMatchServerToClient(groupSystem.thirdPlace, teams)
-			: undefined,
+			: null,
 	}
 }
 

From 5accb0c672fc51d1e87348d3cc05467c3d5b72c5 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 20:35:17 +0200
Subject: [PATCH 071/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20dragging=20to=20ex?=
 =?UTF-8?q?ternal=20dragging=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/draggable/DraggablePanel.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index c2bc34dd..87412676 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -133,7 +133,8 @@ function create() {
 			if (from !== to) return
 			if (oldIndex === undefined || newIndex === undefined) return
 
-			props.list.splice(newIndex, 0, props.list.splice(oldIndex, 1)[0])
+			const el = props.list.splice(oldIndex, 1)[0]
+			if (el) props.list.splice(newIndex, 0, el)
 			reload()
 		},
 		removeOnSpill: false,

From 39c06d617734f6be8eb49fb275d544973a643a44 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 20:35:47 +0200
Subject: [PATCH 072/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20GroupSystem=20team?=
 =?UTF-8?q?=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/interfaces/groupSystem.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 8c47a70c..488c3144 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -1,5 +1,5 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
-import { Team } from "@/interfaces/team"
+import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 
 export interface GroupSystem {
@@ -16,7 +16,7 @@ export interface Group {
 }
 
 export interface GroupSystemServer {
-	teams: Team[]
+	teams: TeamServer[]
 	groups: GroupServer[]
 	finale: GroupMatchServer
 	thirdPlace: GroupMatchServer
@@ -48,23 +48,24 @@ export interface GroupMatch extends KnockoutMatch {
 export function groupSystemServerToClient(
 	groupSystem: GroupSystemServer,
 ): GroupSystem {
-	const teams = new Map<string, Team>()
-	groupSystem.teams.forEach((team) => {
+	const teams = groupSystem.teams.map((team) => teamServerToClient(team))
+	const teamMap = new Map<string, Team>()
+	teams.forEach((team) => {
 		if (!team.id) {
 			console.error("Team without id:", team)
 			return
 		}
-		teams.set(team.id, team)
+		teamMap.set(team.id, team)
 	})
 
 	return {
-		teams: groupSystem.teams,
+		teams: teams,
 		groups: groupSystem.groups.map((group) =>
-			groupServerToClient(group, teams),
+			groupServerToClient(group, teamMap),
 		),
-		finale: groupMatchServerToClient(groupSystem.finale, teams),
+		finale: groupMatchServerToClient(groupSystem.finale, teamMap),
 		thirdPlace: groupSystem.thirdPlace
-			? groupMatchServerToClient(groupSystem.thirdPlace, teams)
+			? groupMatchServerToClient(groupSystem.thirdPlace, teamMap)
 			: null,
 	}
 }

From 39f29c6fcb696e9e6a897874ea49e1cbedaf19e5 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 22:11:39 +0200
Subject: [PATCH 073/247] =?UTF-8?q?=E2=9C=A8=20Save=20events=20in=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduleMatches/SchedulingCalendar.vue    | 91 ++++++++++++++++---
 1 file changed, 78 insertions(+), 13 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 9616c15a..e9a07939 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,23 +1,45 @@
 <template>
 	<vue-cal
 		v-if="tournament"
+		:key="calid"
 		active-view="week"
-		hide-view-selector
-		:disable-views="['years', 'year', 'month', 'day']"
+		:disable-views="['years', 'year', 'month']"
 		:locale="$i18n.locale"
 		:time-from="8 * 60"
 		:time-to="20 * 60"
 		:split-days="splitDays"
 		:sticky-split-labels="true"
-		:min-split-width="150"
+		:min-event-width="80"
+		:min-split-width="200"
 		:snap-to-time="15"
-		editable-events
+		:editable-events="!!props.courts.length"
 		:events="events"
 		@event-drop="onEventDrop"
+		@event-change="onEventChange"
 	>
 		<template #event="{ event }">
-			<div class="w-full flex flex-column">
-				<p>test</p>
+			<div class="w-full flex flex-column p-1 text-left">
+				<div>{{ event.data.title }}</div>
+				<div class="grid">
+					<div class="col-6" style="font-size: 0.5rem">
+						<template v-if="event.data.teamA">
+							{{ event.data.teamA.playerA.name }}<br />
+							<template v-if="event.data.teamA.playerB">
+								{{ event.data.teamA.playerB.name }}
+							</template>
+						</template>
+						<template v-else> N.A. </template>
+					</div>
+					<div class="col-6" style="font-size: 0.5rem">
+						<template v-if="event.data.teamB">
+							{{ event.data.teamB.playerA.name }}<br />
+							<template v-if="event.data.teamB.playerB">
+								{{ event.data.teamB.playerB.name }}
+							</template>
+						</template>
+						<template v-else> N.A. </template>
+					</div>
+				</div>
 			</div>
 		</template>
 	</vue-cal>
@@ -29,7 +51,6 @@ import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 import { Court } from "@/interfaces/court"
 import { computed, ref, watch } from "vue"
-import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { getTournamentDetails } from "@/backend/tournament"
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
@@ -45,7 +66,16 @@ import {
 	extractKnockoutMatches,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 
+const calid = ref<number>(0)
+function reload() {
+	calid.value++
+}
+
 const emit = defineEmits<{ removeId: [id: string] }>()
+const props = defineProps<{
+	courts: Court[]
+}>()
+watch(() => props.courts, reload)
 
 const { t } = useI18n({ inheritLocale: true })
 const route = useRoute()
@@ -100,26 +130,61 @@ function addMatch(match: Match, title: string) {
 		})
 }
 
+interface Event {
+	start: Date
+	end: Date
+	split: string
+	data: EventMatch
+}
+
 function onEventDrop({
 	event,
 	originalEvent,
 	external,
 }: {
-	originalEvent: { data: KnockoutMatch }
+	event: Event
+	originalEvent: Event
 	external: boolean
 }) {
 	if (external) {
 		if (originalEvent.data.id) emit("removeId", originalEvent.data.id)
 		else throw "Match id is missing"
 
-		console.log(event)
-		console.log(originalEvent)
+		events.value.push({
+			start: event.start,
+			end: event.end,
+			split: event.split,
+			data: {
+				...originalEvent.data,
+				court: event.split,
+			},
+		})
 	}
 }
 
-const props = defineProps<{
-	courts: Court[]
-}>()
+function onEventChange({
+	event,
+	originalEvent,
+}: {
+	event: Event
+	originalEvent: Event
+}) {
+	if (!originalEvent) return
+
+	events.value.splice(
+		events.value.findIndex((e) => e.data.id === originalEvent.data.id),
+		1,
+	)
+	events.value.push({
+		start: event.start,
+		end: event.end,
+		split: event.split,
+		data: {
+			...originalEvent.data,
+			court: event.split,
+		},
+	})
+}
 
 const splitDays = computed(() => {
 	return props.courts.map((court, index) => {

From 304b1c590cbdc805d0840309c728e4d2299a3f77 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 26 Aug 2024 23:49:33 +0200
Subject: [PATCH 074/247] =?UTF-8?q?=E2=9C=A8=20Implement=20saving=20of=20m?=
 =?UTF-8?q?atch=20dates=20and=20court?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/MatchRepository.java      |  7 ++
 .../resources/MatchRessource.java             | 64 +++++++++++++++++++
 .../jsonEntities/user/jUserMatch.java         |  3 +
 frontend/app/src/backend/match.ts             | 38 +++++++++++
 .../knockoutSystem/ViewKnockoutTree.vue       |  1 -
 .../scheduleMatches/ScheduleMatchesHelper.ts  |  7 ++
 .../scheduleMatches/SchedulingCalendar.vue    | 33 ++++------
 .../scheduleMatches/ViewScheduleMatches.vue   | 21 +++---
 frontend/app/src/interfaces/match.ts          | 18 +++++-
 9 files changed, 159 insertions(+), 33 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
 create mode 100644 frontend/app/src/backend/match.ts

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 018dabfd..ef19750b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -9,10 +9,15 @@
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.util.List;
+import java.util.UUID;
 
 @ApplicationScoped
 public class MatchRepository implements PanacheRepository<Match> {
 
+    public Match findById(UUID id) {
+        return find("id", id).firstResult();
+    }
+
     public Match getFinal(Competition competition) {
         PanacheQuery<Match> result = find("#findHead", Parameters.with("comp", competition).and("finale", true));
         if (result.count() != 1)
@@ -39,4 +44,6 @@ public void delete(Match m) {
     public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
+
+
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
new file mode 100644
index 00000000..557ac9e1
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
@@ -0,0 +1,64 @@
+package de.secretj12.turnierplaner.resources;
+
+
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
+import de.secretj12.turnierplaner.db.repositories.MatchRepository;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import io.quarkus.security.UnauthorizedException;
+import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+
+import java.util.List;
+
+@Path("/tournament/{tourName}/competition/{compName}/match")
+public class MatchRessource {
+
+    @Inject
+    TournamentRepository tournaments;
+    @Inject
+    CompetitionRepository competitions;
+    @Inject
+    MatchRepository matchRepository;
+    @Inject
+    CourtRepositiory courtRepositiory;
+    @Inject
+    SecurityIdentity securityIdentity;
+
+    @POST
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
+                                List<jUserMatch> matches) {
+        checkTournamentAccessibility(tourName);
+        Competition competition = competitions.getByName(tourName, compName);
+
+        for (jUserMatch cMatch : matches) {
+            Match match = matchRepository.findById(cMatch.getId());
+            if (match == null)
+                throw new NotFoundException("Could not find match");
+            if (match.getCompetition().getId() != competition.getId())
+                throw new BadRequestException("Match does not belong to specified competition");
+            match.setCourt(courtRepositiory.findByName(cMatch.getCourt()));
+            match.setBegin(cMatch.getBegin());
+            match.setEnd(cMatch.getEnd());
+
+            matchRepository.persist(match);
+        }
+        return "Updated matches";
+    }
+
+    private void checkTournamentAccessibility(String tourName) {
+        Tournament tournament = tournaments.getByName(tourName);
+        if (tournament == null) throw new NotFoundException("Tournament could not be found");
+        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
+            throw new UnauthorizedException("Cannot access tournament");
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index c1b30565..233d3b52 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -1,6 +1,8 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -8,6 +10,7 @@
 
 public class jUserMatch {
 
+    private static final Logger log = LoggerFactory.getLogger(jUserMatch.class);
     private UUID id;
     private String court;
     private LocalDateTime begin;
diff --git a/frontend/app/src/backend/match.ts b/frontend/app/src/backend/match.ts
new file mode 100644
index 00000000..54f95d77
--- /dev/null
+++ b/frontend/app/src/backend/match.ts
@@ -0,0 +1,38 @@
+import { useMutation } from "@tanstack/vue-query"
+import { Match, matchClientToServer } from "@/interfaces/match"
+import axios from "axios"
+import { RouteLocationNormalizedLoaded } from "vue-router"
+import { ToastServiceMethods } from "primevue/toastservice"
+
+export function useUpdateMatches(
+	route: RouteLocationNormalizedLoaded,
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useMutation({
+		mutationFn: (matches: Match[]) =>
+			axios.post(
+				`/tournament/${<string>route.params.tourId}/competition/${<string>route.params.compId}/match`,
+				matches.map(matchClientToServer),
+			),
+		onSuccess() {
+			// TODO internalization
+			toast.add({
+				severity: "success",
+				summary: "Scheduling saved",
+				detail: "saved all the matches",
+				life: 3000,
+			})
+		},
+		onError(error) {
+			// TODO internalization
+			toast.add({
+				severity: "error",
+				summary: "Saving failed",
+				detail: "error saving matches",
+				life: 3000,
+			})
+			console.log(error)
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index 29455a6a..b9829528 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -28,7 +28,6 @@
 								:index="index"
 								@update:teamA="
 									(team: Team | null) => {
-										console.log('update teamA')
 										getMatch(level, index).teamA = team
 									}
 								"
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index 607967a3..d20dec64 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -7,6 +7,13 @@ export interface EventMatch extends Match {
 	title: string
 }
 
+export interface CalEvent {
+	start: Date
+	end: Date
+	split: string
+	data: EventMatch
+}
+
 export function extractKnockoutMatches(
 	knockout: KnockoutSystem,
 	t: (_: string) => string,
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index e9a07939..96ac2fe2 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -28,7 +28,7 @@
 								{{ event.data.teamA.playerB.name }}
 							</template>
 						</template>
-						<template v-else> N.A. </template>
+						<template v-else> N.A.</template>
 					</div>
 					<div class="col-6" style="font-size: 0.5rem">
 						<template v-if="event.data.teamB">
@@ -37,7 +37,7 @@
 								{{ event.data.teamB.playerB.name }}
 							</template>
 						</template>
-						<template v-else> N.A. </template>
+						<template v-else> N.A.</template>
 					</div>
 				</div>
 			</div>
@@ -61,12 +61,13 @@ import { TourType } from "@/interfaces/competition"
 import { getGroup } from "@/backend/group"
 import { Match } from "@/interfaces/match"
 import {
-	EventMatch,
+	CalEvent,
 	extractGroupMatches,
 	extractKnockoutMatches,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 
 const calid = ref<number>(0)
+
 function reload() {
 	calid.value++
 }
@@ -91,14 +92,7 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === TourType.GROUPS),
 )
 
-const events = ref<
-	{
-		start: Date
-		end: Date
-		split: string
-		data: EventMatch
-	}[]
->([])
+const events = defineModel<CalEvent[]>({ default: [] })
 watch(
 	[knockout, groups],
 	() => {
@@ -130,20 +124,13 @@ function addMatch(match: Match, title: string) {
 		})
 }
 
-interface Event {
-	start: Date
-	end: Date
-	split: string
-	data: EventMatch
-}
-
 function onEventDrop({
 	event,
 	originalEvent,
 	external,
 }: {
-	event: Event
-	originalEvent: Event
+	event: CalEvent
+	originalEvent: CalEvent
 	external: boolean
 }) {
 	if (external) {
@@ -166,8 +153,8 @@ function onEventChange({
 	event,
 	originalEvent,
 }: {
-	event: Event
-	originalEvent: Event
+	event: CalEvent
+	originalEvent: CalEvent
 }) {
 	if (!originalEvent) return
 
@@ -181,6 +168,8 @@ function onEventChange({
 		split: event.split,
 		data: {
 			...originalEvent.data,
+			begin: event.start,
+			end: event.end,
 			court: event.split,
 		},
 	})
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index dec363af..0db64a13 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -33,6 +33,7 @@
 		<div class="col-8">
 			<div class="flex flex-column gap-3">
 				<SchedulingCalendar
+					v-model="scheduledMatches"
 					:courts="selectedCourts"
 					@remove-id="
 						(id) => {
@@ -58,17 +59,26 @@ import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
 import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
 import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
-import { Match } from "@/interfaces/match"
+import {
+	CalEvent,
+	EventMatch,
+} from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { useUpdateMatches } from "@/backend/match"
+import { useI18n } from "vue-i18n"
 
 const route = useRoute()
 const router = useRouter()
+const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
 const { data: courts } = getCourts()
 
-const matches = ref<Match[]>([])
+const matches = ref<EventMatch[]>([])
+const scheduledMatches = ref<CalEvent[]>([])
+
+const { mutate: updateMatches } = useUpdateMatches(route, t, toast)
 
 const selectedCourts = ref<Court[]>([])
 watch(selectedCourts, () => {
@@ -97,12 +107,7 @@ function nextPage() {
 function save() {
 	// TODO
 	isUpdating.value = true
-	toast.add({
-		severity: "success",
-		summary: "Scheduling saved",
-		detail: "TODO",
-		life: 3000,
-	})
+	updateMatches(scheduledMatches.value.map((event) => event.data))
 	isUpdating.value = false
 }
 
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 16f4ad38..b07802e6 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -27,8 +27,8 @@ export interface Match {
 export interface MatchServer {
 	id?: string
 	court: string | undefined
-	begin: string | undefined
-	end: string | undefined
+	begin: Date | undefined
+	end: Date | undefined
 	finished: boolean | undefined
 	winner: boolean | undefined
 	teamA: string | null
@@ -76,3 +76,17 @@ export function matchServerToClient(
 		curGame: null,
 	}
 }
+
+export function matchClientToServer(match: Match): MatchServer {
+	return {
+		id: match.id,
+		court: match.court ?? undefined,
+		begin: match.begin ?? undefined,
+		end: match.end ?? undefined,
+		finished: match.finished,
+		winner: match.winner ?? undefined,
+		teamA: match.teamA?.id ?? null,
+		teamB: match.teamB?.id ?? null,
+		sets: match.sets ?? [],
+	}
+}

From d3ce512607089d6786c2ca42d1f050607a4cf67f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 00:58:03 +0200
Subject: [PATCH 075/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Switch=20from=20Lo?=
 =?UTF-8?q?calDateTime=20to=20Instant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      | 14 ++---
 .../turnierplaner/db/entities/Timeslot.java   | 14 ++---
 .../turnierplaner/db/entities/Tournament.java | 26 ++++-----
 .../db/entities/VerificationCode.java         |  8 +--
 .../resources/CompetitionResource.java        | 10 ++--
 .../resources/PlayerResource.java             |  5 +-
 .../jsonEntities/user/jUserMatch.java         | 14 ++---
 .../jsonEntities/user/jUserTournament.java    | 26 ++++-----
 .../startup/testdata/TestdataGenerator.java   | 58 ++++++++++---------
 .../modifier/TestKnockoutTools.java           | 11 ++--
 .../resources/TestCompetitionResource.java    | 27 ++++-----
 .../resources/TestTournamentResource.java     | 23 ++++----
 frontend/app/src/interfaces/match.ts          |  8 +--
 13 files changed, 126 insertions(+), 118 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 56785dda..ff3e8242 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -9,7 +9,7 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
@@ -48,9 +48,9 @@ public class Match {
     private Court court;
 
     @Column(name = "begin_time")
-    private LocalDateTime begin;
+    private Instant begin;
     @Column(name = "end_time")
-    private LocalDateTime end;
+    private Instant end;
 
     @Column(name = "finished")
     private Boolean finished;
@@ -111,19 +111,19 @@ public void setCourt(Court courts) {
         this.court = courts;
     }
 
-    public LocalDateTime getBegin() {
+    public Instant getBegin() {
         return begin;
     }
 
-    public void setBegin(LocalDateTime begin) {
+    public void setBegin(Instant begin) {
         this.begin = begin;
     }
 
-    public LocalDateTime getEnd() {
+    public Instant getEnd() {
         return end;
     }
 
-    public void setEnd(LocalDateTime end) {
+    public void setEnd(Instant end) {
         this.end = end;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
index 6cc8c32d..2a900899 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
@@ -4,7 +4,7 @@
 
 import jakarta.persistence.*;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 @Entity
@@ -16,9 +16,9 @@ public class Timeslot {
     private UUID id;
 
     @Column(name = "begin_time")
-    private LocalDateTime begin;
+    private Instant begin;
     @Column(name = "end_time")
-    private LocalDateTime end;
+    private Instant end;
     @ManyToOne
     @JoinColumns(@JoinColumn(name = "competition_id"))
     private Competition competition;
@@ -35,19 +35,19 @@ public void setId(UUID id) {
         this.id = id;
     }
 
-    public LocalDateTime getBegin() {
+    public Instant getBegin() {
         return begin;
     }
 
-    public void setBegin(LocalDateTime begin) {
+    public void setBegin(Instant begin) {
         this.begin = begin;
     }
 
-    public LocalDateTime getEnd() {
+    public Instant getEnd() {
         return end;
     }
 
-    public void setEnd(LocalDateTime end) {
+    public void setEnd(Instant end) {
         this.end = end;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
index a576d91f..f0a2ce9f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
@@ -2,7 +2,7 @@
 
 import jakarta.persistence.*;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 import java.util.Set;
 
@@ -20,14 +20,14 @@ public class Tournament {
     private String description;
 
     @Column(name = "begin_registration")
-    private LocalDateTime beginRegistration;
+    private Instant beginRegistration;
     @Column(name = "end_registration")
-    private LocalDateTime endRegistration;
+    private Instant endRegistration;
 
     @Column(name = "begin_game_phase")
-    private LocalDateTime beginGamePhase;
+    private Instant beginGamePhase;
     @Column(name = "end_game_phase")
-    private LocalDateTime endGamePhase;
+    private Instant endGamePhase;
 
     @Column(name = "visible")
     private boolean visible;
@@ -64,35 +64,35 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public LocalDateTime getBeginRegistration() {
+    public Instant getBeginRegistration() {
         return beginRegistration;
     }
 
-    public void setBeginRegistration(LocalDateTime beginRegistration) {
+    public void setBeginRegistration(Instant beginRegistration) {
         this.beginRegistration = beginRegistration;
     }
 
-    public LocalDateTime getEndRegistration() {
+    public Instant getEndRegistration() {
         return endRegistration;
     }
 
-    public void setEndRegistration(LocalDateTime endRegistration) {
+    public void setEndRegistration(Instant endRegistration) {
         this.endRegistration = endRegistration;
     }
 
-    public LocalDateTime getBeginGamePhase() {
+    public Instant getBeginGamePhase() {
         return beginGamePhase;
     }
 
-    public void setBeginGamePhase(LocalDateTime beginGamePhase) {
+    public void setBeginGamePhase(Instant beginGamePhase) {
         this.beginGamePhase = beginGamePhase;
     }
 
-    public LocalDateTime getEndGamePhase() {
+    public Instant getEndGamePhase() {
         return endGamePhase;
     }
 
-    public void setEndGamePhase(LocalDateTime endGamePhase) {
+    public void setEndGamePhase(Instant endGamePhase) {
         this.endGamePhase = endGamePhase;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
index c7588d0f..9c7c8e5a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
@@ -2,7 +2,7 @@
 
 import jakarta.persistence.*;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 @Entity
@@ -18,7 +18,7 @@ public class VerificationCode {
     private Player player;
 
     @Column(name = "expiration_date")
-    private LocalDateTime expiration_date;
+    private Instant expiration_date;
 
     public UUID getId() {
         return id;
@@ -36,11 +36,11 @@ public void setPlayer(Player player) {
         this.player = player;
     }
 
-    public LocalDateTime getExpirationDate() {
+    public Instant getExpirationDate() {
         return expiration_date;
     }
 
-    public void setExpirationDate(LocalDateTime expiration_date) {
+    public void setExpirationDate(Instant expiration_date) {
         this.expiration_date = expiration_date;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 02fcc67c..17679c61 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -29,7 +29,7 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -162,8 +162,8 @@ public List<jUserTeam> getSignedUpPlayers(@PathParam("tourName") String tourName
         if (competition == null) throw new NotFoundException("Competition was not found");
 
         if (!securityIdentity.hasRole("director")
-            && (competition.getTournament().getBeginRegistration().isAfter(LocalDateTime.now())
-                || competition.getTournament().getBeginGamePhase().isBefore(LocalDateTime.now())))
+            && (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+                || competition.getTournament().getBeginGamePhase().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
         return competition.getTeams().stream().map(jUserTeam::new).toList();
@@ -185,8 +185,8 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
         if (competition == null) throw new BadRequestException("Competition doesn't exist");
 
         if (!securityIdentity.hasRole("director") && // or registration phase
-            (competition.getTournament().getBeginRegistration().isAfter(LocalDateTime.now())
-                || competition.getTournament().getEndRegistration().isBefore(LocalDateTime.now())))
+            (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+                || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
         if (competition.getMode() == CompetitionMode.SINGLES
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index a0515296..56417d57 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -20,7 +20,8 @@
 import jakarta.ws.rs.core.Response;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.UUID;
 
@@ -89,7 +90,7 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
 
         VerificationCode verificationCode = new VerificationCode();
         verificationCode.setPlayer(newPlayer);
-        verificationCode.setExpirationDate(LocalDateTime.now().plusMinutes(30));
+        verificationCode.setExpirationDate(Instant.now().plus(30, ChronoUnit.MINUTES));
         verificationCodeRepository.persist(verificationCode);
 
         // TODO check for valid mail
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index 233d3b52..49e00760 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -4,7 +4,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 
@@ -13,8 +13,8 @@ public class jUserMatch {
     private static final Logger log = LoggerFactory.getLogger(jUserMatch.class);
     private UUID id;
     private String court;
-    private LocalDateTime begin;
-    private LocalDateTime end;
+    private Instant begin;
+    private Instant end;
 
     private Boolean finished;
     private Boolean winner;
@@ -60,19 +60,19 @@ public void setCourt(String court) {
         this.court = court;
     }
 
-    public LocalDateTime getBegin() {
+    public Instant getBegin() {
         return begin;
     }
 
-    public void setBegin(LocalDateTime begin) {
+    public void setBegin(Instant begin) {
         this.begin = begin;
     }
 
-    public LocalDateTime getEnd() {
+    public Instant getEnd() {
         return end;
     }
 
-    public void setEnd(LocalDateTime end) {
+    public void setEnd(Instant end) {
         this.end = end;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java
index 2c5b1dae..bc4f32eb 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java
@@ -2,15 +2,15 @@
 
 import de.secretj12.turnierplaner.db.entities.Tournament;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 public class jUserTournament {
     private String name;
     private String description;
-    private LocalDateTime beginRegistration;
-    private LocalDateTime endRegistration;
-    private LocalDateTime beginGamePhase;
-    private LocalDateTime endGamePhase;
+    private Instant beginRegistration;
+    private Instant endRegistration;
+    private Instant beginGamePhase;
+    private Instant endGamePhase;
 
     public jUserTournament() {
     }
@@ -40,35 +40,35 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public LocalDateTime getBeginRegistration() {
+    public Instant getBeginRegistration() {
         return beginRegistration;
     }
 
-    public void setBeginRegistration(LocalDateTime beginRegistration) {
+    public void setBeginRegistration(Instant beginRegistration) {
         this.beginRegistration = beginRegistration;
     }
 
-    public LocalDateTime getEndRegistration() {
+    public Instant getEndRegistration() {
         return endRegistration;
     }
 
-    public void setEndRegistration(LocalDateTime endRegistration) {
+    public void setEndRegistration(Instant endRegistration) {
         this.endRegistration = endRegistration;
     }
 
-    public LocalDateTime getBeginGamePhase() {
+    public Instant getBeginGamePhase() {
         return beginGamePhase;
     }
 
-    public void setBeginGamePhase(LocalDateTime beginGamePhase) {
+    public void setBeginGamePhase(Instant beginGamePhase) {
         this.beginGamePhase = beginGamePhase;
     }
 
-    public LocalDateTime getEndGamePhase() {
+    public Instant getEndGamePhase() {
         return endGamePhase;
     }
 
-    public void setEndGamePhase(LocalDateTime endGamePhase) {
+    public void setEndGamePhase(Instant endGamePhase) {
         this.endGamePhase = endGamePhase;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 7b17fb45..0ecd540f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -13,8 +13,9 @@
 import jakarta.transaction.Transactional;
 import net.datafaker.Faker;
 
+import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -91,34 +92,34 @@ private void createTournament(TDate tDate, String name, String description, bool
         tournament.setVisible(visible);
         switch (tDate) {
             case BEFORE_REGISTRATION -> {
-                tournament.setBeginRegistration(LocalDateTime.now().plusDays(10));
-                tournament.setEndRegistration(LocalDateTime.now().plusDays(11));
-                tournament.setBeginGamePhase(LocalDateTime.now().plusDays(12));
-                tournament.setEndGamePhase(LocalDateTime.now().plusDays(13));
+                tournament.setBeginRegistration(Instant.now().plus(10, ChronoUnit.DAYS));
+                tournament.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+                tournament.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+                tournament.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
             }
             case REGISTRATION_OPEN -> {
-                tournament.setBeginRegistration(LocalDateTime.now().minusDays(1));
-                tournament.setEndRegistration(LocalDateTime.now().plusDays(10));
-                tournament.setBeginGamePhase(LocalDateTime.now().plusDays(11));
-                tournament.setEndGamePhase(LocalDateTime.now().plusDays(12));
+                tournament.setBeginRegistration(Instant.now().minus(1, ChronoUnit.DAYS));
+                tournament.setEndRegistration(Instant.now().plus(10, ChronoUnit.DAYS));
+                tournament.setBeginGamePhase(Instant.now().plus(11, ChronoUnit.DAYS));
+                tournament.setEndGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
             }
             case BEFORE_GAMEPHASE -> {
-                tournament.setBeginRegistration(LocalDateTime.now().minusDays(2));
-                tournament.setEndRegistration(LocalDateTime.now().minusDays(1));
-                tournament.setBeginGamePhase(LocalDateTime.now().plusDays(10));
-                tournament.setEndGamePhase(LocalDateTime.now().plusDays(11));
+                tournament.setBeginRegistration(Instant.now().minus(2, ChronoUnit.DAYS));
+                tournament.setEndRegistration(Instant.now().minus(1, ChronoUnit.DAYS));
+                tournament.setBeginGamePhase(Instant.now().plus(10, ChronoUnit.DAYS));
+                tournament.setEndGamePhase(Instant.now().plus(11, ChronoUnit.DAYS));
             }
             case GAMEPHASE_OPEN -> {
-                tournament.setBeginRegistration(LocalDateTime.now().minusDays(3));
-                tournament.setEndRegistration(LocalDateTime.now().minusDays(2));
-                tournament.setBeginGamePhase(LocalDateTime.now().minusDays(1));
-                tournament.setEndGamePhase(LocalDateTime.now().plusDays(10));
+                tournament.setBeginRegistration(Instant.now().minus(3, ChronoUnit.DAYS));
+                tournament.setEndRegistration(Instant.now().minus(2, ChronoUnit.DAYS));
+                tournament.setBeginGamePhase(Instant.now().minus(1, ChronoUnit.DAYS));
+                tournament.setEndGamePhase(Instant.now().plus(10, ChronoUnit.DAYS));
             }
             case AFTER_GAMEPHASE -> {
-                tournament.setBeginRegistration(LocalDateTime.now().minusDays(4));
-                tournament.setEndRegistration(LocalDateTime.now().minusDays(3));
-                tournament.setBeginGamePhase(LocalDateTime.now().minusDays(2));
-                tournament.setEndGamePhase(LocalDateTime.now().minusDays(1));
+                tournament.setBeginRegistration(Instant.now().minus(4, ChronoUnit.DAYS));
+                tournament.setEndRegistration(Instant.now().minus(3, ChronoUnit.DAYS));
+                tournament.setBeginGamePhase(Instant.now().minus(2, ChronoUnit.DAYS));
+                tournament.setEndGamePhase(Instant.now().minus(1, ChronoUnit.DAYS));
             }
         }
         tournament.setDescription(description);
@@ -135,7 +136,8 @@ private void createSets(Match match) {
         int numberOfSets = 2;
         int winDif = 0;
         List<Tuple2<Integer, Integer>> possibleResults = List.of(Tuple2.of(6, 0), Tuple2.of(6, 1), Tuple2.of(6, 2),
-            Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5), Tuple2.of(7, 6));
+            Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
+            Tuple2.of(7, 6));
         for (int i = 0; i < numberOfSets; i++) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
@@ -273,12 +275,12 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
                     match.setTeamB(groupTeams[j]);
                     int matchBegin = random.nextInt(3);
                     if (matchBegin != 0) {
-                        match.setBegin(LocalDateTime.now());
-                        match.setEnd(LocalDateTime.now().plusHours(1));
+                        match.setBegin(Instant.now());
+                        match.setEnd(Instant.now().plus(1, ChronoUnit.HOURS));
                         createSets(match);
                     } else {
-                        match.setBegin(LocalDateTime.now().plusMinutes(random.nextInt(60)));
-                        match.setEnd(LocalDateTime.now().plusHours(2));
+                        match.setBegin(Instant.now().plus(random.nextInt(60), ChronoUnit.MINUTES));
+                        match.setEnd(Instant.now().plus(2, ChronoUnit.HOURS));
                     }
                     matchRepository.persist(match);
                     MatchOfGroup matchOfGroup = new MatchOfGroup();
@@ -387,8 +389,8 @@ private Match createMatch(Court c, Competition competition) {
         Match match = new Match();
         match.setCompetition(competition);
         match.setCourt(c);
-        match.setBegin(LocalDateTime.now());
-        match.setEnd(LocalDateTime.now().plusDays(1));
+        match.setBegin(Instant.now());
+        match.setEnd(Instant.now().plus(2, ChronoUnit.HOURS));
         match.setFinished(false);
         matchRepository.persist(match);
         return match;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
index aad2c18c..02452d80 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
@@ -14,7 +14,8 @@
 import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 
 @QuarkusTest
 public class TestKnockoutTools {
@@ -34,10 +35,10 @@ public void addData() {
         Tournament tour = new Tournament();
         tour.setName("Clubmeisterschaft");
         tour.setDescription("Anmeldung abgeschlossen");
-        tour.setBeginRegistration(LocalDateTime.now().minusDays(10));
-        tour.setEndRegistration(LocalDateTime.now().minusDays(5));
-        tour.setBeginGamePhase(LocalDateTime.now().plusDays(5));
-        tour.setEndGamePhase(LocalDateTime.now().plusDays(10));
+        tour.setBeginRegistration(Instant.now().minus(10, ChronoUnit.DAYS));
+        tour.setEndRegistration(Instant.now().minus(5, ChronoUnit.DAYS));
+        tour.setBeginGamePhase(Instant.now().plus(5, ChronoUnit.DAYS));
+        tour.setEndGamePhase(Instant.now().plus(10, ChronoUnit.DAYS));
         tour.setVisible(true);
         tournamentRepository.persist(tour);
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
index b6b73d7e..2e47b009 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
 import static de.secretj12.turnierplaner.db.entities.competition.CreationProgress.TEAMS;
@@ -45,28 +46,28 @@ public void addData() {
         Tournament tour20 = new Tournament();
         tour20.setName("Clubmeisterschaft 2020");
         tour20.setDescription("Anmeldung ausstehend");
-        tour20.setBeginRegistration(LocalDateTime.now().minusDays(20));
-        tour20.setEndRegistration(LocalDateTime.now().minusDays(18));
-        tour20.setBeginGamePhase(LocalDateTime.now().minusDays(17));
-        tour20.setEndGamePhase(LocalDateTime.now().minusDays(15));
+        tour20.setBeginRegistration(Instant.now().minus(20, ChronoUnit.DAYS));
+        tour20.setEndRegistration(Instant.now().minus(18, ChronoUnit.DAYS));
+        tour20.setBeginGamePhase(Instant.now().minus(17, ChronoUnit.DAYS));
+        tour20.setEndGamePhase(Instant.now().minus(15, ChronoUnit.DAYS));
         tour20.setVisible(true);
         tournaments.persist(tour20);
         Tournament tour21 = new Tournament();
         tour21.setName("Clubmeisterschaft 2021");
         tour21.setDescription("Anmeldung ausstehend");
-        tour21.setBeginRegistration(LocalDateTime.now().minusDays(10));
-        tour21.setEndRegistration(LocalDateTime.now().plusDays(11));
-        tour21.setBeginGamePhase(LocalDateTime.now().plusDays(12));
-        tour21.setEndGamePhase(LocalDateTime.now().plusDays(13));
+        tour21.setBeginRegistration(Instant.now().minus(10, ChronoUnit.DAYS));
+        tour21.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+        tour21.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+        tour21.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour21.setVisible(true);
         tournaments.persist(tour21);
         Tournament tour22 = new Tournament();
         tour22.setName("Clubmeisterschaft 2022");
         tour22.setDescription("Anmeldung ausstehend");
-        tour22.setBeginRegistration(LocalDateTime.now().plusDays(10));
-        tour22.setEndRegistration(LocalDateTime.now().plusDays(11));
-        tour22.setBeginGamePhase(LocalDateTime.now().plusDays(12));
-        tour22.setEndGamePhase(LocalDateTime.now().plusDays(13));
+        tour22.setBeginRegistration(Instant.now().plus(10, ChronoUnit.DAYS));
+        tour22.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+        tour22.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+        tour22.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour22.setVisible(false);
         tournaments.persist(tour22);
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index 9b296cf7..5e449fcf 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -14,7 +14,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
 import static io.restassured.RestAssured.given;
@@ -34,19 +37,19 @@ public void addData() {
         Tournament tour = new Tournament();
         tour.setName("Clubmeisterschaft");
         tour.setDescription("Anmeldung ausstehend");
-        tour.setBeginRegistration(LocalDateTime.now().plusDays(10));
-        tour.setEndRegistration(LocalDateTime.now().plusDays(11));
-        tour.setBeginGamePhase(LocalDateTime.now().plusDays(12));
-        tour.setEndGamePhase(LocalDateTime.now().plusDays(13));
+        tour.setBeginRegistration(Instant.now().plus(10, ChronoUnit.DAYS));
+        tour.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+        tour.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+        tour.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour.setVisible(true);
         tournamentRepository.persist(tour);
         Tournament tour2 = new Tournament();
         tour2.setName("Clubmeisterschaft2");
         tour2.setDescription("Anmeldung ausstehend");
-        tour2.setBeginRegistration(LocalDateTime.now().plusDays(10));
-        tour2.setEndRegistration(LocalDateTime.now().plusDays(11));
-        tour2.setBeginGamePhase(LocalDateTime.now().plusDays(12));
-        tour2.setEndGamePhase(LocalDateTime.now().plusDays(13));
+        tour2.setBeginRegistration(Instant.now().plus(10, ChronoUnit.DAYS));
+        tour2.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+        tour2.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+        tour2.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour2.setVisible(false);
         tournamentRepository.persist(tour2);
     }
@@ -183,7 +186,7 @@ public void createTournament() {
         Tournament tour = tournamentRepository.getByName("Clubmeisterschaft 2024");
         assertNotNull(tour);
         assertEquals(tour.getDescription(), "Anmeldephase offen");
-        assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30));
+        assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30).toInstant(ZoneOffset.UTC));
     }
 
     @Test
@@ -314,7 +317,7 @@ public void updateTournament() {
         Tournament tour = tournamentRepository.getByName("Clubmeisterschaft 2024");
         assertNotNull(tour);
         assertEquals(tour.getDescription(), "Anmeldephase offen");
-        assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30));
+        assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30).toInstant(ZoneOffset.UTC));
     }
 
     @Test
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index b07802e6..3129ce26 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -27,8 +27,8 @@ export interface Match {
 export interface MatchServer {
 	id?: string
 	court: string | undefined
-	begin: Date | undefined
-	end: Date | undefined
+	begin: string | undefined
+	end: string | undefined
 	finished: boolean | undefined
 	winner: boolean | undefined
 	teamA: string | null
@@ -81,8 +81,8 @@ export function matchClientToServer(match: Match): MatchServer {
 	return {
 		id: match.id,
 		court: match.court ?? undefined,
-		begin: match.begin ?? undefined,
-		end: match.end ?? undefined,
+		begin: match.begin?.toISOString() ?? undefined,
+		end: match.end?.toISOString() ?? undefined,
 		finished: match.finished,
 		winner: match.winner ?? undefined,
 		teamA: match.teamA?.id ?? null,

From eb638372b3f0ad41dc3d6e6a0d9aebd99f57c756 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 15:48:10 +0200
Subject: [PATCH 076/247] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Only=20allow=20?=
 =?UTF-8?q?match=20and=20court=20config=20as=20director?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/CourtResource.java     | 2 ++
 .../de/secretj12/turnierplaner/resources/MatchRessource.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index 80a87601..45885773 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -3,6 +3,7 @@
 import de.secretj12.turnierplaner.db.entities.Court;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
@@ -11,6 +12,7 @@
 import java.util.List;
 
 @Path("/court")
+@RolesAllowed("director")
 public class CourtResource {
 
     @Inject
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
index 557ac9e1..6dcb6281 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
@@ -11,6 +11,7 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
@@ -18,6 +19,7 @@
 
 import java.util.List;
 
+@RolesAllowed("director")
 @Path("/tournament/{tourName}/competition/{compName}/match")
 public class MatchRessource {
 

From 32be7d5b0e6b64fef4e5f5e85e84ba8510b8fba6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 16:50:52 +0200
Subject: [PATCH 077/247] =?UTF-8?q?=F0=9F=92=84=20Fix=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/components/header/HeadContent.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/app/src/components/header/HeadContent.vue b/frontend/app/src/components/header/HeadContent.vue
index 44aa7714..eeb1ab09 100644
--- a/frontend/app/src/components/header/HeadContent.vue
+++ b/frontend/app/src/components/header/HeadContent.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- TODO optimize mobile -->
-	<div class="sticky top-0">
+	<div id="head" class="sticky top-0">
 		<header>
 			<HeaderLeft />
 			<HeaderRight />
@@ -27,7 +27,11 @@ header {
 	left: 0;
 	right: 0;
 	top: 0;
-	z-index: 10;
 	background-color: white;
 }
+
+#head {
+	z-index: 10;
+	box-shadow: 0 10px 15px rgb(0, 0, 0, 0.2);
+}
 </style>

From e2b7ad52736a1f284baff51c39c4f869bdf00793 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 16:59:23 +0200
Subject: [PATCH 078/247] =?UTF-8?q?=E2=9C=A8=20Redesign=20match=20event?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/scheduleMatches/MatchEvent.vue    | 40 +++++++++++++++++++
 .../MatchesContainerDraggable.vue             |  8 ++--
 .../scheduleMatches/SchedulingCalendar.vue    | 32 ++++-----------
 3 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
new file mode 100644
index 00000000..c6881c57
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -0,0 +1,40 @@
+<template>
+	<div class="w-full flex flex-column p-1 text-left">
+		<strong>{{ props.match.title }}</strong>
+		<i v-if="competition">
+			{{ competition.name }}
+		</i>
+		<ul class="mt-1 pt-0 pl-4">
+			<li v-if="props.match.teamA">
+				<template v-if="props.match.teamA.playerA">
+					{{ props.match.teamA.playerA.name }}
+					<template v-if="props.match.teamA.playerB">
+						<br />
+						{{ props.match.teamA.playerB.name }}
+					</template>
+				</template>
+			</li>
+			<li v-if="props.match.teamB">
+				<template v-if="props.match.teamB.playerA">
+					{{ props.match.teamB.playerA.name }}
+					<template v-if="props.match.teamB.playerB">
+						<br />
+						{{ props.match.teamB.playerB.name }}
+					</template>
+				</template>
+			</li>
+		</ul>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { EventMatch } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { Competition } from "@/interfaces/competition"
+
+const props = defineProps<{
+	match: EventMatch
+	competition?: Competition
+}>()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 13f556c8..f5e2dfde 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -14,11 +14,8 @@
 		style="box-sizing: content-box; width: calc(100% - 6px)"
 	>
 		<template #default="{ item }">
-			<div
-				v-if="item"
-				class="bg-primary-400 text-black border-round select-none cursor-pointer pl-3 pr-3 h-3rem inline text-50 flex align-items-center justify-content-center"
-			>
-				<span>{{ item.title }}</span>
+			<div style="background-color: rgba(164, 230, 210, 0.9); width: 200px">
+				<MatchEvent :match="item" :competition="competition" />
 			</div>
 		</template>
 	</DraggablePanel>
@@ -40,6 +37,7 @@ import {
 	extractGroupMatches,
 	extractKnockoutMatches,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import MatchEvent from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 96ac2fe2..335b43be 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -10,7 +10,9 @@
 		:split-days="splitDays"
 		:sticky-split-labels="true"
 		:min-event-width="80"
-		:min-split-width="200"
+		:min-split-width="250"
+		:min-cell-width="250"
+		:time-cell-height="100"
 		:snap-to-time="15"
 		:editable-events="!!props.courts.length"
 		:events="events"
@@ -18,29 +20,7 @@
 		@event-change="onEventChange"
 	>
 		<template #event="{ event }">
-			<div class="w-full flex flex-column p-1 text-left">
-				<div>{{ event.data.title }}</div>
-				<div class="grid">
-					<div class="col-6" style="font-size: 0.5rem">
-						<template v-if="event.data.teamA">
-							{{ event.data.teamA.playerA.name }}<br />
-							<template v-if="event.data.teamA.playerB">
-								{{ event.data.teamA.playerB.name }}
-							</template>
-						</template>
-						<template v-else> N.A.</template>
-					</div>
-					<div class="col-6" style="font-size: 0.5rem">
-						<template v-if="event.data.teamB">
-							{{ event.data.teamB.playerA.name }}<br />
-							<template v-if="event.data.teamB.playerB">
-								{{ event.data.teamB.playerB.name }}
-							</template>
-						</template>
-						<template v-else> N.A.</template>
-					</div>
-				</div>
-			</div>
+			<EventMatch :match="event.data" :competition="competition" />
 		</template>
 	</vue-cal>
 </template>
@@ -65,6 +45,7 @@ import {
 	extractGroupMatches,
 	extractKnockoutMatches,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import EventMatch from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
 
 const calid = ref<number>(0)
 
@@ -137,6 +118,9 @@ function onEventDrop({
 		if (originalEvent.data.id) emit("removeId", originalEvent.data.id)
 		else throw "Match id is missing"
 
+		event.end = new Date(event.start)
+		event.end.setHours(event.end.getHours() + 1)
+		event.end.setMinutes(event.end.getMinutes() + 30)
 		events.value.push({
 			start: event.start,
 			end: event.end,

From f17bbe362db79884722770acde140ab7e9fd34f4 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 17:54:29 +0200
Subject: [PATCH 079/247] =?UTF-8?q?=E2=9C=A8=20Save=20and=20load=20courts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CourtResource.java              |  2 +-
 .../resources/TournamentResource.java         | 35 ++++++++++++++++
 .../director/jDirectorTournamentUpdate.java   | 13 ++++++
 .../jsonEntities/user/jUserCourt.java         |  2 +-
 frontend/app/src/backend/court.ts             | 35 ++++++++++++++++
 .../prepare/scheduleMatches/CourtChooser.vue  | 34 ++++++++++++++++
 .../scheduleMatches/ViewScheduleMatches.vue   | 40 ++++++++-----------
 7 files changed, 136 insertions(+), 25 deletions(-)
 create mode 100644 frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index 45885773..0a6a7b32 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -30,7 +30,7 @@ public String create(jUserCourt court) {
         if (exCourt != null)
             throw new WebApplicationException("Court already exists", Response.Status.CONFLICT);
 
-        courtRepositiory.persist(court.toCourt());
+        courtRepositiory.persist(court.toDB());
         return "Created";
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 0f9ff9bf..2570b0e6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -1,9 +1,12 @@
 package de.secretj12.turnierplaner.resources;
 
+import de.secretj12.turnierplaner.db.entities.Court;
 import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -16,6 +19,8 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Path("/tournament")
 public class TournamentResource {
@@ -23,6 +28,8 @@ public class TournamentResource {
     @Inject
     TournamentRepository tournaments;
     @Inject
+    CourtRepositiory courts;
+    @Inject
     SecurityIdentity securityIdentity;
 
     @GET
@@ -63,6 +70,34 @@ public jUserTournament getTournament(@PathParam("tourName") String name) {
             return new jUserTournament(tournament);
     }
 
+    @POST
+    @Path("/{tourName}/updateCourts")
+    @Transactional
+    @RolesAllowed("director")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String setCourts(@PathParam("tourName") String tourName, Set<jUserCourt> tCourts) {
+        Tournament tournament = tournaments.getByName(tourName);
+
+        tournament.setCourts(tCourts.stream().map(court -> {
+            Court dbCourt = courts.findByName(court.getName());
+            if (dbCourt == null)
+                throw new NotFoundException("Could not find court " + court.getName());
+            return dbCourt;
+        }).collect(Collectors.toSet()));
+        tournaments.persist(tournament);
+        return "Courts updated";
+    }
+
+    @GET
+    @Path("/{tourName}/courts")
+    @RolesAllowed("director")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Set<jUserCourt> getCourts(@PathParam("tourName") String tourName) {
+        Tournament tournament = tournaments.getByName(tourName);
+
+        return tournament.getCourts().stream().map(jUserCourt::new).collect(Collectors.toSet());
+    }
+
     private void checkDates(jDirectorTournamentAdd tournament) {
         if (tournament.getBeginRegistration().isAfter(tournament.getEndRegistration()))
             throw new BadRequestException("Begin of registration phase needs to be before it's end");
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java
index b3e9afea..86d7f609 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java
@@ -1,11 +1,15 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director;
 
 import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
 
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class jDirectorTournamentUpdate extends jDirectorTournamentAdd {
     private UUID id;
+    private Set<jUserCourt> courts;
 
     public jDirectorTournamentUpdate() {
     }
@@ -13,6 +17,7 @@ public jDirectorTournamentUpdate() {
     public jDirectorTournamentUpdate(Tournament dbTournament) {
         super(dbTournament);
         this.id = dbTournament.getId();
+        this.courts = dbTournament.getCourts().stream().map(jUserCourt::new).collect(Collectors.toSet());
     }
 
     public UUID getId() {
@@ -22,4 +27,12 @@ public UUID getId() {
     public void setId(UUID id) {
         this.id = id;
     }
+
+    public Set<jUserCourt> getCourts() {
+        return courts;
+    }
+
+    public void setCourts(Set<jUserCourt> courts) {
+        this.courts = courts;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
index b0c49c76..dab5793f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
@@ -16,7 +16,7 @@ public jUserCourt(Court court) {
         this.courtType = court.getCourtType();
     }
 
-    public Court toCourt() {
+    public Court toDB() {
         Court court = new Court();
         court.setName(name);
         court.setCourtType(courtType);
diff --git a/frontend/app/src/backend/court.ts b/frontend/app/src/backend/court.ts
index 8dd8500d..5d98e7a2 100644
--- a/frontend/app/src/backend/court.ts
+++ b/frontend/app/src/backend/court.ts
@@ -1,6 +1,9 @@
 import axios from "axios"
 import { Court } from "@/interfaces/court"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
+import { Tournament } from "@/interfaces/tournament"
+import { RouteLocationNormalizedLoaded } from "vue-router"
+import { computed, Ref } from "vue"
 
 export function getCourts() {
 	return useQuery({
@@ -48,3 +51,35 @@ export function useDeleteCourt() {
 		},
 	})
 }
+
+export function getTournamentCourts(route: RouteLocationNormalizedLoaded) {
+	return useQuery({
+		queryKey: ["tournamentCourts", computed(() => route.params.tourId)],
+		queryFn: () =>
+			axios
+				.get(`/tournament/${route.params.tourId}/courts`)
+				.then<Court[]>((response) => response.data),
+	})
+}
+
+export function useUpdateTournamentCourts(
+	tournament: Ref<Tournament> | Ref<undefined>,
+) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: (courts: Court[]) => {
+			if (!tournament.value) throw Error("Tournament is null")
+			return axios.post(
+				`/tournament/${tournament.value.name}/updateCourts`,
+				courts,
+			)
+		},
+		onSuccess() {
+			if (tournament.value)
+				queryClient.invalidateQueries({
+					queryKey: ["tournamentCourts", tournament.value.name],
+					refetchType: "all",
+				})
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
new file mode 100644
index 00000000..779d78dc
--- /dev/null
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
@@ -0,0 +1,34 @@
+<template>
+	<MultiSelect
+		v-model="selectedCourts"
+		:loading="!courts || !selectedCourts"
+		:options="courts"
+		option-label="name"
+		placeholder="Select courts"
+		class="w-full"
+	>
+		<template #footer>
+			<div class="w-full flex align-items-center p-2">
+				<ViewCreateCourtSmall />
+			</div>
+		</template>
+	</MultiSelect>
+</template>
+
+<script setup lang="ts">
+import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
+import { Court } from "@/interfaces/court"
+import { getCourts } from "@/backend/court"
+import { watch } from "vue"
+
+const selectedCourts = defineModel<Court[]>({ default: [] })
+const { data: courts } = getCourts()
+
+watch(selectedCourts, () => {
+	selectedCourts.value = selectedCourts.value.sort((a, b) =>
+		a.name < b.name ? -1 : 1,
+	)
+})
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 0db64a13..a6eec160 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -4,20 +4,7 @@
 			<Card>
 				<template #title>Options</template>
 				<template #content>
-					<MultiSelect
-						v-model="selectedCourts"
-						:loading="!courts || !selectedCourts"
-						:options="courts"
-						option-label="name"
-						placeholder="Select courts"
-						class="w-full"
-					>
-						<template #footer>
-							<div class="w-full flex align-items-center p-2">
-								<ViewCreateCourtSmall />
-							</div>
-						</template>
-					</MultiSelect>
+					<CourtChooser v-if="selectedCourts" v-model="selectedCourts" />
 				</template>
 			</Card>
 			<Card>
@@ -54,10 +41,8 @@
 import { useRoute, useRouter } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import SchedulingCalendar from "@/components/views/prepare/scheduleMatches/SchedulingCalendar.vue"
-import { getCourts } from "@/backend/court"
 import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
-import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
 import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
 import {
 	CalEvent,
@@ -65,6 +50,9 @@ import {
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { useUpdateMatches } from "@/backend/match"
 import { useI18n } from "vue-i18n"
+import CourtChooser from "@/components/views/prepare/scheduleMatches/CourtChooser.vue"
+import { getTournamentCourts, useUpdateTournamentCourts } from "@/backend/court"
+import { getTournamentDetails } from "@/backend/tournament"
 
 const route = useRoute()
 const router = useRouter()
@@ -73,19 +61,24 @@ const toast = useToast()
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
-const { data: courts } = getCourts()
-
 const matches = ref<EventMatch[]>([])
 const scheduledMatches = ref<CalEvent[]>([])
 
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: tournamentCourts } = getTournamentCourts(route)
 const { mutate: updateMatches } = useUpdateMatches(route, t, toast)
+const { mutate: updateCourts } = useUpdateTournamentCourts(tournament)
 
 const selectedCourts = ref<Court[]>([])
-watch(selectedCourts, () => {
-	selectedCourts.value = selectedCourts.value.sort((a, b) =>
-		a.name < b.name ? -1 : 1,
-	)
-})
+watch(
+	tournamentCourts,
+	() => {
+		if (!tournamentCourts.value) return
+
+		selectedCourts.value = tournamentCourts.value
+	},
+	{ immediate: true },
+)
 
 function prevPage() {
 	router.replace({
@@ -108,6 +101,7 @@ function save() {
 	// TODO
 	isUpdating.value = true
 	updateMatches(scheduledMatches.value.map((event) => event.data))
+	updateCourts(selectedCourts.value)
 	isUpdating.value = false
 }
 

From 11ed87048b5f91de22cfdd01ff49a6d673b05589 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 27 Aug 2024 22:27:46 +0200
Subject: [PATCH 080/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Increase=20shown?=
 =?UTF-8?q?=20day=20time=20of=20calendar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/scheduleMatches/SchedulingCalendar.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 335b43be..28ef8cb2 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,12 +1,13 @@
 <template>
 	<vue-cal
 		v-if="tournament"
+		style="height: 1000px"
 		:key="calid"
 		active-view="week"
 		:disable-views="['years', 'year', 'month']"
 		:locale="$i18n.locale"
 		:time-from="8 * 60"
-		:time-to="20 * 60"
+		:time-to="24 * 60"
 		:split-days="splitDays"
 		:sticky-split-labels="true"
 		:min-event-width="80"

From 642eead008542e867c619a0769323f6bade8b6cf Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sun, 1 Sep 2024 02:18:48 +0200
Subject: [PATCH 081/247] =?UTF-8?q?=E2=9C=85=20Add=20tests=20for=20court?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/TestCourtPlayerResource.java    | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java

diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java
new file mode 100644
index 00000000..fc9469b1
--- /dev/null
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java
@@ -0,0 +1,179 @@
+package de.secretj12.turnierplaner.resources;
+
+import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.entities.CourtType;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
+import io.quarkus.hibernate.orm.panache.Panache;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.http.ContentType;
+import jakarta.inject.Inject;
+import jakarta.transaction.*;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.*;
+
+
+@QuarkusTest
+public class TestCourtPlayerResource {
+
+    @Inject
+    CourtRepositiory courts;
+
+    @BeforeEach
+    @Transactional
+    public void addCourts() {
+        for (int i = 0; i < 5; i++) {
+            Court court = new Court();
+            court.setCourtType(CourtType.CLAY);
+            court.setName("Court " + i);
+            courts.persist(court);
+        }
+    }
+
+    @AfterEach
+    @Transactional
+    public void delete() {
+        courts.deleteAll();
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void listCourts() {
+        given()
+            .get("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode())
+            .body("size()", equalTo(5))
+            .body("[2].name", equalTo("Court 2"));
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void addCourtExists() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 4",
+                    "courtType": "HARD"
+                }""")
+            .put("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.CONFLICT.getStatusCode());
+    }
+
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void addCourt() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 5",
+                    "courtType": "HARD"
+                }""")
+            .put("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void updateCourt() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 4",
+                    "courtType": "HARD"
+                }""")
+            .post("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode());
+        Panache.getTransactionManager().begin();
+        Court court = courts.findByName("Court 4");
+        assertNotNull(court);
+        assertEquals(court.getCourtType(), CourtType.HARD);
+        Panache.getTransactionManager().commit();
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void updateCourtNotFound() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 9",
+                    "courtType": "HARD"
+                }""")
+            .post("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void deleteCourt() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
+        given()
+            .delete("/court/Court 0")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode());
+
+        Panache.getTransactionManager().begin();
+        assertNull(courts.findByName("Court 0"));
+        Panache.getTransactionManager().commit();
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void delCourtNotFound() {
+        given()
+            .delete("/court/Court 9")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void unauthorized() {
+        given()
+            .get("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 5",
+                    "courtType": "HARD"
+                }""")
+            .put("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                {
+                    "name": "Court 4",
+                    "courtType": "HARD"
+                }""")
+            .post("/court")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+
+
+        given()
+            .delete("/court/Court 0")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+    }
+}

From d1a126b567edf536db266cc43dbde0948cb9dde1 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 12:04:07 +0200
Subject: [PATCH 082/247] =?UTF-8?q?=E2=9C=85=20Add=20tests=20for=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |   2 +
 .../resources/MatchRessource.java             |  10 +-
 .../director/jDirectorScheduleMatch.java      |  43 ++++
 ...erResource.java => TestCourtResource.java} |   2 +-
 .../resources/TestMatchResource.java          | 220 ++++++++++++++++++
 5 files changed, 270 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java
 rename backend/src/test/java/de/secretj12/turnierplaner/resources/{TestCourtPlayerResource.java => TestCourtResource.java} (99%)
 create mode 100644 backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index ff3e8242..4546d03c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -5,6 +5,7 @@
 import de.secretj12.turnierplaner.db.entities.groups.FinalOfGroup;
 import de.secretj12.turnierplaner.db.entities.groups.MatchOfGroup;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
+import io.smallrye.common.constraint.NotNull;
 import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
@@ -40,6 +41,7 @@ public class Match {
     @Column(name = "id")
     private UUID id;
 
+    @NotNull
     @ManyToOne(cascade = CascadeType.ALL)
     @JoinColumns(@JoinColumn(name = "competition_id"))
     private Competition competition;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
index 6dcb6281..a0ae9419 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
@@ -8,8 +8,7 @@
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
-import io.quarkus.security.UnauthorizedException;
+import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorScheduleMatch;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -38,11 +37,12 @@ public class MatchRessource {
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
     public String updateMatches(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
-                                List<jUserMatch> matches) {
+                                List<jDirectorScheduleMatch> matches) {
         checkTournamentAccessibility(tourName);
         Competition competition = competitions.getByName(tourName, compName);
+        if (competition == null) throw new NotFoundException("Competition could not be found");
 
-        for (jUserMatch cMatch : matches) {
+        for (var cMatch : matches) {
             Match match = matchRepository.findById(cMatch.getId());
             if (match == null)
                 throw new NotFoundException("Could not find match");
@@ -60,7 +60,5 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
     private void checkTournamentAccessibility(String tourName) {
         Tournament tournament = tournaments.getByName(tourName);
         if (tournament == null) throw new NotFoundException("Tournament could not be found");
-        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
-            throw new UnauthorizedException("Cannot access tournament");
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java
new file mode 100644
index 00000000..fbb310f1
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java
@@ -0,0 +1,43 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.director;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class jDirectorScheduleMatch {
+    private UUID id;
+    private String court;
+    private Instant begin;
+    private Instant end;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getCourt() {
+        return court;
+    }
+
+    public void setCourt(String court) {
+        this.court = court;
+    }
+
+    public Instant getBegin() {
+        return begin;
+    }
+
+    public void setBegin(Instant begin) {
+        this.begin = begin;
+    }
+
+    public Instant getEnd() {
+        return end;
+    }
+
+    public void setEnd(Instant end) {
+        this.end = end;
+    }
+}
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
similarity index 99%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java
rename to backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
index fc9469b1..7e3ab5d1 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
@@ -20,7 +20,7 @@
 
 
 @QuarkusTest
-public class TestCourtPlayerResource {
+public class TestCourtResource {
 
     @Inject
     CourtRepositiory courts;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
new file mode 100644
index 00000000..03e0d119
--- /dev/null
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
@@ -0,0 +1,220 @@
+package de.secretj12.turnierplaner.resources;
+
+import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.entities.CourtType;
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
+import de.secretj12.turnierplaner.db.repositories.MatchRepository;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import io.quarkus.hibernate.orm.panache.Panache;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.http.ContentType;
+import jakarta.inject.Inject;
+import jakarta.transaction.*;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.UUID;
+
+import static de.secretj12.turnierplaner.db.entities.competition.CreationProgress.TEAMS;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@QuarkusTest
+public class TestMatchResource {
+
+    @Inject
+    MatchRepository matches;
+    @Inject
+    CourtRepositiory courts;
+    @Inject
+    CompetitionRepository competitions;
+    @Inject
+    TournamentRepository tournaments;
+
+    private Match matchE;
+    private Match matchF;
+
+    private final Instant beginE = Instant.now().truncatedTo(ChronoUnit.SECONDS);
+    private final Instant endE = Instant.now().truncatedTo(ChronoUnit.SECONDS).plus(90, ChronoUnit.MINUTES);
+    private final Instant beginF = Instant.now().truncatedTo(ChronoUnit.SECONDS).plus(90, ChronoUnit.MINUTES);
+    private final Instant endF = Instant.now().truncatedTo(ChronoUnit.SECONDS).plus(180, ChronoUnit.MINUTES);
+
+    @BeforeEach
+    @Transactional
+    public void addCourts() {
+        Tournament tour = new Tournament();
+        tour.setName("Clubmeisterschaft");
+        tour.setDescription("Anmeldung vorbei");
+        tour.setBeginRegistration(Instant.now().minus(12, ChronoUnit.DAYS));
+        tour.setEndRegistration(Instant.now().plus(11, ChronoUnit.DAYS));
+        tour.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
+        tour.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
+        tour.setVisible(true);
+        tournaments.persist(tour);
+
+        Competition comp = new Competition();
+        comp.setName("Herren");
+        comp.setDescription("Offen für alle Herren");
+        comp.setMode(CompetitionMode.SINGLES);
+        comp.setType(CompetitionType.KNOCKOUT);
+        comp.setPlayerASex(Sex.MALE);
+        comp.setcProgress(TEAMS);
+        comp.setSignup(CompetitionSignUp.INDIVIDUAL);
+        comp.setPlayerASex(Sex.ANY);
+        comp.setTournament(tour);
+        competitions.persist(comp);
+
+        Competition comp2 = new Competition();
+        comp2.setName("Damen");
+        comp2.setDescription("Offen für alle Herren");
+        comp2.setMode(CompetitionMode.SINGLES);
+        comp2.setType(CompetitionType.KNOCKOUT);
+        comp2.setPlayerASex(Sex.MALE);
+        comp2.setcProgress(TEAMS);
+        comp2.setSignup(CompetitionSignUp.INDIVIDUAL);
+        comp2.setPlayerASex(Sex.ANY);
+        comp2.setTournament(tour);
+        competitions.persist(comp2);
+
+        for (int i = 0; i < 5; i++) {
+            Court court = new Court();
+            court.setCourtType(CourtType.CLAY);
+            court.setName("Court " + i);
+            courts.persist(court);
+        }
+
+        matchE = new Match();
+        matchE.setCompetition(comp);
+        matches.persist(matchE);
+
+        matchF = new Match();
+        matchF.setCompetition(comp);
+        matchF.setCourt(courts.findByName("Court 1"));
+        matchF.setBegin(Instant.now().plus(15, ChronoUnit.MINUTES));
+        matchF.setBegin(Instant.now().plus(120, ChronoUnit.MINUTES));
+        matches.persist(matchF);
+    }
+
+    @AfterEach
+    @Transactional
+    public void delete() {
+        matches.deleteAll();
+        courts.deleteAll();
+        competitions.deleteAll();
+        tournaments.deleteAll();
+    }
+
+    private String updateJSON() {
+        return String.format("""
+            [
+              {
+                "id": "%s",
+                "court": "Court 2",
+                "begin": "%s",
+                "end": "%s"
+              },
+              {
+                "id": "%s",
+                "court": "Court 3",
+                "begin": "%s",
+                "end": "%s"
+              }
+            ]""", matchE.getId(), beginE, endE, matchF.getId(), beginF, endF);
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void testUpdateMatch() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
+        given()
+            .contentType(ContentType.JSON)
+            .body(updateJSON())
+            .post("/tournament/Clubmeisterschaft/competition/Herren/match")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode());
+
+        Panache.getTransactionManager().begin();
+        Match matchE = matches.findById(this.matchE.getId());
+        Match matchF = matches.findById(this.matchF.getId());
+        assertEquals(matchE.getCourt().getName(), "Court 2");
+        assertEquals(matchF.getCourt().getName(), "Court 3");
+
+        assertEquals(matchE.getBegin(), beginE);
+        assertEquals(matchF.getBegin(), beginF);
+        assertEquals(matchE.getEnd(), endE);
+        assertEquals(matchF.getEnd(), endF);
+
+        Panache.getTransactionManager().commit();
+    }
+
+    @Test
+    public void testUnauthorized() {
+        given()
+            .contentType(ContentType.JSON)
+            .body(updateJSON())
+            .post("/tournament/Clubmeisterschaft/competition/Herren/match")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void unknownTournament() {
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(updateJSON())
+            .post("/tournament/Random turnier/competition/Herren/match")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void unknownCompetition() {
+        given()
+            .contentType(ContentType.JSON)
+            .body(updateJSON())
+            .post("/tournament/Clubmeisterschaft/competition/Mixed/match")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void otherCompetition() {
+        given()
+            .contentType(ContentType.JSON)
+            .body(updateJSON())
+            .post("/tournament/Clubmeisterschaft/competition/Damen/match")
+            .then().assertThat()
+            .statusCode(Response.Status.BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void unknownMatch() {
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                [
+                  {
+                    "id": "%s",
+                    "court": "Court 2",
+                    "begin": "%s",
+                    "end": "%s"
+                  }
+                ]""", UUID.randomUUID(), beginE, endE))
+            .post("/tournament/Clubmeisterschaft/competition/Damen/match")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+}

From e88a505c028bd3dc791b5517e1fc6d791d6d765a Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 12:37:49 +0200
Subject: [PATCH 083/247] =?UTF-8?q?=E2=9C=85=20Add=20tests=20for=20tournam?=
 =?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/TournamentResource.java         |   4 +
 .../resources/TestTournamentResource.java     | 149 +++++++++++++++++-
 2 files changed, 146 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 2570b0e6..c2f8af93 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -77,6 +77,8 @@ public jUserTournament getTournament(@PathParam("tourName") String name) {
     @Consumes(MediaType.APPLICATION_JSON)
     public String setCourts(@PathParam("tourName") String tourName, Set<jUserCourt> tCourts) {
         Tournament tournament = tournaments.getByName(tourName);
+        if (tournament == null)
+            throw new NotFoundException("Could not find tournament");
 
         tournament.setCourts(tCourts.stream().map(court -> {
             Court dbCourt = courts.findByName(court.getName());
@@ -94,6 +96,8 @@ public String setCourts(@PathParam("tourName") String tourName, Set<jUserCourt>
     @Produces(MediaType.APPLICATION_JSON)
     public Set<jUserCourt> getCourts(@PathParam("tourName") String tourName) {
         Tournament tournament = tournaments.getByName(tourName);
+        if (tournament == null)
+            throw new NotFoundException("Could not find tournament");
 
         return tournament.getCourts().stream().map(jUserCourt::new).collect(Collectors.toSet());
     }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index 5e449fcf..82adf689 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -1,13 +1,17 @@
 package de.secretj12.turnierplaner.resources;
 
+import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.entities.CourtType;
 import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
+import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.security.TestSecurity;
 import io.restassured.http.ContentType;
 import jakarta.inject.Inject;
-import jakarta.transaction.Transactional;
+import jakarta.transaction.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.AfterEach;
@@ -18,6 +22,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
+import java.util.Set;
 import java.util.UUID;
 
 import static io.restassured.RestAssured.given;
@@ -29,7 +34,9 @@
 public class TestTournamentResource {
 
     @Inject
-    TournamentRepository tournamentRepository;
+    TournamentRepository tournaments;
+    @Inject
+    CourtRepositiory courts;
 
     @BeforeEach
     @Transactional
@@ -42,7 +49,7 @@ public void addData() {
         tour.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
         tour.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour.setVisible(true);
-        tournamentRepository.persist(tour);
+        tournaments.persist(tour);
         Tournament tour2 = new Tournament();
         tour2.setName("Clubmeisterschaft2");
         tour2.setDescription("Anmeldung ausstehend");
@@ -51,13 +58,21 @@ public void addData() {
         tour2.setBeginGamePhase(Instant.now().plus(12, ChronoUnit.DAYS));
         tour2.setEndGamePhase(Instant.now().plus(13, ChronoUnit.DAYS));
         tour2.setVisible(false);
-        tournamentRepository.persist(tour2);
+        tournaments.persist(tour2);
+
+        for (int i = 0; i < 5; i++) {
+            Court court = new Court();
+            court.setCourtType(CourtType.CLAY);
+            court.setName("Court " + i);
+            courts.persist(court);
+        }
     }
 
     @AfterEach
     @Transactional
     public void clearData() {
-        tournamentRepository.deleteAll();
+        tournaments.deleteAll();
+        courts.deleteAll();
     }
 
     @Test
@@ -183,7 +198,7 @@ public void createTournament() {
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode());
 
-        Tournament tour = tournamentRepository.getByName("Clubmeisterschaft 2024");
+        Tournament tour = tournaments.getByName("Clubmeisterschaft 2024");
         assertNotNull(tour);
         assertEquals(tour.getDescription(), "Anmeldephase offen");
         assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30).toInstant(ZoneOffset.UTC));
@@ -314,7 +329,7 @@ public void updateTournament() {
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode());
 
-        Tournament tour = tournamentRepository.getByName("Clubmeisterschaft 2024");
+        Tournament tour = tournaments.getByName("Clubmeisterschaft 2024");
         assertNotNull(tour);
         assertEquals(tour.getDescription(), "Anmeldephase offen");
         assertEquals(tour.getBeginRegistration(), LocalDateTime.of(2024, 4, 1, 23, 15, 30).toInstant(ZoneOffset.UTC));
@@ -370,4 +385,124 @@ public void updateTournamentNotExisting() {
             .then().assertThat()
             .statusCode(Response.Status.NOT_FOUND.getStatusCode());
     }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void updateCourts() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                [
+                  {
+                    "name": "Court 1"
+                  },
+                  {
+                    "name": "Court 2"
+                  }
+                ]
+                """)
+            .post("/tournament/Clubmeisterschaft/updateCourts")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode());
+
+        Panache.getTransactionManager().begin();
+        Tournament tournament = tournaments.getByName("Clubmeisterschaft");
+        assertEquals(tournament.getCourts().size(), 2);
+        assertEquals(tournament.getCourts(), Set.of(courts.findByName("Court 1"), courts.findByName("Court 2")));
+        Panache.getTransactionManager().commit();
+    }
+
+    @Test
+    public void updateCourtsUnauthorized() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                [
+                  {
+                    "name": "Court 1"
+                  },
+                  {
+                    "name": "Court 2"
+                  }
+                ]
+                """)
+            .post("/tournament/Clubmeisterschaft/updateCourts")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void updateCourtsUnkownCourt() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                [
+                  {
+                    "name": "Court 7"
+                  },
+                  {
+                    "name": "Court 2"
+                  }
+                ]
+                """)
+            .post("/tournament/Clubmeisterschaft/updateCourts")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void updateCourtsUnknownTour() {
+        given()
+            .contentType(ContentType.JSON)
+            .body("""
+                [
+                  {
+                    "name": "Court 7"
+                  },
+                  {
+                    "name": "Court 2"
+                  }
+                ]
+                """)
+            .post("/tournament/Clubmeisterschaft2/updateCourts")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void getCourts() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
+        Panache.getTransactionManager().begin();
+        Tournament tournament = tournaments.getByName("Clubmeisterschaft");
+        tournament.setCourts(Set.of(courts.findByName("Court 1"), courts.findByName("Court 2")));
+        tournaments.persist(tournament);
+        Panache.getTransactionManager().commit();
+
+        given()
+            .get("/tournament/Clubmeisterschaft/courts")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode())
+            .body("size()", is(2))
+            .body("[0].name", is(oneOf("Court 1", "Court 2")))
+            .body("[1].name", is(oneOf("Court 1", "Court 2")));
+    }
+
+    @Test
+    @TestSecurity(user = "testUser", roles = {"director"})
+    public void getCourtsUnknownTour() {
+        given()
+            .get("/tournament/Random Clubmeisterschaft/courts")
+            .then().assertThat()
+            .statusCode(Response.Status.NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void getCourtsUnauthorized() {
+        given()
+            .get("/tournament/Clubmeisterschaft/courts")
+            .then().assertThat()
+            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
+    }
 }

From 7a741865bdfc9531280e3e7c78dca6ac5e59a274 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 13:53:54 +0200
Subject: [PATCH 084/247] =?UTF-8?q?=F0=9F=90=9B=20Correctly=20set=20progre?=
 =?UTF-8?q?ss=20of=20competition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CompetitionResource.java        | 21 +++++++++----------
 .../resources/TestCompetitionResource.java    | 12 ++---------
 frontend/app/src/backend/group.ts             |  4 ++++
 .../scheduleMatches/SchedulingCalendar.vue    |  2 +-
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 17679c61..9766c56b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -305,21 +305,15 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
     }
 
     @POST
+    @Transactional
     @RolesAllowed("director")
     @Path("/{compName}/updateTeams")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserTeam> updateTeams(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
-                                       List<jUserTeam> teams) {
+    public String updateTeams(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
+                              List<jUserTeam> teams) {
         checkTournamentAccessibility(tourName);
 
-        updateTeamsHelper(teams, tourName, compName);
-
-        return competitions.getByName(tourName, compName).getTeams().stream().map(jUserTeam::new).toList();
-    }
-
-    @Transactional
-    protected void updateTeamsHelper(List<jUserTeam> teams, String tourName, String compName) {
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new BadRequestException("Competition doesn't exist");
 
@@ -348,6 +342,11 @@ protected void updateTeamsHelper(List<jUserTeam> teams, String tourName, String
                 this.teams.persist(cTeam);
             }
         }
+
+        competition.setcProgress(CreationProgress.GAMES);
+        competitions.persist(competition);
+
+        return "Teams updated";
     }
 
     @POST
@@ -451,7 +450,7 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         knockoutTools.updateKnockoutTree(competition, tree, finale);
         knockoutTools.updateThirdPlace(competition, finale);
 
-        competition.setcProgress(CreationProgress.GAMES);
+        competition.setcProgress(CreationProgress.SCHEDULING);
         competitions.persist(competition);
         return true;
     }
@@ -485,7 +484,7 @@ public boolean initializeMatchesGroups(@PathParam("tourName") String tourName,
 
         groupTools.generateMatches(competition, groups);
 
-        competition.setcProgress(CreationProgress.GAMES);
+        competition.setcProgress(CreationProgress.SCHEDULING);
         competitions.persist(competition);
         return true;
     }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
index 2e47b009..3a68640c 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
@@ -1045,11 +1045,7 @@ public void updateTeamsChangeTeams() {
                 """, playerF.getId().toString()))
             .post("/tournament/Clubmeisterschaft 2021/competition/Herren/updateTeams")
             .then().assertThat()
-            .statusCode(200)
-            .contentType(MediaType.APPLICATION_JSON)
-            .body("$.size()", is(1),
-                "[0].id", not(teamIdBefore.toString()),
-                "[0].playerA.id", is(playerF.getId().toString()));
+            .statusCode(200);
 
         given()
             .get("/tournament/Clubmeisterschaft 2021/competition/Herren/signedUpTeams")
@@ -1084,11 +1080,7 @@ public void updateTeamsChangePlayerInTeam() {
                 """, teamId, playerF.getId().toString()))
             .post("/tournament/Clubmeisterschaft 2021/competition/Herren/updateTeams")
             .then().assertThat()
-            .statusCode(200)
-            .contentType(MediaType.APPLICATION_JSON)
-            .body("$.size()", is(1),
-                "[0].id", is(teamId.toString()),
-                "[0].playerA.id", is(playerF.getId().toString()));
+            .statusCode(200);
 
         given()
             .get("/tournament/Clubmeisterschaft 2021/competition/Herren/signedUpTeams")
diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index 24821de1..d1599286 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -92,6 +92,10 @@ export function useInitGroups(
 				queryKey: ["groupsDivision", route.params.tourId, route.params.compId],
 				refetchType: "all",
 			})
+			queryClient.invalidateQueries({
+				queryKey: ["competitionList", route.params.tourId],
+				refetchType: "all",
+			})
 			toast.add({
 				severity: "success",
 				summary: t("general.success"),
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 28ef8cb2..0e95b95e 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,8 +1,8 @@
 <template>
 	<vue-cal
 		v-if="tournament"
-		style="height: 1000px"
 		:key="calid"
+		style="height: 1000px"
 		active-view="week"
 		:disable-views="['years', 'year', 'month']"
 		:locale="$i18n.locale"

From 0035cbc6390414a4ab030613a4045e2eb520d5b2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 15:39:00 +0200
Subject: [PATCH 085/247] =?UTF-8?q?=F0=9F=90=9B=20Only=20allow=20progress?=
 =?UTF-8?q?=20if=20step=20is=20finished?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/group.ts             |  8 +++++
 frontend/app/src/backend/knockout.ts          | 12 +++++++
 frontend/app/src/backend/signup.ts            |  6 +++-
 .../views/prepare/ViewPrepareMatches.vue      | 33 +++++++++++++++----
 frontend/app/src/interfaces/competition.ts    | 11 +++++++
 5 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index d1599286..8e4a582a 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -96,6 +96,14 @@ export function useInitGroups(
 				queryKey: ["competitionList", route.params.tourId],
 				refetchType: "all",
 			})
+			queryClient.invalidateQueries({
+				queryKey: [
+					"competitionDetails",
+					route.params.tourId,
+					route.params.compId,
+				],
+				refetchType: "all",
+			})
 			toast.add({
 				severity: "success",
 				summary: t("general.success"),
diff --git a/frontend/app/src/backend/knockout.ts b/frontend/app/src/backend/knockout.ts
index e1aa1990..c0501a4c 100644
--- a/frontend/app/src/backend/knockout.ts
+++ b/frontend/app/src/backend/knockout.ts
@@ -48,6 +48,18 @@ export function useInitKnockout(
 						queryKey: ["knockout", route.params.tourId, route.params.compId],
 						refetchType: "all",
 					})
+					queryClient.invalidateQueries({
+						queryKey: ["competitionList", route.params.tourId],
+						refetchType: "all",
+					})
+					queryClient.invalidateQueries({
+						queryKey: [
+							"competitionDetails",
+							route.params.tourId,
+							route.params.compId,
+						],
+						refetchType: "all",
+					})
 					toast.add({
 						severity: "success",
 						summary: t("general.success"),
diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index 9ad7fa2f..f2fef002 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -173,10 +173,14 @@ export function useUpdateTeams(
 			)
 		},
 		onSuccess() {
-			return queryClient.invalidateQueries({
+			queryClient.invalidateQueries({
 				queryKey: ["signedUp", route.params.tourId, route.params.compId],
 				refetchType: "all",
 			})
+			queryClient.invalidateQueries({
+				queryKey: ["competitionList", route.params.tourId],
+				refetchType: "all",
+			})
 		},
 		onError() {
 			toast.add({
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 1cc3a034..6461302d 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -4,7 +4,7 @@
 			<template #header>
 				<TabMenu
 					:active-index="activeTab"
-					:model="competitions || []"
+					:model="menuComps"
 					@tab-change="tabChange"
 				>
 					<template #item="{ item, props }">
@@ -56,7 +56,11 @@
 					/>
 					<Button
 						v-if="route.meta.step !== 4"
-						:disabled="isUpdating"
+						:disabled="
+							isUpdating ||
+							!competition ||
+							<number>route.meta.step >= progressOrder(competition.cProgress)
+						"
 						icon="pi pi-angle-right"
 						icon-pos="right"
 						:label="t('general.next')"
@@ -83,9 +87,12 @@ import { computed, inject, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
 import { TabMenuChangeEvent } from "primevue/tabmenu"
-import { getCompetitionsList } from "@/backend/competition"
+import {
+	getCompetitionDetails,
+	getCompetitionsList,
+} from "@/backend/competition"
 import Steps from "primevue/steps"
-import { Progress } from "@/interfaces/competition"
+import { Progress, progressOrder } from "@/interfaces/competition"
 import Button from "primevue/button"
 import ViewEditTeams from "@/components/views/prepare/editTeams/ViewEditTeams.vue"
 
@@ -104,9 +111,23 @@ const curPrepStep = ref<InstanceType<typeof ViewEditTeams> | null>()
 
 const isLoggedIn = inject("loggedIn", ref(false))
 const { data: competitions } = getCompetitionsList(route, isLoggedIn, t, toast)
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const activeTab = ref<number>(0)
-watch([competitions, route], () => updateRoute())
-updateRoute()
+watch([competitions, route], () => updateRoute(), { immediate: true })
+
+const menuComps = computed(() => {
+	if (!competitions.value) return []
+
+	return competitions.value
+		.map((competition) => {
+			return {
+				disabled:
+					progressOrder(competition.cProgress) < <number>route.meta.step,
+				...competition,
+			}
+		})
+		.sort((comp1, comp2) => comp1.name.localeCompare(comp2.name))
+})
 
 function updateRoute(compId?: string) {
 	if (!competitions.value || competitions.value.length === 0) return
diff --git a/frontend/app/src/interfaces/competition.ts b/frontend/app/src/interfaces/competition.ts
index 45d8e16f..17966923 100644
--- a/frontend/app/src/interfaces/competition.ts
+++ b/frontend/app/src/interfaces/competition.ts
@@ -27,6 +27,17 @@ export enum Progress {
 	SCHEDULING = "SCHEDULING",
 }
 
+export function progressOrder(progress: Progress) {
+	switch (progress) {
+		case Progress.TEAMS:
+			return 2
+		case Progress.GAMES:
+			return 3
+		case Progress.SCHEDULING:
+			return 4
+	}
+}
+
 export interface Competition {
 	id?: null | string
 	name: string

From 27fe0b8e559c54d61432c64db6e3a99c350e95f8 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 21:24:48 +0200
Subject: [PATCH 086/247] =?UTF-8?q?=F0=9F=90=9B=20Allow=20editing=20of=20t?=
 =?UTF-8?q?eams=20more=20than=20once?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/views/prepare/editTeams/ViewEditTeams.vue  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index 27dab58a..894ffb49 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -133,7 +133,6 @@ function selectRandomElement<T>(players: Ref<T[]>) {
 	const r = Math.floor(Math.random() * players.value.length)
 	const element = players.value[r]
 	players.value.splice(r, 1)
-	//players.value = players.value.filter((v, i) => i !== r)
 	return element
 }
 
@@ -250,8 +249,7 @@ async function reset() {
 }
 
 function save() {
-	// TODO warning if a step further was already executed
-	if (competition.value?.cProgress !== Progress.TEAMS) {
+	if (competition.value?.cProgress === Progress.SCHEDULING) {
 		toast.add({
 			severity: "error",
 			summary: "Matches already assigned",

From de6ed7287e0091c11f15b21a7ec351cbdaa1cec4 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 2 Sep 2024 21:58:59 +0200
Subject: [PATCH 087/247] =?UTF-8?q?=E2=9C=A8=20Leave=20byes=20in=20knockou?=
 =?UTF-8?q?t=20when=20not=20enough=20players?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/signup.ts            |  8 +++
 .../assignMatches/AssignMatchesKnockout.vue   | 55 ++++++++++++++-----
 frontend/app/src/i18n/de.json                 |  2 +-
 frontend/app/src/i18n/en.json                 |  2 +-
 4 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index f2fef002..71513427 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -181,6 +181,14 @@ export function useUpdateTeams(
 				queryKey: ["competitionList", route.params.tourId],
 				refetchType: "all",
 			})
+			queryClient.invalidateQueries({
+				queryKey: [
+					"competitionDetails",
+					route.params.tourId,
+					route.params.compId,
+				],
+				refetchType: "all",
+			})
 		},
 		onError() {
 			toast.add({
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 44428b4d..752c7b3e 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -162,27 +162,53 @@ const delay = computed(() =>
 )
 const delayBetween = computed(() => delay.value / 2)
 
+function range(n: number) {
+	return [...Array(n)].map((_, i) => i)
+}
+
 async function randomize() {
 	isUpdating.value = true
-	let knockOutListIndex = 0
 	const matches = getMatches()
-	while (data.value.teams.length && knockOutListIndex < matches.length) {
-		if (!matches[knockOutListIndex].teamA) {
+
+	const noBye =
+		matches.length * 2 -
+		data.value.teams.length -
+		matches
+			.map((m) => (m.teamA ? 1 : 0) + (m.teamB ? 1 : 0))
+			.reduce((a, b) => a + b)
+	console.log(noBye)
+	let pos = range(matches.length).filter(
+		(i) => !matches[i].teamA || !matches[i].teamB,
+	)
+	let byes = []
+	for (let i = 0; i < noBye; i++) byes.push(selectRandomElement(pos))
+
+	for (
+		let knockOutListIndex = 0;
+		data.value.teams.length && knockOutListIndex < matches.length;
+		knockOutListIndex++
+	) {
+		const match = matches[knockOutListIndex]
+
+		let bye = byes.includes(knockOutListIndex)
+		if (bye && (match.teamA || match.teamB)) continue
+
+		if (!match.teamA) {
 			const teamA = selectRandomElement(data.value.teams)
 			await sleep(delayBetween.value)
 
-			matches[knockOutListIndex].teamA = teamA
+			match.teamA = teamA
 			await sleep(delay.value)
 		}
+		if (bye) continue
 
-		if (!matches[knockOutListIndex].teamB) {
+		if (!match.teamB) {
 			const teamB = selectRandomElement(data.value.teams)
 			if (!teamB) break
-			matches[knockOutListIndex].teamB = teamB
+			match.teamB = teamB
 			await sleep(delayBetween.value)
 		}
 
-		knockOutListIndex++
 		await sleep(delay.value)
 	}
 	isUpdating.value = false
@@ -206,7 +232,7 @@ async function reroll() {
 }
 
 function save() {
-	if (!knockoutTreeCompletelyAssigned()) {
+	if (!allPlayersAssigned()) {
 		toast.add({
 			severity: "error",
 			summary: t("general.failure"),
@@ -220,14 +246,15 @@ function save() {
 	initKnockout(data.value.tree)
 }
 
-function knockoutTreeCompletelyAssigned(): boolean {
-	// check that tree is completely assigned
-	const check = (m: KnockoutMatch): boolean => {
+function allPlayersAssigned(): boolean {
+	// check that tree is correctly assigned
+	function checkTree(m: KnockoutMatch): boolean {
 		if (m.prevMatch) {
-			return check(m.prevMatch.a) && check(m.prevMatch.b)
-		} else return m.teamA !== null && m.teamB !== null
+			return checkTree(m.prevMatch.a) && checkTree(m.prevMatch.b)
+		} else return m.teamA !== null || m.teamB !== null
 	}
-	return check(data.value.tree)
+
+	return checkTree(data.value.tree) && data.value.teams.length === 0
 }
 
 function getMatches(tree?: KnockoutMatch, treeDepth?: number): Match[] {
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 74d784c5..d99fbc25 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -204,7 +204,7 @@
 			"emptyGroupDet": "Jede Gruppe benötigt mindestens 2 Teams",
 			"teams": "Teams",
 			"ranking": "Rangliste",
-			"knockout_not_assigned": "Es wurden noch nicht alle Spiele ausgelost"
+			"knockout_not_assigned": "Es wurden noch nicht alle Spieler zugeteilt"
 		}
 	},
 	"validation": {
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 76e7ec67..189dd87c 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -206,7 +206,7 @@
 			"emptyGroupDet": "Every group needs at least 2 teams",
 			"teams": "Teams",
 			"ranking": "Ranking",
-			"knockout_not_assigned": "Not all games have been assigned yet"
+			"knockout_not_assigned": "Not all players have been assigned yet"
 		}
 	},
 	"validation": {

From 2c87a1ce63506a11a2ad4b6e09b6d007ebe0a92d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 3 Sep 2024 00:10:15 +0200
Subject: [PATCH 088/247] =?UTF-8?q?=E2=9C=A8=20Adjust=20partial=20assignme?=
 =?UTF-8?q?nt=20in=20knockout=20backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/TeamRepository.java       |  2 +-
 .../turnierplaner/modifier/KnockoutTools.java | 51 ++++++++++++-------
 .../resources/CompetitionResource.java        |  3 +-
 .../assignMatches/AssignMatchesKnockout.vue   |  2 +-
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
index 847e10e6..69fca58c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
@@ -14,7 +14,7 @@
 
 @ApplicationScoped
 public class TeamRepository implements PanacheRepository<Team> {
-    public Team getById(UUID uuid) {
+    public Team findById(UUID uuid) {
         return find("id", uuid).firstResultOptional().orElse(null);
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index e9777167..7f7eac73 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -6,6 +6,7 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.NextMatchRepository;
+import de.secretj12.turnierplaner.db.repositories.TeamRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
@@ -17,52 +18,68 @@ public class KnockoutTools {
     MatchRepository matches;
     @Inject
     NextMatchRepository nextMatches;
+    @Inject
+    TeamRepository teams;
 
     public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match) {
-        if (tree == null) {
+        if (tree == null)
             return null;
-        }
-        match.setTeamA(Team.findById(tree.getTeamA()));
-        match.setTeamB(Team.findById(tree.getTeamB()));
-
-        match.setFinished(false);
-        match.setCompetition(competition);
-        match.setWinner(true);
-        matches.persist(match);
 
-        if (tree.getPreviousA() == null || tree.getPreviousB() == null) {
+        if (tree.getPreviousA() == null || tree.getPreviousB() == null)
             deletePrevious(match);
-        }
 
+        Match a, b;
         if (match.getDependentOn() != null) {
-            Match a = match.getDependentOn().getPreviousA();
+            a = match.getDependentOn().getPreviousA();
             updateKnockoutTree(competition, tree.getPreviousA(), a);
-            Match b = match.getDependentOn().getPreviousB();
+            b = match.getDependentOn().getPreviousB();
             updateKnockoutTree(competition, tree.getPreviousB(), b);
         } else if (tree.getPreviousA() != null && tree.getPreviousB() != null) {
             NextMatch nMatch = new NextMatch();
-            Match a = updateKnockoutTree(competition, tree.getPreviousA(), new Match());
-            Match b = updateKnockoutTree(competition, tree.getPreviousB(), new Match());
+            a = updateKnockoutTree(competition, tree.getPreviousA(), new Match());
+            b = updateKnockoutTree(competition, tree.getPreviousB(), new Match());
             nMatch.setPreviousA(a);
             nMatch.setPreviousB(b);
             nMatch.setNextMatch(match);
             nextMatches.persist(nMatch);
             match.setDependentOn(nMatch);
+        } else
+            a = b = null;
+
+        if (tree.getPreviousA() == null) {
+            match.setTeamA(tree.getTeamA() == null ? null : teams.findById(tree.getTeamA()));
+            match.setTeamB(tree.getTeamB() == null ? null : teams.findById(tree.getTeamB()));
+        } else if (tree.getPreviousA().getPreviousA() == null) {
+            match.setTeamA(selectTeam(a));
+            match.setTeamB(selectTeam(b));
         }
+        match.setCompetition(competition);
+        match.setFinished(false);
+        match.setWinner(true);
+        matches.persist(match);
 
         return match;
     }
 
+    private Team selectTeam(Match match) {
+        if (match == null)
+            return null;
+        if (match.getTeamA() == null && match.getTeamB() != null)
+            return match.getTeamB();
+        if (match.getTeamB() == null && match.getTeamA() != null)
+            return match.getTeamA();
+        return null;
+    }
+
     public void updateThirdPlace(Competition competition, Match finale) {
         Match thirdPlace = matches.getThirdPlace(competition);
 
         // cover deletion of third place
-        if (finale.getDependentOn() == null) {
+        if (competition.getTeams().size() <= 3) {
             if (thirdPlace != null) {
                 nextMatches.delete(thirdPlace.getDependentOn());
                 matches.delete(thirdPlace);
             }
-
             return;
         }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 9766c56b..2d5aba62 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -450,6 +450,7 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         knockoutTools.updateKnockoutTree(competition, tree, finale);
         knockoutTools.updateThirdPlace(competition, finale);
 
+        // TODO only set progress if everything is assigned
         competition.setcProgress(CreationProgress.SCHEDULING);
         competitions.persist(competition);
         return true;
@@ -470,7 +471,7 @@ public boolean initializeMatchesGroups(@PathParam("tourName") String tourName,
         // @formatter:off
         List<Set<Team>> groups = division.getGroups().stream()
             .map(group -> group.stream()
-                .map(t -> teams.getById(t.getId()))
+                .map(t -> teams.findById(t.getId()))
                 .collect(Collectors.toCollection(HashSet::new)))
             .collect(Collectors.toList());
         // @formatter:on
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 752c7b3e..cf7120db 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -121,7 +121,7 @@ const { data, reload } = track(
 	400,
 )
 const thirdPlace = computed(() => {
-	if (signedUpTeams.value && signedUpTeams.value.length > 2)
+	if (signedUpTeams.value && signedUpTeams.value.length > 3)
 		return genTree(0, null)
 	else return null
 })

From 281038560e54a1c64e87ee7154f5e6f4e086b75e Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 3 Sep 2024 00:59:00 +0200
Subject: [PATCH 089/247] =?UTF-8?q?=F0=9F=90=9B=20Don't=20schedule=20bye?=
 =?UTF-8?q?=20games?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/scheduleMatches/ScheduleMatchesHelper.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index d20dec64..7eddfc47 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -39,7 +39,8 @@ export function extractKnockoutMatches(
 
 	rounds.toReversed().forEach((round, i) => {
 		round.forEach((match) => {
-			add(match, knockoutTitle(t)(i, rounds.length + 1))
+			if (i > 0 || (match.teamA && match.teamB))
+				add(match, knockoutTitle(t)(i, rounds.length + 1))
 		})
 	})
 	if (knockout.thirdPlace)

From a78cf98eb0c153254153ccb47532eb69fb45643f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 3 Sep 2024 00:59:13 +0200
Subject: [PATCH 090/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ordering=20of=20pr?=
 =?UTF-8?q?epare=20tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/competition.ts           |  4 +++-
 .../views/prepare/ViewPrepareMatches.vue          | 15 ++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index 560b821e..2bd4b618 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -33,7 +33,9 @@ export function getCompetitionsList(
 					`/tournament/${route.params.tourId}/competition/list`,
 				)
 				.then((response) => {
-					return response.data.map(competitionServerToClient)
+					return response.data
+						.map(competitionServerToClient)
+						.sort((comp1, comp2) => comp1.name.localeCompare(comp2.name))
 				})
 				.catch((error) => {
 					toast.add({
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 6461302d..84e8a1d6 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -118,15 +118,12 @@ watch([competitions, route], () => updateRoute(), { immediate: true })
 const menuComps = computed(() => {
 	if (!competitions.value) return []
 
-	return competitions.value
-		.map((competition) => {
-			return {
-				disabled:
-					progressOrder(competition.cProgress) < <number>route.meta.step,
-				...competition,
-			}
-		})
-		.sort((comp1, comp2) => comp1.name.localeCompare(comp2.name))
+	return competitions.value.map((competition) => {
+		return {
+			disabled: progressOrder(competition.cProgress) < <number>route.meta.step,
+			...competition,
+		}
+	})
 })
 
 function updateRoute(compId?: string) {

From 1ef7cdd012228be9f4d6acb7f48f471dd0daae4b Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 4 Sep 2024 17:33:46 +0200
Subject: [PATCH 091/247] =?UTF-8?q?=F0=9F=90=9B=20Require=20courts=20to=20?=
 =?UTF-8?q?contains=20a=20name=20and=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CourtResource.java              |  8 +++++++
 .../views/court/ViewCreateCourtSmall.vue      | 22 ++++++++++++++-----
 frontend/app/src/i18n/de.json                 |  4 +++-
 frontend/app/src/i18n/en.json                 |  4 +++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index 0a6a7b32..c4ce6d2c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -30,6 +30,10 @@ public String create(jUserCourt court) {
         if (exCourt != null)
             throw new WebApplicationException("Court already exists", Response.Status.CONFLICT);
 
+        if (court.getName() == null || court.getName().isEmpty())
+            throw new BadRequestException("Court name is required");
+        if (court.getCourtType() == null)
+            throw new BadRequestException("Court type is required");
         courtRepositiory.persist(court.toDB());
         return "Created";
     }
@@ -41,6 +45,10 @@ public String update(jUserCourt court) {
         if (exCourt == null)
             throw new NotFoundException("Court not found");
 
+        if (court.getName() == null || court.getName().isEmpty())
+            throw new BadRequestException("Court name is required");
+        if (court.getCourtType() == null)
+            throw new BadRequestException("Court type is required");
         exCourt.setName(court.getName());
         exCourt.setCourtType(court.getCourtType());
         courtRepositiory.persist(exCourt);
diff --git a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
index bdaa2968..29b55058 100644
--- a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
+++ b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
@@ -3,6 +3,7 @@
 		<InputText v-model="name" size="small" />
 		<Dropdown
 			v-model="type"
+			option-value="id"
 			:options="options"
 			option-label="name"
 			placeholder="Platztyp"
@@ -15,13 +16,14 @@
 import { ref } from "vue"
 import { useCreateCourt } from "@/backend/court"
 import { useI18n } from "vue-i18n"
-import { courttype } from "@/interfaces/court"
+import { useToast } from "primevue/usetoast"
 
 const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
 const { mutate: addCourt } = useCreateCourt()
 
 const name = ref("")
-const type = ref("HARD")
+const type = ref(null)
 
 const options = [
 	{ id: "HARD", name: t("court.courtTypes.HARD") },
@@ -30,10 +32,18 @@ const options = [
 ]
 
 function add() {
-	addCourt({
-		name: name.value,
-		type: courttype.HARD,
-	})
+	if (name.value && type.value)
+		addCourt({
+			name: name.value,
+			type: type.value,
+		})
+	else
+		toast.add({
+			severity: "error",
+			summary: t("general.error_saving"),
+			detail: t("court.not_selected"),
+			life: 3000,
+		})
 }
 </script>
 
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index d99fbc25..7b489979 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -15,6 +15,7 @@
 		"success": "Erfolg",
 		"failure": "Fehler",
 		"loading": "Lädt...",
+		"error_saving": "Fehler beim Speichern",
 		"save": "Speichern",
 		"reset": "Zurücksetzen",
 		"back": "Zurück",
@@ -225,6 +226,7 @@
 			"HARD": "Hart",
 			"CLAY": "Sand",
 			"GRASS": "Gras"
-		}
+		},
+		"not_selected": "Alle Felder müssen ausgefüllt werden"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 189dd87c..036ba85a 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -15,6 +15,7 @@
 		"success": "Success!",
 		"failure": "Failure!",
 		"loading": "Loading...",
+		"error_saving": "Error while saving",
 		"save": "Save",
 		"reset": "Reset",
 		"back": "Back",
@@ -227,6 +228,7 @@
 			"HARD": "Hard",
 			"CLAY": "Sand",
 			"GRASS": "Grass"
-		}
+		},
+		"not_selected": "All fields need to be filled"
 	}
 }

From e09a3b60bd9c023d01013988c147ef0c827d7175 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 4 Sep 2024 17:44:45 +0200
Subject: [PATCH 092/247] =?UTF-8?q?=F0=9F=90=9B=20Only=20allow=20available?=
 =?UTF-8?q?=20steps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/prepare/ViewPrepareMatches.vue  | 12 ++++++++++++
 frontend/app/src/i18n/de.json                        |  6 +++++-
 frontend/app/src/i18n/en.json                        |  6 +++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 84e8a1d6..6db38fd8 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -136,6 +136,18 @@ function updateRoute(compId?: string) {
 	activeTab.value = competitions.value.findIndex((c) => c.name === compId)
 
 	let step = route.name
+	if (
+		competition.value &&
+		<number>route.meta.step > progressOrder(competition.value.cProgress)
+	) {
+		toast.add({
+			severity: "error",
+			summary: t("ViewPrepare.steps.invalid_step.summary"),
+			detail: t("ViewPrepare.steps.invalid_step.detail"),
+			life: 3000,
+		})
+		step = undefined
+	}
 	if (route.meta.step === undefined || !step) {
 		switch (competitions.value[activeTab.value].cProgress) {
 			case Progress.TEAMS:
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 7b489979..64f053b3 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -189,7 +189,11 @@
 			"assignMatches": "Spiele auslosen",
 			"scheduleMatches": "Zeiteinteilung",
 			"previous": "Zurück",
-			"next": "Weiter"
+			"next": "Weiter",
+			"invalid_step": {
+				"summary": "Ungültiger Schritt",
+				"detail": "Vorherige Schritte wurden noch nicht erledigt"
+			}
 		},
 		"editTeams": {
 			"deleteBox": "Löschen",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 036ba85a..f2335b40 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -191,7 +191,11 @@
 			"assignMatches": "Assign matches",
 			"scheduleMatches": "Schedule matches",
 			"previous": "Previous",
-			"next": "Next"
+			"next": "Next",
+			"invalid_step": {
+				"summary": "Invalid step",
+				"detail": "Previous steps need to be fulfilled first"
+			}
 		},
 		"editTeams": {
 			"deleteBox": "Drop to delete",

From cfd3c79a4c70faedbe61db589823545b9d2c7a42 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 4 Sep 2024 22:40:33 +0200
Subject: [PATCH 093/247] =?UTF-8?q?=E2=9C=A8=20Scheduling:=20Jump=20to=20b?=
 =?UTF-8?q?egin=20of=20game=20phase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/scheduleMatches/CourtChooser.vue  | 14 +++++++++-----
 .../scheduleMatches/SchedulingCalendar.vue    | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
index 779d78dc..84b051f5 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
@@ -24,11 +24,15 @@ import { watch } from "vue"
 const selectedCourts = defineModel<Court[]>({ default: [] })
 const { data: courts } = getCourts()
 
-watch(selectedCourts, () => {
-	selectedCourts.value = selectedCourts.value.sort((a, b) =>
-		a.name < b.name ? -1 : 1,
-	)
-})
+watch(
+	selectedCourts,
+	() => {
+		selectedCourts.value = selectedCourts.value.sort((a, b) =>
+			a.name < b.name ? -1 : 1,
+		)
+	},
+	{ immediate: true },
+)
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 0e95b95e..94dfdc1f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,9 +1,12 @@
 <template>
 	<vue-cal
 		v-if="tournament"
+		ref="vuecal"
 		:key="calid"
 		style="height: 1000px"
 		active-view="week"
+		:min-date="tournament.game_phase.begin"
+		:max-date="tournament.game_phase.end"
 		:disable-views="['years', 'year', 'month']"
 		:locale="$i18n.locale"
 		:time-from="8 * 60"
@@ -74,6 +77,17 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === TourType.GROUPS),
 )
 
+const vuecal = ref()
+watch(
+	[tournament, vuecal],
+	async () => {
+		if (tournament.value && vuecal.value) {
+			vuecal.value.switchView("week", tournament.value.game_phase.begin)
+		}
+	},
+	{ immediate: true },
+)
+
 const events = defineModel<CalEvent[]>({ default: [] })
 watch(
 	[knockout, groups],
@@ -209,4 +223,9 @@ const splitDays = computed(() => {
 .vuecal__event {
 	background-color: rgba(164, 230, 210, 0.9);
 }
+
+.vuecal__cell--disabled {
+	background-color: #a0a0a0 !important; /* Light grey background */
+	color: #a0a0a0 !important; /* Grey text */
+}
 </style>

From 6d663d978d7c8ddfe8ec2f5da690910c9c87f630 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 5 Sep 2024 01:09:28 +0200
Subject: [PATCH 094/247] =?UTF-8?q?=E2=9C=A8=20Scheduling:=20Fix=20sorting?=
 =?UTF-8?q?=20of=20courts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/court.ts                         | 4 ++++
 .../views/prepare/scheduleMatches/CourtChooser.vue        | 8 +++-----
 .../views/prepare/scheduleMatches/SchedulingCalendar.vue  | 4 ++--
 .../views/prepare/scheduleMatches/ViewScheduleMatches.vue | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/app/src/backend/court.ts b/frontend/app/src/backend/court.ts
index 5d98e7a2..66b0849c 100644
--- a/frontend/app/src/backend/court.ts
+++ b/frontend/app/src/backend/court.ts
@@ -13,6 +13,10 @@ export function getCourts() {
 	})
 }
 
+export function courtComp(a: Court, b: Court) {
+	return a.name.localeCompare(b.name)
+}
+
 export function useCreateCourt() {
 	const queryClient = useQueryClient()
 	return useMutation({
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
index 84b051f5..8b446bc4 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
@@ -2,7 +2,7 @@
 	<MultiSelect
 		v-model="selectedCourts"
 		:loading="!courts || !selectedCourts"
-		:options="courts"
+		:options="courts?.toSorted(courtComp)"
 		option-label="name"
 		placeholder="Select courts"
 		class="w-full"
@@ -18,7 +18,7 @@
 <script setup lang="ts">
 import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
 import { Court } from "@/interfaces/court"
-import { getCourts } from "@/backend/court"
+import { courtComp, getCourts } from "@/backend/court"
 import { watch } from "vue"
 
 const selectedCourts = defineModel<Court[]>({ default: [] })
@@ -27,9 +27,7 @@ const { data: courts } = getCourts()
 watch(
 	selectedCourts,
 	() => {
-		selectedCourts.value = selectedCourts.value.sort((a, b) =>
-			a.name < b.name ? -1 : 1,
-		)
+		selectedCourts.value.sort(courtComp)
 	},
 	{ immediate: true },
 )
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 94dfdc1f..b3906287 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -4,7 +4,7 @@
 		ref="vuecal"
 		:key="calid"
 		style="height: 1000px"
-		active-view="week"
+		active-view="day"
 		:min-date="tournament.game_phase.begin"
 		:max-date="tournament.game_phase.end"
 		:disable-views="['years', 'year', 'month']"
@@ -82,7 +82,7 @@ watch(
 	[tournament, vuecal],
 	async () => {
 		if (tournament.value && vuecal.value) {
-			vuecal.value.switchView("week", tournament.value.game_phase.begin)
+			vuecal.value.switchView("day", tournament.value.game_phase.begin)
 		}
 	},
 	{ immediate: true },
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index a6eec160..747414c6 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -75,7 +75,7 @@ watch(
 	() => {
 		if (!tournamentCourts.value) return
 
-		selectedCourts.value = tournamentCourts.value
+		selectedCourts.value = JSON.parse(JSON.stringify(tournamentCourts.value))
 	},
 	{ immediate: true },
 )

From 10676a907f4b8f32b49911ec21b60aa223957a71 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 5 Sep 2024 01:13:59 +0200
Subject: [PATCH 095/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Scheduling:=20s?=
 =?UTF-8?q?elect=20begin=20date=20by=20prop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/scheduleMatches/SchedulingCalendar.vue   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index b3906287..e08589f5 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -3,6 +3,7 @@
 		v-if="tournament"
 		ref="vuecal"
 		:key="calid"
+		:selected-date="tournament.game_phase.begin"
 		style="height: 1000px"
 		active-view="day"
 		:min-date="tournament.game_phase.begin"
@@ -77,17 +78,6 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === TourType.GROUPS),
 )
 
-const vuecal = ref()
-watch(
-	[tournament, vuecal],
-	async () => {
-		if (tournament.value && vuecal.value) {
-			vuecal.value.switchView("day", tournament.value.game_phase.begin)
-		}
-	},
-	{ immediate: true },
-)
-
 const events = defineModel<CalEvent[]>({ default: [] })
 watch(
 	[knockout, groups],

From 2966bbd0c33078e1742599cd608e758121153212 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 00:27:10 +0200
Subject: [PATCH 096/247] =?UTF-8?q?=E2=9C=A8=20Add=20endpoint=20scheduled?=
 =?UTF-8?q?=20match=20by=20court=20and=20time?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Tournament.java |  14 ++-
 .../db/repositories/MatchRepository.java      |   3 +-
 .../resources/TournamentResource.java         | 103 ++++++++++++++++++
 .../jsonEntities/user/jUserMatchEvent.java    |  80 ++++++++++++++
 frontend/app/src/backend/tournament.ts        |  29 +++++
 .../scheduleMatches/SchedulingCalendar.vue    |  28 ++++-
 6 files changed, 253 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
index f0a2ce9f..fa36eb40 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
@@ -1,10 +1,11 @@
 package de.secretj12.turnierplaner.db.entities;
 
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import jakarta.persistence.*;
 
 import java.time.Instant;
-import java.util.UUID;
 import java.util.Set;
+import java.util.UUID;
 
 @Entity
 @Table(name = "tournaments")
@@ -40,6 +41,9 @@ public class Tournament {
     )
     private Set<Court> courts;
 
+    @OneToMany(mappedBy = "tournament", fetch = FetchType.LAZY)
+    private Set<Competition> competitions;
+
     public UUID getId() {
         return id;
     }
@@ -111,4 +115,12 @@ public Set<Court> getCourts() {
     public void setCourts(Set<Court> courts) {
         this.courts = courts;
     }
+
+    public Set<Competition> getCompetitions() {
+        return competitions;
+    }
+
+    public void setCompetitions(Set<Competition> competitions) {
+        this.competitions = competitions;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index ef19750b..955ae74d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -8,6 +8,7 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -44,6 +45,4 @@ public void delete(Match m) {
     public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
-
-
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index c2f8af93..36258b8a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -1,12 +1,18 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.db.entities.Court;
+import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.db.entities.competition.CompetitionType;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
+import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetitionType;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -16,7 +22,10 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.Separator;
 
+import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -31,6 +40,8 @@ public class TournamentResource {
     CourtRepositiory courts;
     @Inject
     SecurityIdentity securityIdentity;
+    @Inject
+    MatchRepository matches;
 
     @GET
     @Path("/list")
@@ -156,6 +167,98 @@ public String updateTournament(jDirectorTournamentUpdate tournament) {
         return "successfully changed";
     }
 
+    @GET
+    @Path("/{tourId}/matches")
+    @RolesAllowed("director")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
+                                              @QueryParam("from") String from,
+                                              @QueryParam("to") String to,
+                                              @QueryParam("courts") @Separator(",") List<String> courts
+    ) {
+        Tournament tournament = tournaments.getByName(tourId);
+
+        var matchEvents = new ArrayList<jUserMatchEvent>();
+        for (var comp : tournament.getCompetitions()) {
+            var rounds = getMatchRounds(comp);
+
+            var thirdPlace = matches.getThirdPlace(comp);
+            if (thirdPlace != null) {
+                jUserMatchEvent matchEvent = new jUserMatchEvent(thirdPlace);
+                matchEvent.setCompName(comp.getName());
+                matchEvent.setType(jUserCompetitionType.KNOCKOUT);
+                matchEvent.setNumber(rounds.size() - 1);
+                matchEvent.setTotal(rounds.size());
+                matchEvent.setFinal(false);
+                matchEvents.add(matchEvent);
+            }
+
+            for (int i = 0; i < rounds.size(); i++) {
+                for (var match : rounds.get(i)) {
+                    jUserMatchEvent matchEvent = new jUserMatchEvent(match);
+                    matchEvent.setCompName(comp.getName());
+                    matchEvent.setType(jUserCompetitionType.KNOCKOUT);
+                    matchEvent.setNumber(i);
+                    matchEvent.setTotal(rounds.size());
+                    matchEvent.setFinal(true);
+                    matchEvents.add(matchEvent);
+                }
+            }
+
+            if (comp.getType() == CompetitionType.GROUPS) {
+                for (var group : comp.getGroups()) {
+                    for (var match : group.getMatches()) {
+                        jUserMatchEvent matchEvent = new jUserMatchEvent(match);
+                        matchEvent.setCompName(comp.getName());
+                        matchEvent.setType(jUserCompetitionType.GROUPS);
+                        matchEvent.setNumber(group.getIndex());
+                        matchEvent.setFinal(false);
+                        matchEvents.add(matchEvent);
+                    }
+                }
+            }
+        }
+
+        Instant fromD = from == null ? null : Instant.parse(from);
+        Instant toD = to == null ? null : Instant.parse(to);
+        return matchEvents
+            .stream().filter(match -> {
+                if (courts != null
+                    && (match.getCourt() == null || !courts.contains(match.getCourt())))
+                    return false;
+                if (fromD != null
+                    && (match.getBegin() == null || match.getEnd().isBefore(fromD)))
+                    return false;
+                if (toD != null
+                    && (match.getEnd() == null || match.getBegin().isAfter(toD)))
+                    return false;
+
+                return true;
+            })
+            .toList();
+    }
+
+    private List<List<Match>> getMatchRounds(Competition competition) {
+        Match finale = matches.getFinal(competition);
+        if (finale == null)
+            return List.of();
+
+        List<List<Match>> matchRounds = new ArrayList<>();
+        List<Match> queue = List.of(finale);
+        List<Match> newQueue = new ArrayList<>();
+        while (!queue.isEmpty()) {
+            matchRounds.add(queue);
+            for (Match match : queue) {
+                if (match.getDependentOn() != null) {
+                    newQueue.add(match.getDependentOn().getPreviousA());
+                    newQueue.add(match.getDependentOn().getPreviousB());
+                }
+            }
+            queue = newQueue;
+        }
+        return matchRounds.reversed();
+    }
+
     private void checkTournamentAccessibility(Tournament tournament) {
         if (tournament == null)
             throw new NotFoundException("Tournament could not be found");
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
new file mode 100644
index 00000000..0342cb5d
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
@@ -0,0 +1,80 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.user;
+
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetitionType;
+
+public class jUserMatchEvent extends jUserMatch {
+
+    /**
+     * Name of the competition
+     */
+    public String compName;
+    /**
+     * Type of the match in competition
+     * -> also group competitions contain knockout matches
+     */
+    public jUserCompetitionType type;
+    /**
+     * For knockout: round number
+     * For group: group number
+     */
+    public long number;
+    /**
+     * Only set for knockout
+     * Total number of rounds
+     */
+    public int total;
+
+    /**
+     * Only set for knockout
+     * Set if the match is the final
+     */
+    public boolean isFinal;
+
+    public jUserMatchEvent(Match match) {
+        super(match);
+    }
+
+    public jUserMatchEvent() {
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+
+    public jUserCompetitionType getType() {
+        return type;
+    }
+
+    public void setType(jUserCompetitionType type) {
+        this.type = type;
+    }
+
+    public long getNumber() {
+        return number;
+    }
+
+    public void setNumber(long number) {
+        this.number = number;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public boolean isFinal() {
+        return isFinal;
+    }
+
+    public void setFinal(boolean aFinal) {
+        isFinal = aFinal;
+    }
+}
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index d5b045ef..689ccbcd 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -8,6 +8,7 @@ import {
 import { ToastServiceMethods } from "primevue/toastservice"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
+import { Court } from "@/interfaces/court"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
@@ -146,3 +147,31 @@ export function useAddTournament(
 		},
 	})
 }
+
+export function getTournamentMatchEvents(
+	route: RouteLocationNormalizedLoaded,
+	from: Ref<Date | undefined>,
+	to: Ref<Date | undefined>,
+	courts: Ref<Court[]>,
+) {
+	return useQuery({
+		queryKey: [
+			"tournamentCourts",
+			computed(() => route.params.tourId),
+			from,
+			to,
+			courts,
+		],
+		queryFn: () =>
+			axios.get(`/tournament/${route.params.tourId}/matches`, {
+				params: {
+					from: from.value,
+					to: to.value,
+					courts:
+						courts.value.length > 0
+							? courts.value.map((c) => c.name).join(",")
+							: undefined,
+				},
+			}),
+	})
+}
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index e08589f5..975041cc 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -23,6 +23,7 @@
 		:events="events"
 		@event-drop="onEventDrop"
 		@event-change="onEventChange"
+		@view-change="onViewChange"
 	>
 		<template #event="{ event }">
 			<EventMatch :match="event.data" :competition="competition" />
@@ -36,7 +37,10 @@ import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 import { Court } from "@/interfaces/court"
 import { computed, ref, watch } from "vue"
-import { getTournamentDetails } from "@/backend/tournament"
+import {
+	getTournamentDetails,
+	getTournamentMatchEvents,
+} from "@/backend/tournament"
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
@@ -78,6 +82,15 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === TourType.GROUPS),
 )
 
+const curStart = ref<Date | undefined>(undefined)
+const curEnd = ref<Date | undefined>(undefined)
+const { data: exMatches } = getTournamentMatchEvents(
+	route,
+	curStart,
+	curEnd,
+	computed(() => props.courts),
+)
+
 const events = defineModel<CalEvent[]>({ default: [] })
 watch(
 	[knockout, groups],
@@ -97,6 +110,19 @@ watch(
 	{ immediate: true },
 )
 
+// on onViewChange: load events from begin to end for courts
+// -> display as unchangable event
+function onViewChange({
+	startDate,
+	endDate,
+}: {
+	startDate: Date
+	endDate: Date
+}) {
+	curStart.value = startDate
+	curEnd.value = endDate
+}
+
 function addMatch(match: Match, title: string) {
 	if (match.begin && match.end && match.court)
 		events.value.push({

From cc9eeb382b6e2fee3d82774ca32e78714ebd2860 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 15:23:25 +0200
Subject: [PATCH 097/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20competition=20deta?=
 =?UTF-8?q?ils=20undefined=20parameter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/competition.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index 2bd4b618..a60ea1bf 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -2,6 +2,8 @@ import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
 import axios from "axios"
 import {
+	Competition,
+	CompetitionDefault,
 	CompetitionServer,
 	competitionServerToClient,
 } from "@/interfaces/competition"
@@ -62,7 +64,10 @@ export function getCompetitionDetails(
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 		],
-		queryFn: async () => {
+		queryFn: async (): Promise<Competition> => {
+			if (!route.params.tourId || !route.params.compId)
+				return CompetitionDefault
+
 			return axios
 				.get<CompetitionServer>(
 					`/tournament/${route.params.tourId}/competition/${route.params.compId}/details`,

From d47542715ff0a9c5ff8a98882795f21a34c22a6f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 16:38:00 +0200
Subject: [PATCH 098/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Send=20teams=20dir?=
 =?UTF-8?q?ectly=20inside=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/KnockoutTools.java |  4 +--
 .../resources/TournamentResource.java         |  1 +
 .../user/group/jUserGroupSystem.java          | 17 -----------
 .../jsonEntities/user/jUserMatch.java         | 16 +++++-----
 .../user/knockout/jUserKnockoutSystem.java    | 29 -------------------
 5 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 7f7eac73..10836be8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -47,8 +47,8 @@ public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree
             a = b = null;
 
         if (tree.getPreviousA() == null) {
-            match.setTeamA(tree.getTeamA() == null ? null : teams.findById(tree.getTeamA()));
-            match.setTeamB(tree.getTeamB() == null ? null : teams.findById(tree.getTeamB()));
+            match.setTeamA(tree.getTeamA() == null ? null : teams.findById(tree.getTeamA().getId()));
+            match.setTeamB(tree.getTeamB() == null ? null : teams.findById(tree.getTeamB().getId()));
         } else if (tree.getPreviousA().getPreviousA() == null) {
             match.setTeamA(selectTeam(a));
             match.setTeamB(selectTeam(b));
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 36258b8a..729e4cd6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -255,6 +255,7 @@ private List<List<Match>> getMatchRounds(Competition competition) {
                 }
             }
             queue = newQueue;
+            newQueue = new ArrayList<>();
         }
         return matchRounds.reversed();
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
index d9f5b59f..e95cdafd 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
@@ -3,25 +3,16 @@
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
 
 import java.util.List;
-import java.util.stream.Stream;
 
 public class jUserGroupSystem {
 
-    private List<jUserTeam> teams;
     private List<jUserGroup> groups;
     private jUserMatch finale;
     private jUserMatch thirdPlace;
 
     public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace) {
-        this.teams = groups.stream()
-            .flatMap(group -> group.getMatches().stream()
-                .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB())))
-            .distinct()
-            .map(jUserTeam::new)
-            .toList();
         this.groups = groups.stream().map(jUserGroup::new).toList();
 
         if (finale.getFinalOfGroup() != null)
@@ -36,14 +27,6 @@ public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace) {
                     .isWinner(), false);
     }
 
-    public List<jUserTeam> getTeams() {
-        return teams;
-    }
-
-    public void setTeams(List<jUserTeam> teams) {
-        this.teams = teams;
-    }
-
     public List<jUserGroup> getGroups() {
         return groups;
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index 49e00760..4836a063 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -19,8 +19,8 @@ public class jUserMatch {
     private Boolean finished;
     private Boolean winner;
 
-    private UUID teamA;
-    private UUID teamB;
+    private jUserTeam teamA;
+    private jUserTeam teamB;
 
     private List<jUserSet> sets;
 
@@ -37,9 +37,9 @@ public jUserMatch(Match match) {
         this.winner = match.getWinner();
 
         if (match.getTeamA() != null)
-            this.teamA = match.getTeamA().getId();
+            this.teamA = new jUserTeam(match.getTeamA());
         if (match.getTeamB() != null)
-            this.teamB = match.getTeamB().getId();
+            this.teamB = new jUserTeam(match.getTeamB());
 
         this.sets = match.getSets().stream().map(jUserSet::new).toList();
     }
@@ -92,19 +92,19 @@ public void setWinner(Boolean winner) {
         this.winner = winner;
     }
 
-    public UUID getTeamA() {
+    public jUserTeam getTeamA() {
         return teamA;
     }
 
-    public void setTeamA(UUID teamA) {
+    public void setTeamA(jUserTeam teamA) {
         this.teamA = teamA;
     }
 
-    public UUID getTeamB() {
+    public jUserTeam getTeamB() {
         return teamB;
     }
 
-    public void setTeamB(UUID teamB) {
+    public void setTeamB(jUserTeam teamB) {
         this.teamB = teamB;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
index ac4e4448..cb33488e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
@@ -1,15 +1,10 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user.knockout;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.competition.Team;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
 import jakarta.ws.rs.NotFoundException;
 
-import java.util.*;
-
 public class jUserKnockoutSystem {
 
-    private List<jUserTeam> teams;
     private jUserKnockoutMatch finale;
     private jUserKnockoutMatch thirdPlace;
 
@@ -19,34 +14,10 @@ public jUserKnockoutSystem(Match finale, Match thirdPlace, boolean nullable) {
         if (thirdPlace == null && !nullable)
             throw new NotFoundException("Game for third place was not found");
 
-        Set<Team> teams = new HashSet<>();
-        Queue<Match> matchQueue = new ArrayDeque<>();
-        if (finale != null)
-            matchQueue.add(finale);
-        if (thirdPlace != null)
-            matchQueue.add(thirdPlace);
-        Match match;
-        while ((match = matchQueue.poll()) != null) {
-            teams.add(match.getTeamA());
-            teams.add(match.getTeamB());
-            if (match.getDependentOn() != null) {
-                matchQueue.add(match.getDependentOn().getPreviousA());
-                matchQueue.add(match.getDependentOn().getPreviousB());
-            }
-        }
-        this.teams = teams.stream().filter(Objects::nonNull).map(jUserTeam::new).toList();
         this.finale = finale == null ? null : new jUserKnockoutMatch(finale);
         this.thirdPlace = thirdPlace == null ? null : new jUserKnockoutMatch(thirdPlace, false);
     }
 
-    public List<jUserTeam> getTeams() {
-        return teams;
-    }
-
-    public void setTeams(List<jUserTeam> teams) {
-        this.teams = teams;
-    }
-
     public jUserKnockoutMatch getFinale() {
         return finale;
     }

From 9ee2ef871d70c41a6a9b8f636229110e966e43e0 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 17:42:19 +0200
Subject: [PATCH 099/247] =?UTF-8?q?=E2=9C=A8=20Show=20matches=20of=20other?=
 =?UTF-8?q?=20competitions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/tournament.ts        | 55 +++++++++++++++----
 .../components/views/competition/ViewGame.vue |  8 +--
 .../views/competitions/FormCompetition.vue    |  8 +--
 .../competitions/ViewCreateCompetition.vue    |  4 +-
 .../assignMatches/AssignMatchesKnockout.vue   |  1 -
 .../assignMatches/ViewAssignMatches.vue       |  8 +--
 .../prepare/scheduleMatches/MatchEvent.vue    |  6 +-
 .../MatchesContainerDraggable.vue             | 14 ++---
 .../scheduleMatches/ScheduleMatchesHelper.ts  | 10 ++--
 .../scheduleMatches/SchedulingCalendar.vue    | 36 ++++++++----
 .../scheduleMatches/ViewScheduleMatches.vue   |  7 +--
 frontend/app/src/interfaces/competition.ts    | 10 ++--
 frontend/app/src/interfaces/groupSystem.ts    | 50 +++--------------
 frontend/app/src/interfaces/knockoutSystem.ts | 26 +++------
 frontend/app/src/interfaces/match.ts          | 52 +++++++++---------
 15 files changed, 151 insertions(+), 144 deletions(-)

diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 689ccbcd..c14c87df 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -9,6 +9,10 @@ import { ToastServiceMethods } from "primevue/toastservice"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { Court } from "@/interfaces/court"
+import { MatchEventServer, matchServerToClient } from "@/interfaces/match"
+import { CalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { CompType } from "@/interfaces/competition"
+import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
@@ -150,6 +154,7 @@ export function useAddTournament(
 
 export function getTournamentMatchEvents(
 	route: RouteLocationNormalizedLoaded,
+	t: (_: string) => string,
 	from: Ref<Date | undefined>,
 	to: Ref<Date | undefined>,
 	courts: Ref<Court[]>,
@@ -158,20 +163,50 @@ export function getTournamentMatchEvents(
 		queryKey: [
 			"tournamentCourts",
 			computed(() => route.params.tourId),
+			computed(() => route.params.compId),
 			from,
 			to,
 			courts,
 		],
 		queryFn: () =>
-			axios.get(`/tournament/${route.params.tourId}/matches`, {
-				params: {
-					from: from.value,
-					to: to.value,
-					courts:
-						courts.value.length > 0
-							? courts.value.map((c) => c.name).join(",")
-							: undefined,
-				},
-			}),
+			axios
+				.get(`/tournament/${route.params.tourId}/matches`, {
+					params: {
+						from: from.value,
+						to: to.value,
+						courts:
+							courts.value.length > 0
+								? courts.value.map((c) => c.name).join(",")
+								: undefined,
+					},
+				})
+				.then<MatchEventServer[]>((data) => data.data)
+				.then<CalEvent[]>((events) => {
+					return events
+						.filter((match) => match.compName !== route.params.compId)
+						.map((matchServer) => {
+							const match = matchServerToClient(matchServer)
+							return {
+								start: match.begin ?? new Date(),
+								end: match.end ?? new Date(),
+								split: match.court ?? "undefined court",
+								data: {
+									title: genTitle(matchServer, t),
+									compName: matchServer.compName,
+									...match,
+								},
+							}
+						})
+				}),
 	})
 }
+
+function genTitle(match: MatchEventServer, t: (_: string) => string) {
+	switch (match.type) {
+		case CompType.GROUPS:
+			return t("ViewGroupSystem.group") + " " + (match.number + 1)
+		case CompType.KNOCKOUT:
+			if (!match.isFinal) return t("ViewKnockout.thirdPlace")
+			else return knockoutTitle(t)(match.number, match.total)
+	}
+}
diff --git a/frontend/app/src/components/views/competition/ViewGame.vue b/frontend/app/src/components/views/competition/ViewGame.vue
index f08b8269..951c50d9 100644
--- a/frontend/app/src/components/views/competition/ViewGame.vue
+++ b/frontend/app/src/components/views/competition/ViewGame.vue
@@ -1,8 +1,8 @@
 <template>
 	<Suspense>
-		<ViewGroupSystem v-if="props.tourType === TourType.GROUPS" />
+		<ViewGroupSystem v-if="props.tourType === CompType.GROUPS" />
 		<ViewKnockoutSystem
-			v-else-if="props.tourType === TourType.KNOCKOUT"
+			v-else-if="props.tourType === CompType.KNOCKOUT"
 			:mode="props.mode"
 		/>
 		<p v-else>Invalid type</p>
@@ -12,10 +12,10 @@
 <script lang="ts" setup>
 import ViewGroupSystem from "@/components/views/competition/groupSystem/ViewGroupSystem.vue"
 import ViewKnockoutSystem from "@/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue"
-import { Mode, TourType } from "@/interfaces/competition"
+import { Mode, CompType } from "@/interfaces/competition"
 
 const props = defineProps<{
-	tourType: TourType
+	tourType: CompType
 	mode: Mode
 }>()
 </script>
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 907d72b2..7e502324 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -36,11 +36,11 @@
 				:options="[
 					{
 						name: t('CompetitionSettings.knockout'),
-						value: TourType.KNOCKOUT,
+						value: CompType.KNOCKOUT,
 					},
 					{
 						name: t('CompetitionSettings.groups'),
-						value: TourType.GROUPS,
+						value: CompType.GROUPS,
 					},
 				]"
 				:placeholder="t(`CompetitionSettings.type`)"
@@ -383,7 +383,7 @@ import {
 	Mode,
 	Sex,
 	SignUp,
-	TourType,
+	CompType,
 } from "@/interfaces/competition"
 
 import { useForm } from "vee-validate"
@@ -409,7 +409,7 @@ const { values, defineInputBinds, errors, defineComponentBinds, handleSubmit } =
 			object({
 				name: string().min(4).max(40).required(),
 				description: string().max(50),
-				tourType: mixed().oneOf(Object.values(TourType)).required(),
+				tourType: mixed().oneOf(Object.values(CompType)).required(),
 				mode: mixed().oneOf(Object.values(Mode)).required(),
 				signUp: mixed().oneOf(Object.values(SignUp)).required(),
 
diff --git a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
index 628c1b4c..d11a1817 100644
--- a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
+++ b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
@@ -35,7 +35,7 @@ import {
 	Progress,
 	Sex,
 	SignUp,
-	TourType,
+	CompType,
 } from "@/interfaces/competition"
 import { useToast } from "primevue/usetoast"
 import { useAddCompetition } from "@/backend/competition"
@@ -49,7 +49,7 @@ const form = ref<InstanceType<typeof FormCompetition> | null>(null)
 const competition = reactive<Competition>({
 	name: "",
 	description: "",
-	tourType: TourType.KNOCKOUT,
+	tourType: CompType.KNOCKOUT,
 	mode: Mode.SINGLE,
 	signUp: SignUp.INDIVIDUAL,
 	playerA: {
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index cf7120db..56e7ba0d 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -176,7 +176,6 @@ async function randomize() {
 		matches
 			.map((m) => (m.teamA ? 1 : 0) + (m.teamB ? 1 : 0))
 			.reduce((a, b) => a + b)
-	console.log(noBye)
 	let pos = range(matches.length).filter(
 		(i) => !matches[i].teamA || !matches[i].teamB,
 	)
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index d0430c15..54308ac6 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -2,7 +2,7 @@
 	<div class="flex flex-column gap-1">
 		<Transition v-if="competition">
 			<Groups
-				v-if="competition.tourType === TourType.GROUPS"
+				v-if="competition.tourType === CompType.GROUPS"
 				ref="groupsRef"
 				v-model:is-updating="isUpdating"
 			/>
@@ -15,7 +15,7 @@
 import { useRoute, useRouter } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { TourType } from "@/interfaces/competition"
+import { CompType } from "@/interfaces/competition"
 import Groups from "@/components/views/prepare/assignMatches/AssignMatchesGroups.vue"
 import AssignMatchesGroups from "@/components/views/prepare/assignMatches/AssignMatchesGroups.vue"
 import Knockout from "@/components/views/prepare/assignMatches/AssignMatchesKnockout.vue"
@@ -49,7 +49,7 @@ function nextPage() {
 }
 
 function save() {
-	if (competition.value?.tourType === TourType.GROUPS) {
+	if (competition.value?.tourType === CompType.GROUPS) {
 		if (groupsRef.value === null) return
 		groupsRef.value.save()
 	} else {
@@ -59,7 +59,7 @@ function save() {
 }
 
 function reset() {
-	if (competition.value?.tourType === TourType.GROUPS) {
+	if (competition.value?.tourType === CompType.GROUPS) {
 		if (groupsRef.value === null) return
 		groupsRef.value.reload()
 	} else {
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index c6881c57..23687e6e 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="w-full flex flex-column p-1 text-left">
 		<strong>{{ props.match.title }}</strong>
-		<i v-if="competition">
-			{{ competition.name }}
+		<i>
+			{{ props.match.compName }}
 		</i>
 		<ul class="mt-1 pt-0 pl-4">
 			<li v-if="props.match.teamA">
@@ -28,8 +28,8 @@
 </template>
 
 <script setup lang="ts">
-import { EventMatch } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { Competition } from "@/interfaces/competition"
+import { EventMatch } from "@/interfaces/match"
 
 const props = defineProps<{
 	match: EventMatch
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index f5e2dfde..51cbd136 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -26,14 +26,13 @@ import { computed, TransitionGroup, watch } from "vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import { getKnockout } from "@/backend/knockout"
 import { useRoute } from "vue-router"
-import { Match } from "@/interfaces/match"
+import { EventMatch, Match } from "@/interfaces/match"
 import { getCompetitionDetails } from "@/backend/competition"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
 import { getGroup } from "@/backend/group"
-import { TourType } from "@/interfaces/competition"
+import { CompType } from "@/interfaces/competition"
 import {
-	EventMatch,
 	extractGroupMatches,
 	extractKnockoutMatches,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
@@ -46,11 +45,11 @@ const toast = useToast()
 const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: knockout } = getKnockout(
 	route,
-	computed(() => competition.value?.tourType === TourType.KNOCKOUT),
+	computed(() => competition.value?.tourType === CompType.KNOCKOUT),
 )
 const { data: groups } = getGroup(
 	route,
-	computed(() => competition.value?.tourType === TourType.GROUPS),
+	computed(() => competition.value?.tourType === CompType.GROUPS),
 )
 
 const matches = defineModel<EventMatch[]>({ default: [] })
@@ -58,10 +57,10 @@ watch(
 	[knockout, groups],
 	() => {
 		matches.value.splice(0, matches.value.length)
-		if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
+		if (competition.value?.tourType === CompType.KNOCKOUT && knockout.value) {
 			extractKnockoutMatches(knockout.value, t, addMatch)
 		} else if (
-			competition.value?.tourType === TourType.GROUPS &&
+			competition.value?.tourType === CompType.GROUPS &&
 			groups.value
 		) {
 			extractGroupMatches(groups.value, t, addMatch)
@@ -76,6 +75,7 @@ function addMatch(match: Match, title: string) {
 	if (!match.begin)
 		matches.value.push({
 			title,
+			compName: <string>route.params.compId,
 			...match,
 		})
 }
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index 7eddfc47..7fbe18b0 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -1,16 +1,16 @@
-import { Match } from "@/interfaces/match"
+import { EventMatch } from "@/interfaces/match"
 import { KnockoutMatch, KnockoutSystem } from "@/interfaces/knockoutSystem"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { GroupMatch, GroupSystem } from "@/interfaces/groupSystem"
 
-export interface EventMatch extends Match {
-	title: string
-}
-
 export interface CalEvent {
 	start: Date
 	end: Date
 	split: string
+	draggable?: boolean
+	resizable?: boolean
+	deletable?: boolean
+	class?: string
 	data: EventMatch
 }
 
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 975041cc..4128cb09 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -46,7 +46,7 @@ import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getKnockout } from "@/backend/knockout"
-import { TourType } from "@/interfaces/competition"
+import { CompType } from "@/interfaces/competition"
 import { getGroup } from "@/backend/group"
 import { Match } from "@/interfaces/match"
 import {
@@ -75,43 +75,54 @@ const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: knockout } = getKnockout(
 	route,
-	computed(() => competition.value?.tourType === TourType.KNOCKOUT),
+	computed(() => competition.value?.tourType === CompType.KNOCKOUT),
 )
 const { data: groups } = getGroup(
 	route,
-	computed(() => competition.value?.tourType === TourType.GROUPS),
+	computed(() => competition.value?.tourType === CompType.GROUPS),
 )
 
 const curStart = ref<Date | undefined>(undefined)
 const curEnd = ref<Date | undefined>(undefined)
 const { data: exMatches } = getTournamentMatchEvents(
 	route,
+	t,
 	curStart,
 	curEnd,
 	computed(() => props.courts),
 )
 
-const events = defineModel<CalEvent[]>({ default: [] })
+const events = ref<CalEvent[]>([])
 watch(
-	[knockout, groups],
+	[knockout, groups, exMatches],
 	() => {
-		if (events.value.length) return
-
 		events.value.splice(0, events.value.length)
-		if (competition.value?.tourType === TourType.KNOCKOUT && knockout.value) {
+		if (competition.value?.tourType === CompType.KNOCKOUT && knockout.value) {
 			extractKnockoutMatches(knockout.value, t, addMatch)
 		} else if (
-			competition.value?.tourType === TourType.GROUPS &&
+			competition.value?.tourType === CompType.GROUPS &&
 			groups.value
 		) {
 			extractGroupMatches(groups.value, t, addMatch)
 		}
+
+		if (exMatches.value) {
+			exMatches.value.forEach((match) => {
+				events.value.push({
+					draggable: false,
+					resizable: false,
+					deletable: false,
+					class: "extern",
+					...match,
+				})
+			})
+		}
 	},
 	{ immediate: true },
 )
 
 // on onViewChange: load events from begin to end for courts
-// -> display as unchangable event
+// -> display as unchangeable event
 function onViewChange({
 	startDate,
 	endDate,
@@ -131,6 +142,7 @@ function addMatch(match: Match, title: string) {
 			split: match.court,
 			data: {
 				title,
+				compName: <string>route.params.compId,
 				...match,
 			},
 		})
@@ -240,6 +252,10 @@ const splitDays = computed(() => {
 	background-color: rgba(164, 230, 210, 0.9);
 }
 
+.vuecal__event.extern {
+	background-color: #fd9c42b9 !important;
+}
+
 .vuecal__cell--disabled {
 	background-color: #a0a0a0 !important; /* Light grey background */
 	color: #a0a0a0 !important; /* Grey text */
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 747414c6..f257ba6d 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -44,15 +44,13 @@ import SchedulingCalendar from "@/components/views/prepare/scheduleMatches/Sched
 import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
 import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
-import {
-	CalEvent,
-	EventMatch,
-} from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { CalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { useUpdateMatches } from "@/backend/match"
 import { useI18n } from "vue-i18n"
 import CourtChooser from "@/components/views/prepare/scheduleMatches/CourtChooser.vue"
 import { getTournamentCourts, useUpdateTournamentCourts } from "@/backend/court"
 import { getTournamentDetails } from "@/backend/tournament"
+import { EventMatch } from "@/interfaces/match"
 
 const route = useRoute()
 const router = useRouter()
@@ -98,7 +96,6 @@ function nextPage() {
 }
 
 function save() {
-	// TODO
 	isUpdating.value = true
 	updateMatches(scheduledMatches.value.map((event) => event.data))
 	updateCourts(selectedCourts.value)
diff --git a/frontend/app/src/interfaces/competition.ts b/frontend/app/src/interfaces/competition.ts
index 17966923..ae3a39fc 100644
--- a/frontend/app/src/interfaces/competition.ts
+++ b/frontend/app/src/interfaces/competition.ts
@@ -6,7 +6,7 @@ export enum Sex {
 	ANY = "ANY",
 }
 
-export enum TourType {
+export enum CompType {
 	KNOCKOUT = "KNOCKOUT",
 	GROUPS = "GROUPS",
 }
@@ -42,7 +42,7 @@ export interface Competition {
 	id?: null | string
 	name: string
 	description: string
-	tourType: TourType
+	tourType: CompType
 	mode: Mode
 	signUp: SignUp
 	playerA: settingsPlayer
@@ -54,7 +54,7 @@ export const CompetitionDefault: Competition = {
 	id: null,
 	name: "",
 	description: "",
-	tourType: TourType.KNOCKOUT,
+	tourType: CompType.KNOCKOUT,
 	mode: Mode.SINGLE,
 	signUp: SignUp.INDIVIDUAL,
 	playerA: {
@@ -79,7 +79,7 @@ export interface CompetitionServer {
 	id?: null | string
 	name: string
 	description: string
-	type: TourType
+	type: CompType
 	mode: Mode
 	signUp: SignUp
 	playerA: {
@@ -111,7 +111,7 @@ export interface settingsPlayer {
 export interface CompetitionForm {
 	name: string
 	description: string
-	tourType: TourType
+	tourType: CompType
 	mode: Mode
 	signUp: SignUp
 	playerA_Sex: Sex
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 488c3144..1bdf415e 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -1,9 +1,7 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
-import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 
 export interface GroupSystem {
-	teams: Team[]
 	groups: Group[]
 	finale: GroupMatch
 	thirdPlace: GroupMatch | null
@@ -11,12 +9,10 @@ export interface GroupSystem {
 
 export interface Group {
 	index: number
-	teams: Team[]
 	matches: Match[]
 }
 
 export interface GroupSystemServer {
-	teams: TeamServer[]
 	groups: GroupServer[]
 	finale: GroupMatchServer
 	thirdPlace: GroupMatchServer
@@ -24,7 +20,6 @@ export interface GroupSystemServer {
 
 export interface GroupServer {
 	index: number
-	teams: string[]
 	matches: MatchServer[]
 }
 
@@ -48,51 +43,24 @@ export interface GroupMatch extends KnockoutMatch {
 export function groupSystemServerToClient(
 	groupSystem: GroupSystemServer,
 ): GroupSystem {
-	const teams = groupSystem.teams.map((team) => teamServerToClient(team))
-	const teamMap = new Map<string, Team>()
-	teams.forEach((team) => {
-		if (!team.id) {
-			console.error("Team without id:", team)
-			return
-		}
-		teamMap.set(team.id, team)
-	})
-
 	return {
-		teams: teams,
-		groups: groupSystem.groups.map((group) =>
-			groupServerToClient(group, teamMap),
-		),
-		finale: groupMatchServerToClient(groupSystem.finale, teamMap),
+		groups: groupSystem.groups.map((group) => groupServerToClient(group)),
+		finale: groupMatchServerToClient(groupSystem.finale),
 		thirdPlace: groupSystem.thirdPlace
-			? groupMatchServerToClient(groupSystem.thirdPlace, teamMap)
+			? groupMatchServerToClient(groupSystem.thirdPlace)
 			: null,
 	}
 }
 
-function groupServerToClient(
-	group: GroupServer,
-	teams: Map<string, Team>,
-): Group {
+function groupServerToClient(group: GroupServer): Group {
 	return {
 		index: group.index,
-		teams: group.teams.map((team) => {
-			const t = teams.get(team)
-			if (t === undefined) {
-				console.error("Team is undefined")
-				throw new Error("Team is undefined")
-			}
-			return t
-		}),
-		matches: group.matches.map((match) => matchServerToClient(match, teams)),
+		matches: group.matches.map((match) => matchServerToClient(match)),
 	}
 }
 
-function groupMatchServerToClient(
-	matchServer: GroupMatchServer,
-	teams: Map<string, Team>,
-): GroupMatch {
-	const match: GroupMatch = matchServerToClient(matchServer, teams)
+function groupMatchServerToClient(matchServer: GroupMatchServer): GroupMatch {
+	const match: GroupMatch = matchServerToClient(matchServer)
 	if (
 		matchServer.pos !== undefined &&
 		matchServer.groupA !== undefined &&
@@ -127,8 +95,8 @@ function groupMatchServerToClient(
 		}
 		match.prevMatch = {
 			winner: matchServer.winningPlayer,
-			a: groupMatchServerToClient(matchServer.previousA, teams),
-			b: groupMatchServerToClient(matchServer.previousB, teams),
+			a: groupMatchServerToClient(matchServer.previousA),
+			b: groupMatchServerToClient(matchServer.previousB),
 		}
 	}
 	return match
diff --git a/frontend/app/src/interfaces/knockoutSystem.ts b/frontend/app/src/interfaces/knockoutSystem.ts
index 37477196..bbdecd73 100644
--- a/frontend/app/src/interfaces/knockoutSystem.ts
+++ b/frontend/app/src/interfaces/knockoutSystem.ts
@@ -1,5 +1,5 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
-import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
+import { teamClientToServer } from "@/interfaces/team"
 
 export interface KnockoutSystem {
 	finale: KnockoutMatch | null
@@ -7,7 +7,6 @@ export interface KnockoutSystem {
 }
 
 export interface KnockoutSystemServer {
-	teams: TeamServer[]
 	finale: KnockoutMatchServer
 	thirdPlace: KnockoutMatchServer
 }
@@ -29,34 +28,25 @@ export interface KnockoutMatchServer extends MatchServer {
 export function knockoutSystemServerToClient(
 	knockoutSystem: KnockoutSystemServer,
 ): KnockoutSystem {
-	const teams = new Map<string, Team>()
-	knockoutSystem.teams.forEach((team) => {
-		if (!team.id) {
-			console.error("Team without id:", team)
-			return
-		}
-		teams.set(team.id, teamServerToClient(team))
-	})
 	return {
 		finale: knockoutSystem.finale
-			? knockoutMatchServerToClient(knockoutSystem.finale, teams)
+			? knockoutMatchServerToClient(knockoutSystem.finale)
 			: null,
 		thirdPlace: knockoutSystem.thirdPlace
-			? knockoutMatchServerToClient(knockoutSystem.thirdPlace, teams)
+			? knockoutMatchServerToClient(knockoutSystem.thirdPlace)
 			: null,
 	}
 }
 
 function knockoutMatchServerToClient(
 	matchServer: KnockoutMatchServer,
-	teams: Map<string, Team>,
 ): KnockoutMatch {
-	const match: KnockoutMatch = matchServerToClient(matchServer, teams)
+	const match: KnockoutMatch = matchServerToClient(matchServer)
 	if (matchServer.previousA && matchServer.previousB) {
 		match.prevMatch = {
 			winner: matchServer.winningPlayer,
-			a: knockoutMatchServerToClient(matchServer.previousA, teams),
-			b: knockoutMatchServerToClient(matchServer.previousB, teams),
+			a: knockoutMatchServerToClient(matchServer.previousA),
+			b: knockoutMatchServerToClient(matchServer.previousB),
 		}
 	}
 	return match
@@ -71,8 +61,8 @@ export function knockoutMatchClientToServer(
 		end: match.end ? match.end.toISOString() : undefined,
 		finished: match.finished,
 		winner: match.winner ? match.winner : undefined,
-		teamA: match.teamA && match.teamA.id ? match.teamA.id : null,
-		teamB: match.teamB && match.teamB.id ? match.teamB.id : null,
+		teamA: match.teamA === null ? null : teamClientToServer(match.teamA),
+		teamB: match.teamB === null ? null : teamClientToServer(match.teamB),
 		sets: match.sets ? match.sets : [],
 
 		winningPlayer: match.prevMatch?.winner ?? false,
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 3129ce26..5085ef96 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -1,4 +1,10 @@
-import { Team } from "@/interfaces/team"
+import {
+	Team,
+	teamClientToServer,
+	TeamServer,
+	teamServerToClient,
+} from "@/interfaces/team"
+import { CompType } from "@/interfaces/competition"
 
 export interface Game {
 	scoreA: number
@@ -31,32 +37,28 @@ export interface MatchServer {
 	end: string | undefined
 	finished: boolean | undefined
 	winner: boolean | undefined
-	teamA: string | null
-	teamB: string | null
+	teamA: TeamServer | null
+	teamB: TeamServer | null
 	// TODO add result
 	sets: Array<Set>
 }
 
-export function matchServerToClient(
-	match: MatchServer,
-	teams: Map<string, Team>,
-): Match {
-	let teamA = null
-	if (match.teamA !== null) {
-		teamA = teams.get(match.teamA)
-		if (teamA === undefined) {
-			console.error("Team A is undefined")
-			throw new Error("Team A is undefined")
-		}
-	}
-	let teamB = null
-	if (match.teamB !== null) {
-		teamB = teams.get(match.teamB)
-		if (teamB === undefined) {
-			console.error("Team B is undefined")
-			throw new Error("Team B is undefined")
-		}
-	}
+export interface MatchEventServer extends MatchServer {
+	compName: string
+	type: CompType
+	number: number
+	total: number
+	isFinal: number
+}
+
+export interface EventMatch extends Match {
+	title: string
+	compName: string
+}
+
+export function matchServerToClient(match: MatchServer): Match {
+	const teamA = match.teamA === null ? null : teamServerToClient(match.teamA)
+	const teamB = match.teamB === null ? null : teamServerToClient(match.teamB)
 
 	let sets: Set[] = []
 	if (match.sets !== null) {
@@ -85,8 +87,8 @@ export function matchClientToServer(match: Match): MatchServer {
 		end: match.end?.toISOString() ?? undefined,
 		finished: match.finished,
 		winner: match.winner ?? undefined,
-		teamA: match.teamA?.id ?? null,
-		teamB: match.teamB?.id ?? null,
+		teamA: match.teamA === null ? null : teamClientToServer(match.teamA),
+		teamB: match.teamB === null ? null : teamClientToServer(match.teamB),
 		sets: match.sets ?? [],
 	}
 }

From 4c989e47bc899913a435aac82742c2d7af3ec164 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 21:45:49 +0200
Subject: [PATCH 100/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20saving=20with=20ot?=
 =?UTF-8?q?her=20comps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/tournament.ts        | 14 ++++--
 .../scheduleMatches/SchedulingCalendar.vue    | 48 +++++++++++++------
 .../scheduleMatches/ViewScheduleMatches.vue   |  6 ++-
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index c14c87df..ba5a54b6 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -158,18 +158,21 @@ export function getTournamentMatchEvents(
 	from: Ref<Date | undefined>,
 	to: Ref<Date | undefined>,
 	courts: Ref<Court[]>,
+	enabled: Ref<boolean>,
 ) {
 	return useQuery({
+		enabled,
 		queryKey: [
-			"tournamentCourts",
+			"tournamentMatches",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 			from,
 			to,
-			courts,
+			computed(() => courts.value.map((court) => court.name)),
 		],
-		queryFn: () =>
-			axios
+		queryFn: () => {
+			if (!from.value || !to.value) return []
+			return axios
 				.get(`/tournament/${route.params.tourId}/matches`, {
 					params: {
 						from: from.value,
@@ -197,7 +200,8 @@ export function getTournamentMatchEvents(
 								},
 							}
 						})
-				}),
+				})
+		},
 	})
 }
 
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 4128cb09..a23175cd 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -57,6 +57,7 @@ import {
 import EventMatch from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
 
 const calid = ref<number>(0)
+const vuecal = ref()
 
 function reload() {
 	calid.value++
@@ -82,19 +83,27 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === CompType.GROUPS),
 )
 
-const curStart = ref<Date | undefined>(undefined)
-const curEnd = ref<Date | undefined>(undefined)
+watch([vuecal, tournament], () => {
+	if (!vuecal.value || !tournament.value) return
+	// needed to always trigger the onViewChange
+	vuecal.value.previous()
+	vuecal.value.switchView("day", tournament.value.game_phase.begin)
+})
+
+const curStart = ref<Date | undefined>()
+const curEnd = ref<Date | undefined>()
 const { data: exMatches } = getTournamentMatchEvents(
 	route,
 	t,
 	curStart,
 	curEnd,
 	computed(() => props.courts),
+	computed(() => !!curStart.value && !!curEnd.value && !!props.courts),
 )
 
-const events = ref<CalEvent[]>([])
+const events = defineModel<CalEvent[]>({ default: [] })
 watch(
-	[knockout, groups, exMatches],
+	[knockout, groups],
 	() => {
 		events.value.splice(0, events.value.length)
 		if (competition.value?.tourType === CompType.KNOCKOUT && knockout.value) {
@@ -106,21 +115,30 @@ watch(
 			extractGroupMatches(groups.value, t, addMatch)
 		}
 
-		if (exMatches.value) {
-			exMatches.value.forEach((match) => {
-				events.value.push({
-					draggable: false,
-					resizable: false,
-					deletable: false,
-					class: "extern",
-					...match,
-				})
-			})
-		}
+		addExisting()
 	},
 	{ immediate: true },
 )
 
+watch(exMatches, addExisting)
+
+function addExisting() {
+	for (let i = events.value.length - 1; i >= 0; i--)
+		if (events.value[i].draggable === false) events.value.splice(i, 1)
+
+	if (exMatches.value) {
+		exMatches.value.forEach((match) => {
+			events.value.push({
+				draggable: false,
+				resizable: false,
+				deletable: false,
+				class: "extern",
+				...match,
+			})
+		})
+	}
+}
+
 // on onViewChange: load events from begin to end for courts
 // -> display as unchangeable event
 function onViewChange({
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index f257ba6d..87b64b1f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -97,7 +97,11 @@ function nextPage() {
 
 function save() {
 	isUpdating.value = true
-	updateMatches(scheduledMatches.value.map((event) => event.data))
+	updateMatches(
+		scheduledMatches.value
+			.filter((event) => event.draggable !== false)
+			.map((event) => event.data),
+	)
 	updateCourts(selectedCourts.value)
 	isUpdating.value = false
 }

From 8e17e62b7eb507e5b9daa0ff7ddada5c0ec7f61f Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 22:25:58 +0200
Subject: [PATCH 101/247] =?UTF-8?q?=F0=9F=92=84=20Fix=20alignment=20of=20s?=
 =?UTF-8?q?cheduling=20events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduleMatches/SchedulingCalendar.vue    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index a23175cd..be98380b 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -13,12 +13,13 @@
 		:time-from="8 * 60"
 		:time-to="24 * 60"
 		:split-days="splitDays"
-		:sticky-split-labels="true"
+		sticky-split-labels
 		:min-event-width="80"
 		:min-split-width="250"
 		:min-cell-width="250"
-		:time-cell-height="100"
+		:time-cell-height="25"
 		:snap-to-time="15"
+		:time-step="15"
 		:editable-events="!!props.courts.length"
 		:events="events"
 		@event-drop="onEventDrop"
@@ -28,6 +29,21 @@
 		<template #event="{ event }">
 			<EventMatch :match="event.data" :competition="competition" />
 		</template>
+		<template #time-cell="{ hours, minutes }">
+			<div :class="{ 'vuecal__time-cell-line': true, hours: !minutes }">
+				<strong v-if="!minutes" style="font-size: 15px">{{ hours }}</strong>
+				<span v-else style="font-size: 11px">{{ minutes }}</span>
+			</div>
+		</template>
+		<template #split-label="{ split }">
+			<strong
+				style="height: 24px"
+				:style="{
+					color: split.color,
+				}"
+				>{{ split.label }}</strong
+			>
+		</template>
 	</vue-cal>
 </template>
 
@@ -234,32 +250,26 @@ const splitDays = computed(() => {
 <style>
 .court1 {
 	background-color: rgba(221, 238, 255, 0.5);
-	border-width: 2px 0;
 }
 
 .court2 {
 	background-color: rgba(255, 232, 251, 0.5);
-	border-width: 2px 0;
 }
 
 .court3 {
 	background-color: rgba(221, 255, 239, 0.5);
-	border-width: 2px 0;
 }
 
 .court4 {
 	background-color: rgba(255, 250, 196, 0.5);
-	border-width: 2px 0;
 }
 
 .court5 {
 	background-color: rgba(255, 206, 178, 0.5);
-	border-width: 2px 0;
 }
 
 .court6 {
 	background-color: rgba(0, 0, 0, 0.1);
-	border-width: 2px 0;
 }
 
 .vuecal__no-event {
@@ -268,6 +278,7 @@ const splitDays = computed(() => {
 
 .vuecal__event {
 	background-color: rgba(164, 230, 210, 0.9);
+	border-radius: var(--border-radius);
 }
 
 .vuecal__event.extern {

From 3ccd964b613ef1451fb6e98025848935bca9055a Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 6 Sep 2024 22:38:56 +0200
Subject: [PATCH 102/247] =?UTF-8?q?=F0=9F=8C=90=20Internalize=20scheduling?=
 =?UTF-8?q?=20notification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/match.ts  | 10 ++++------
 frontend/app/src/backend/signup.ts |  7 +++++++
 frontend/app/src/i18n/de.json      |  4 ++--
 frontend/app/src/i18n/en.json      |  7 ++++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/app/src/backend/match.ts b/frontend/app/src/backend/match.ts
index 54f95d77..9f1237f0 100644
--- a/frontend/app/src/backend/match.ts
+++ b/frontend/app/src/backend/match.ts
@@ -16,20 +16,18 @@ export function useUpdateMatches(
 				matches.map(matchClientToServer),
 			),
 		onSuccess() {
-			// TODO internalization
 			toast.add({
 				severity: "success",
-				summary: "Scheduling saved",
-				detail: "saved all the matches",
+				summary: t("general.success"),
+				detail: t("general.saved"),
 				life: 3000,
 			})
 		},
 		onError(error) {
-			// TODO internalization
 			toast.add({
 				severity: "error",
-				summary: "Saving failed",
-				detail: "error saving matches",
+				summary: t("general.failure"),
+				detail: t("general.error_saving"),
 				life: 3000,
 			})
 			console.log(error)
diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index 71513427..a03c83c6 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -189,6 +189,13 @@ export function useUpdateTeams(
 				],
 				refetchType: "all",
 			})
+			toast.add({
+				severity: "success",
+				summary: t("general.success"),
+				detail: t("general.saved"),
+				life: 3000,
+				closable: false,
+			})
 		},
 		onError() {
 			toast.add({
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 64f053b3..c3c9d427 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -12,7 +12,7 @@
 		"name_missing": "Bitte gib einen Namen ein",
 		"signUp": "Anmelden",
 		"register": "Registrieren",
-		"success": "Erfolg",
+		"success": "Erfolgreich",
 		"failure": "Fehler",
 		"loading": "Lädt...",
 		"error_saving": "Fehler beim Speichern",
@@ -20,7 +20,7 @@
 		"reset": "Zurücksetzen",
 		"back": "Zurück",
 		"next": "Weiter",
-		"saved": "Konkurrenz wurde gespeichert",
+		"saved": "Änderungen gespeichert",
 		"save_failed": "Während dem Speichern ist etwas schiefgelaufen",
 		"loading_failed": "Während dem Laden ist etwas schiefgelaufen",
 		"tournament_tree": "Turnierbaum"
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index f2335b40..669356b9 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -12,8 +12,8 @@
 		"name_missing": "Please input a name",
 		"signUp": "Sign up",
 		"register": "Register",
-		"success": "Success!",
-		"failure": "Failure!",
+		"success": "Success",
+		"failure": "Failure",
 		"loading": "Loading...",
 		"error_saving": "Error while saving",
 		"save": "Save",
@@ -23,7 +23,8 @@
 		"saved": "Changes saved",
 		"save_failed": "Something went wrong while saving",
 		"loading_failed": "Something went wrong while loading",
-		"tournament_tree": "Tournament tree"
+		"tournament_tree": "Tournament tree",
+		"successful": "Successful"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",

From f0778c3b2f0ebefa1f5fecffb46c2094eebb02e6 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 6 Sep 2024 23:47:51 +0200
Subject: [PATCH 103/247] =?UTF-8?q?=F0=9F=8E=A8=20format=20file=20and=20re?=
 =?UTF-8?q?move=20unused=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/repositories/MatchRepository.java        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 955ae74d..d8a97ac1 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -1,14 +1,12 @@
 package de.secretj12.turnierplaner.db.repositories;
 
-import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
-
 import jakarta.enterprise.context.ApplicationScoped;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 

From 73b8158144525a51c07578f6d541367effb96e3d Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 6 Sep 2024 23:56:48 +0200
Subject: [PATCH 104/247] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20I=20hope=202=20?=
 =?UTF-8?q?billion=20groups=20are=20enough?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secretj12/turnierplaner/db/entities/groups/Group.java   | 6 +++---
 .../resources/jsonEntities/user/jUserMatchEvent.java        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
index e7a4a14e..37557139 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
@@ -24,7 +24,7 @@ public class Group {
     @OneToMany(mappedBy = "group", fetch = FetchType.EAGER)
     private Set<MatchOfGroup> matchesOfGroup;
     @Column(name = "index")
-    private long index;
+    private int index;
     @ManyToOne
     @JoinColumns(@JoinColumn(name = "competition_id"))
     private Competition competition;
@@ -52,11 +52,11 @@ public void setCompetition(Competition competition) {
         this.competition = competition;
     }
 
-    public long getIndex() {
+    public int getIndex() {
         return index;
     }
 
-    public void setIndex(long index) {
+    public void setIndex(int index) {
         this.index = index;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
index 0342cb5d..d21e4bb7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
@@ -18,7 +18,7 @@ public class jUserMatchEvent extends jUserMatch {
      * For knockout: round number
      * For group: group number
      */
-    public long number;
+    public int number;
     /**
      * Only set for knockout
      * Total number of rounds
@@ -54,11 +54,11 @@ public void setType(jUserCompetitionType type) {
         this.type = type;
     }
 
-    public long getNumber() {
+    public int getNumber() {
         return number;
     }
 
-    public void setNumber(long number) {
+    public void setNumber(int number) {
         this.number = number;
     }
 

From c2b7933d858c7fa51a876bb53207a290b3ce4aeb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 10 Sep 2024 18:34:51 +0200
Subject: [PATCH 105/247] =?UTF-8?q?=E2=9C=A8=20Add=20new=20view=20for=20ma?=
 =?UTF-8?q?tch=20overview=20of=20tournament?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competitions/ViewCompetitions.vue   | 11 +++++--
 .../views/overview/ViewTournamentOverview.vue |  5 ++++
 frontend/app/src/i18n/de.json                 |  3 +-
 frontend/app/src/i18n/en.json                 |  3 +-
 frontend/app/src/routes.ts                    | 30 ++++++++++++-------
 5 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 frontend/app/src/components/views/overview/ViewTournamentOverview.vue

diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
index 28ee048b..2655c075 100644
--- a/frontend/app/src/components/views/competitions/ViewCompetitions.vue
+++ b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
@@ -66,16 +66,21 @@
 				</Timeline>
 				<Button
 					v-if="isLoggedIn"
-					id="button"
+					class="button"
 					:label="t('ViewCompetition.prepare') + ' >>'"
 					@click="prepare"
 				/>
 				<Button
 					v-if="openRegistration"
-					id="button"
+					class="button"
 					:label="t('general.register') + ' >>'"
 					@click="router.push({ name: 'Player registration' })"
 				/>
+				<Button
+					class="button"
+					:label="t('general.matches') + ' >>'"
+					@click="router.push({ name: 'Matches overview' })"
+				/>
 			</div>
 		</div>
 	</div>
@@ -245,7 +250,7 @@ function addCompetition() {
 	height: fit-content;
 }
 
-#button {
+.button {
 	margin-top: 20px;
 	width: min(100%, 30rem);
 }
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
new file mode 100644
index 00000000..1e5bf4a5
--- /dev/null
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -0,0 +1,5 @@
+<template>Hello there's some overview</template>
+
+<script setup lang="ts"></script>
+
+<style scoped></style>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index c3c9d427..75483c4e 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -23,7 +23,8 @@
 		"saved": "Änderungen gespeichert",
 		"save_failed": "Während dem Speichern ist etwas schiefgelaufen",
 		"loading_failed": "Während dem Laden ist etwas schiefgelaufen",
-		"tournament_tree": "Turnierbaum"
+		"tournament_tree": "Turnierbaum",
+		"matches": "Spiele"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Spielerregistrierung",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 669356b9..c781278b 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -24,7 +24,8 @@
 		"save_failed": "Something went wrong while saving",
 		"loading_failed": "Something went wrong while loading",
 		"tournament_tree": "Tournament tree",
-		"successful": "Successful"
+		"successful": "Successful",
+		"matches": "Matches"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index af0169de..43d3744a 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -1,10 +1,5 @@
 import viewTournaments from "@/components/views/tournaments/ViewTournaments.vue"
 import viewCompetition from "@/components/views/competition/ViewCompetition.vue"
-import viewPrepareMatches from "@/components/views/prepare/ViewPrepareMatches.vue"
-import ViewAssignMatches from "@/components/views/prepare/assignMatches/ViewAssignMatches.vue"
-import ViewScheduleMatches from "@/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue"
-import ViewEditTeams from "@/components/views/prepare/editTeams/ViewEditTeams.vue"
-import ViewEditCompetition from "@/components/views/prepare/ViewEditCompetition.vue"
 
 export default [
 	{
@@ -36,6 +31,12 @@ export default [
 		component: () =>
 			import("@/components/views/competitions/ViewCreateCompetition.vue"),
 	},
+	{
+		path: "/tournament/:tourId/overview",
+		name: "Matches overview",
+		component: () =>
+			import("@/components/views/overview/ViewTournamentOverview.vue"),
+	},
 	{
 		path: "/tournament/:tourId/competition/:compId",
 		name: "Competition",
@@ -44,30 +45,39 @@ export default [
 	{
 		path: "/tournament/:tourId/prepare/:compId?",
 		name: "Edit competition",
-		component: viewPrepareMatches,
+		component: () =>
+			import("@/components/views/prepare/ViewPrepareMatches.vue"),
 		children: [
 			{
 				path: "settings",
 				name: "settings",
-				component: ViewEditCompetition,
+				component: () =>
+					import("@/components/views/prepare/ViewEditCompetition.vue"),
 				meta: { step: 1, reset: false },
 			},
 			{
 				path: "editTeams",
 				name: "editTeams",
-				component: ViewEditTeams,
+				component: () =>
+					import("@/components/views/prepare/editTeams/ViewEditTeams.vue"),
 				meta: { step: 2, reset: true },
 			},
 			{
 				path: "assignMatches",
 				name: "assignMatches",
-				component: ViewAssignMatches,
+				component: () =>
+					import(
+						"@/components/views/prepare/assignMatches/ViewAssignMatches.vue"
+					),
 				meta: { step: 3, reset: true },
 			},
 			{
 				path: "scheduleMatches",
 				name: "scheduleMatches",
-				component: ViewScheduleMatches,
+				component: () =>
+					import(
+						"@/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue"
+					),
 				meta: { step: 4, reset: false },
 			},
 		],

From 5926c169d53e2f3f3dfba10ed8b5fef9d1a8c286 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 10 Sep 2024 18:40:25 +0200
Subject: [PATCH 106/247] =?UTF-8?q?=F0=9F=92=84=20Adjust=20css=20of=20sett?=
 =?UTF-8?q?ings=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/items/ItemCompetition.vue    |  8 ++++++++
 .../app/src/components/items/ItemTournament.vue     | 12 ++++++++++--
 .../views/competitions/ViewCompetitions.vue         | 13 -------------
 .../views/tournaments/ViewTournaments.vue           |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/frontend/app/src/components/items/ItemCompetition.vue b/frontend/app/src/components/items/ItemCompetition.vue
index d7051e22..1c962510 100644
--- a/frontend/app/src/components/items/ItemCompetition.vue
+++ b/frontend/app/src/components/items/ItemCompetition.vue
@@ -75,4 +75,12 @@ function settings() {
 	right: 1.25rem;
 	bottom: 1.25rem;
 }
+
+.settings:hover {
+	filter: drop-shadow(0 0 6px #808080);
+}
+
+.settings:active {
+	color: #505050;
+}
 </style>
diff --git a/frontend/app/src/components/items/ItemTournament.vue b/frontend/app/src/components/items/ItemTournament.vue
index d68d71a3..5687c94d 100644
--- a/frontend/app/src/components/items/ItemTournament.vue
+++ b/frontend/app/src/components/items/ItemTournament.vue
@@ -31,7 +31,7 @@
 					v-if="props.canCreate"
 					outlined
 					rounded
-					class="icon"
+					class="settings"
 					@click="settings"
 					@click.stop
 				>
@@ -68,9 +68,17 @@ function settings() {
 	word-break: break-word;
 }
 
-.icon {
+.settings {
 	position: absolute;
 	right: 1.25rem;
 	bottom: 1.25rem;
 }
+
+.settings:hover {
+	filter: drop-shadow(0 0 6px #808080);
+}
+
+.settings:active {
+	color: #505050;
+}
 </style>
diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
index 2655c075..25353c25 100644
--- a/frontend/app/src/components/views/competitions/ViewCompetitions.vue
+++ b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
@@ -198,19 +198,6 @@ function addCompetition() {
 </script>
 
 <style scoped>
-#settings {
-	color: #303030;
-	margin-right: 5px;
-}
-
-#settings:hover {
-	filter: drop-shadow(0 0 6px #808080);
-}
-
-#settings:active {
-	color: #505050;
-}
-
 #competitions {
 	margin: 10px;
 	display: flex;
diff --git a/frontend/app/src/components/views/tournaments/ViewTournaments.vue b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
index fc57f185..3e3330a8 100644
--- a/frontend/app/src/components/views/tournaments/ViewTournaments.vue
+++ b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
@@ -7,7 +7,7 @@
 			v-for="tournament in tournaments"
 			v-else-if="isSuccess"
 			:key="tournament.name"
-			:can-create="canCreate"
+			:can-create="canCreate || false"
 			:tournament="tournament"
 			@selected="selected"
 			@settings="settingsItem"

From 735cf1b88c3153e76829225ed99ec73ef13ac1f4 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 11 Sep 2024 08:41:16 +0200
Subject: [PATCH 107/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Extract=20calendar?=
 =?UTF-8?q?=20to=20extra=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json                     |   1 +
 frontend/app/src/backend/tournament.ts        |   6 +-
 .../app/src/calendar/CalendarInterfaces.ts    |  27 +++
 frontend/app/src/calendar/ViewCalendar.vue    | 200 ++++++++++++++++++
 .../prepare/scheduleMatches/MatchEvent.vue    |   4 +-
 .../MatchesContainerDraggable.vue             |   4 +-
 .../scheduleMatches/ScheduleMatchesHelper.ts  |  14 +-
 .../scheduleMatches/SchedulingCalendar.vue    | 153 +++-----------
 .../scheduleMatches/ViewScheduleMatches.vue   |  19 +-
 frontend/app/src/draggable/DraggablePanel.vue |   1 -
 frontend/app/src/interfaces/match.ts          |   4 +-
 frontend/app/tsconfig.json                    |   3 +-
 12 files changed, 288 insertions(+), 148 deletions(-)
 create mode 100644 frontend/app/src/calendar/CalendarInterfaces.ts
 create mode 100644 frontend/app/src/calendar/ViewCalendar.vue

diff --git a/frontend/app/package.json b/frontend/app/package.json
index 9c33d3bc..9731b36f 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -53,6 +53,7 @@
 		"unplugin-auto-import": "^0.17.2",
 		"unplugin-vue-components": "^0.26.0",
 		"vite": "^5.0.10",
+		"vue-component-type-helpers": "^2.1.6",
 		"vue-loader-v16": "^16.0.0-beta.5.4"
 	}
 }
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index ba5a54b6..ceaeff98 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -9,7 +9,7 @@ import { ToastServiceMethods } from "primevue/toastservice"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { Court } from "@/interfaces/court"
-import { MatchEventServer, matchServerToClient } from "@/interfaces/match"
+import { AnnotatedMatchServer, matchServerToClient } from "@/interfaces/match"
 import { CalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { CompType } from "@/interfaces/competition"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
@@ -183,7 +183,7 @@ export function getTournamentMatchEvents(
 								: undefined,
 					},
 				})
-				.then<MatchEventServer[]>((data) => data.data)
+				.then<AnnotatedMatchServer[]>((data) => data.data)
 				.then<CalEvent[]>((events) => {
 					return events
 						.filter((match) => match.compName !== route.params.compId)
@@ -205,7 +205,7 @@ export function getTournamentMatchEvents(
 	})
 }
 
-function genTitle(match: MatchEventServer, t: (_: string) => string) {
+function genTitle(match: AnnotatedMatchServer, t: (_: string) => string) {
 	switch (match.type) {
 		case CompType.GROUPS:
 			return t("ViewGroupSystem.group") + " " + (match.number + 1)
diff --git a/frontend/app/src/calendar/CalendarInterfaces.ts b/frontend/app/src/calendar/CalendarInterfaces.ts
new file mode 100644
index 00000000..2679d7c1
--- /dev/null
+++ b/frontend/app/src/calendar/CalendarInterfaces.ts
@@ -0,0 +1,27 @@
+export enum View {
+	day = "day",
+	week = "week",
+	month = "month",
+	year = "year",
+	years = "years",
+}
+
+export interface DaySplit {
+	id: string
+	label: string
+	class: string
+}
+
+export interface CalEvent<T> {
+	id: string
+	start: Date
+	end: Date
+	split: string
+	draggable?: boolean
+	resizable?: boolean
+	deletable?: boolean
+	class?: string
+	changed?: boolean
+	secondary?: boolean
+	data: T
+}
diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
new file mode 100644
index 00000000..ca5ffeaa
--- /dev/null
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -0,0 +1,200 @@
+<template>
+	<vue-cal
+		ref="vuecal"
+		:key="calid"
+		:selected-date="props.selectedDate"
+		:time-from="props.timeFrom"
+		:time-to="props.timeTo"
+		:active-view="props.activeView"
+		:disable-views="props.disabledViews"
+		:min-date="props.minDate"
+		:max-date="props.maxDate"
+		:locale="$i18n.locale"
+		:split-days="props.splitDays"
+		sticky-split-labels
+		:min-event-width="props.minEventWidth"
+		:min-split-width="props.minSplitWidth"
+		:min-cell-width="props.minCellWidth"
+		:time-cell-height="props.timeCellHeight"
+		:snap-to-time="props.snapToTime"
+		:time-step="props.timeStep"
+		:editable-events="props.editableEvents"
+		@event-drop="onEventDrop"
+		@event-change="onEventChange"
+		@view-change="onViewChange"
+	>
+		<template v-if="$slots.event" #event="{ event }">
+			<slot name="event" v-bind="{ event: <CalEvent<T>>event }"></slot>
+		</template>
+		<template v-if="$slots.timeCell" #time-cell="{ hours, minutes }">
+			<slot
+				name="timeCell"
+				v-bind="{ hours: <number>hours, minutes: <number>minutes }"
+			/>
+		</template>
+		<template v-if="$slots.splitLabel" #split-label="{ split }">
+			<slot name="splitLabel" v-bind="{ split: <DaySplit>split }" />
+		</template>
+	</vue-cal>
+</template>
+
+<script setup lang="ts" generic="T">
+// @ts-expect-error vue-cal does not have proper typescript support
+import VueCal from "vue-cal"
+import "vue-cal/dist/vuecal.css"
+import { Ref, ref, watch } from "vue"
+import { CalEvent, DaySplit, View } from "@/calendar/CalendarInterfaces"
+
+const props = withDefaults(
+	defineProps<{
+		selectedDate?: Date
+		timeFrom?: number
+		timeTo?: number
+		activeView?: View
+		disabledViews?: View[]
+		minDate?: Date
+		maxDate?: Date
+		locale?: Ref<string> | string
+		splitDays?: DaySplit[]
+		minEventWidth?: number
+		minSplitWidth?: number
+		minCellWidth?: number
+		timeCellHeight?: number
+		snapToTime?: number
+		timeStep?: number
+		editableEvents?: boolean
+		automaticEvent?: boolean
+	}>(),
+	{
+		selectedDate: () => new Date(),
+		timeFrom: 8 * 60,
+		timeTo: 24 * 60,
+		snapToTime: 15,
+		timeStep: 15,
+		activeView: View.day,
+		disabledViews: () => [View.years, View.year, View.month],
+		locale: "en",
+		editableEvents: false,
+		automaticEvents: true,
+		minDate: undefined,
+		maxDate: undefined,
+		splitDays: undefined,
+		minEventWidth: undefined,
+		minSplitWidth: undefined,
+		minCellWidth: undefined,
+		timeCellHeight: undefined,
+	},
+)
+
+const events = defineModel<CalEvent<T>[]>({ default: [] })
+
+const emit = defineEmits<{
+	onEventDrop: [CalEvent<T>, CalEvent<T>, boolean]
+	onEventChange: [CalEvent<T>, CalEvent<T>]
+	onViewChange: [Date, Date]
+}>()
+
+const vuecal = ref()
+const calid = ref<number>(0)
+
+watch([vuecal, () => props.selectedDate], () => {
+	if (!vuecal.value || !props.selectedDate) return
+	// needed to always trigger the onViewChange
+	vuecal.value.previous()
+	vuecal.value.switchView("day", props.selectedDate)
+})
+
+function previous() {
+	if (vuecal.value) vuecal.value.previous()
+}
+
+function next() {
+	if (vuecal.value) vuecal.value.next()
+}
+
+function switchView(view: View, date?: Date) {
+	if (vuecal.value) switchView(view, date)
+}
+
+function reload() {
+	calid.value++
+}
+
+defineExpose({ previous, next, switchView, reload })
+
+function onEventDrop(
+	event: CalEvent<T>,
+	originalEvent: CalEvent<T>,
+	external: boolean,
+) {
+	emit("onEventDrop", event, originalEvent, external)
+}
+
+function onEventChange(event: CalEvent<T>, originalEvent: CalEvent<T>) {
+	if (props.automaticEvent && originalEvent) {
+		events.value.splice(
+			events.value.findIndex((e) => e.id === originalEvent.id),
+			1,
+		)
+		events.value.push({
+			...event,
+			changed: true,
+		})
+	}
+	emit("onEventChange", event, originalEvent)
+}
+
+function onViewChange({
+	startDate,
+	endDate,
+}: {
+	startDate: Date
+	endDate: Date
+}) {
+	emit("onViewChange", startDate, endDate)
+}
+</script>
+
+<style>
+.court1 {
+	background-color: rgba(221, 238, 255, 0.5);
+}
+
+.court2 {
+	background-color: rgba(255, 232, 251, 0.5);
+}
+
+.court3 {
+	background-color: rgba(221, 255, 239, 0.5);
+}
+
+.court4 {
+	background-color: rgba(255, 250, 196, 0.5);
+}
+
+.court5 {
+	background-color: rgba(255, 206, 178, 0.5);
+}
+
+.court6 {
+	background-color: rgba(0, 0, 0, 0.1);
+}
+
+.vuecal__no-event {
+	display: none;
+}
+
+.vuecal__event {
+	background-color: rgba(164, 230, 210, 0.9);
+	border-radius: var(--border-radius);
+}
+
+.vuecal__event.extern {
+	background-color: #fd9c42b9 !important;
+}
+
+.vuecal__cell--disabled {
+	background-color: #a0a0a0 !important; /* Light grey background */
+	color: #a0a0a0 !important; /* Grey text */
+}
+</style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index 23687e6e..79847a6c 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -29,10 +29,10 @@
 
 <script setup lang="ts">
 import { Competition } from "@/interfaces/competition"
-import { EventMatch } from "@/interfaces/match"
+import { AnnotatedMatch } from "@/interfaces/match"
 
 const props = defineProps<{
-	match: EventMatch
+	match: AnnotatedMatch
 	competition?: Competition
 }>()
 </script>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 51cbd136..c1c6fe6c 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -26,7 +26,7 @@ import { computed, TransitionGroup, watch } from "vue"
 import DraggablePanel from "@/draggable/DraggablePanel.vue"
 import { getKnockout } from "@/backend/knockout"
 import { useRoute } from "vue-router"
-import { EventMatch, Match } from "@/interfaces/match"
+import { AnnotatedMatch, Match } from "@/interfaces/match"
 import { getCompetitionDetails } from "@/backend/competition"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
@@ -52,7 +52,7 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === CompType.GROUPS),
 )
 
-const matches = defineModel<EventMatch[]>({ default: [] })
+const matches = defineModel<AnnotatedMatch[]>({ default: [] })
 watch(
 	[knockout, groups],
 	() => {
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index 7fbe18b0..a82d339f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -1,18 +1,10 @@
-import { EventMatch } from "@/interfaces/match"
+import { AnnotatedMatch } from "@/interfaces/match"
 import { KnockoutMatch, KnockoutSystem } from "@/interfaces/knockoutSystem"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { GroupMatch, GroupSystem } from "@/interfaces/groupSystem"
+import { CalEvent } from "@/calendar/CalendarInterfaces"
 
-export interface CalEvent {
-	start: Date
-	end: Date
-	split: string
-	draggable?: boolean
-	resizable?: boolean
-	deletable?: boolean
-	class?: string
-	data: EventMatch
-}
+export type MatchCalEvent = CalEvent<AnnotatedMatch>
 
 export function extractKnockoutMatches(
 	knockout: KnockoutSystem,
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index be98380b..c799befe 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,56 +1,41 @@
 <template>
-	<vue-cal
+	<ViewCalendar
 		v-if="tournament"
 		ref="vuecal"
-		:key="calid"
+		v-model:events="events"
 		:selected-date="tournament.game_phase.begin"
 		style="height: 1000px"
-		active-view="day"
 		:min-date="tournament.game_phase.begin"
 		:max-date="tournament.game_phase.end"
-		:disable-views="['years', 'year', 'month']"
-		:locale="$i18n.locale"
-		:time-from="8 * 60"
-		:time-to="24 * 60"
+		:locale="useI18n().locale"
 		:split-days="splitDays"
-		sticky-split-labels
 		:min-event-width="80"
 		:min-split-width="250"
 		:min-cell-width="250"
 		:time-cell-height="25"
-		:snap-to-time="15"
-		:time-step="15"
 		:editable-events="!!props.courts.length"
-		:events="events"
 		@event-drop="onEventDrop"
-		@event-change="onEventChange"
 		@view-change="onViewChange"
 	>
 		<template #event="{ event }">
-			<EventMatch :match="event.data" :competition="competition" />
+			<EventMatch
+				:match="<AnnotatedMatch>event.data"
+				:competition="competition"
+			/>
 		</template>
-		<template #time-cell="{ hours, minutes }">
-			<div :class="{ 'vuecal__time-cell-line': true, hours: !minutes }">
+		<template #timeCell="{ hours, minutes }">
+			<div class="vuecal__time-cell-line" :class="{ hours: !minutes }">
 				<strong v-if="!minutes" style="font-size: 15px">{{ hours }}</strong>
 				<span v-else style="font-size: 11px">{{ minutes }}</span>
 			</div>
 		</template>
-		<template #split-label="{ split }">
-			<strong
-				style="height: 24px"
-				:style="{
-					color: split.color,
-				}"
-				>{{ split.label }}</strong
-			>
+		<template #splitLabel="{ split }">
+			<strong style="height: 24px">{{ split.label }}</strong>
 		</template>
-	</vue-cal>
+	</ViewCalendar>
 </template>
 
 <script setup lang="ts">
-// @ts-expect-error vue-cal does not have proper typescript support
-import VueCal from "vue-cal"
-import "vue-cal/dist/vuecal.css"
 import { Court } from "@/interfaces/court"
 import { computed, ref, watch } from "vue"
 import {
@@ -64,19 +49,21 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { getKnockout } from "@/backend/knockout"
 import { CompType } from "@/interfaces/competition"
 import { getGroup } from "@/backend/group"
-import { Match } from "@/interfaces/match"
+import { AnnotatedMatch, Match } from "@/interfaces/match"
 import {
-	CalEvent,
 	extractGroupMatches,
 	extractKnockoutMatches,
+	MatchCalEvent,
 } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import EventMatch from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
+import ViewCalendar from "@/calendar/ViewCalendar.vue"
+import { v4 as uuidv4 } from "uuid"
+import { ComponentExposed } from "vue-component-type-helpers"
 
-const calid = ref<number>(0)
-const vuecal = ref()
+const vuecal = ref<ComponentExposed<typeof ViewCalendar> | null>(null)
 
 function reload() {
-	calid.value++
+	if (vuecal.value) vuecal.value.reload()
 }
 
 const emit = defineEmits<{ removeId: [id: string] }>()
@@ -99,13 +86,6 @@ const { data: groups } = getGroup(
 	computed(() => competition.value?.tourType === CompType.GROUPS),
 )
 
-watch([vuecal, tournament], () => {
-	if (!vuecal.value || !tournament.value) return
-	// needed to always trigger the onViewChange
-	vuecal.value.previous()
-	vuecal.value.switchView("day", tournament.value.game_phase.begin)
-})
-
 const curStart = ref<Date | undefined>()
 const curEnd = ref<Date | undefined>()
 const { data: exMatches } = getTournamentMatchEvents(
@@ -117,7 +97,7 @@ const { data: exMatches } = getTournamentMatchEvents(
 	computed(() => !!curStart.value && !!curEnd.value && !!props.courts),
 )
 
-const events = defineModel<CalEvent[]>({ default: [] })
+const events = defineModel<MatchCalEvent[]>({ default: [] })
 watch(
 	[knockout, groups],
 	() => {
@@ -131,16 +111,17 @@ watch(
 			extractGroupMatches(groups.value, t, addMatch)
 		}
 
-		addExisting()
+		updateExisting()
 	},
 	{ immediate: true },
 )
 
-watch(exMatches, addExisting)
+watch(exMatches, updateExisting)
 
-function addExisting() {
-	for (let i = events.value.length - 1; i >= 0; i--)
-		if (events.value[i].draggable === false) events.value.splice(i, 1)
+function updateExisting() {
+	for (let i = events.value.length - 1; i >= 0; i--) {
+		if (events.value[i].secondary) events.value.splice(i, 1)
+	}
 
 	if (exMatches.value) {
 		exMatches.value.forEach((match) => {
@@ -148,6 +129,7 @@ function addExisting() {
 				draggable: false,
 				resizable: false,
 				deletable: false,
+				secondary: true,
 				class: "extern",
 				...match,
 			})
@@ -171,6 +153,7 @@ function onViewChange({
 function addMatch(match: Match, title: string) {
 	if (match.begin && match.end && match.court)
 		events.value.push({
+			id: match.id || uuidv4(),
 			start: match.begin,
 			end: match.end,
 			split: match.court,
@@ -187,8 +170,8 @@ function onEventDrop({
 	originalEvent,
 	external,
 }: {
-	event: CalEvent
-	originalEvent: CalEvent
+	event: MatchCalEvent
+	originalEvent: MatchCalEvent
 	external: boolean
 }) {
 	if (external) {
@@ -199,43 +182,15 @@ function onEventDrop({
 		event.end.setHours(event.end.getHours() + 1)
 		event.end.setMinutes(event.end.getMinutes() + 30)
 		events.value.push({
+			id: event.data.id || uuidv4(),
 			start: event.start,
 			end: event.end,
 			split: event.split,
-			data: {
-				...originalEvent.data,
-				court: event.split,
-			},
+			data: originalEvent.data,
 		})
 	}
 }
 
-function onEventChange({
-	event,
-	originalEvent,
-}: {
-	event: CalEvent
-	originalEvent: CalEvent
-}) {
-	if (!originalEvent) return
-
-	events.value.splice(
-		events.value.findIndex((e) => e.data.id === originalEvent.data.id),
-		1,
-	)
-	events.value.push({
-		start: event.start,
-		end: event.end,
-		split: event.split,
-		data: {
-			...originalEvent.data,
-			begin: event.start,
-			end: event.end,
-			court: event.split,
-		},
-	})
-}
-
 const splitDays = computed(() => {
 	return props.courts.map((court, index) => {
 		return {
@@ -247,46 +202,4 @@ const splitDays = computed(() => {
 })
 </script>
 
-<style>
-.court1 {
-	background-color: rgba(221, 238, 255, 0.5);
-}
-
-.court2 {
-	background-color: rgba(255, 232, 251, 0.5);
-}
-
-.court3 {
-	background-color: rgba(221, 255, 239, 0.5);
-}
-
-.court4 {
-	background-color: rgba(255, 250, 196, 0.5);
-}
-
-.court5 {
-	background-color: rgba(255, 206, 178, 0.5);
-}
-
-.court6 {
-	background-color: rgba(0, 0, 0, 0.1);
-}
-
-.vuecal__no-event {
-	display: none;
-}
-
-.vuecal__event {
-	background-color: rgba(164, 230, 210, 0.9);
-	border-radius: var(--border-radius);
-}
-
-.vuecal__event.extern {
-	background-color: #fd9c42b9 !important;
-}
-
-.vuecal__cell--disabled {
-	background-color: #a0a0a0 !important; /* Light grey background */
-	color: #a0a0a0 !important; /* Grey text */
-}
-</style>
+<style></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 87b64b1f..d5cfec4f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -44,13 +44,13 @@ import SchedulingCalendar from "@/components/views/prepare/scheduleMatches/Sched
 import { ref, watch } from "vue"
 import { Court } from "@/interfaces/court"
 import MatchesContainerDraggable from "@/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue"
-import { CalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { useUpdateMatches } from "@/backend/match"
 import { useI18n } from "vue-i18n"
 import CourtChooser from "@/components/views/prepare/scheduleMatches/CourtChooser.vue"
 import { getTournamentCourts, useUpdateTournamentCourts } from "@/backend/court"
 import { getTournamentDetails } from "@/backend/tournament"
-import { EventMatch } from "@/interfaces/match"
+import { AnnotatedMatch } from "@/interfaces/match"
 
 const route = useRoute()
 const router = useRouter()
@@ -59,8 +59,8 @@ const toast = useToast()
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 
-const matches = ref<EventMatch[]>([])
-const scheduledMatches = ref<CalEvent[]>([])
+const matches = ref<AnnotatedMatch[]>([])
+const scheduledMatches = ref<MatchCalEvent[]>([])
 
 const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: tournamentCourts } = getTournamentCourts(route)
@@ -99,8 +99,15 @@ function save() {
 	isUpdating.value = true
 	updateMatches(
 		scheduledMatches.value
-			.filter((event) => event.draggable !== false)
-			.map((event) => event.data),
+			.filter((event) => !event.secondary)
+			.map((event) => {
+				return {
+					...event.data,
+					begin: event.start,
+					end: event.end,
+					court: event.split,
+				}
+			}),
 	)
 	updateCourts(selectedCourts.value)
 	isUpdating.value = false
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index 87412676..a2db322c 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -17,7 +17,6 @@ import { ref, watch } from "vue"
 
 const props = withDefaults(
 	defineProps<{
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		list: T[]
 		itemKey: string
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 5085ef96..ac1f6df9 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -43,7 +43,7 @@ export interface MatchServer {
 	sets: Array<Set>
 }
 
-export interface MatchEventServer extends MatchServer {
+export interface AnnotatedMatchServer extends MatchServer {
 	compName: string
 	type: CompType
 	number: number
@@ -51,7 +51,7 @@ export interface MatchEventServer extends MatchServer {
 	isFinal: number
 }
 
-export interface EventMatch extends Match {
+export interface AnnotatedMatch extends Match {
 	title: string
 	compName: string
 }
diff --git a/frontend/app/tsconfig.json b/frontend/app/tsconfig.json
index 79472a1e..3aa6e116 100644
--- a/frontend/app/tsconfig.json
+++ b/frontend/app/tsconfig.json
@@ -25,7 +25,8 @@
 		"src/**/*.tsx",
 		"src/**/*.vue",
 		"tests/**/*.ts",
-		"tests/**/*.tsx"
+		"tests/**/*.tsx",
+		"node_modules/unplugin-auto-import/auto-imports.d.ts"
 	],
 	"exclude": ["node_modules"]
 }

From 7385f5ee5b45f1d70ea55cb6b6787e3f0c3cdf05 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 11 Sep 2024 18:06:40 +0200
Subject: [PATCH 108/247] =?UTF-8?q?=F0=9F=92=84=20Add=20navigation=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/header/HeaderLeft.vue  | 58 ++++++++++++++-----
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index 3badafb9..7d2b865f 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -1,45 +1,71 @@
 <template>
-	<div id="headerLeft" @click="home">
-		<span class="material-icons" style="font-size: 3rem">sports_tennis</span>
-		<h1 id="colorHeadLine">{{ t("title") }}</h1>
+	<div
+		id="header"
+		class="flex flex-row pl-3 align-items-center gap-3 cursor-pointer"
+	>
+		<span class="material-icons" style="font-size: 3rem" @click="toHome"
+			>sports_tennis</span
+		>
+		<div class="flex flex-row align-items-baseline gap-3">
+			<h1 id="colorHeadLine" class="m-0 title" @click="toHome">
+				{{ t("title") }}
+			</h1>
+			<h2 class="m-0" @click="toTournament">{{ route.params.tourId }}</h2>
+			<h3 class="m-0" @click="toCompetition">{{ route.params.compId }}</h3>
+		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
 import { router } from "@/main"
 import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
 
+const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
 
-function home() {
+function toHome() {
 	router.push({ name: "Tournaments" })
 }
-</script>
 
-<style scoped>
-#headerLeft {
-	padding-left: 10px;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	cursor: pointer;
+function toTournament() {
+	router.push({
+		name: "Competitions",
+	})
 }
 
-#colorHeadLine {
-	color: #044154;
+function toCompetition() {
+	router.push({
+		name: "Competition",
+	})
 }
+</script>
 
-#headerLeft > * {
-	margin-left: 20px;
+<style scoped>
+#colorHeadLine {
+	color: #044154;
 }
 
 h1 {
 	font-weight: 900;
 }
 
+h1,
+h2,
+h3 {
+	line-height: 1;
+}
+
 @media only screen and (max-width: 750px) {
 	h1 {
 		font-size: 1em;
 	}
 }
+
+span:hover,
+h1:hover,
+h2:hover,
+h3:hover {
+	filter: drop-shadow(0 0 6px #808080);
+}
 </style>

From 9669bb3f435e96e38df022c9da062b1b9403c359 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 11 Sep 2024 19:56:32 +0200
Subject: [PATCH 109/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20viewing=20of=20eve?=
 =?UTF-8?q?nts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/court.ts             |  3 +-
 frontend/app/src/backend/tournament.ts        | 15 ++++----
 frontend/app/src/calendar/ViewCalendar.vue    | 32 +++++++++++++----
 .../scheduleMatches/SchedulingCalendar.vue    | 36 +++++--------------
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/frontend/app/src/backend/court.ts b/frontend/app/src/backend/court.ts
index 66b0849c..e42c4506 100644
--- a/frontend/app/src/backend/court.ts
+++ b/frontend/app/src/backend/court.ts
@@ -62,7 +62,8 @@ export function getTournamentCourts(route: RouteLocationNormalizedLoaded) {
 		queryFn: () =>
 			axios
 				.get(`/tournament/${route.params.tourId}/courts`)
-				.then<Court[]>((response) => response.data),
+				.then<Court[]>((response) => response.data)
+				.then<Court[]>((data) => data.sort(courtComp)),
 	})
 }
 
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index ceaeff98..91ab0540 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -10,9 +10,10 @@ import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { Court } from "@/interfaces/court"
 import { AnnotatedMatchServer, matchServerToClient } from "@/interfaces/match"
-import { CalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 import { CompType } from "@/interfaces/competition"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
+import { v4 as uuidv4 } from "uuid"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
@@ -157,21 +158,20 @@ export function getTournamentMatchEvents(
 	t: (_: string) => string,
 	from: Ref<Date | undefined>,
 	to: Ref<Date | undefined>,
-	courts: Ref<Court[]>,
-	enabled: Ref<boolean>,
+	courts: Ref<Court[] | undefined>,
 ) {
 	return useQuery({
-		enabled,
+		enabled: computed(() => !!from.value && !!to.value && !!courts.value),
 		queryKey: [
 			"tournamentMatches",
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
 			from,
 			to,
-			computed(() => courts.value.map((court) => court.name)),
+			computed(() => courts.value?.map((court) => court.name)),
 		],
 		queryFn: () => {
-			if (!from.value || !to.value) return []
+			if (!from.value || !to.value || !courts.value) return []
 			return axios
 				.get(`/tournament/${route.params.tourId}/matches`, {
 					params: {
@@ -184,12 +184,13 @@ export function getTournamentMatchEvents(
 					},
 				})
 				.then<AnnotatedMatchServer[]>((data) => data.data)
-				.then<CalEvent[]>((events) => {
+				.then<MatchCalEvent[]>((events) => {
 					return events
 						.filter((match) => match.compName !== route.params.compId)
 						.map((matchServer) => {
 							const match = matchServerToClient(matchServer)
 							return {
+								id: matchServer.id || uuidv4(),
 								start: match.begin ?? new Date(),
 								end: match.end ?? new Date(),
 								split: match.court ?? "undefined court",
diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index ca5ffeaa..cec96ef1 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -2,6 +2,7 @@
 	<vue-cal
 		ref="vuecal"
 		:key="calid"
+		:events="events"
 		:selected-date="props.selectedDate"
 		:time-from="props.timeFrom"
 		:time-to="props.timeTo"
@@ -32,9 +33,18 @@
 				v-bind="{ hours: <number>hours, minutes: <number>minutes }"
 			/>
 		</template>
+		<template v-else #time-cell="{ hours, minutes }">
+			<div class="vuecal__time-cell-line" :class="{ hours: !minutes }">
+				<strong v-if="!minutes" style="font-size: 15px">{{ hours }}</strong>
+				<span v-else style="font-size: 11px">{{ minutes }}</span>
+			</div>
+		</template>
 		<template v-if="$slots.splitLabel" #split-label="{ split }">
 			<slot name="splitLabel" v-bind="{ split: <DaySplit>split }" />
 		</template>
+		<template v-else #split-label="{ split }">
+			<strong style="height: 24px">{{ split.label }}</strong>
+		</template>
 	</vue-cal>
 </template>
 
@@ -122,15 +132,25 @@ function reload() {
 
 defineExpose({ previous, next, switchView, reload })
 
-function onEventDrop(
-	event: CalEvent<T>,
-	originalEvent: CalEvent<T>,
-	external: boolean,
-) {
+function onEventDrop({
+	event,
+	originalEvent,
+	external,
+}: {
+	event: CalEvent<T>
+	originalEvent: CalEvent<T>
+	external: boolean
+}) {
 	emit("onEventDrop", event, originalEvent, external)
 }
 
-function onEventChange(event: CalEvent<T>, originalEvent: CalEvent<T>) {
+function onEventChange({
+	event,
+	originalEvent,
+}: {
+	event: CalEvent<T>
+	originalEvent: CalEvent<T>
+}) {
 	if (props.automaticEvent && originalEvent) {
 		events.value.splice(
 			events.value.findIndex((e) => e.id === originalEvent.id),
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index c799befe..95a48515 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -14,8 +14,8 @@
 		:min-cell-width="250"
 		:time-cell-height="25"
 		:editable-events="!!props.courts.length"
-		@event-drop="onEventDrop"
-		@view-change="onViewChange"
+		@on-event-drop="onEventDrop"
+		@on-view-change="onViewChange"
 	>
 		<template #event="{ event }">
 			<EventMatch
@@ -23,15 +23,6 @@
 				:competition="competition"
 			/>
 		</template>
-		<template #timeCell="{ hours, minutes }">
-			<div class="vuecal__time-cell-line" :class="{ hours: !minutes }">
-				<strong v-if="!minutes" style="font-size: 15px">{{ hours }}</strong>
-				<span v-else style="font-size: 11px">{{ minutes }}</span>
-			</div>
-		</template>
-		<template #splitLabel="{ split }">
-			<strong style="height: 24px">{{ split.label }}</strong>
-		</template>
 	</ViewCalendar>
 </template>
 
@@ -94,7 +85,6 @@ const { data: exMatches } = getTournamentMatchEvents(
 	curStart,
 	curEnd,
 	computed(() => props.courts),
-	computed(() => !!curStart.value && !!curEnd.value && !!props.courts),
 )
 
 const events = defineModel<MatchCalEvent[]>({ default: [] })
@@ -139,13 +129,7 @@ function updateExisting() {
 
 // on onViewChange: load events from begin to end for courts
 // -> display as unchangeable event
-function onViewChange({
-	startDate,
-	endDate,
-}: {
-	startDate: Date
-	endDate: Date
-}) {
+function onViewChange(startDate: Date, endDate: Date) {
 	curStart.value = startDate
 	curEnd.value = endDate
 }
@@ -165,15 +149,11 @@ function addMatch(match: Match, title: string) {
 		})
 }
 
-function onEventDrop({
-	event,
-	originalEvent,
-	external,
-}: {
-	event: MatchCalEvent
-	originalEvent: MatchCalEvent
-	external: boolean
-}) {
+function onEventDrop(
+	event: MatchCalEvent,
+	originalEvent: MatchCalEvent,
+	external: boolean,
+) {
 	if (external) {
 		if (originalEvent.data.id) emit("removeId", originalEvent.data.id)
 		else throw "Match id is missing"

From 85095cf361ffd2cba63c7737727a78bf49a913a9 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 11 Sep 2024 20:03:49 +0200
Subject: [PATCH 110/247] =?UTF-8?q?=E2=9C=A8=20Show=20events=20in=20overvi?=
 =?UTF-8?q?ew?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/calendar/ViewCalendar.vue    |  8 +-
 .../views/overview/ViewTournamentOverview.vue | 85 ++++++++++++++++++-
 .../scheduleMatches/SchedulingCalendar.vue    |  7 +-
 3 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index cec96ef1..e75e038b 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -89,10 +89,10 @@ const props = withDefaults(
 		minDate: undefined,
 		maxDate: undefined,
 		splitDays: undefined,
-		minEventWidth: undefined,
-		minSplitWidth: undefined,
-		minCellWidth: undefined,
-		timeCellHeight: undefined,
+		minEventWidth: 80,
+		minSplitWidth: 250,
+		minCellWidth: 250,
+		timeCellHeight: 25,
 	},
 )
 
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
index 1e5bf4a5..2361b1f5 100644
--- a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -1,5 +1,86 @@
-<template>Hello there's some overview</template>
+<template>
+	<div class="w-full p-2">
+		<Card style="margin-top: -10px !important">
+			<template #content>
+				<ViewCalendar
+					v-if="tournament"
+					v-model:events="events"
+					style="height: 800px"
+					:selected-date="tournament.game_phase.begin"
+					:min-date="tournament.game_phase.begin"
+					:max-date="tournament.game_phase.end"
+					:split-days="splitDays"
+					@on-view-change="onViewChange"
+				>
+					<template #event="{ event }">
+						<MatchEvent :match="<AnnotatedMatch>event.data" />
+					</template>
+				</ViewCalendar>
+			</template>
+		</Card>
+	</div>
+</template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import ViewCalendar from "@/calendar/ViewCalendar.vue"
+import { getTournamentCourts } from "@/backend/court"
+import { useRoute } from "vue-router"
+import { useI18n } from "vue-i18n"
+import { computed, ref, watch } from "vue"
+import {
+	getTournamentDetails,
+	getTournamentMatchEvents,
+} from "@/backend/tournament"
+import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import { useToast } from "primevue/usetoast"
+import MatchEvent from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
+import { AnnotatedMatch } from "@/interfaces/match"
+
+const route = useRoute()
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+
+const curStart = ref<Date | undefined>()
+const curEnd = ref<Date | undefined>()
+
+const { data: courts } = getTournamentCourts(route)
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: matches } = getTournamentMatchEvents(
+	route,
+	t,
+	curStart,
+	curEnd,
+	courts,
+)
+
+function onViewChange(startDate: Date, endDate: Date) {
+	curStart.value = startDate
+	curEnd.value = endDate
+}
+
+const events = ref<MatchCalEvent[]>([])
+
+watch(matches, () => {
+	events.value.splice(0, events.value.length)
+
+	if (!matches.value) return
+
+	matches.value.forEach((match) => {
+		events.value.push(match)
+	})
+})
+
+const splitDays = computed(() => {
+	if (!courts.value) return []
+
+	return courts.value.map((court, index) => {
+		return {
+			id: court.name,
+			label: court.name,
+			class: "court" + (index + 1),
+		}
+	})
+})
+</script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 95a48515..cdc9bb5f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -3,16 +3,11 @@
 		v-if="tournament"
 		ref="vuecal"
 		v-model:events="events"
-		:selected-date="tournament.game_phase.begin"
 		style="height: 1000px"
+		:selected-date="tournament.game_phase.begin"
 		:min-date="tournament.game_phase.begin"
 		:max-date="tournament.game_phase.end"
-		:locale="useI18n().locale"
 		:split-days="splitDays"
-		:min-event-width="80"
-		:min-split-width="250"
-		:min-cell-width="250"
-		:time-cell-height="25"
 		:editable-events="!!props.courts.length"
 		@on-event-drop="onEventDrop"
 		@on-view-change="onViewChange"

From ede85e82f29f6e65823598d2f9d16f3f64755514 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 11 Sep 2024 23:11:57 +0200
Subject: [PATCH 111/247] =?UTF-8?q?=F0=9F=92=84=20Fix=20box=20of=20change?=
 =?UTF-8?q?=20cursor=20in=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/header/HeaderLeft.vue  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index 7d2b865f..23ac7044 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -1,17 +1,21 @@
 <template>
-	<div
-		id="header"
-		class="flex flex-row pl-3 align-items-center gap-3 cursor-pointer"
-	>
-		<span class="material-icons" style="font-size: 3rem" @click="toHome"
+	<div id="header" class="flex flex-row pl-3 align-items-center gap-3">
+		<span
+			class="material-icons cursor-pointer"
+			style="font-size: 3rem"
+			@click="toHome"
 			>sports_tennis</span
 		>
 		<div class="flex flex-row align-items-baseline gap-3">
-			<h1 id="colorHeadLine" class="m-0 title" @click="toHome">
+			<h1 id="colorHeadLine" class="m-0 cursor-pointer title" @click="toHome">
 				{{ t("title") }}
 			</h1>
-			<h2 class="m-0" @click="toTournament">{{ route.params.tourId }}</h2>
-			<h3 class="m-0" @click="toCompetition">{{ route.params.compId }}</h3>
+			<h2 class="m-0 cursor-pointer" @click="toTournament">
+				{{ route.params.tourId }}
+			</h2>
+			<h3 class="m-0 cursor-pointer" @click="toCompetition">
+				{{ route.params.compId }}
+			</h3>
 		</div>
 	</div>
 </template>

From 7c77d764bc4a4e6c590f6a37830d56af75300aa3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 12 Sep 2024 00:01:56 +0200
Subject: [PATCH 112/247] =?UTF-8?q?=E2=9C=A8=20Add=20selector=20to=20chang?=
 =?UTF-8?q?e=20between=20views?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/overview/OverviewCalendar.vue       | 80 ++++++++++++++++
 .../views/overview/ViewTournamentOverview.vue | 96 +++++--------------
 frontend/app/src/main.ts                      |  1 -
 3 files changed, 103 insertions(+), 74 deletions(-)
 create mode 100644 frontend/app/src/components/views/overview/OverviewCalendar.vue

diff --git a/frontend/app/src/components/views/overview/OverviewCalendar.vue b/frontend/app/src/components/views/overview/OverviewCalendar.vue
new file mode 100644
index 00000000..bfed011a
--- /dev/null
+++ b/frontend/app/src/components/views/overview/OverviewCalendar.vue
@@ -0,0 +1,80 @@
+<template>
+	<ViewCalendar
+		v-if="tournament"
+		v-model:events="events"
+		style="height: 800px"
+		:selected-date="tournament.game_phase.begin"
+		:min-date="tournament.game_phase.begin"
+		:max-date="tournament.game_phase.end"
+		:split-days="splitDays"
+		@on-view-change="onViewChange"
+	>
+		<template #event="{ event }">
+			<MatchEvent :match="<AnnotatedMatch>event.data" />
+		</template>
+	</ViewCalendar>
+</template>
+
+<script setup lang="ts">
+import { AnnotatedMatch } from "@/interfaces/match"
+import ViewCalendar from "@/calendar/ViewCalendar.vue"
+import MatchEvent from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
+import { useRoute } from "vue-router"
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+import { computed, ref, watch } from "vue"
+import { getTournamentCourts } from "@/backend/court"
+import {
+	getTournamentDetails,
+	getTournamentMatchEvents,
+} from "@/backend/tournament"
+import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+
+const route = useRoute()
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+
+const curStart = ref<Date | undefined>()
+const curEnd = ref<Date | undefined>()
+
+const { data: courts } = getTournamentCourts(route)
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: matches } = getTournamentMatchEvents(
+	route,
+	t,
+	curStart,
+	curEnd,
+	courts,
+)
+
+function onViewChange(startDate: Date, endDate: Date) {
+	curStart.value = startDate
+	curEnd.value = endDate
+}
+
+const events = ref<MatchCalEvent[]>([])
+
+watch(matches, () => {
+	events.value.splice(0, events.value.length)
+
+	if (!matches.value) return
+
+	matches.value.forEach((match) => {
+		events.value.push(match)
+	})
+})
+
+const splitDays = computed(() => {
+	if (!courts.value) return []
+
+	return courts.value.map((court, index) => {
+		return {
+			id: court.name,
+			label: court.name,
+			class: "court" + (index + 1),
+		}
+	})
+})
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
index 2361b1f5..41101dce 100644
--- a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -2,85 +2,35 @@
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
 			<template #content>
-				<ViewCalendar
-					v-if="tournament"
-					v-model:events="events"
-					style="height: 800px"
-					:selected-date="tournament.game_phase.begin"
-					:min-date="tournament.game_phase.begin"
-					:max-date="tournament.game_phase.end"
-					:split-days="splitDays"
-					@on-view-change="onViewChange"
-				>
-					<template #event="{ event }">
-						<MatchEvent :match="<AnnotatedMatch>event.data" />
-					</template>
-				</ViewCalendar>
+				<SelectButton
+					v-model="calendarView"
+					class="pb-2"
+					:options="views"
+					option-label="label"
+				/>
+				<OverviewCalendar v-if="calendarView.id === 'calendar'" />
+				<div v-else-if="calendarView.id === 'list'">test</div>
 			</template>
 		</Card>
 	</div>
 </template>
 
 <script setup lang="ts">
-import ViewCalendar from "@/calendar/ViewCalendar.vue"
-import { getTournamentCourts } from "@/backend/court"
-import { useRoute } from "vue-router"
-import { useI18n } from "vue-i18n"
-import { computed, ref, watch } from "vue"
-import {
-	getTournamentDetails,
-	getTournamentMatchEvents,
-} from "@/backend/tournament"
-import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
-import { useToast } from "primevue/usetoast"
-import MatchEvent from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
-import { AnnotatedMatch } from "@/interfaces/match"
-
-const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
-const toast = useToast()
-
-const curStart = ref<Date | undefined>()
-const curEnd = ref<Date | undefined>()
-
-const { data: courts } = getTournamentCourts(route)
-const { data: tournament } = getTournamentDetails(route, t, toast)
-const { data: matches } = getTournamentMatchEvents(
-	route,
-	t,
-	curStart,
-	curEnd,
-	courts,
-)
-
-function onViewChange(startDate: Date, endDate: Date) {
-	curStart.value = startDate
-	curEnd.value = endDate
-}
-
-const events = ref<MatchCalEvent[]>([])
-
-watch(matches, () => {
-	events.value.splice(0, events.value.length)
-
-	if (!matches.value) return
-
-	matches.value.forEach((match) => {
-		events.value.push(match)
-	})
-})
-
-const splitDays = computed(() => {
-	if (!courts.value) return []
-
-	return courts.value.map((court, index) => {
-		return {
-			id: court.name,
-			label: court.name,
-			class: "court" + (index + 1),
-		}
-	})
-})
+import { ref } from "vue"
+import OverviewCalendar from "@/components/views/overview/OverviewCalendar.vue"
+
+const views = [
+	{
+		id: "calendar",
+		label: "Calendar",
+	},
+	{
+		id: "list",
+		label: "List",
+	},
+]
+
+const calendarView = ref(views[0])
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 612b8f93..16a0c0e2 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -3,7 +3,6 @@ import App from "./App.vue"
 import { createI18n, I18nOptions } from "vue-i18n"
 import * as VueRouter from "vue-router"
 
-/* import the fontawesome core */
 import { settings } from "@/settings"
 
 /* https request */

From f4023bfdaa95e375fce5c2e9a8a02a5b58f9e3f5 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 12 Sep 2024 11:44:32 +0200
Subject: [PATCH 113/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20moving=20of=20even?=
 =?UTF-8?q?ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/calendar/ViewCalendar.vue                | 2 +-
 .../views/prepare/scheduleMatches/SchedulingCalendar.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index e75e038b..ac281d11 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -85,7 +85,7 @@ const props = withDefaults(
 		disabledViews: () => [View.years, View.year, View.month],
 		locale: "en",
 		editableEvents: false,
-		automaticEvents: true,
+		automaticEvent: true,
 		minDate: undefined,
 		maxDate: undefined,
 		splitDays: undefined,
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index cdc9bb5f..dc8ad1e0 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -1,8 +1,8 @@
 <template>
 	<ViewCalendar
 		v-if="tournament"
-		ref="vuecal"
-		v-model:events="events"
+		ref="calendar"
+		v-model="events"
 		style="height: 1000px"
 		:selected-date="tournament.game_phase.begin"
 		:min-date="tournament.game_phase.begin"
@@ -46,10 +46,10 @@ import ViewCalendar from "@/calendar/ViewCalendar.vue"
 import { v4 as uuidv4 } from "uuid"
 import { ComponentExposed } from "vue-component-type-helpers"
 
-const vuecal = ref<ComponentExposed<typeof ViewCalendar> | null>(null)
+const calendar = ref<ComponentExposed<typeof ViewCalendar> | null>(null)
 
 function reload() {
-	if (vuecal.value) vuecal.value.reload()
+	if (calendar.value) calendar.value.reload()
 }
 
 const emit = defineEmits<{ removeId: [id: string] }>()

From 44d9cbc1ad84dc26a535bca4e94f69e0ed8db951 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 12 Sep 2024 13:55:32 +0200
Subject: [PATCH 114/247] =?UTF-8?q?=E2=9C=A8=20Show=20matches=20in=20list?=
 =?UTF-8?q?=20and=20add=20filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/tournament.ts        |  63 ++++---
 .../views/overview/OverviewCalendar.vue       |   1 +
 .../views/overview/OverviewList.vue           | 170 ++++++++++++++++++
 .../views/overview/ViewTournamentOverview.vue |   3 +-
 4 files changed, 216 insertions(+), 21 deletions(-)
 create mode 100644 frontend/app/src/components/views/overview/OverviewList.vue

diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 91ab0540..313563ac 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -9,8 +9,11 @@ import { ToastServiceMethods } from "primevue/toastservice"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { Court } from "@/interfaces/court"
-import { AnnotatedMatchServer, matchServerToClient } from "@/interfaces/match"
-import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
+import {
+	AnnotatedMatch,
+	AnnotatedMatchServer,
+	matchServerToClient,
+} from "@/interfaces/match"
 import { CompType } from "@/interfaces/competition"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { v4 as uuidv4 } from "uuid"
@@ -153,7 +156,7 @@ export function useAddTournament(
 	})
 }
 
-export function getTournamentMatchEvents(
+export function getTournamentMatches(
 	route: RouteLocationNormalizedLoaded,
 	t: (_: string) => string,
 	from: Ref<Date | undefined>,
@@ -184,28 +187,48 @@ export function getTournamentMatchEvents(
 					},
 				})
 				.then<AnnotatedMatchServer[]>((data) => data.data)
-				.then<MatchCalEvent[]>((events) => {
-					return events
-						.filter((match) => match.compName !== route.params.compId)
-						.map((matchServer) => {
-							const match = matchServerToClient(matchServer)
-							return {
-								id: matchServer.id || uuidv4(),
-								start: match.begin ?? new Date(),
-								end: match.end ?? new Date(),
-								split: match.court ?? "undefined court",
-								data: {
-									title: genTitle(matchServer, t),
-									compName: matchServer.compName,
-									...match,
-								},
-							}
-						})
+				.then<AnnotatedMatch[]>((matches) => {
+					return matches.map((matchServer) => {
+						const match = matchServerToClient(matchServer)
+						return {
+							title: genTitle(matchServer, t),
+							compName: matchServer.compName,
+							...match,
+						}
+					})
 				})
 		},
 	})
 }
 
+export function getTournamentMatchEvents(
+	route: RouteLocationNormalizedLoaded,
+	t: (_: string) => string,
+	from: Ref<Date | undefined>,
+	to: Ref<Date | undefined>,
+	courts: Ref<Court[] | undefined>,
+) {
+	const matches = getTournamentMatches(route, t, from, to, courts)
+
+	return {
+		...matches,
+		data: computed(() => {
+			if (!matches.data.value) return undefined
+			return matches.data.value
+				.filter((match) => match.compName !== route.params.compId)
+				.map((match) => {
+					return {
+						id: match.id || uuidv4(),
+						start: match.begin ?? new Date(),
+						end: match.end ?? new Date(),
+						split: match.court ?? "undefined court",
+						data: match,
+					}
+				})
+		}),
+	}
+}
+
 function genTitle(match: AnnotatedMatchServer, t: (_: string) => string) {
 	switch (match.type) {
 		case CompType.GROUPS:
diff --git a/frontend/app/src/components/views/overview/OverviewCalendar.vue b/frontend/app/src/components/views/overview/OverviewCalendar.vue
index bfed011a..4013edf7 100644
--- a/frontend/app/src/components/views/overview/OverviewCalendar.vue
+++ b/frontend/app/src/components/views/overview/OverviewCalendar.vue
@@ -1,4 +1,5 @@
 <template>
+	<!-- TODO add report and rescheduling -->
 	<ViewCalendar
 		v-if="tournament"
 		v-model:events="events"
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
new file mode 100644
index 00000000..4c2bea31
--- /dev/null
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -0,0 +1,170 @@
+<template>
+	<DataTable
+		v-model:filters="filters"
+		data-key="id"
+		resizable-columns
+		:loading="!tournament"
+		:value="matches"
+		filter-display="row"
+		:global-filter-fields="['title']"
+	>
+		<template #empty> No matches found.</template>
+		<template #loading> Loading matches...</template>
+		<Column sortable field="title" header="Title" :show-filter-menu="false">
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					placeholder="Search by name"
+					@input="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column
+			sortable
+			field="compName"
+			header="Competition"
+			:show-filter-menu="false"
+		>
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					placeholder="Search by name"
+					@input="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column sortable field="court" header="Court" :show-filter-menu="false">
+			<template #filter="{ filterModel, filterCallback }">
+				<MultiSelect
+					v-model="filterModel.value"
+					:options="courts?.map((court) => court.name) || []"
+					placeholder="Any"
+					class="p-column-filter"
+					style="min-width: 14rem"
+					:max-selected-labels="3"
+					@change="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column sortable field="begin" header="Begin" data-type="date">
+			<template #body="{ data }">
+				{{ data.begin?.toLocaleString(t("lang"), dateOptions) }}
+			</template>
+			<template #filter="{ filterModel, filterCallback }">
+				<Calendar
+					v-model="filterModel.value"
+					:date-format="t('date_format')"
+					:placeholder="t('date_format')"
+					:mask="t('date_format')"
+					show-time
+					@date-select="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column sortable field="teamA" header="Team A" :show-filter-menu="false">
+			<template #body="{ data }">
+				{{ data.teamA?.playerA?.name }}
+				<template v-if="data.teamA?.playerB">
+					<br />
+					{{ data.teamA?.playerB?.name }}
+				</template>
+			</template>
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					placeholder="Search by name"
+					@input="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column sortable field="teamB" header="Team B" :show-filter-menu="false">
+			<template #body="{ data }">
+				{{ data.teamB?.playerA?.name }}
+				<template v-if="data.teamB?.playerB">
+					<br />
+					{{ data.teamB?.playerB?.name }}
+				</template>
+			</template>
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					placeholder="Search by name"
+					@input="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<!-- TODO add results -->
+		<Column header="Result" />
+	</DataTable>
+</template>
+
+<script setup lang="ts">
+import {
+	getTournamentDetails,
+	getTournamentMatches,
+} from "@/backend/tournament"
+import { useRoute } from "vue-router"
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+import { computed, ref } from "vue"
+import { getTournamentCourts } from "@/backend/court"
+import { FilterMatchMode, FilterService } from "primevue/api"
+import { DataTableFilterMeta } from "primevue/datatable"
+import { Team } from "@/interfaces/team"
+
+const route = useRoute()
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+const { data: tournament } = getTournamentDetails(route, t, toast)
+const { data: courts } = getTournamentCourts(route)
+
+const TEAMS_FILTER = "TEAMS_FILTER"
+
+FilterService.register(TEAMS_FILTER, teamFilter)
+
+const filters = ref<DataTableFilterMeta>({
+	title: { value: null, matchMode: FilterMatchMode.CONTAINS },
+	compName: { value: null, matchMode: FilterMatchMode.CONTAINS },
+	court: { value: null, matchMode: FilterMatchMode.IN },
+	begin: { value: null, matchMode: FilterMatchMode.DATE_AFTER },
+	teamA: { value: null, matchMode: TEAMS_FILTER },
+	teamB: { value: null, matchMode: TEAMS_FILTER },
+})
+
+function teamFilter(team: Team | null, filter: string | null) {
+	const filterValue = filter?.toLowerCase() || ""
+	const playerA = team?.playerA?.name.toLowerCase() || ""
+	const playerB = team?.playerB?.name.toLowerCase() || ""
+	return playerA.includes(filterValue) || playerB.includes(filterValue)
+}
+
+const { data: matches } = getTournamentMatches(
+	route,
+	t,
+	computed(() => tournament.value?.game_phase.begin),
+	computed(() => tournament.value?.game_phase.end),
+	courts,
+)
+
+const dateOptions: Intl.DateTimeFormatOptions = {
+	year: "2-digit",
+	month: "numeric",
+	day: "numeric",
+	hour: "numeric",
+	minute: "numeric",
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
index 41101dce..d7c939cb 100644
--- a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -9,7 +9,7 @@
 					option-label="label"
 				/>
 				<OverviewCalendar v-if="calendarView.id === 'calendar'" />
-				<div v-else-if="calendarView.id === 'list'">test</div>
+				<OverviewList v-else-if="calendarView.id === 'list'" />
 			</template>
 		</Card>
 	</div>
@@ -18,6 +18,7 @@
 <script setup lang="ts">
 import { ref } from "vue"
 import OverviewCalendar from "@/components/views/overview/OverviewCalendar.vue"
+import OverviewList from "@/components/views/overview/OverviewList.vue"
 
 const views = [
 	{

From e0ffe9db686b222285d1b42eae6fbd3febff0ba2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 12 Sep 2024 14:32:30 +0200
Subject: [PATCH 115/247] =?UTF-8?q?=F0=9F=8C=90=20Internalization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/tournament.ts        | 20 +++++--
 .../views/overview/OverviewList.vue           | 56 ++++++++++++++++---
 .../views/overview/ViewTournamentOverview.vue | 18 +++---
 .../prepare/scheduleMatches/MatchEvent.vue    |  6 +-
 .../MatchesContainerDraggable.vue             |  6 +-
 .../scheduleMatches/ScheduleMatchesHelper.ts  | 38 +++++++++----
 .../scheduleMatches/SchedulingCalendar.vue    |  6 +-
 .../scheduleMatches/ViewScheduleMatches.vue   |  4 +-
 frontend/app/src/i18n/de.json                 | 12 +++-
 frontend/app/src/i18n/en.json                 | 11 +++-
 frontend/app/src/interfaces/match.ts          |  9 ++-
 11 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 313563ac..9cce9c70 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -191,8 +191,13 @@ export function getTournamentMatches(
 					return matches.map((matchServer) => {
 						const match = matchServerToClient(matchServer)
 						return {
-							title: genTitle(matchServer, t),
 							compName: matchServer.compName,
+							title: {
+								type: matchServer.type,
+								number: matchServer.number,
+								isFinal: matchServer.isFinal,
+								total: matchServer.total,
+							},
 							...match,
 						}
 					})
@@ -229,12 +234,15 @@ export function getTournamentMatchEvents(
 	}
 }
 
-function genTitle(match: AnnotatedMatchServer, t: (_: string) => string) {
-	switch (match.type) {
+export function genTitle(
+	title: AnnotatedMatch["title"],
+	t: (_: string) => string,
+) {
+	switch (title.type) {
 		case CompType.GROUPS:
-			return t("ViewGroupSystem.group") + " " + (match.number + 1)
+			return t("ViewGroupSystem.group") + " " + (title.number + 1)
 		case CompType.KNOCKOUT:
-			if (!match.isFinal) return t("ViewKnockout.thirdPlace")
-			else return knockoutTitle(t)(match.number, match.total)
+			if (!title.isFinal) return t("ViewKnockout.thirdPlace")
+			else return knockoutTitle(t)(title.number, title.total)
 	}
 }
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 4c2bea31..b1e7b364 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -10,7 +10,15 @@
 	>
 		<template #empty> No matches found.</template>
 		<template #loading> Loading matches...</template>
-		<Column sortable field="title" header="Title" :show-filter-menu="false">
+		<Column
+			sortable
+			field="title"
+			:header="t('general.title')"
+			:show-filter-menu="false"
+		>
+			<template #body="{ data }">
+				{{ genTitle(data.title, t) }}
+			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
 					v-model="filterModel.value"
@@ -25,7 +33,7 @@
 		<Column
 			sortable
 			field="compName"
-			header="Competition"
+			:header="t('general.competition')"
 			:show-filter-menu="false"
 		>
 			<template #filter="{ filterModel, filterCallback }">
@@ -39,7 +47,12 @@
 				/>
 			</template>
 		</Column>
-		<Column sortable field="court" header="Court" :show-filter-menu="false">
+		<Column
+			sortable
+			field="court"
+			:header="t('general.court')"
+			:show-filter-menu="false"
+		>
 			<template #filter="{ filterModel, filterCallback }">
 				<MultiSelect
 					v-model="filterModel.value"
@@ -52,7 +65,12 @@
 				/>
 			</template>
 		</Column>
-		<Column sortable field="begin" header="Begin" data-type="date">
+		<Column
+			sortable
+			field="begin"
+			:header="t('general.begin')"
+			data-type="date"
+		>
 			<template #body="{ data }">
 				{{ data.begin?.toLocaleString(t("lang"), dateOptions) }}
 			</template>
@@ -67,7 +85,12 @@
 				/>
 			</template>
 		</Column>
-		<Column sortable field="teamA" header="Team A" :show-filter-menu="false">
+		<Column
+			sortable
+			field="teamA"
+			:header="t('general.team') + ' A'"
+			:show-filter-menu="false"
+		>
 			<template #body="{ data }">
 				{{ data.teamA?.playerA?.name }}
 				<template v-if="data.teamA?.playerB">
@@ -86,7 +109,12 @@
 				/>
 			</template>
 		</Column>
-		<Column sortable field="teamB" header="Team B" :show-filter-menu="false">
+		<Column
+			sortable
+			field="teamB"
+			:header="t('general.team') + ' B'"
+			:show-filter-menu="false"
+		>
 			<template #body="{ data }">
 				{{ data.teamB?.playerA?.name }}
 				<template v-if="data.teamB?.playerB">
@@ -106,12 +134,13 @@
 			</template>
 		</Column>
 		<!-- TODO add results -->
-		<Column header="Result" />
+		<Column :header="t('general.result')" />
 	</DataTable>
 </template>
 
 <script setup lang="ts">
 import {
+	genTitle,
 	getTournamentDetails,
 	getTournamentMatches,
 } from "@/backend/tournament"
@@ -123,6 +152,7 @@ import { getTournamentCourts } from "@/backend/court"
 import { FilterMatchMode, FilterService } from "primevue/api"
 import { DataTableFilterMeta } from "primevue/datatable"
 import { Team } from "@/interfaces/team"
+import { AnnotatedMatch } from "@/interfaces/match"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
@@ -131,11 +161,13 @@ const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: courts } = getTournamentCourts(route)
 
 const TEAMS_FILTER = "TEAMS_FILTER"
+const TITLE_FILTER = "TITLE_FILTER"
 
 FilterService.register(TEAMS_FILTER, teamFilter)
+FilterService.register(TITLE_FILTER, titleFilter)
 
 const filters = ref<DataTableFilterMeta>({
-	title: { value: null, matchMode: FilterMatchMode.CONTAINS },
+	title: { value: null, matchMode: TITLE_FILTER },
 	compName: { value: null, matchMode: FilterMatchMode.CONTAINS },
 	court: { value: null, matchMode: FilterMatchMode.IN },
 	begin: { value: null, matchMode: FilterMatchMode.DATE_AFTER },
@@ -149,6 +181,14 @@ function teamFilter(team: Team | null, filter: string | null) {
 	const playerB = team?.playerB?.name.toLowerCase() || ""
 	return playerA.includes(filterValue) || playerB.includes(filterValue)
 }
+function titleFilter(
+	title: AnnotatedMatch["title"] | null,
+	filter: string | null,
+) {
+	const titleValue = title ? genTitle(title, t) : ""
+	const filterValue = filter?.toLowerCase() || ""
+	return titleValue.toLowerCase().includes(filterValue)
+}
 
 const { data: matches } = getTournamentMatches(
 	route,
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
index d7c939cb..dd4abcc0 100644
--- a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -2,12 +2,11 @@
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
 			<template #content>
-				<SelectButton
-					v-model="calendarView"
-					class="pb-2"
-					:options="views"
-					option-label="label"
-				/>
+				<SelectButton v-model="calendarView" class="pb-2" :options="views">
+					<template #option="{ option }">
+						{{ t(option.label) }}
+					</template>
+				</SelectButton>
 				<OverviewCalendar v-if="calendarView.id === 'calendar'" />
 				<OverviewList v-else-if="calendarView.id === 'list'" />
 			</template>
@@ -19,15 +18,18 @@
 import { ref } from "vue"
 import OverviewCalendar from "@/components/views/overview/OverviewCalendar.vue"
 import OverviewList from "@/components/views/overview/OverviewList.vue"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
 
 const views = [
 	{
 		id: "calendar",
-		label: "Calendar",
+		label: "general.calendar",
 	},
 	{
 		id: "list",
-		label: "List",
+		label: "general.list",
 	},
 ]
 
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index 79847a6c..2867bd3e 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="w-full flex flex-column p-1 text-left">
-		<strong>{{ props.match.title }}</strong>
+		<strong>{{ genTitle(props.match.title, t) }}</strong>
 		<i>
 			{{ props.match.compName }}
 		</i>
@@ -30,6 +30,10 @@
 <script setup lang="ts">
 import { Competition } from "@/interfaces/competition"
 import { AnnotatedMatch } from "@/interfaces/match"
+import { genTitle } from "@/backend/tournament"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
 
 const props = defineProps<{
 	match: AnnotatedMatch
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index c1c6fe6c..65a5b682 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -58,12 +58,12 @@ watch(
 	() => {
 		matches.value.splice(0, matches.value.length)
 		if (competition.value?.tourType === CompType.KNOCKOUT && knockout.value) {
-			extractKnockoutMatches(knockout.value, t, addMatch)
+			extractKnockoutMatches(knockout.value, addMatch)
 		} else if (
 			competition.value?.tourType === CompType.GROUPS &&
 			groups.value
 		) {
-			extractGroupMatches(groups.value, t, addMatch)
+			extractGroupMatches(groups.value, addMatch)
 		}
 	},
 	{
@@ -71,7 +71,7 @@ watch(
 	},
 )
 
-function addMatch(match: Match, title: string) {
+function addMatch(match: Match, title: AnnotatedMatch["title"]) {
 	if (!match.begin)
 		matches.value.push({
 			title,
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index a82d339f..d05c4e58 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -1,15 +1,14 @@
 import { AnnotatedMatch } from "@/interfaces/match"
 import { KnockoutMatch, KnockoutSystem } from "@/interfaces/knockoutSystem"
-import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { GroupMatch, GroupSystem } from "@/interfaces/groupSystem"
 import { CalEvent } from "@/calendar/CalendarInterfaces"
+import { CompType } from "@/interfaces/competition"
 
 export type MatchCalEvent = CalEvent<AnnotatedMatch>
 
 export function extractKnockoutMatches(
 	knockout: KnockoutSystem,
-	t: (_: string) => string,
-	add: (match: KnockoutMatch, title: string) => void,
+	add: (match: KnockoutMatch, title: AnnotatedMatch["title"]) => void,
 ) {
 	const rounds: KnockoutMatch[][] = []
 	let queue: KnockoutMatch[] = []
@@ -32,27 +31,46 @@ export function extractKnockoutMatches(
 	rounds.toReversed().forEach((round, i) => {
 		round.forEach((match) => {
 			if (i > 0 || (match.teamA && match.teamB))
-				add(match, knockoutTitle(t)(i, rounds.length + 1))
+				add(match, {
+					isFinal: true,
+					type: CompType.KNOCKOUT,
+					number: i,
+					total: rounds.length + 1,
+				})
 		})
 	})
 	if (knockout.thirdPlace)
-		add(knockout.thirdPlace, t("ViewKnockout.thirdPlace"))
-	if (knockout.finale) add(knockout.finale, t("ViewKnockout.finale"))
+		add(knockout.thirdPlace, {
+			isFinal: false,
+			type: CompType.KNOCKOUT,
+			number: rounds.length,
+			total: rounds.length + 1,
+		})
+	if (knockout.finale)
+		add(knockout.finale, {
+			isFinal: true,
+			type: CompType.KNOCKOUT,
+			number: rounds.length,
+			total: rounds.length + 1,
+		})
 }
 
 export function extractGroupMatches(
 	groupSystem: GroupSystem,
-	t: (_: string) => string,
-	add: (match: GroupMatch, title: string) => void,
+	add: (match: GroupMatch, title: AnnotatedMatch["title"]) => void,
 ) {
 	groupSystem.groups.forEach((group, i) => {
 		group.matches.forEach((match) => {
-			add(match, t("ViewGroupSystem.group") + " " + (i + 1))
+			add(match, {
+				type: CompType.GROUPS,
+				number: i,
+				total: i,
+				isFinal: true,
+			})
 		})
 	})
 	extractKnockoutMatches(
 		{ finale: groupSystem.finale, thirdPlace: groupSystem.thirdPlace },
-		t,
 		add,
 	)
 }
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index dc8ad1e0..071cf63f 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -88,12 +88,12 @@ watch(
 	() => {
 		events.value.splice(0, events.value.length)
 		if (competition.value?.tourType === CompType.KNOCKOUT && knockout.value) {
-			extractKnockoutMatches(knockout.value, t, addMatch)
+			extractKnockoutMatches(knockout.value, addMatch)
 		} else if (
 			competition.value?.tourType === CompType.GROUPS &&
 			groups.value
 		) {
-			extractGroupMatches(groups.value, t, addMatch)
+			extractGroupMatches(groups.value, addMatch)
 		}
 
 		updateExisting()
@@ -129,7 +129,7 @@ function onViewChange(startDate: Date, endDate: Date) {
 	curEnd.value = endDate
 }
 
-function addMatch(match: Match, title: string) {
+function addMatch(match: Match, title: AnnotatedMatch["title"]) {
 	if (match.begin && match.end && match.court)
 		events.value.push({
 			id: match.id || uuidv4(),
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index d5cfec4f..92956a5b 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -2,13 +2,13 @@
 	<div class="grid">
 		<div class="col-4 flex flex-column gap-3">
 			<Card>
-				<template #title>Options</template>
+				<template #title>{{ t("general.courts") }}</template>
 				<template #content>
 					<CourtChooser v-if="selectedCourts" v-model="selectedCourts" />
 				</template>
 			</Card>
 			<Card>
-				<template #title> Matches</template>
+				<template #title>{{ t("general.matches") }}</template>
 				<template #content>
 					<MatchesContainerDraggable
 						v-model="matches"
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 75483c4e..1985b478 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -24,7 +24,17 @@
 		"save_failed": "Während dem Speichern ist etwas schiefgelaufen",
 		"loading_failed": "Während dem Laden ist etwas schiefgelaufen",
 		"tournament_tree": "Turnierbaum",
-		"matches": "Spiele"
+		"matches": "Spiele",
+		"calendar": "Kalender",
+		"list": "Liste",
+		"title": "Titel",
+		"competition": "Konkurrenz",
+		"court": "Platz",
+		"begin": "Beginn",
+		"team": "Team",
+		"result": "Ergebnis",
+		"options": "Optionen",
+		"courts": "Plätze"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Spielerregistrierung",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index c781278b..d9ef4bb1 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -25,7 +25,16 @@
 		"loading_failed": "Something went wrong while loading",
 		"tournament_tree": "Tournament tree",
 		"successful": "Successful",
-		"matches": "Matches"
+		"matches": "Matches",
+		"calendar": "Calendar",
+		"list": "List",
+		"title": "Title",
+		"competition": "Competition",
+		"court": "Court",
+		"begin": "Begin",
+		"team": "Team",
+		"result": "Result",
+		"courts": "Courts"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index ac1f6df9..2347c96d 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -48,11 +48,16 @@ export interface AnnotatedMatchServer extends MatchServer {
 	type: CompType
 	number: number
 	total: number
-	isFinal: number
+	isFinal: boolean
 }
 
 export interface AnnotatedMatch extends Match {
-	title: string
+	title: {
+		isFinal: boolean
+		type: CompType
+		number: number
+		total: number
+	}
 	compName: string
 }
 

From b9d455a01c923daddd629377aa1d189ba6f18cca Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 14 Sep 2024 23:40:09 +0200
Subject: [PATCH 116/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20group=20generation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |  32 +---
 .../turnierplaner/db/entities/Set.java        |   2 +-
 .../turnierplaner/db/entities/Tournament.java |   2 +-
 .../db/entities/competition/Competition.java  |  25 +++-
 .../db/entities/groups/FinalOfGroup.java      |   6 +-
 .../db/entities/groups/Group.java             |  32 ++--
 .../db/entities/groups/MatchOfGroup.java      |   6 +-
 .../db/entities/knockout/NextMatch.java       |   9 +-
 .../db/repositories/MatchRepository.java      |  27 +---
 .../turnierplaner/modifier/GroupTools.java    | 141 ++++++++++--------
 .../turnierplaner/modifier/KnockoutTools.java |   7 +-
 .../resources/CompetitionResource.java        |  15 +-
 .../resources/TournamentResource.java         |   4 +-
 .../user/group/jUserGroupMatchAfterMatch.java |   3 +-
 .../user/group/jUserGroupSystem.java          |   9 +-
 frontend/app/src/backend/group.ts             |   8 +
 .../assignMatches/AssignMatchesGroups.vue     |  17 ++-
 frontend/app/src/interfaces/groupSystem.ts    |   6 +-
 pom.xml                                       |   2 +-
 19 files changed, 196 insertions(+), 157 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 4546d03c..2a0ce98b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -7,8 +7,6 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import io.smallrye.common.constraint.NotNull;
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -18,15 +16,6 @@
 @Entity
 @Table(name = "matches")
 @NamedQueries({
-               @NamedQuery(name = "findHead",
-                           query = """
-                               FROM Match m WHERE m.competition = :comp
-                               AND NOT EXISTS (FROM NextMatch n WHERE n.previousA = m OR n.previousB = m)
-                               AND (EXISTS (FROM NextMatch n WHERE m = n.nextMatch AND n.winner = :finale)
-                                  OR EXISTS (FROM FinalOfGroup f WHERE m = f.nextMatch AND
-                                      (f.pos = 1 AND :finale = true
-                                        OR f.pos = 2 AND :finale = false)))
-                               AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)"""),
                @NamedQuery(name = "deleteByComp",
                            query = """
                                DELETE FROM Match m WHERE m.competition = :comp"""),
@@ -42,8 +31,8 @@ public class Match {
     private UUID id;
 
     @NotNull
-    @ManyToOne(cascade = CascadeType.ALL)
-    @JoinColumns(@JoinColumn(name = "competition_id"))
+    @ManyToOne
+    @JoinColumn(name = "competition_id")
     private Competition competition;
     @ManyToOne
     @JoinColumn(name = "court")
@@ -66,27 +55,22 @@ public class Match {
     @JoinColumn(name = "team_b")
     private Team teamB;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToOne(mappedBy = "nextMatch", fetch = FetchType.LAZY)
+    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private NextMatch dependentOn;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToMany(mappedBy = "previousA", fetch = FetchType.LAZY)
+    @OneToMany(mappedBy = "previousA", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private Collection<NextMatch> previousOfA;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToMany(mappedBy = "previousB", fetch = FetchType.LAZY)
+    @OneToMany(mappedBy = "previousB", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private Collection<NextMatch> previousOfB;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToOne(mappedBy = "nextMatch", fetch = FetchType.LAZY)
+    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private FinalOfGroup finalOfGroup;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToOne(mappedBy = "match", fetch = FetchType.LAZY)
+    @OneToOne(mappedBy = "match", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private MatchOfGroup group;
 
-    @OneToMany(mappedBy = "key.match", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "key.match", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<Set> sets;
 
     public UUID getId() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
index b7e0c034..c9f314e7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
@@ -43,7 +43,7 @@ public void setScoreB(int scoreB) {
 
     @Embeddable
     public static class SetKey implements Serializable {
-        @ManyToOne(cascade = CascadeType.ALL)
+        @ManyToOne
         @JoinColumn(name = "match_id")
         private Match match;
         @Column(name = "index")
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
index fa36eb40..41a8ea34 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
@@ -33,7 +33,7 @@ public class Tournament {
     @Column(name = "visible")
     private boolean visible;
 
-    @ManyToMany(cascade = {CascadeType.ALL})
+    @ManyToMany
     @JoinTable(
                name = "court_of_tournament",
                joinColumns = {@JoinColumn(name = "id")},
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index f3771288..fc37fb63 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -29,7 +29,7 @@ public class Competition {
     @Column(name = "name", nullable = false)
     private String name;
 
-    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "tournament_id", nullable = false)
     private Tournament tournament;
 
@@ -69,6 +69,13 @@ public class Competition {
     @Column(name = "creation_progess", nullable = false)
     private CreationProgress cProgress;
 
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "finale_id")
+    private Match finale;
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "thirdPlace_id")
+    private Match thirdPlace;
+
     @OneToMany(mappedBy = "competition")
     private List<Team> teams;
 
@@ -253,4 +260,20 @@ public CreationProgress getcProgress() {
     public void setcProgress(CreationProgress cProgress) {
         this.cProgress = cProgress;
     }
+
+    public Match getThirdPlace() {
+        return thirdPlace;
+    }
+
+    public void setThirdPlace(Match thirdPlace) {
+        this.thirdPlace = thirdPlace;
+    }
+
+    public Match getFinale() {
+        return finale;
+    }
+
+    public void setFinale(Match finale) {
+        this.finale = finale;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
index 57f8d702..7c029e17 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
@@ -17,14 +17,14 @@ public class FinalOfGroup {
     private int pos;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
-    @ManyToOne(cascade = CascadeType.ALL)
+    @ManyToOne
     @JoinColumn(name = "group_a", referencedColumnName = "id", nullable = false)
     private Group groupA;
-    @ManyToOne(cascade = CascadeType.ALL)
+    @ManyToOne
     @JoinColumn(name = "group_b", referencedColumnName = "id", nullable = false)
     private Group groupB;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
index 37557139..7e65bbed 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
@@ -1,11 +1,8 @@
 package de.secretj12.turnierplaner.db.entities.groups;
 
-import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.entities.Match;
-
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -20,20 +17,17 @@ public class Group {
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id", nullable = false)
     private UUID id;
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToMany(mappedBy = "group", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "group", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Set<MatchOfGroup> matchesOfGroup;
     @Column(name = "index")
     private int index;
     @ManyToOne
-    @JoinColumns(@JoinColumn(name = "competition_id"))
+    @JoinColumn(name = "competition_id")
     private Competition competition;
 
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToMany(mappedBy = "groupA")
+    @OneToMany(mappedBy = "groupA", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Set<FinalOfGroup> finalOfGroupA;
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @OneToMany(mappedBy = "groupB")
+    @OneToMany(mappedBy = "groupB", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Set<FinalOfGroup> finalOfGroupB;
 
     public UUID getId() {
@@ -74,4 +68,20 @@ public Set<Match> getMatches() {
 
         return matchesOfGroup.stream().map(MatchOfGroup::getMatch).collect(Collectors.toCollection(HashSet::new));
     }
+
+    public Set<FinalOfGroup> getFinalOfGroupA() {
+        return finalOfGroupA;
+    }
+
+    public void setFinalOfGroupA(Set<FinalOfGroup> finalOfGroupA) {
+        this.finalOfGroupA = finalOfGroupA;
+    }
+
+    public Set<FinalOfGroup> getFinalOfGroupB() {
+        return finalOfGroupB;
+    }
+
+    public void setFinalOfGroupB(Set<FinalOfGroup> finalOfGroupB) {
+        this.finalOfGroupB = finalOfGroupB;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
index a2369cc0..2d2f78bd 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
@@ -1,10 +1,7 @@
 package de.secretj12.turnierplaner.db.entities.groups;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 import java.util.UUID;
 
@@ -20,8 +17,7 @@ public class MatchOfGroup {
     private Group group;
 
     @MapsId
-    @OneToOne
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
     @JoinColumn(name = "match", referencedColumnName = "id", nullable = false)
     private Match match;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
index 051da465..19f5b5fe 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
@@ -2,8 +2,6 @@
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 import java.util.UUID;
 
@@ -15,15 +13,14 @@ public class NextMatch {
     private UUID id;
 
     @MapsId
-    @OneToOne
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
-    @ManyToOne(cascade = CascadeType.ALL)
+    @ManyToOne
     @JoinColumn(name = "previous_a", referencedColumnName = "id", nullable = false)
     private Match previousA;
-    @ManyToOne(cascade = CascadeType.ALL)
+    @ManyToOne
     @JoinColumn(name = "previous_b", referencedColumnName = "id", nullable = false)
     private Match previousB;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index d8a97ac1..8c526ef6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -2,44 +2,31 @@
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import java.util.List;
 import java.util.UUID;
 
 @ApplicationScoped
 public class MatchRepository implements PanacheRepository<Match> {
+    @Inject
+    NextMatchRepository nextMatches;
+    @Inject
+    FinalOfGroupRepository finalOfGroups;
+    @Inject
+    MatchOfGroupRepository matchOfGroups;
 
     public Match findById(UUID id) {
         return find("id", id).firstResult();
     }
 
-    public Match getFinal(Competition competition) {
-        PanacheQuery<Match> result = find("#findHead", Parameters.with("comp", competition).and("finale", true));
-        if (result.count() != 1)
-            return null;
-        return result.firstResultOptional().orElse(null);
-    }
-
-    public Match getThirdPlace(Competition competition) {
-        PanacheQuery<Match> result = find("#findHead", Parameters.with("comp", competition).and("finale", false));
-        if (result.count() != 1)
-            return null;
-        return result.firstResultOptional().orElse(null);
-    }
-
     public void deleteByComp(Competition competition) {
         delete("#deleteByComp", Parameters.with("comp", competition));
     }
 
-    public void delete(Match m) {
-        // normal delete by object sadly does not work :(
-        delete("DELETE FROM Match m WHERE m = :match", Parameters.with("match", m));
-    }
-
     public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
index f85e69fb..cf38d25b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
@@ -28,7 +28,10 @@ public class GroupTools {
     FinalOfGroupRepository finalOfGroupRepository;
     @Inject
     NextMatchRepository nextMatchRepository;
+    @Inject
+    CompetitionRepository competitions;
 
+    // TODO please add tests for me
     public void generateMatches(Competition competition, List<Set<Team>> nGroups) {
         List<Group> groups = competition.getGroups();
         int prevGroupsSize = groups.size();
@@ -37,6 +40,11 @@ public void generateMatches(Competition competition, List<Set<Team>> nGroups) {
     }
 
     private void createGroups(Competition competition, List<Group> exGroups, List<Set<Team>> nGroups) {
+        // delete all groups no longer existing
+        while (exGroups.size() > nGroups.size()) {
+            groupsRepository.delete(exGroups.removeLast());
+        }
+
         for (int index = 0; index < nGroups.size(); index++) {
             Set<Team> nGroup = nGroups.get(index);
 
@@ -81,36 +89,20 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
                 }
             }
         }
-
-        // delete all groups no longer existing
-        while (exGroups.size() > nGroups.size()) {
-            exGroups.getLast().getMatches().forEach(matchRepository::delete);
-            groupsRepository.delete(exGroups.getLast());
-            exGroups.removeLast();
-        }
     }
 
     private void createKnockoutTree(Competition competition, int prevGroupsSize, List<Group> groups) {
-        List<Match> nonGroupMatches = matchRepository.nonGroupMatches(competition);
-        if (groups.size() == 1) { // no finale needed
-            // delete all matches not belonging to a group
-            nonGroupMatches.forEach(matchRepository::delete);
-        } else if (groups.size() == 2) { // finale and game for third place needed
-            if (prevGroupsSize == 2) // matches already correct
-                return;
-
-            // delete all non finals of deleted groups and further matches
-            nonGroupMatches.stream().filter(m -> m.getFinalOfGroup() == null).forEach(matchRepository::delete);
-
-            if (prevGroupsSize == 1) // create new finale
-                finaleOfGroups(competition, groups.get(0), groups.get(1), 1);
+        if (groups.size() == 2) { // finale and game for third place needed
+            Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1), 1);
+            competition.setFinale(finale);
+
             // create third place match
-            finaleOfGroups(competition, groups.get(0), groups.get(1), 2);
-        } else { // knockout tree needed
-            if (prevGroupsSize == 2) // delete third place match
-                nonGroupMatches.stream()
-                    .filter(m -> m.getFinalOfGroup() != null && m.getFinalOfGroup().getPos() == 2)
-                    .forEach(matchRepository::delete); // should only find one
+            Match thirdPlace = finaleOfGroups(competition, groups.get(0), groups.get(1), 2);
+            competition.setThirdPlace(thirdPlace);
+            competitions.persist(competition);
+        } else if (groups.size() > 2) { // knockout tree needed
+            if (prevGroupsSize == 2) // delete previous game for third place
+                matchRepository.delete(finaleOfGroups(competition, groups.get(0), groups.get(1), 2));
 
             List<Match> matches = new ArrayList<>();
             for (int i = 0; i < groups.size() / 2; i++)
@@ -119,48 +111,77 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
             do {
                 List<Match> newMatches = new ArrayList<>();
                 for (int i = 0; i < matches.size() / 2; i++) {
-                    Match m = new Match();
-                    m.setCompetition(competition);
-                    matchRepository.persist(m);
-
-                    NextMatch nextMatch = new NextMatch();
-                    nextMatch.setPreviousA(matches.get(2 * i));
-                    nextMatch.setPreviousB(matches.get(2 * i + 1));
-                    nextMatch.setNextMatch(m);
-                    nextMatchRepository.persist(nextMatch);
+                    Optional<NextMatch> exNext = matches.get(i).getPreviousOfA() == null ? Optional.empty() : matches
+                        .get(2 * i).getPreviousOfA()
+                        .stream().filter(NextMatch::isWinner)
+                        .findFirst();
+                    if (exNext.isEmpty()) {
+                        Match m = new Match();
+                        m.setCompetition(competition);
+                        matchRepository.persist(m);
+                        newMatches.add(m);
+                        if (matches.size() == 2)
+                            competition.setFinale(m);
+
+                        NextMatch nextMatch = new NextMatch();
+                        nextMatch.setPreviousA(matches.get(2 * i));
+                        nextMatch.setPreviousB(matches.get(2 * i + 1));
+                        nextMatch.setNextMatch(m);
+                        nextMatchRepository.persist(nextMatch);
+                    } else {
+                        newMatches.add(exNext.get().getNextMatch());
+                        if (matches.size() == 2)
+                            competition.setFinale(exNext.get().getNextMatch());
+                    }
                 }
 
                 if (matches.size() == 2) {
-                    Match m = new Match();
-                    m.setCompetition(competition);
-                    matchRepository.persist(m);
-
-                    NextMatch nextMatch = new NextMatch();
-                    nextMatch.setPreviousA(matches.get(0));
-                    nextMatch.setPreviousB(matches.get(1));
-                    nextMatch.setNextMatch(m);
-                    nextMatch.setWinner(false);
-                    nextMatchRepository.persist(nextMatch);
-                } else {
-                    matches = newMatches;
+                    Optional<NextMatch> exNext = matches.getFirst().getPreviousOfA() == null ? Optional
+                        .empty() : matches.getFirst().getPreviousOfA()
+                            .stream().filter(nm -> !nm.isWinner())
+                            .findAny();
+                    if (exNext.isEmpty()) {
+                        Match m = new Match();
+                        m.setCompetition(competition);
+                        matchRepository.persist(m);
+                        competition.setThirdPlace(m);
+
+                        NextMatch nextMatch = new NextMatch();
+                        nextMatch.setPreviousA(matches.get(0));
+                        nextMatch.setPreviousB(matches.get(1));
+                        nextMatch.setNextMatch(m);
+                        nextMatch.setWinner(false);
+                        nextMatchRepository.persist(nextMatch);
+                    } else {
+                        competition.setThirdPlace(exNext.get().getNextMatch());
+                    }
                 }
-            } while (matches.size() > 2);
+                matches = newMatches;
+            } while (matches.size() > 1);
+            competitions.persist(competition);
         }
     }
 
     private Match finaleOfGroups(Competition competition, Group g1, Group g2, int pos) {
-        Match finale = new Match();
-        finale.setCompetition(competition);
-        matchRepository.persist(finale);
-
-        FinalOfGroup fog = new FinalOfGroup();
-        fog.setGroupA(g1);
-        fog.setGroupB(g2);
-        fog.setPos(1);
-        fog.setNextMatch(finale);
-        finalOfGroupRepository.persist(fog);
-
-        return finale;
+        Optional<FinalOfGroup> exFin = g1.getFinalOfGroupA() == null ? Optional.empty() : g1.getFinalOfGroupA().stream()
+            .filter(fog -> fog.getPos() == pos)
+            .findFirst();
+        if (exFin.isEmpty()) {
+            Match finale = new Match();
+            finale.setCompetition(competition);
+            matchRepository.persist(finale);
+
+            FinalOfGroup fog = new FinalOfGroup();
+            fog.setGroupA(g1);
+            fog.setGroupB(g2);
+            fog.setPos(pos);
+            fog.setNextMatch(finale);
+            finalOfGroupRepository.persist(fog);
+
+            return finale;
+        } else {
+            return exFin.get().getNextMatch();
+        }
     }
 
     public Set<Team> teamsOfGroup(Group group) {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 10836be8..0090cd4e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -4,6 +4,7 @@
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.entities.competition.Team;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.NextMatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TeamRepository;
@@ -20,6 +21,8 @@ public class KnockoutTools {
     NextMatchRepository nextMatches;
     @Inject
     TeamRepository teams;
+    @Inject
+    CompetitionRepository competitions;
 
     public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match) {
         if (tree == null)
@@ -72,7 +75,7 @@ private Team selectTeam(Match match) {
     }
 
     public void updateThirdPlace(Competition competition, Match finale) {
-        Match thirdPlace = matches.getThirdPlace(competition);
+        Match thirdPlace = competition.getThirdPlace();
 
         // cover deletion of third place
         if (competition.getTeams().size() <= 3) {
@@ -96,6 +99,8 @@ public void updateThirdPlace(Competition competition, Match finale) {
 
             matches.persist(thirdPlace);
             nextMatches.persist(nMatch);
+            competition.setThirdPlace(thirdPlace);
+            competitions.persist(competition);
         } else {
             // update third place if already existing
             NextMatch nMatch = thirdPlace.getDependentOn();
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 2d5aba62..dff35bbc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -400,8 +400,8 @@ public jUserKnockoutSystem getKnockoutMatches(@PathParam("tourName") String tour
         if (competition.getType() != CompetitionType.KNOCKOUT)
             throw new WebApplicationException("Competition does not have type knockout", Response.Status.METHOD_NOT_ALLOWED);
 
-        Match finale = matches.getFinal(competition);
-        Match thirdPlace = matches.getThirdPlace(competition);
+        Match finale = competition.getFinale();
+        Match thirdPlace = competition.getThirdPlace();
         return new jUserKnockoutSystem(finale, thirdPlace, securityIdentity.hasRole("director"));
     }
 
@@ -420,9 +420,9 @@ public jUserGroupSystem getGroupMatches(@PathParam("tourName") String tourName,
         List<Group> groups = competition.getGroups();
         if (groups == null) throw new NotFoundException("Found no groups");
 
-        Match finale = matches.getFinal(competition);
-        Match thirdPlace = matches.getThirdPlace(competition);
-        if (finale == null || (groups.size() > 2 && thirdPlace == null))
+        Match finale = competition.getFinale();
+        Match thirdPlace = competition.getThirdPlace();
+        if (groups.size() > 2 && (finale == null || thirdPlace == null))
             throw new InternalServerErrorException("Finale or thirdPlace is null");
         return new jUserGroupSystem(groups, finale, thirdPlace);
     }
@@ -444,7 +444,7 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
-        Match finale = matches.getFinal(competition);
+        Match finale = competition.getFinale();
         if (finale == null)
             finale = new Match();
         knockoutTools.updateKnockoutTree(competition, tree, finale);
@@ -452,6 +452,7 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
 
         // TODO only set progress if everything is assigned
         competition.setcProgress(CreationProgress.SCHEDULING);
+        competition.setFinale(finale);
         competitions.persist(competition);
         return true;
     }
@@ -483,6 +484,8 @@ public boolean initializeMatchesGroups(@PathParam("tourName") String tourName,
 
         Competition competition = competitions.getByName(tourName, compName);
 
+        competition.setFinale(null);
+        competition.setThirdPlace(null);
         groupTools.generateMatches(competition, groups);
 
         competition.setcProgress(CreationProgress.SCHEDULING);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 729e4cd6..6e5f03e6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -182,7 +182,7 @@ public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
         for (var comp : tournament.getCompetitions()) {
             var rounds = getMatchRounds(comp);
 
-            var thirdPlace = matches.getThirdPlace(comp);
+            var thirdPlace = comp.getThirdPlace();
             if (thirdPlace != null) {
                 jUserMatchEvent matchEvent = new jUserMatchEvent(thirdPlace);
                 matchEvent.setCompName(comp.getName());
@@ -239,7 +239,7 @@ public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
     }
 
     private List<List<Match>> getMatchRounds(Competition competition) {
-        Match finale = matches.getFinal(competition);
+        Match finale = competition.getFinale();
         if (finale == null)
             return List.of();
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java
index 38fcd7d5..69413832 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java
@@ -12,13 +12,14 @@ public class jUserGroupMatchAfterMatch extends jUserMatch {
     public jUserGroupMatchAfterMatch(Match match, boolean winner, boolean dependant) {
         super(match);
 
+        this.winningPlayer = winner;
         if (dependant) {
             if (match.getDependentOn().getPreviousA().getFinalOfGroup() != null)
                 this.previousA = new jUserGroupMatchAfterGroup(match.getDependentOn().getPreviousA());
             else
                 this.previousA = new jUserGroupMatchAfterMatch(match.getDependentOn().getPreviousA(), match
                     .getDependentOn().isWinner());
-            if (match.getFinalOfGroup() != null)
+            if (match.getDependentOn().getPreviousB().getFinalOfGroup() != null)
                 this.previousB = new jUserGroupMatchAfterGroup(match.getDependentOn().getPreviousB());
             else
                 this.previousB = new jUserGroupMatchAfterMatch(match.getDependentOn().getPreviousB(), match
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
index e95cdafd..07d32abb 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
@@ -15,10 +15,11 @@ public class jUserGroupSystem {
     public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace) {
         this.groups = groups.stream().map(jUserGroup::new).toList();
 
-        if (finale.getFinalOfGroup() != null)
-            this.finale = new jUserGroupMatchAfterGroup(finale);
-        else
-            this.finale = new jUserGroupMatchAfterMatch(finale, finale.getDependentOn().isWinner());
+        if (finale != null)
+            if (finale.getFinalOfGroup() != null)
+                this.finale = new jUserGroupMatchAfterGroup(finale);
+            else
+                this.finale = new jUserGroupMatchAfterMatch(finale, finale.getDependentOn().isWinner());
         if (thirdPlace != null)
             if (thirdPlace.getFinalOfGroup() != null)
                 this.thirdPlace = new jUserGroupMatchAfterGroup(thirdPlace);
diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index 8e4a582a..85fe7a00 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -104,6 +104,14 @@ export function useInitGroups(
 				],
 				refetchType: "all",
 			})
+			queryClient.invalidateQueries({
+				queryKey: [
+					"group",
+					route.params.tourId,
+					route.params.compId,
+				],
+				refetchType: "all"
+			})
 			toast.add({
 				severity: "success",
 				summary: t("general.success"),
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 94fd8cdc..2b21e8ef 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -47,23 +47,23 @@
 			<div class="flex flex-row gap-2">
 				<Button
 					:label="t('ViewPrepare.assignMatches.remove')"
-					:disabled="noGroups <= 2 || isUpdating"
+					:disabled="data.noGroups <= 1 || isUpdating"
 					severity="danger"
 					@click="
 						() => {
-							noGroups /= 2
-							adjustSize(noGroups)
+							data.noGroups /= 2
+							adjustSize(data.noGroups)
 						}
 					"
 				></Button>
 				<Button
 					:label="t('ViewPrepare.assignMatches.add')"
-					:disabled="noGroups >= 64 || isUpdating"
+					:disabled="data.noGroups >= 64 || isUpdating"
 					severity="success"
 					@click="
 						() => {
-							noGroups *= 2
-							adjustSize(noGroups)
+							data.noGroups *= 2
+							adjustSize(data.noGroups)
 						}
 					"
 				></Button>
@@ -76,7 +76,7 @@
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
-import { Ref, ref } from "vue"
+import { Ref } from "vue"
 import { Team } from "@/interfaces/team"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUp } from "@/backend/signup"
@@ -109,13 +109,13 @@ const { data: groupsServer, isLoading: groupsLoading } = getGroupsDivision(
 )
 const { mutate: initGroups } = useInitGroups(route, t, toast)
 
-const noGroups = ref<number>(2)
 const { data, reload } = track(
 	loadFromServer,
 	{
 		teams: [],
 		groups: [[], []],
 		teamCount: 0,
+		noGroups: 2
 	},
 	{ signedUpTeams, groupsServer },
 	[signedUpTeams, groupsServer],
@@ -143,6 +143,7 @@ function loadFromServer({
 		teams,
 		groups,
 		teamCount: signedUpTeams.value.length,
+		noGroups: groups.length
 	}
 }
 
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 1bdf415e..f03cb180 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -3,7 +3,7 @@ import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 
 export interface GroupSystem {
 	groups: Group[]
-	finale: GroupMatch
+	finale: GroupMatch | null
 	thirdPlace: GroupMatch | null
 }
 
@@ -45,7 +45,9 @@ export function groupSystemServerToClient(
 ): GroupSystem {
 	return {
 		groups: groupSystem.groups.map((group) => groupServerToClient(group)),
-		finale: groupMatchServerToClient(groupSystem.finale),
+		finale: groupSystem.finale
+			? groupMatchServerToClient(groupSystem.finale)
+		  : null,
 		thirdPlace: groupSystem.thirdPlace
 			? groupMatchServerToClient(groupSystem.thirdPlace)
 			: null,
diff --git a/pom.xml b/pom.xml
index a0b9bc6e..8664c7b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <quarkus.platform.version>3.11.2</quarkus.platform.version>
+        <quarkus.platform.version>3.14.3</quarkus.platform.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

From 9ecb40ef4a4b57f14bc2a1a811b650646d0c82c2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sun, 15 Sep 2024 21:50:18 +0200
Subject: [PATCH 117/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20group=20extraction?=
 =?UTF-8?q?=20in=20frontend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/group.ts             |  8 ++----
 .../assignMatches/AssignMatchesGroups.vue     |  4 +--
 .../scheduleMatches/ScheduleMatchesHelper.ts  | 13 +++++-----
 frontend/app/src/interfaces/groupSystem.ts    | 26 +++++++------------
 4 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/frontend/app/src/backend/group.ts b/frontend/app/src/backend/group.ts
index 85fe7a00..0ebaba68 100644
--- a/frontend/app/src/backend/group.ts
+++ b/frontend/app/src/backend/group.ts
@@ -105,12 +105,8 @@ export function useInitGroups(
 				refetchType: "all",
 			})
 			queryClient.invalidateQueries({
-				queryKey: [
-					"group",
-					route.params.tourId,
-					route.params.compId,
-				],
-				refetchType: "all"
+				queryKey: ["group", route.params.tourId, route.params.compId],
+				refetchType: "all",
 			})
 			toast.add({
 				severity: "success",
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 2b21e8ef..4dc4a3d9 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -115,7 +115,7 @@ const { data, reload } = track(
 		teams: [],
 		groups: [[], []],
 		teamCount: 0,
-		noGroups: 2
+		noGroups: 2,
 	},
 	{ signedUpTeams, groupsServer },
 	[signedUpTeams, groupsServer],
@@ -143,7 +143,7 @@ function loadFromServer({
 		teams,
 		groups,
 		teamCount: signedUpTeams.value.length,
-		noGroups: groups.length
+		noGroups: groups.length,
 	}
 }
 
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index d05c4e58..c8836079 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -30,13 +30,12 @@ export function extractKnockoutMatches(
 
 	rounds.toReversed().forEach((round, i) => {
 		round.forEach((match) => {
-			if (i > 0 || (match.teamA && match.teamB))
-				add(match, {
-					isFinal: true,
-					type: CompType.KNOCKOUT,
-					number: i,
-					total: rounds.length + 1,
-				})
+			add(match, {
+				isFinal: true,
+				type: CompType.KNOCKOUT,
+				number: i,
+				total: rounds.length + 1,
+			})
 		})
 	})
 	if (knockout.thirdPlace)
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index f03cb180..5183dc0e 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -47,7 +47,7 @@ export function groupSystemServerToClient(
 		groups: groupSystem.groups.map((group) => groupServerToClient(group)),
 		finale: groupSystem.finale
 			? groupMatchServerToClient(groupSystem.finale)
-		  : null,
+			: null,
 		thirdPlace: groupSystem.thirdPlace
 			? groupMatchServerToClient(groupSystem.thirdPlace)
 			: null,
@@ -63,15 +63,11 @@ function groupServerToClient(group: GroupServer): Group {
 
 function groupMatchServerToClient(matchServer: GroupMatchServer): GroupMatch {
 	const match: GroupMatch = matchServerToClient(matchServer)
-	if (
-		matchServer.pos !== undefined &&
-		matchServer.groupA !== undefined &&
-		matchServer.groupB !== undefined
-	) {
+	if (!!matchServer.pos && !!matchServer.groupA && !!matchServer.groupB) {
 		if (
-			matchServer.winningPlayer !== undefined ||
-			matchServer.previousA !== undefined ||
-			matchServer.previousB !== undefined
+			!!matchServer.winningPlayer ||
+			!!matchServer.previousA ||
+			!!matchServer.previousB
 		) {
 			console.error("Invalid state")
 			throw new Error("Invalid state")
@@ -83,15 +79,11 @@ function groupMatchServerToClient(matchServer: GroupMatchServer): GroupMatch {
 		}
 	}
 	if (
-		matchServer.winningPlayer !== undefined &&
-		matchServer.previousA !== undefined &&
-		matchServer.previousB !== undefined
+		!!matchServer.winningPlayer &&
+		!!matchServer.previousA &&
+		!!matchServer.previousB
 	) {
-		if (
-			matchServer.pos !== undefined ||
-			matchServer.groupA !== undefined ||
-			matchServer.groupB !== undefined
-		) {
+		if (!!matchServer.pos || !!matchServer.groupA || !!matchServer.groupB) {
 			console.error("Invalid state")
 			throw new Error("Invalid state")
 		}

From f0d1546d0a84e7056af3043d999e151608a4f647 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sun, 15 Sep 2024 23:14:42 +0200
Subject: [PATCH 118/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20knockout=20extract?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/KnockoutTools.java     |  1 -
 .../scheduleMatches/ScheduleMatchesHelper.ts      | 15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 0090cd4e..d8a28ebe 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -80,7 +80,6 @@ public void updateThirdPlace(Competition competition, Match finale) {
         // cover deletion of third place
         if (competition.getTeams().size() <= 3) {
             if (thirdPlace != null) {
-                nextMatches.delete(thirdPlace.getDependentOn());
                 matches.delete(thirdPlace);
             }
             return;
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
index c8836079..c5f2dc6c 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
@@ -9,6 +9,7 @@ export type MatchCalEvent = CalEvent<AnnotatedMatch>
 export function extractKnockoutMatches(
 	knockout: KnockoutSystem,
 	add: (match: KnockoutMatch, title: AnnotatedMatch["title"]) => void,
+	group = false,
 ) {
 	const rounds: KnockoutMatch[][] = []
 	let queue: KnockoutMatch[] = []
@@ -30,12 +31,13 @@ export function extractKnockoutMatches(
 
 	rounds.toReversed().forEach((round, i) => {
 		round.forEach((match) => {
-			add(match, {
-				isFinal: true,
-				type: CompType.KNOCKOUT,
-				number: i,
-				total: rounds.length + 1,
-			})
+			if (i > 0 || (match.teamA && match.teamB) || group)
+				add(match, {
+					isFinal: true,
+					type: CompType.KNOCKOUT,
+					number: i,
+					total: rounds.length + 1,
+				})
 		})
 	})
 	if (knockout.thirdPlace)
@@ -71,5 +73,6 @@ export function extractGroupMatches(
 	extractKnockoutMatches(
 		{ finale: groupSystem.finale, thirdPlace: groupSystem.thirdPlace },
 		add,
+		true,
 	)
 }

From a84b42ccb34ab8b6d244f16ace070a8500dd95d6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 12:58:26 +0200
Subject: [PATCH 119/247] =?UTF-8?q?=F0=9F=94=A7=20Import=20PrimeVue=20comp?=
 =?UTF-8?q?onents=20automatically?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/main.ts    | 62 ++-----------------------------------
 frontend/app/vite.config.ts |  7 ++---
 2 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 16a0c0e2..bcb16ca3 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -16,38 +16,9 @@ import routes from "./routes"
 /* Primevue components*/
 import PrimeVue from "primevue/config"
 import ToastService from "primevue/toastservice"
+import Toast from "primevue/toast"
 import Tooltip from "primevue/tooltip"
 import FocusTrap from "primevue/focustrap"
-import Steps from "primevue/steps"
-import TabView from "primevue/tabview"
-import TabPanel from "primevue/tabpanel"
-import TabMenu from "primevue/tabmenu"
-import Card from "primevue/card"
-import Button from "primevue/button"
-import Toolbar from "primevue/toolbar"
-import InputText from "primevue/inputtext"
-import Textarea from "primevue/textarea"
-import Calendar from "primevue/calendar"
-import InputSwitch from "primevue/inputswitch"
-import Dropdown from "primevue/dropdown"
-import Divider from "primevue/divider"
-import InlineMessage from "primevue/inlinemessage"
-import Toast from "primevue/toast"
-import SelectButton from "primevue/selectbutton"
-import Skeleton from "primevue/skeleton"
-import Panel from "primevue/panel"
-import ScrollPanel from "primevue/scrollpanel"
-import DataTable from "primevue/datatable"
-import Column from "primevue/column"
-import Tag from "primevue/tag"
-import AutoComplete from "primevue/autocomplete"
-import Checkbox from "primevue/checkbox"
-import Fieldset from "primevue/fieldset"
-import SplitButton from "primevue/splitbutton"
-import OverlayPanel from "primevue/overlaypanel"
-import Dialog from "primevue/dialog"
-import MultiSelect from "primevue/multiselect"
-import InputGroup from "primevue/inputgroup"
 
 /* Primevue styling */
 import "primeflex/primeflex.css"
@@ -139,39 +110,10 @@ app
 	/* Primevue */
 	.use(PrimeVue, { ripple: true })
 	.use(ToastService)
-	.use(VueQueryPlugin, vueQueryPluginOptions)
-	.component("Steps", Steps)
-	.component("TabView", TabView)
-	.component("TabMenu", TabMenu)
-	.component("TabPanel", TabPanel)
-	.component("Card", Card)
-	.component("MultiSelect", MultiSelect)
-	.component("Button", Button)
-	.component("Toolbar", Toolbar)
-	.component("InputText", InputText)
-	.component("Textarea", Textarea)
-	.component("Calendar", Calendar)
-	.component("InputSwitch", InputSwitch)
-	.component("Dropdown", Dropdown)
-	.component("Divider", Divider)
-	.component("InlineMessage", InlineMessage)
 	.component("Toast", Toast)
-	.component("SelectButton", SelectButton)
-	.component("Skeleton", Skeleton)
-	.component("Panel", Panel)
-	.component("ScrollPanel", ScrollPanel)
-	.component("InputGroup", InputGroup)
-	.component("DataTable", DataTable)
-	.component("Column", Column)
-	.component("Tag", Tag)
-	.component("AutoComplete", AutoComplete)
-	.component("Checkbox", Checkbox)
-	.component("Fieldset", Fieldset)
-	.component("SplitButton", SplitButton)
-	.component("OverlayPanel", OverlayPanel)
-	.component("Dialog", Dialog)
 	.directive("tooltip", Tooltip)
 	.directive("focustrap", FocusTrap)
+	.use(VueQueryPlugin, vueQueryPluginOptions)
 	.mount("#app")
 
 export { router }
diff --git a/frontend/app/vite.config.ts b/frontend/app/vite.config.ts
index be398eb4..370db76e 100644
--- a/frontend/app/vite.config.ts
+++ b/frontend/app/vite.config.ts
@@ -1,8 +1,8 @@
 import { resolve } from "path"
 import { defineConfig } from "vite"
 import vue from "@vitejs/plugin-vue"
-import AutoImport from "unplugin-auto-import/vite"
 import Components from "unplugin-vue-components/vite"
+import { PrimeVueResolver } from "unplugin-vue-components/resolvers"
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -12,11 +12,8 @@ export default defineConfig({
 	},
 	plugins: [
 		vue(),
-		AutoImport({
-			resolvers: [],
-		}),
 		Components({
-			resolvers: [],
+			resolvers: [PrimeVueResolver()],
 		}),
 	],
 	resolve: {

From d45c6c39629ff1e725f426b9a99bfba2758fce58 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 13:29:28 +0200
Subject: [PATCH 120/247] =?UTF-8?q?=E2=9E=96=20Remove=20material=20icons,?=
 =?UTF-8?q?=20only=20use=20symbols?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json                              |  3 +--
 frontend/app/src/components/header/HeaderLeft.vue      |  2 +-
 frontend/app/src/components/header/HeaderRight.vue     |  4 ++--
 frontend/app/src/components/items/ItemCompetition.vue  |  2 +-
 frontend/app/src/components/items/ItemTournament.vue   |  2 +-
 .../components/views/competition/ViewCompetition.vue   |  2 +-
 .../components/views/competition/signup/ViewTable.vue  | 10 +++++-----
 .../prepare/assignMatches/AssignMatchesGroups.vue      |  2 +-
 .../prepare/assignMatches/AssignMatchesKnockout.vue    |  7 +++++--
 .../views/prepare/editTeams/ViewEditTeams.vue          |  4 +++-
 frontend/app/src/main.ts                               |  1 -
 frontend/app/src/style.css                             |  9 +++++++++
 12 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index 9731b36f..5e51d842 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -20,8 +20,7 @@
 		"@vue/cli": "^5.0.8",
 		"axios": "^1.6.2",
 		"keycloak-js": "^23.0.3",
-		"material-icons": "^1.13.12",
-		"material-symbols": "^0.14.3",
+		"material-symbols": "^0.23.0",
 		"oidc-client-ts": "^2.4.0",
 		"primeflex": "^3.3.1",
 		"primeicons": "^6.0.1",
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index 23ac7044..a47862ad 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -1,7 +1,7 @@
 <template>
 	<div id="header" class="flex flex-row pl-3 align-items-center gap-3">
 		<span
-			class="material-icons cursor-pointer"
+			class="material-symbols-outlined cursor-pointer"
 			style="font-size: 3rem"
 			@click="toHome"
 			>sports_tennis</span
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index eaa46442..456dd7b4 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -4,13 +4,13 @@
 
 		<span
 			v-if="!isLoggedIn"
-			class="material-icons clickable bigger"
+			class="material-symbols-outlined clickable bigger"
 			@click="login"
 			>login</span
 		>
 		<template v-else>
 			<span v-if="windowWidth > 600">{{ currentUser }}</span>
-			<span class="material-icons clickable bigger" @click="logout"
+			<span class="material-symbols-outlined clickable bigger" @click="logout"
 				>logout</span
 			>
 		</template>
diff --git a/frontend/app/src/components/items/ItemCompetition.vue b/frontend/app/src/components/items/ItemCompetition.vue
index 1c962510..42934395 100644
--- a/frontend/app/src/components/items/ItemCompetition.vue
+++ b/frontend/app/src/components/items/ItemCompetition.vue
@@ -37,7 +37,7 @@
 				@click.stop
 			>
 				<template #icon>
-					<span class="material-icons">settings</span>
+					<span class="material-symbols-outlined">settings</span>
 				</template>
 			</Button>
 		</template>
diff --git a/frontend/app/src/components/items/ItemTournament.vue b/frontend/app/src/components/items/ItemTournament.vue
index 5687c94d..d69003f8 100644
--- a/frontend/app/src/components/items/ItemTournament.vue
+++ b/frontend/app/src/components/items/ItemTournament.vue
@@ -36,7 +36,7 @@
 					@click.stop
 				>
 					<template #icon>
-						<span class="material-icons">settings</span>
+						<span class="material-symbols-outlined">settings</span>
 					</template>
 				</Button>
 			</div>
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index db07ed19..3260914e 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -4,7 +4,7 @@
 			<span
 				v-if="canEdit"
 				id="settings"
-				class="material-icons cursor-pointer"
+				class="material-symbols-outlined cursor-pointer"
 				style="font-size: 1.7rem"
 				@click="settings"
 				>settings</span
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index 441c0516..620a3253 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -25,7 +25,7 @@
 							class="h-2rem"
 							@click="deletePlayer(data)"
 						>
-							<span class="material-icons">delete_forever</span>
+							<span class="material-symbols-outlined">delete_forever</span>
 						</Button>
 					</div>
 				</template>
@@ -68,7 +68,7 @@
 							class="h-2rem"
 							@click="deletePlayer(data)"
 						>
-							<span class="material-icons">delete_forever</span>
+							<span class="material-symbols-outlined">delete_forever</span>
 						</Button>
 					</div>
 				</template>
@@ -99,7 +99,7 @@
 							class="h-2rem"
 							@click="deletePlayer(data)"
 						>
-							<span class="material-icons">delete_forever</span>
+							<span class="material-symbols-outlined">delete_forever</span>
 						</Button>
 					</div>
 				</template>
@@ -132,7 +132,7 @@
 								class="h-2rem"
 								@click="deletePlayer(data)"
 							>
-								<span class="material-icons">delete_forever</span>
+								<span class="material-symbols-outlined">delete_forever</span>
 							</Button>
 						</div>
 					</template>
@@ -162,7 +162,7 @@
 								class="h-2rem"
 								@click="deletePlayer(data)"
 							>
-								<span class="material-icons">delete_forever</span>
+								<span class="material-symbols-outlined">delete_forever</span>
 							</Button>
 						</div>
 					</template>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index 4dc4a3d9..f110018b 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -13,7 +13,7 @@
 							@click="randomize"
 						>
 							<template #icon>
-								<span class="material-icons mb-1" style="font-size: 1.2rem"
+								<span class="material-symbols-outlined mb-1 symbols-prep"
 									>casino</span
 								>
 							</template>
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index 56e7ba0d..fc8e528c 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -12,9 +12,12 @@
 							@click="randomize"
 						>
 							<template #icon>
-								<span class="material-icons mb-1" style="font-size: 1.2rem"
-									>casino</span
+								<span
+									class="material-symbols-outlined symbols-prep"
+									style="font-size: 1.2rem"
 								>
+									casino
+								</span>
 							</template>
 						</SplitButton>
 					</div>
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index 894ffb49..6a359e76 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -41,7 +41,9 @@
 					@click="randomize"
 				>
 					<template #icon>
-						<span class="material-icons mb-1" style="font-size: 1.2rem"
+						<span
+							class="material-symbols-outlined mb-1 symbols-prep"
+							style="font-size: 1.2rem"
 							>casino</span
 						>
 					</template>
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index bcb16ca3..bfef9379 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -27,7 +27,6 @@ import "primeicons/primeicons.css"
 import "./style.css"
 
 /* Icons */
-import "material-icons/iconfont/material-icons.css"
 import "material-symbols"
 
 /* yup validation */
diff --git a/frontend/app/src/style.css b/frontend/app/src/style.css
index 7dbfbbea..63c9144d 100644
--- a/frontend/app/src/style.css
+++ b/frontend/app/src/style.css
@@ -15,6 +15,15 @@ body {
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.symbols-prep {
+	font-variation-settings:
+		"FILL" 0,
+		"wght" 500,
+		"GRAD" 200,
+		"opsz" 40;
+	margin-right: 0.5rem;
+}
+
 .ghost {
 	opacity: 50%;
 }

From d3c21bc1bc6a304be71d8f24778cd8b1b836f17d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 13:48:05 +0200
Subject: [PATCH 121/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Only=20import=20ou?=
 =?UTF-8?q?tlined=20symbols?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index bfef9379..0584fc05 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -27,7 +27,7 @@ import "primeicons/primeicons.css"
 import "./style.css"
 
 /* Icons */
-import "material-symbols"
+import "material-symbols/outlined.css"
 
 /* yup validation */
 import { setLocale } from "yup"

From aed74cf77968fb9acfe9dc8476c925930c52c1b7 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 13:52:29 +0200
Subject: [PATCH 122/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Load=20routes=20dy?=
 =?UTF-8?q?namically=20to=20decrease=20chunks=20sizes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/routes.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 43d3744a..9a6e1641 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -1,11 +1,9 @@
-import viewTournaments from "@/components/views/tournaments/ViewTournaments.vue"
-import viewCompetition from "@/components/views/competition/ViewCompetition.vue"
-
 export default [
 	{
 		path: "/",
 		name: "Tournaments",
-		component: viewTournaments,
+		component: () =>
+			import("@/components/views/tournaments/ViewTournaments.vue"),
 	},
 	{
 		path: "/createTournament",
@@ -40,7 +38,8 @@ export default [
 	{
 		path: "/tournament/:tourId/competition/:compId",
 		name: "Competition",
-		component: viewCompetition,
+		component: () =>
+			import("@/components/views/competition/ViewCompetition.vue"),
 	},
 	{
 		path: "/tournament/:tourId/prepare/:compId?",

From f9cdddfb0c78a68335ef5f566af882683192ad9d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 13 Sep 2024 10:40:13 +0200
Subject: [PATCH 123/247] =?UTF-8?q?=E2=9C=A8=20Add=20player=20overview=20p?=
 =?UTF-8?q?age?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/player/ViewPlayerOverview.vue    | 11 +++++++++++
 frontend/app/src/routes.ts                            |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 frontend/app/src/components/views/player/ViewPlayerOverview.vue

diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
new file mode 100644
index 00000000..8b20818d
--- /dev/null
+++ b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
@@ -0,0 +1,11 @@
+<template>
+	<div class="w-full p-2">
+		<Card style="margin-top: -10px !important">
+			<template #title> Player Overview </template>
+		</Card>
+	</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped></style>
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 9a6e1641..3115c8c4 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -92,6 +92,12 @@ export default [
 		name: "Player verified",
 		component: () => import("@/components/views/player/ViewVerification.vue"),
 	},
+	{
+		path: "/player/overview/:id",
+		name: "Player overview",
+		component: () =>
+			import("@/components/views/player/ViewPlayerOverview.vue"),
+	},
 	{
 		path: "/templates",
 		name: "Templates",

From 054a928782e199702e4ce40f2489130969065ae2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 16 Sep 2024 12:00:06 +0200
Subject: [PATCH 124/247] =?UTF-8?q?=E2=9C=A8=20Load=20and=20show=20player?=
 =?UTF-8?q?=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/PlayerResource.java             | 11 +++++-
 frontend/app/src/backend/player.ts            | 36 +++++++++++++++----
 .../competition/signup/ViewSignUpForm.vue     |  6 ++--
 .../views/player/ViewPlayerOverview.vue       | 15 ++++++--
 .../views/prepare/editTeams/AddPlayer.vue     |  4 +--
 frontend/app/src/i18n/de.json                 |  3 +-
 frontend/app/src/i18n/en.json                 |  3 +-
 frontend/app/src/routes.ts                    |  5 ++-
 8 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 56417d57..f6f9231a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -39,7 +39,6 @@ public class PlayerResource {
     SecurityIdentity securityIdentity;
 
     @GET
-    @Transactional
     @Path("/find")
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryParam("sex") jUserSex sex,
@@ -60,6 +59,16 @@ public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryP
         return playerRepository.filter(search, dbSex, minAge, maxAge).map(jUserPlayer::new).toList();
     }
 
+    @GET
+    @Path("/{playerId}/details")
+    @Produces(MediaType.APPLICATION_JSON)
+    public jUserPlayer getPlayer(@PathParam("playerId") UUID playerId) {
+        Player player = playerRepository.getById(playerId);
+        if (player == null)
+            throw new NotFoundException("Player not found");
+        return new jUserPlayer(player);
+    }
+
     @POST
     @Transactional
     @Path("/registration")
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 9998f41c..f1f95356 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -1,9 +1,10 @@
 import { Competition, Sex } from "@/interfaces/competition"
 import axios from "axios"
-import { Player, playerServerToClient } from "@/interfaces/player"
+import { Player, PlayerServer, playerServerToClient } from "@/interfaces/player"
 import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
 import { useQuery } from "@tanstack/vue-query"
+import { RouteLocationNormalizedLoaded } from "vue-router"
 
 export interface searchPlayer {
 	sex: Sex
@@ -41,7 +42,7 @@ export function extractSearchPlayer(
 	})
 }
 
-export function getPlayer(
+export function findPlayers(
 	search: Ref<string>,
 	searchPlayer: Ref<searchPlayer>,
 	t: (s: string) => string,
@@ -51,7 +52,7 @@ export function getPlayer(
 		queryKey: ["searchPlayer", search, searchPlayer],
 		queryFn: async () => {
 			return axios
-				.get<Player[]>(
+				.get<PlayerServer[]>(
 					`/player/find?search=${search.value.toLowerCase()}` +
 						(searchPlayer.value.sex !== Sex.ANY
 							? `&sex=${searchPlayer.value.sex}`
@@ -63,9 +64,7 @@ export function getPlayer(
 							? `&maxAge=${searchPlayer.value.maxAge.toISOString().slice(0, 10)}`
 							: ""),
 				)
-				.then((result) => {
-					return result.data.map(playerServerToClient)
-				})
+				.then<Player[]>((result) => result.data.map(playerServerToClient))
 				.catch((error) => {
 					toast.add({
 						severity: "error",
@@ -79,3 +78,28 @@ export function getPlayer(
 		},
 	})
 }
+
+export function getPlayer(
+	route: RouteLocationNormalizedLoaded,
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useQuery({
+		queryKey: ["playerDetails", computed(() => route.params.playerId)],
+		queryFn: async () => {
+			return axios
+				.get<PlayerServer>(`/player/${route.params.playerId}/details`)
+				.then<Player>((result) => playerServerToClient(result.data))
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("Player.player_not_found"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
+				})
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
index 4ad80870..c171017e 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
@@ -220,7 +220,7 @@ import {
 	useSignUpSingle,
 } from "@/backend/competition"
 import { useQueryClient } from "@tanstack/vue-query"
-import { extractSearchPlayer, getPlayer } from "@/backend/player"
+import { extractSearchPlayer, findPlayers } from "@/backend/player"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
@@ -232,7 +232,7 @@ const { data: competition } = getCompetitionDetails(route, t, toast)
 
 const selectedPlayerA = ref<Player | null>(null)
 const searchA = ref<string>("")
-const { data: suggestionsPlayerA, isFetching: loadingA } = getPlayer(
+const { data: suggestionsPlayerA, isFetching: loadingA } = findPlayers(
 	searchA,
 	extractSearchPlayer(competition, false),
 	t,
@@ -240,7 +240,7 @@ const { data: suggestionsPlayerA, isFetching: loadingA } = getPlayer(
 )
 const selectedPlayerB = ref<Player | null>(null)
 const searchB = ref<string>("")
-const { data: suggestionsPlayerB, isFetching: loadingB } = getPlayer(
+const { data: suggestionsPlayerB, isFetching: loadingB } = findPlayers(
 	searchB,
 	extractSearchPlayer(competition, true),
 	t,
diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
index 8b20818d..03820011 100644
--- a/frontend/app/src/components/views/player/ViewPlayerOverview.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
@@ -1,11 +1,22 @@
 <template>
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
-			<template #title> Player Overview </template>
+			<template #title> Player Overview - {{ player?.name }}</template>
 		</Card>
 	</div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useRoute } from "vue-router"
+import { getPlayer } from "@/backend/player"
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+
+const route = useRoute()
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+
+const { data: player } = getPlayer(route, t, toast)
+</script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
index 4e802d66..9ac4e0b7 100644
--- a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
@@ -40,7 +40,7 @@ import { Player } from "@/interfaces/player"
 import { Mode } from "@/interfaces/competition"
 import { ref } from "vue"
 import { useToast } from "primevue/usetoast"
-import { extractSearchPlayer, getPlayer } from "@/backend/player"
+import { extractSearchPlayer, findPlayers } from "@/backend/player"
 import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute } from "vue-router"
 import { getTournamentDetails } from "@/backend/tournament"
@@ -58,7 +58,7 @@ const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: competition } = getCompetitionDetails(route, t, toast)
 const selectedPlayer = ref<Player | null>(null)
 const search = ref<string>("")
-const { data: suggestionsPlayer, isFetching: loading } = getPlayer(
+const { data: suggestionsPlayer, isFetching: loading } = findPlayers(
 	search,
 	extractSearchPlayer(competition, false),
 	t,
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 1985b478..0a02cbb6 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -184,7 +184,8 @@
 		"register_success": "Der Spieler wurde erfolgreich registriert",
 		"register_failed": "Fehler beim Hinzufügen des Spielers",
 		"over": "Ü",
-		"under": "U"
+		"under": "U",
+		"player_not_found": "Spieler nicht gefunden"
 	},
 	"ViewKnockout": {
 		"finale": "Finale",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index d9ef4bb1..595bd364 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -186,7 +186,8 @@
 		"register_success": "Successful registered",
 		"register_failed": "Registration failed",
 		"over": "O",
-		"under": "U"
+		"under": "U",
+		"player_not_found": "Player not found"
 	},
 	"ViewKnockout": {
 		"finale": "Finale",
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 3115c8c4..6d372aaa 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -93,10 +93,9 @@ export default [
 		component: () => import("@/components/views/player/ViewVerification.vue"),
 	},
 	{
-		path: "/player/overview/:id",
+		path: "/player/overview/:playerId",
 		name: "Player overview",
-		component: () =>
-			import("@/components/views/player/ViewPlayerOverview.vue"),
+		component: () => import("@/components/views/player/ViewPlayerOverview.vue"),
 	},
 	{
 		path: "/templates",

From c3b72e801f42d8ad7588c9100a88f2fe62aca47c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 16 Sep 2024 12:58:42 +0200
Subject: [PATCH 125/247] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Save=20match=20?=
 =?UTF-8?q?numbers=20to=20match?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      | 11 ++++
 .../db/entities/competition/Competition.java  | 11 ++++
 .../turnierplaner/modifier/GroupTools.java    | 40 ++++++++++++---
 .../turnierplaner/modifier/KnockoutTools.java | 17 ++++---
 .../resources/CompetitionResource.java        | 14 +++++-
 ...MatchRessource.java => MatchResource.java} |  2 +-
 .../resources/TournamentResource.java         | 50 ++-----------------
 .../jsonEntities/user/jUserMatchEvent.java    | 26 ++++++++++
 8 files changed, 109 insertions(+), 62 deletions(-)
 rename backend/src/main/java/de/secretj12/turnierplaner/resources/{MatchRessource.java => MatchResource.java} (98%)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 2a0ce98b..196d9a82 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -55,6 +55,9 @@ public class Match {
     @JoinColumn(name = "team_b")
     private Team teamB;
 
+    @Column(name = "number")
+    private int number;
+
     @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     private NextMatch dependentOn;
 
@@ -196,4 +199,12 @@ public List<Set> getSets() {
     public void setSets(List<Set> sets) {
         this.sets = sets;
     }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index fc37fb63..969411ed 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -69,6 +69,9 @@ public class Competition {
     @Column(name = "creation_progess", nullable = false)
     private CreationProgress cProgress;
 
+    @Column(name = "totalRounds")
+    private int total;
+
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "finale_id")
     private Match finale;
@@ -276,4 +279,12 @@ public Match getFinale() {
     public void setFinale(Match finale) {
         this.finale = finale;
     }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
index cf38d25b..6534782c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
@@ -10,6 +10,7 @@
 import de.secretj12.turnierplaner.db.repositories.*;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.ws.rs.BadRequestException;
 
 import java.util.*;
 
@@ -80,6 +81,7 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
                     m.setCompetition(competition);
                     m.setTeamA(nGroupList.get(i));
                     m.setTeamB(nGroupList.get(j));
+                    m.setNumber(index);
                     matchRepository.persist(m);
 
                     MatchOfGroup mog = new MatchOfGroup();
@@ -92,23 +94,30 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
     }
 
     private void createKnockoutTree(Competition competition, int prevGroupsSize, List<Group> groups) {
+        if (groups.size() == 1) {
+            competition.setTotal(0);
+            competitions.persist(competition);
+        }
         if (groups.size() == 2) { // finale and game for third place needed
-            Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1), 1);
+            Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1), 1, 0);
             competition.setFinale(finale);
 
             // create third place match
-            Match thirdPlace = finaleOfGroups(competition, groups.get(0), groups.get(1), 2);
+            Match thirdPlace = finaleOfGroups(competition, groups.get(0), groups.get(1), 2, 0);
             competition.setThirdPlace(thirdPlace);
+            competition.setTotal(1);
             competitions.persist(competition);
         } else if (groups.size() > 2) { // knockout tree needed
             if (prevGroupsSize == 2) // delete previous game for third place
-                matchRepository.delete(finaleOfGroups(competition, groups.get(0), groups.get(1), 2));
+                matchRepository.delete(finaleOfGroups(competition, groups.get(0), groups.get(1), 2, -1));
 
             List<Match> matches = new ArrayList<>();
             for (int i = 0; i < groups.size() / 2; i++)
-                matches.add(finaleOfGroups(competition, groups.get(2 * i), groups.get(2 * i + 1), 1));
+                matches.add(finaleOfGroups(competition, groups.get(2 * i), groups.get(2 * i + 1), 1, 0));
 
+            int counter = 0;
             do {
+                counter++;
                 List<Match> newMatches = new ArrayList<>();
                 for (int i = 0; i < matches.size() / 2; i++) {
                     Optional<NextMatch> exNext = matches.get(i).getPreviousOfA() == null ? Optional.empty() : matches
@@ -117,6 +126,7 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
                         .findFirst();
                     if (exNext.isEmpty()) {
                         Match m = new Match();
+                        m.setNumber(counter);
                         m.setCompetition(competition);
                         matchRepository.persist(m);
                         newMatches.add(m);
@@ -129,7 +139,10 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
                         nextMatch.setNextMatch(m);
                         nextMatchRepository.persist(nextMatch);
                     } else {
-                        newMatches.add(exNext.get().getNextMatch());
+                        Match m = exNext.get().getNextMatch();
+                        m.setNumber(counter);
+                        matchRepository.persist(m);
+                        newMatches.add(m);
                         if (matches.size() == 2)
                             competition.setFinale(exNext.get().getNextMatch());
                     }
@@ -142,6 +155,7 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
                             .findAny();
                     if (exNext.isEmpty()) {
                         Match m = new Match();
+                        m.setNumber(counter);
                         m.setCompetition(competition);
                         matchRepository.persist(m);
                         competition.setThirdPlace(m);
@@ -153,21 +167,28 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
                         nextMatch.setWinner(false);
                         nextMatchRepository.persist(nextMatch);
                     } else {
-                        competition.setThirdPlace(exNext.get().getNextMatch());
+                        Match m = exNext.get().getNextMatch();
+                        m.setNumber(counter);
+                        matchRepository.persist(m);
+                        competition.setThirdPlace(m);
                     }
                 }
                 matches = newMatches;
             } while (matches.size() > 1);
+            competition.setTotal(counter + 1);
             competitions.persist(competition);
+        } else {
+            throw new BadRequestException("Invalid group size");
         }
     }
 
-    private Match finaleOfGroups(Competition competition, Group g1, Group g2, int pos) {
+    private Match finaleOfGroups(Competition competition, Group g1, Group g2, int pos, int number) {
         Optional<FinalOfGroup> exFin = g1.getFinalOfGroupA() == null ? Optional.empty() : g1.getFinalOfGroupA().stream()
             .filter(fog -> fog.getPos() == pos)
             .findFirst();
         if (exFin.isEmpty()) {
             Match finale = new Match();
+            finale.setNumber(number);
             finale.setCompetition(competition);
             matchRepository.persist(finale);
 
@@ -180,7 +201,10 @@ private Match finaleOfGroups(Competition competition, Group g1, Group g2, int po
 
             return finale;
         } else {
-            return exFin.get().getNextMatch();
+            Match match = exFin.get().getNextMatch();
+            match.setNumber(number);
+            matchRepository.persist(match);
+            return match;
         }
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index d8a28ebe..a11622c9 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -24,7 +24,7 @@ public class KnockoutTools {
     @Inject
     CompetitionRepository competitions;
 
-    public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match) {
+    public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
         if (tree == null)
             return null;
 
@@ -34,13 +34,13 @@ public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree
         Match a, b;
         if (match.getDependentOn() != null) {
             a = match.getDependentOn().getPreviousA();
-            updateKnockoutTree(competition, tree.getPreviousA(), a);
+            updateKnockoutTree(competition, tree.getPreviousA(), a, number - 1);
             b = match.getDependentOn().getPreviousB();
-            updateKnockoutTree(competition, tree.getPreviousB(), b);
+            updateKnockoutTree(competition, tree.getPreviousB(), b, number - 1);
         } else if (tree.getPreviousA() != null && tree.getPreviousB() != null) {
             NextMatch nMatch = new NextMatch();
-            a = updateKnockoutTree(competition, tree.getPreviousA(), new Match());
-            b = updateKnockoutTree(competition, tree.getPreviousB(), new Match());
+            a = updateKnockoutTree(competition, tree.getPreviousA(), new Match(), number - 1);
+            b = updateKnockoutTree(competition, tree.getPreviousB(), new Match(), number - 1);
             nMatch.setPreviousA(a);
             nMatch.setPreviousB(b);
             nMatch.setNextMatch(match);
@@ -59,6 +59,7 @@ public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree
         match.setCompetition(competition);
         match.setFinished(false);
         match.setWinner(true);
+        match.setNumber(number);
         matches.persist(match);
 
         return match;
@@ -74,7 +75,7 @@ private Team selectTeam(Match match) {
         return null;
     }
 
-    public void updateThirdPlace(Competition competition, Match finale) {
+    public void updateThirdPlace(Competition competition, Match finale, int total) {
         Match thirdPlace = competition.getThirdPlace();
 
         // cover deletion of third place
@@ -88,6 +89,7 @@ public void updateThirdPlace(Competition competition, Match finale) {
         if (thirdPlace == null) {
             // create third place if didn't exist before
             thirdPlace = new Match();
+            thirdPlace.setNumber(total - 1);
             thirdPlace.setCompetition(competition);
             NextMatch nMatch = new NextMatch();
             nMatch.setWinner(false);
@@ -108,6 +110,9 @@ public void updateThirdPlace(Competition competition, Match finale) {
             nMatch.setPreviousB(finale.getDependentOn().getPreviousB());
 
             nextMatches.persist(nMatch);
+
+            thirdPlace.setNumber(total - 1);
+            matches.persist(thirdPlace);
         }
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index dff35bbc..734bb81a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -447,8 +447,18 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         Match finale = competition.getFinale();
         if (finale == null)
             finale = new Match();
-        knockoutTools.updateKnockoutTree(competition, tree, finale);
-        knockoutTools.updateThirdPlace(competition, finale);
+
+
+        jUserKnockoutMatch curTree = tree;
+        int total = 1;
+        while (curTree.getPreviousA() != null) {
+            curTree = curTree.getPreviousA();
+            total++;
+        }
+        competition.setTotal(total);
+
+        knockoutTools.updateKnockoutTree(competition, tree, finale, total - 1);
+        knockoutTools.updateThirdPlace(competition, finale, total);
 
         // TODO only set progress if everything is assigned
         competition.setcProgress(CreationProgress.SCHEDULING);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
similarity index 98%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
rename to backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index a0ae9419..6b7acacc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -20,7 +20,7 @@
 
 @RolesAllowed("director")
 @Path("/tournament/{tourName}/competition/{compName}/match")
-public class MatchRessource {
+public class MatchResource {
 
     @Inject
     TournamentRepository tournaments;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 6e5f03e6..38c41bca 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -4,13 +4,11 @@
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import de.secretj12.turnierplaner.db.entities.competition.CompetitionType;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetitionType;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
@@ -178,51 +176,13 @@ public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
     ) {
         Tournament tournament = tournaments.getByName(tourId);
 
-        var matchEvents = new ArrayList<jUserMatchEvent>();
-        for (var comp : tournament.getCompetitions()) {
-            var rounds = getMatchRounds(comp);
-
-            var thirdPlace = comp.getThirdPlace();
-            if (thirdPlace != null) {
-                jUserMatchEvent matchEvent = new jUserMatchEvent(thirdPlace);
-                matchEvent.setCompName(comp.getName());
-                matchEvent.setType(jUserCompetitionType.KNOCKOUT);
-                matchEvent.setNumber(rounds.size() - 1);
-                matchEvent.setTotal(rounds.size());
-                matchEvent.setFinal(false);
-                matchEvents.add(matchEvent);
-            }
-
-            for (int i = 0; i < rounds.size(); i++) {
-                for (var match : rounds.get(i)) {
-                    jUserMatchEvent matchEvent = new jUserMatchEvent(match);
-                    matchEvent.setCompName(comp.getName());
-                    matchEvent.setType(jUserCompetitionType.KNOCKOUT);
-                    matchEvent.setNumber(i);
-                    matchEvent.setTotal(rounds.size());
-                    matchEvent.setFinal(true);
-                    matchEvents.add(matchEvent);
-                }
-            }
-
-            if (comp.getType() == CompetitionType.GROUPS) {
-                for (var group : comp.getGroups()) {
-                    for (var match : group.getMatches()) {
-                        jUserMatchEvent matchEvent = new jUserMatchEvent(match);
-                        matchEvent.setCompName(comp.getName());
-                        matchEvent.setType(jUserCompetitionType.GROUPS);
-                        matchEvent.setNumber(group.getIndex());
-                        matchEvent.setFinal(false);
-                        matchEvents.add(matchEvent);
-                    }
-                }
-            }
-        }
-
         Instant fromD = from == null ? null : Instant.parse(from);
         Instant toD = to == null ? null : Instant.parse(to);
-        return matchEvents
-            .stream().filter(match -> {
+        return tournament
+            .getCompetitions()
+            .stream().flatMap(competition -> competition.getMatches().stream())
+            .map(jUserMatchEvent::new)
+            .filter(match -> {
                 if (courts != null
                     && (match.getCourt() == null || !courts.contains(match.getCourt())))
                     return false;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
index d21e4bb7..d7172566 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
@@ -5,6 +5,10 @@
 
 public class jUserMatchEvent extends jUserMatch {
 
+    /**
+     * Name of the tournament
+     */
+    public String tourName;
     /**
      * Name of the competition
      */
@@ -33,11 +37,33 @@ public class jUserMatchEvent extends jUserMatch {
 
     public jUserMatchEvent(Match match) {
         super(match);
+        this.tourName = match.getCompetition().getTournament().getName();
+        this.compName = match.getCompetition().getName();
+        this.type = match.getGroup() != null ? jUserCompetitionType.GROUPS : jUserCompetitionType.KNOCKOUT;
+        this.number = match.getNumber();
+        this.total = match.getCompetition().getTotal();
+        if (match.getDependentOn() == null) {
+            if (match.getFinalOfGroup() == null) {
+                this.isFinal = true;
+            } else {
+                this.isFinal = match.getFinalOfGroup().getPos() == 1;
+            }
+        } else {
+            this.isFinal = match.getDependentOn().isWinner();
+        }
     }
 
     public jUserMatchEvent() {
     }
 
+    public String getTourName() {
+        return tourName;
+    }
+
+    public void setTourName(String tourName) {
+        this.tourName = tourName;
+    }
+
     public String getCompName() {
         return compName;
     }

From fc9ba90ceea6ee48403ff00fec0dfecf6681fcbb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 16 Sep 2024 13:15:27 +0200
Subject: [PATCH 126/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20drag=20n=20drop=20?=
 =?UTF-8?q?for=20schedule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/calendar/ViewCalendar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index ac281d11..a7c9bee4 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -151,7 +151,7 @@ function onEventChange({
 	event: CalEvent<T>
 	originalEvent: CalEvent<T>
 }) {
-	if (props.automaticEvent && originalEvent) {
+	if (props.automaticEvent && originalEvent && originalEvent.id) {
 		events.value.splice(
 			events.value.findIndex((e) => e.id === originalEvent.id),
 			1,

From 121cc171cae759200f21cc4551ff7c6506d335d9 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 17:34:09 +0200
Subject: [PATCH 127/247] =?UTF-8?q?=F0=9F=9A=9A=20Refactor=20match=20query?=
 =?UTF-8?q?=20api=20to=20be=20more=20flexible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |  9 +++
 .../db/repositories/MatchRepository.java      | 16 +++++
 .../resources/CompetitionResource.java        | 28 ++++++++
 .../resources/MatchResource.java              | 64 ++++++++-----------
 .../resources/TournamentResource.java         | 25 --------
 frontend/app/src/backend/match.ts             | 49 +++++++++++++-
 frontend/app/src/backend/tournament.ts        | 61 +-----------------
 .../views/overview/OverviewList.vue           |  9 +--
 frontend/app/src/interfaces/match.ts          | 19 ++++++
 9 files changed, 153 insertions(+), 127 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 196d9a82..0a539a3b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -23,6 +23,15 @@
                            query = """
                                FROM Match m WHERE m.competition = :comp
                                AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
+                               """),
+               @NamedQuery(name = "filterMatches",
+                           query = """
+                               FROM Match m WHERE (:tour IS NULL OR m.competition.tournament = :tour)
+                               AND (:comp IS NULL OR  m.competition = :comp)
+                               AND (:player IS NULL OR m.teamA.playerA = :player OR m.teamA.playerB = :player
+                                           OR m.teamB.playerA = :player OR m.teamB.playerB = :player)
+                               AND :from <= m.begin
+                               AND m.end <= :to
                                """)})
 public class Match {
     @Id
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 8c526ef6..ee24e47c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -1,12 +1,15 @@
 package de.secretj12.turnierplaner.db.repositories;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 
@@ -30,4 +33,17 @@ public void deleteByComp(Competition competition) {
     public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
+
+    public List<Match> filterMatches(Tournament tournament, Competition competition,
+                                     Player player,
+                                     Instant from, Instant to) {
+        return find("#filterMatches",
+            Parameters
+                .with("tour", tournament)
+                .and("comp", competition)
+                .and("player", player)
+                .and("from", from)
+                .and("to", to)
+        ).list();
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 734bb81a..5b35a670 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -12,6 +12,7 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionUpdate;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorGroupsDivision;
+import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorScheduleMatch;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.group.jUserGroupSystem;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
@@ -54,6 +55,8 @@ public class CompetitionResource {
     MatchRepository matches;
     @Inject
     TeamRepository teams;
+    @Inject
+    CourtRepositiory courts;
 
     @Inject
     KnockoutTools knockoutTools;
@@ -526,4 +529,29 @@ public jDirectorGroupsDivision groupsDivision(@PathParam("tourName") String tour
         List<Group> groups = competition.getGroups();
         return new jDirectorGroupsDivision(groups.stream().map(g -> groupTools.teamsOfGroup(g)).toList());
     }
+
+    @POST
+    @Path("/{compName}/match")
+    @Transactional
+    @RolesAllowed("director")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
+                                List<jDirectorScheduleMatch> matches) {
+        Competition competition = competitions.getByName(tourName, compName);
+        if (competition == null) throw new NotFoundException("Competition could not be found");
+
+        for (var cMatch : matches) {
+            Match match = this.matches.findById(cMatch.getId());
+            if (match == null)
+                throw new NotFoundException("Could not find match");
+            if (match.getCompetition().getId() != competition.getId())
+                throw new BadRequestException("Match does not belong to specified competition");
+            match.setCourt(courts.findByName(cMatch.getCourt()));
+            match.setBegin(cMatch.getBegin());
+            match.setEnd(cMatch.getEnd());
+
+            this.matches.persist(match);
+        }
+        return "Updated matches";
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 6b7acacc..b1e223d2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -1,25 +1,21 @@
 package de.secretj12.turnierplaner.resources;
 
 
-import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
-import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
-import de.secretj12.turnierplaner.db.repositories.MatchRepository;
-import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorScheduleMatch;
+import de.secretj12.turnierplaner.db.repositories.*;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import io.quarkus.security.identity.SecurityIdentity;
-import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
-import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 
+import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
-@RolesAllowed("director")
-@Path("/tournament/{tourName}/competition/{compName}/match")
+@Path("/matches")
 public class MatchResource {
 
     @Inject
@@ -27,38 +23,34 @@ public class MatchResource {
     @Inject
     CompetitionRepository competitions;
     @Inject
-    MatchRepository matchRepository;
+    MatchRepository matches;
     @Inject
-    CourtRepositiory courtRepositiory;
+    CourtRepositiory courts;
+    @Inject
+    PlayerRepository players;
     @Inject
     SecurityIdentity securityIdentity;
 
-    @POST
-    @Transactional
-    @Consumes(MediaType.APPLICATION_JSON)
-    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
-                                List<jDirectorScheduleMatch> matches) {
-        checkTournamentAccessibility(tourName);
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<jUserMatchEvent> getMatches(
+                                            @QueryParam("tour") String tourName,
+                                            @QueryParam("comp") String compName,
+                                            @QueryParam("player") String playerId,
+                                            @QueryParam("from") String from,
+                                            @QueryParam("to") String to
+    ) {
+        Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
-        if (competition == null) throw new NotFoundException("Competition could not be found");
+        Player player = playerId == null ? null : players.getById(UUID.fromString(playerId));
+        Instant fromD = from == null ? Instant.MIN : Instant.parse(from);
+        Instant toD = to == null ? Instant.MAX : Instant.parse(to);
 
-        for (var cMatch : matches) {
-            Match match = matchRepository.findById(cMatch.getId());
-            if (match == null)
-                throw new NotFoundException("Could not find match");
-            if (match.getCompetition().getId() != competition.getId())
-                throw new BadRequestException("Match does not belong to specified competition");
-            match.setCourt(courtRepositiory.findByName(cMatch.getCourt()));
-            match.setBegin(cMatch.getBegin());
-            match.setEnd(cMatch.getEnd());
+        if (player == null && tournament == null)
+            throw new BadRequestException("Need to specify at least a tournament or a player");
 
-            matchRepository.persist(match);
-        }
-        return "Updated matches";
-    }
-
-    private void checkTournamentAccessibility(String tourName) {
-        Tournament tournament = tournaments.getByName(tourName);
-        if (tournament == null) throw new NotFoundException("Tournament could not be found");
+        return this.matches.filterMatches(tournament, competition, player, fromD, toD).stream()
+            .map(jUserMatchEvent::new)
+            .toList();
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 38c41bca..8267dece 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -1,9 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.db.entities.Court;
-import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Tournament;
-import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
@@ -23,7 +21,6 @@
 import org.jboss.resteasy.reactive.Separator;
 
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -198,28 +195,6 @@ public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
             .toList();
     }
 
-    private List<List<Match>> getMatchRounds(Competition competition) {
-        Match finale = competition.getFinale();
-        if (finale == null)
-            return List.of();
-
-        List<List<Match>> matchRounds = new ArrayList<>();
-        List<Match> queue = List.of(finale);
-        List<Match> newQueue = new ArrayList<>();
-        while (!queue.isEmpty()) {
-            matchRounds.add(queue);
-            for (Match match : queue) {
-                if (match.getDependentOn() != null) {
-                    newQueue.add(match.getDependentOn().getPreviousA());
-                    newQueue.add(match.getDependentOn().getPreviousB());
-                }
-            }
-            queue = newQueue;
-            newQueue = new ArrayList<>();
-        }
-        return matchRounds.reversed();
-    }
-
     private void checkTournamentAccessibility(Tournament tournament) {
         if (tournament == null)
             throw new NotFoundException("Tournament could not be found");
diff --git a/frontend/app/src/backend/match.ts b/frontend/app/src/backend/match.ts
index 9f1237f0..15f581ba 100644
--- a/frontend/app/src/backend/match.ts
+++ b/frontend/app/src/backend/match.ts
@@ -1,8 +1,15 @@
-import { useMutation } from "@tanstack/vue-query"
-import { Match, matchClientToServer } from "@/interfaces/match"
+import { useMutation, useQuery } from "@tanstack/vue-query"
+import {
+	AnnotatedMatch,
+	AnnotatedMatchServer,
+	annotatedMatchServerToClient,
+	Match,
+	matchClientToServer,
+} from "@/interfaces/match"
 import axios from "axios"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { ToastServiceMethods } from "primevue/toastservice"
+import { computed, Ref } from "vue"
 
 export function useUpdateMatches(
 	route: RouteLocationNormalizedLoaded,
@@ -34,3 +41,41 @@ export function useUpdateMatches(
 		},
 	})
 }
+
+export function getFilteredMatches(
+	route: RouteLocationNormalizedLoaded,
+	t: (_: string) => string,
+	from: Ref<Date | undefined>,
+	to: Ref<Date | undefined>,
+) {
+	return useQuery({
+		enabled: computed(
+			() => (!!from.value && !!to.value) || !!route.params.playerId,
+		),
+		queryKey: [
+			"tournamentMatches",
+			computed(() => route.params.tourId),
+			computed(() => route.params.compId),
+			computed(() => route.params.playerId),
+			from,
+			to,
+		],
+		queryFn: () => {
+			if (!from.value || !to.value) return []
+			return axios
+				.get(`matches`, {
+					params: {
+						tour: route.params.tourId,
+						comp: route.params.compId,
+						player: route.params.playerId,
+						from: from.value,
+						to: to.value,
+					},
+				})
+				.then<AnnotatedMatchServer[]>((data) => data.data)
+				.then<AnnotatedMatch[]>((matches) => {
+					return matches.map(annotatedMatchServerToClient)
+				})
+		},
+	})
+}
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 9cce9c70..4db2e3c6 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -8,15 +8,11 @@ import {
 import { ToastServiceMethods } from "primevue/toastservice"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
-import { Court } from "@/interfaces/court"
-import {
-	AnnotatedMatch,
-	AnnotatedMatchServer,
-	matchServerToClient,
-} from "@/interfaces/match"
+import { AnnotatedMatch } from "@/interfaces/match"
 import { CompType } from "@/interfaces/competition"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { v4 as uuidv4 } from "uuid"
+import { getFilteredMatches } from "@/backend/match"
 
 export function getTournamentList(
 	isLoggedIn: Ref<boolean>,
@@ -156,64 +152,13 @@ export function useAddTournament(
 	})
 }
 
-export function getTournamentMatches(
-	route: RouteLocationNormalizedLoaded,
-	t: (_: string) => string,
-	from: Ref<Date | undefined>,
-	to: Ref<Date | undefined>,
-	courts: Ref<Court[] | undefined>,
-) {
-	return useQuery({
-		enabled: computed(() => !!from.value && !!to.value && !!courts.value),
-		queryKey: [
-			"tournamentMatches",
-			computed(() => route.params.tourId),
-			computed(() => route.params.compId),
-			from,
-			to,
-			computed(() => courts.value?.map((court) => court.name)),
-		],
-		queryFn: () => {
-			if (!from.value || !to.value || !courts.value) return []
-			return axios
-				.get(`/tournament/${route.params.tourId}/matches`, {
-					params: {
-						from: from.value,
-						to: to.value,
-						courts:
-							courts.value.length > 0
-								? courts.value.map((c) => c.name).join(",")
-								: undefined,
-					},
-				})
-				.then<AnnotatedMatchServer[]>((data) => data.data)
-				.then<AnnotatedMatch[]>((matches) => {
-					return matches.map((matchServer) => {
-						const match = matchServerToClient(matchServer)
-						return {
-							compName: matchServer.compName,
-							title: {
-								type: matchServer.type,
-								number: matchServer.number,
-								isFinal: matchServer.isFinal,
-								total: matchServer.total,
-							},
-							...match,
-						}
-					})
-				})
-		},
-	})
-}
-
 export function getTournamentMatchEvents(
 	route: RouteLocationNormalizedLoaded,
 	t: (_: string) => string,
 	from: Ref<Date | undefined>,
 	to: Ref<Date | undefined>,
-	courts: Ref<Court[] | undefined>,
 ) {
-	const matches = getTournamentMatches(route, t, from, to, courts)
+	const matches = getFilteredMatches(route, t, from, to)
 
 	return {
 		...matches,
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index b1e7b364..818b1dfb 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -139,11 +139,7 @@
 </template>
 
 <script setup lang="ts">
-import {
-	genTitle,
-	getTournamentDetails,
-	getTournamentMatches,
-} from "@/backend/tournament"
+import { genTitle, getTournamentDetails } from "@/backend/tournament"
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
@@ -153,6 +149,7 @@ import { FilterMatchMode, FilterService } from "primevue/api"
 import { DataTableFilterMeta } from "primevue/datatable"
 import { Team } from "@/interfaces/team"
 import { AnnotatedMatch } from "@/interfaces/match"
+import { getFilteredMatches } from "@/backend/match"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
@@ -190,7 +187,7 @@ function titleFilter(
 	return titleValue.toLowerCase().includes(filterValue)
 }
 
-const { data: matches } = getTournamentMatches(
+const { data: matches } = getFilteredMatches(
 	route,
 	t,
 	computed(() => tournament.value?.game_phase.begin),
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 2347c96d..e42c311b 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -44,6 +44,7 @@ export interface MatchServer {
 }
 
 export interface AnnotatedMatchServer extends MatchServer {
+	tourName: string
 	compName: string
 	type: CompType
 	number: number
@@ -58,6 +59,7 @@ export interface AnnotatedMatch extends Match {
 		number: number
 		total: number
 	}
+	tourName: string
 	compName: string
 }
 
@@ -84,6 +86,23 @@ export function matchServerToClient(match: MatchServer): Match {
 	}
 }
 
+export function annotatedMatchServerToClient(
+	matchServer: AnnotatedMatchServer,
+): AnnotatedMatch {
+	const match = matchServerToClient(matchServer)
+	return {
+		tourName: matchServer.tourName,
+		compName: matchServer.compName,
+		title: {
+			type: matchServer.type,
+			number: matchServer.number,
+			isFinal: matchServer.isFinal,
+			total: matchServer.total,
+		},
+		...match,
+	}
+}
+
 export function matchClientToServer(match: Match): MatchServer {
 	return {
 		id: match.id,

From 09b798f435bb9f8e6b43d7585757aafe43634728 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 18:12:45 +0200
Subject: [PATCH 128/247] =?UTF-8?q?=F0=9F=90=9B=20Save=20offset=20of=20dra?=
 =?UTF-8?q?gging=20element=20for=20correct=20placement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/draggable/DraggablePanel.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index a2db322c..92c177b4 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -74,6 +74,7 @@ function create() {
 		sortable.value = null
 	}
 
+	let offsetY = 0
 	sortable.value = Sortable.create(el, {
 		group: { name: props.group, pull: props.pull, put: props.put },
 		animation: props.animation,
@@ -82,10 +83,15 @@ function create() {
 		revertOnSpill: true,
 		setData(dataTransfer) {
 			dataTransfer.setData("event", JSON.stringify({ data: selectedElement }))
+			dataTransfer.setData("cursor-grab-at", offsetY.toString())
 		},
 		onChoose: (event: Sortable.SortableEvent) => {
 			if (event.oldIndex === undefined) return
 			selectedElement = props.list[event.oldIndex]
+			if (event.originalEvent) {
+				offsetY =
+					event.originalEvent.clientY - event.target.getBoundingClientRect().top
+			}
 		},
 		onRemove: (event: Sortable.SortableEvent) => {
 			if (event.oldIndex === undefined) return

From a20f8e53d6d7fa9a9c96ba9881c556b2eef5df94 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 18:35:33 +0200
Subject: [PATCH 129/247] =?UTF-8?q?=E2=9C=A8=20Add=20match=20view=20to=20p?=
 =?UTF-8?q?layer=20overview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CourtResource.java              |  4 +-
 frontend/app/src/backend/court.ts             | 13 +++--
 .../views/overview/OverviewList.vue           | 55 ++++++++++++-------
 .../views/player/ViewPlayerOverview.vue       |  4 ++
 frontend/app/src/i18n/de.json                 |  5 +-
 frontend/app/src/i18n/en.json                 |  5 +-
 6 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index c4ce6d2c..e38a5743 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -12,7 +12,6 @@
 import java.util.List;
 
 @Path("/court")
-@RolesAllowed("director")
 public class CourtResource {
 
     @Inject
@@ -25,6 +24,7 @@ public List<jUserCourt> getCourts() {
 
     @PUT
     @Transactional
+    @RolesAllowed("director")
     public String create(jUserCourt court) {
         Court exCourt = courtRepositiory.findByName(court.getName());
         if (exCourt != null)
@@ -40,6 +40,7 @@ public String create(jUserCourt court) {
 
     @POST
     @Transactional
+    @RolesAllowed("director")
     public String update(jUserCourt court) {
         Court exCourt = courtRepositiory.findByName(court.getName());
         if (exCourt == null)
@@ -58,6 +59,7 @@ public String update(jUserCourt court) {
     @DELETE
     @Path("/{name}")
     @Transactional
+    @RolesAllowed("director")
     public String delete(@PathParam("name") String courtName) {
         Court exCourt = courtRepositiory.findByName(courtName);
         if (exCourt == null)
diff --git a/frontend/app/src/backend/court.ts b/frontend/app/src/backend/court.ts
index e42c4506..9e45cf86 100644
--- a/frontend/app/src/backend/court.ts
+++ b/frontend/app/src/backend/court.ts
@@ -59,11 +59,16 @@ export function useDeleteCourt() {
 export function getTournamentCourts(route: RouteLocationNormalizedLoaded) {
 	return useQuery({
 		queryKey: ["tournamentCourts", computed(() => route.params.tourId)],
-		queryFn: () =>
-			axios
-				.get(`/tournament/${route.params.tourId}/courts`)
+		queryFn: async () => {
+			return axios
+				.get(
+					route.params.tourId
+						? `/tournament/${route.params.tourId}/courts`
+						: `/court`,
+				)
 				.then<Court[]>((response) => response.data)
-				.then<Court[]>((data) => data.sort(courtComp)),
+				.then<Court[]>((data) => data.sort(courtComp))
+		},
 	})
 }
 
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 818b1dfb..8dbd6f57 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -3,7 +3,7 @@
 		v-model:filters="filters"
 		data-key="id"
 		resizable-columns
-		:loading="!tournament"
+		:loading="!matches"
 		:value="matches"
 		filter-display="row"
 		:global-filter-fields="['title']"
@@ -11,21 +11,19 @@
 		<template #empty> No matches found.</template>
 		<template #loading> Loading matches...</template>
 		<Column
+			v-if="!route.params.tourId"
 			sortable
-			field="title"
-			:header="t('general.title')"
+			field="tourName"
+			:header="t('general.tournament')"
 			:show-filter-menu="false"
 		>
-			<template #body="{ data }">
-				{{ genTitle(data.title, t) }}
-			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
 					v-model="filterModel.value"
 					size="small"
 					type="text"
 					class="p-column-filter"
-					placeholder="Search by name"
+					:placeholder="t('general.filter_by_name')"
 					@input="filterCallback()"
 				/>
 			</template>
@@ -42,7 +40,27 @@
 					size="small"
 					type="text"
 					class="p-column-filter"
-					placeholder="Search by name"
+					:placeholder="t('general.filter_by_name')"
+					@input="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column
+			sortable
+			field="title"
+			:header="t('general.title')"
+			:show-filter-menu="false"
+		>
+			<template #body="{ data }">
+				{{ genTitle(data.title, t) }}
+			</template>
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					:placeholder="t('general.filter_by_name')"
 					@input="filterCallback()"
 				/>
 			</template>
@@ -57,7 +75,7 @@
 				<MultiSelect
 					v-model="filterModel.value"
 					:options="courts?.map((court) => court.name) || []"
-					placeholder="Any"
+					:placeholder="t('general.any')"
 					class="p-column-filter"
 					style="min-width: 14rem"
 					:max-selected-labels="3"
@@ -104,7 +122,7 @@
 					size="small"
 					type="text"
 					class="p-column-filter"
-					placeholder="Search by name"
+					:placeholder="t('general.filter_by_name')"
 					@input="filterCallback()"
 				/>
 			</template>
@@ -128,7 +146,7 @@
 					size="small"
 					type="text"
 					class="p-column-filter"
-					placeholder="Search by name"
+					:placeholder="t('general.filter_by_name')"
 					@input="filterCallback()"
 				/>
 			</template>
@@ -139,11 +157,10 @@
 </template>
 
 <script setup lang="ts">
-import { genTitle, getTournamentDetails } from "@/backend/tournament"
+import { genTitle } from "@/backend/tournament"
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
-import { useToast } from "primevue/usetoast"
-import { computed, ref } from "vue"
+import { ref } from "vue"
 import { getTournamentCourts } from "@/backend/court"
 import { FilterMatchMode, FilterService } from "primevue/api"
 import { DataTableFilterMeta } from "primevue/datatable"
@@ -153,8 +170,6 @@ import { getFilteredMatches } from "@/backend/match"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
-const toast = useToast()
-const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: courts } = getTournamentCourts(route)
 
 const TEAMS_FILTER = "TEAMS_FILTER"
@@ -164,8 +179,9 @@ FilterService.register(TEAMS_FILTER, teamFilter)
 FilterService.register(TITLE_FILTER, titleFilter)
 
 const filters = ref<DataTableFilterMeta>({
-	title: { value: null, matchMode: TITLE_FILTER },
+	tourName: { value: null, matchMode: FilterMatchMode.CONTAINS },
 	compName: { value: null, matchMode: FilterMatchMode.CONTAINS },
+	title: { value: null, matchMode: TITLE_FILTER },
 	court: { value: null, matchMode: FilterMatchMode.IN },
 	begin: { value: null, matchMode: FilterMatchMode.DATE_AFTER },
 	teamA: { value: null, matchMode: TEAMS_FILTER },
@@ -190,9 +206,8 @@ function titleFilter(
 const { data: matches } = getFilteredMatches(
 	route,
 	t,
-	computed(() => tournament.value?.game_phase.begin),
-	computed(() => tournament.value?.game_phase.end),
-	courts,
+	ref(undefined),
+	ref(undefined),
 )
 
 const dateOptions: Intl.DateTimeFormatOptions = {
diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
index 03820011..6184707c 100644
--- a/frontend/app/src/components/views/player/ViewPlayerOverview.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
@@ -2,6 +2,9 @@
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
 			<template #title> Player Overview - {{ player?.name }}</template>
+			<template #content>
+				<OverviewList />
+			</template>
 		</Card>
 	</div>
 </template>
@@ -11,6 +14,7 @@ import { useRoute } from "vue-router"
 import { getPlayer } from "@/backend/player"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
+import OverviewList from "@/components/views/overview/OverviewList.vue"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 0a02cbb6..cdf74174 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -28,13 +28,16 @@
 		"calendar": "Kalender",
 		"list": "Liste",
 		"title": "Titel",
+		"tournament": "Turnier",
 		"competition": "Konkurrenz",
 		"court": "Platz",
 		"begin": "Beginn",
 		"team": "Team",
 		"result": "Ergebnis",
 		"options": "Optionen",
-		"courts": "Plätze"
+		"courts": "Plätze",
+		"any": "Beliebig",
+		"filter_by_name": "Nach Name filtern"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Spielerregistrierung",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 595bd364..4b7de565 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -29,12 +29,15 @@
 		"calendar": "Calendar",
 		"list": "List",
 		"title": "Title",
+		"tournament": "Tournament",
 		"competition": "Competition",
 		"court": "Court",
 		"begin": "Begin",
 		"team": "Team",
 		"result": "Result",
-		"courts": "Courts"
+		"courts": "Courts",
+		"any": "Any",
+		"filter_by_name": "Filter by name"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",

From 927d6e239a6605718b550cfa25e43739205667fd Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 20:08:53 +0200
Subject: [PATCH 130/247] =?UTF-8?q?=E2=9C=A8=20Link=20player=20names=20to?=
 =?UTF-8?q?=20player=20overview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../startup/testdata/TestdataGenerator.java   |  9 +++++
 .../groupSystem/ViewGroupTable.vue            | 37 +++++++++++-------
 .../competition/knockoutSystem/ViewMatch.vue  | 31 ++++++---------
 .../views/competition/signup/ViewTable.vue    | 32 ++++++---------
 .../views/player/ViewPlayerName.vue           | 39 +++++++++++++++++++
 .../prepare/scheduleMatches/MatchEvent.vue    |  9 +++--
 frontend/app/src/interfaces/groupSystem.ts    | 18 ++++++++-
 7 files changed, 115 insertions(+), 60 deletions(-)
 create mode 100644 frontend/app/src/components/views/player/ViewPlayerName.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 0ecd540f..d0188570 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -292,6 +292,8 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
         }
         // TODO support more than 2 groups ? How is the tree supposed to look like again with Nextmatch? @Jonas
         Match finalOfGroupMatch1 = createMatch(courts[random.nextInt(4)], competition);
+        competition.setFinale(finalOfGroupMatch1);
+        competitions.persist(competition);
         matchRepository.persist(finalOfGroupMatch1);
         FinalOfGroup finalOfGroup1 = new FinalOfGroup();
         finalOfGroup1.setNextMatch(finalOfGroupMatch1);
@@ -301,6 +303,8 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
         finalOfGroupRepository.persist(finalOfGroup1);
 
         Match finalOfGroupMatch2 = createMatch(courts[random.nextInt(4)], competition);
+        competition.setThirdPlace(finalOfGroupMatch2);
+        competitions.persist(competition);
         matchRepository.persist(finalOfGroupMatch2);
         FinalOfGroup finalOfGroup2 = new FinalOfGroup();
         finalOfGroup2.setNextMatch(finalOfGroupMatch2);
@@ -329,6 +333,9 @@ private void addTeamsAndMatchesToKnockout(Competition competition, CompetitionSe
                 currentMatches[j].setFinished(false);
 
                 matchRepository.persist(currentMatches[j]);
+                if (i == 1) {
+                    competition.setFinale(currentMatches[0]);
+                }
 
                 if (i != compSettings.getTeamNumbers() / 2) {
                     if (previousMatches[j * 2].isFinished() && previousMatches[j * 2 + 1].isFinished())
@@ -352,6 +359,7 @@ private void addTeamsAndMatchesToKnockout(Competition competition, CompetitionSe
                 currentMatches[1].setTeamB(getLooserOfMatchIfExists(previousMatches[1]));
 
                 matchRepository.persist(currentMatches[1]);
+                competition.setThirdPlace(currentMatches[1]);
                 if (previousMatches[0].isFinished() && previousMatches[1].isFinished())
                     createSets(currentMatches[1]);
                 NextMatch nextThirdPlace = new NextMatch();
@@ -365,6 +373,7 @@ private void addTeamsAndMatchesToKnockout(Competition competition, CompetitionSe
             previousMatches = currentMatches;
             currentMatches = new Match[compSettings.getTeamNumbers() / 2];
         }
+        competitions.persist(competition);
     }
 
     private Team getWinnerOfMatchIfExists(Match match) {
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 560855ee..7b6751b0 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -15,18 +15,24 @@
 					@mouseover="headerHover(team.id)"
 					@mouseleave="hoverLeave()"
 				>
-					{{ team.playerA.lastName }}, {{ team.playerA.firstName }}
+					<ViewPlayerName :player="team.playerA" :inverted="true" />
+					<template v-if="team.playerB">
+						<ViewPlayerName :player="team.playerB" :inverted="true" />
+					</template>
 				</th>
 			</template>
 		</tr>
-		<template v-for="(teamA, indexA) in props.group.teams" :key="indexA">
-			<tr v-if="indexA !== props.group.teams.length - 1">
+		<template v-for="(team, index) in props.group.teams" :key="index">
+			<tr v-if="index !== props.group.teams.length - 1">
 				<th
-					:class="hoverIdA === indexA ? 'highlight ' : ''"
-					@mouseover="headerHover(teamA.id)"
+					:class="hoverIdA === index ? 'highlight ' : ''"
+					@mouseover="headerHover(team.id)"
 					@mouseleave="hoverLeave()"
 				>
-					{{ teamA.playerA.lastName }}, {{ teamA.playerA.firstName }}
+					<ViewPlayerName :player="team.playerA" :inverted="true" />
+					<template v-if="team.playerB">
+						<ViewPlayerName :player="team.playerB" :inverted="true" />
+					</template>
 				</th>
 				<template
 					v-for="(teamB, indexB) in props.group.teams.slice().reverse()"
@@ -35,19 +41,21 @@
 					<td
 						v-if="
 							indexB !== props.group.teams.length - 1 &&
-							indexA + indexB < props.group.teams.length - 1
+							index + indexB < props.group.teams.length - 1
 						"
 						:class="{
 							highlightLow:
-								(hoverIdA === indexA && indexB < hoverIdB) ||
-								(hoverIdB === indexB && indexA < hoverIdA),
-							highlight: hoverTeam === teamA.id || hoverTeam === teamB.id,
+								hoverIdA &&
+								hoverIdB &&
+								((hoverIdA === index && indexB < hoverIdB) ||
+									(hoverIdB === indexB && index < hoverIdA)),
+							highlight: hoverTeam === team.id || hoverTeam === teamB.id,
 						}"
-						@mouseover="matchHover(indexA, indexB)"
+						@mouseover="matchHover(index, indexB)"
 						@mouseleave="hoverLeave()"
 					>
 						<div>
-							<ViewMatch :match="findMatch(teamA, teamB)" />
+							<ViewMatch :match="findMatch(team, teamB)" />
 						</div>
 					</td>
 				</template>
@@ -63,6 +71,7 @@ import { useI18n } from "vue-i18n"
 import ViewMatch from "@/components/views/competition/groupSystem/ViewMatch.vue"
 import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
+import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
@@ -92,8 +101,8 @@ function matchHover(indexA: number, indexB: number) {
 	hoverIdB.value = indexB
 }
 
-function headerHover(team: string) {
-	hoverTeam.value = team
+function headerHover(team: string | undefined) {
+	hoverTeam.value = team || ""
 }
 
 function hoverLeave() {
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index dba39afc..b7bd7eac 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -7,18 +7,13 @@
 	>
 		<tr :class="{ winner: props.match.finished && !props.match.winner }">
 			<td class="name">
-				{{
-					props.match.teamA?.playerA
-						? `${props.match.teamA.playerA.lastName}, ${props.match.teamA.playerA.firstName}`
-						: ""
-				}}
+				<ViewPlayerName :player="props.match.teamA?.playerA" :inverted="true" />
 				<template v-if="props.mode === Mode.DOUBLE">
 					<br />
-					{{
-						props.match.teamA?.playerB
-							? `${props.match.teamA.playerB.lastName}, ${props.match.teamA.playerB.firstName}`
-							: ""
-					}}
+					<ViewPlayerName
+						:player="props.match.teamA?.playerB"
+						:inverted="true"
+					/>
 				</template>
 			</td>
 
@@ -30,18 +25,13 @@
 		</tr>
 		<tr :class="{ winner: props.match.finished && props.match.winner }">
 			<td class="name">
-				{{
-					props.match.teamB?.playerA
-						? `${props.match.teamB.playerA.lastName}, ${props.match.teamB.playerA.firstName}`
-						: ""
-				}}
+				<ViewPlayerName :player="props.match.teamB?.playerA" :inverted="true" />
 				<template v-if="props.mode === Mode.DOUBLE">
 					<br />
-					{{
-						props.match.teamB?.playerB
-							? `${props.match.teamB.playerB.lastName}, ${props.match.teamB.playerB.firstName}`
-							: ""
-					}}
+					<ViewPlayerName
+						:player="props.match.teamB?.playerB"
+						:inverted="true"
+					/>
 				</template>
 			</td>
 
@@ -57,6 +47,7 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Mode } from "@/interfaces/competition"
+import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
 
 const props = defineProps<{
 	match: KnockoutMatch
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index 620a3253..7e14065f 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -12,10 +12,7 @@
 			<Column :header="t('general.name')" field="name" sortable>
 				<template #body="{ data }">
 					<div class="flex justify-content-between align-items-center">
-						{{
-							// @ts-ignore
-							data.name
-						}}
+						<ViewPlayerName :player="<Player>data" />
 						<Button
 							v-if="canEdit"
 							severity="danger"
@@ -46,7 +43,11 @@
 				sortable
 				field="playerA.name"
 				style="width: 50%"
-			/>
+			>
+				<template #body="{ data }">
+					<ViewPlayerName :player="<Player>data.playerA" />
+				</template>
+			</Column>
 			<Column
 				:header="t('ViewCompetition.playerB')"
 				sortable
@@ -55,10 +56,7 @@
 			>
 				<template #body="{ data }">
 					<div class="flex justify-content-between align-items-center">
-						{{
-							// @ts-ignore
-							data.playerB.name
-						}}
+						<ViewPlayerName :player="<Player>data.playerB" />
 						<Button
 							v-if="canEdit"
 							severity="danger"
@@ -86,10 +84,7 @@
 			<Column :header="t('general.name')" sortable field="name">
 				<template #body="{ data }">
 					<div class="flex justify-content-between align-items-center">
-						{{
-							// @ts-ignore
-							data.name
-						}}
+						<ViewPlayerName :player="<Player>data" />
 						<Button
 							v-if="canEdit"
 							severity="danger"
@@ -119,10 +114,7 @@
 				<Column :header="t('ViewCompetition.playerA')" sortable field="name">
 					<template #body="{ data }">
 						<div class="flex justify-content-between align-items-center">
-							{{
-								// @ts-ignore
-								data.name
-							}}
+							<ViewPlayerName :player="<Player>data" />
 							<Button
 								v-if="canEdit"
 								severity="danger"
@@ -149,10 +141,7 @@
 				<Column :header="t('ViewCompetition.playerB')" sortable field="name">
 					<template #body="{ data }">
 						<div class="flex justify-content-between align-items-center">
-							{{
-								// @ts-ignore
-								data.name
-							}}
+							<ViewPlayerName :player="<Player>data" />
 							<Button
 								v-if="canEdit"
 								severity="danger"
@@ -182,6 +171,7 @@ import { useToast } from "primevue/usetoast"
 import { getCanEdit } from "@/backend/security"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUpSepByComp } from "@/backend/signup"
+import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
diff --git a/frontend/app/src/components/views/player/ViewPlayerName.vue b/frontend/app/src/components/views/player/ViewPlayerName.vue
new file mode 100644
index 00000000..f5890207
--- /dev/null
+++ b/frontend/app/src/components/views/player/ViewPlayerName.vue
@@ -0,0 +1,39 @@
+<template>
+	<span
+		v-if="props.player"
+		class="cursor-pointer hover:underline"
+		@click="click"
+	>
+		<template v-if="inverted">
+			{{ props.player.lastName }}, {{ props.player.firstName }}
+		</template>
+		<template v-else> {{ props.player.name }}</template>
+	</span>
+</template>
+
+<script setup lang="ts">
+import { Player } from "@/interfaces/player"
+import { router } from "@/main"
+
+const props = withDefaults(
+	defineProps<{
+		player?: Player | null
+		inverted: boolean
+	}>(),
+	{
+		inverted: false,
+	},
+)
+
+function click() {
+	if (props.player)
+		router.push({
+			name: "Player overview",
+			params: {
+				playerId: props.player.id,
+			},
+		})
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index 2867bd3e..dacce48d 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -7,19 +7,19 @@
 		<ul class="mt-1 pt-0 pl-4">
 			<li v-if="props.match.teamA">
 				<template v-if="props.match.teamA.playerA">
-					{{ props.match.teamA.playerA.name }}
+					<ViewPlayerName :player="props.match.teamA.playerA" />
 					<template v-if="props.match.teamA.playerB">
 						<br />
-						{{ props.match.teamA.playerB.name }}
+						<ViewPlayerName :player="props.match.teamA.playerB" />
 					</template>
 				</template>
 			</li>
 			<li v-if="props.match.teamB">
 				<template v-if="props.match.teamB.playerA">
-					{{ props.match.teamB.playerA.name }}
+					<ViewPlayerName :player="props.match.teamB.playerA" />
 					<template v-if="props.match.teamB.playerB">
 						<br />
-						{{ props.match.teamB.playerB.name }}
+						<ViewPlayerName :player="props.match.teamB.playerB" />
 					</template>
 				</template>
 			</li>
@@ -32,6 +32,7 @@ import { Competition } from "@/interfaces/competition"
 import { AnnotatedMatch } from "@/interfaces/match"
 import { genTitle } from "@/backend/tournament"
 import { useI18n } from "vue-i18n"
+import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 5183dc0e..6f2200b0 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -1,5 +1,6 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
+import { Team } from "@/interfaces/team"
 
 export interface GroupSystem {
 	groups: Group[]
@@ -9,6 +10,7 @@ export interface GroupSystem {
 
 export interface Group {
 	index: number
+	teams: Team[]
 	matches: Match[]
 }
 
@@ -54,10 +56,24 @@ export function groupSystemServerToClient(
 	}
 }
 
+function uniqueBy<T>(arr: T[], compareFn: (a: T, b: T) => boolean): T[] {
+	return arr.filter(
+		(item, index, self) =>
+			index === self.findIndex((other) => compareFn(item, other)),
+	)
+}
+
 function groupServerToClient(group: GroupServer): Group {
+	const matches = group.matches.map((match) => matchServerToClient(match))
+	const teams: Team[] = []
+	matches.filter((m) => {
+		if (m.teamA) teams.push(m.teamA)
+		if (m.teamB) teams.push(m.teamB)
+	})
 	return {
 		index: group.index,
-		matches: group.matches.map((match) => matchServerToClient(match)),
+		matches,
+		teams: uniqueBy(teams, (t1, t2) => t1.id === t2.id),
 	}
 }
 

From 99fc8e5b4b97f0f5caffb4bed9bc68f1dcc14bcb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 22:27:04 +0200
Subject: [PATCH 131/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Adjust=20calendar?=
 =?UTF-8?q?=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/TournamentResource.java   |  1 -
 frontend/app/src/calendar/ViewCalendar.vue            | 11 +++++++++--
 .../components/views/court/ViewCreateCourtSmall.vue   |  2 +-
 .../src/components/views/player/ViewPlayerName.vue    |  1 +
 frontend/app/src/interfaces/court.ts                  |  2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 8267dece..4b9714cf 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -98,7 +98,6 @@ public String setCourts(@PathParam("tourName") String tourName, Set<jUserCourt>
 
     @GET
     @Path("/{tourName}/courts")
-    @RolesAllowed("director")
     @Produces(MediaType.APPLICATION_JSON)
     public Set<jUserCourt> getCourts(@PathParam("tourName") String tourName) {
         Tournament tournament = tournaments.getByName(tourName);
diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index a7c9bee4..a2c1652e 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -1,5 +1,6 @@
 <template>
 	<vue-cal
+		id="vuecal"
 		ref="vuecal"
 		:key="calid"
 		:events="events"
@@ -14,7 +15,6 @@
 		:split-days="props.splitDays"
 		sticky-split-labels
 		:min-event-width="props.minEventWidth"
-		:min-split-width="props.minSplitWidth"
 		:min-cell-width="props.minCellWidth"
 		:time-cell-height="props.timeCellHeight"
 		:snap-to-time="props.snapToTime"
@@ -77,7 +77,7 @@ const props = withDefaults(
 	}>(),
 	{
 		selectedDate: () => new Date(),
-		timeFrom: 8 * 60,
+		timeFrom: 0,
 		timeTo: 24 * 60,
 		snapToTime: 15,
 		timeStep: 15,
@@ -112,6 +112,13 @@ watch([vuecal, () => props.selectedDate], () => {
 	// needed to always trigger the onViewChange
 	vuecal.value.previous()
 	vuecal.value.switchView("day", props.selectedDate)
+
+	const calendar = document.querySelector("#vuecal .vuecal__bg")
+	if (calendar)
+		calendar.scrollTo({
+			top: (60 / props.timeStep) * 8 * props.timeCellHeight,
+			behavior: "smooth",
+		})
 })
 
 function previous() {
diff --git a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
index 29b55058..9234524e 100644
--- a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
+++ b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
@@ -35,7 +35,7 @@ function add() {
 	if (name.value && type.value)
 		addCourt({
 			name: name.value,
-			type: type.value,
+			courtType: type.value,
 		})
 	else
 		toast.add({
diff --git a/frontend/app/src/components/views/player/ViewPlayerName.vue b/frontend/app/src/components/views/player/ViewPlayerName.vue
index f5890207..e7806eef 100644
--- a/frontend/app/src/components/views/player/ViewPlayerName.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerName.vue
@@ -21,6 +21,7 @@ const props = withDefaults(
 		inverted: boolean
 	}>(),
 	{
+		player: null,
 		inverted: false,
 	},
 )
diff --git a/frontend/app/src/interfaces/court.ts b/frontend/app/src/interfaces/court.ts
index 81db65f3..b799c00e 100644
--- a/frontend/app/src/interfaces/court.ts
+++ b/frontend/app/src/interfaces/court.ts
@@ -6,5 +6,5 @@ export enum courttype {
 
 export interface Court {
 	name: string
-	type: courttype
+	courtType: courttype
 }

From cbfa28d9cd888a991e72f5e43b8148aaaeb48748 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 17 Sep 2024 23:45:31 +0200
Subject: [PATCH 132/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Small=20improvemen?=
 =?UTF-8?q?ts=20everywhere?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |  9 ---
 .../db/repositories/MatchRepository.java      | 37 +++++++---
 .../resources/MatchResource.java              |  4 +-
 .../src/main/resources/application.properties |  1 +
 frontend/app/src/backend/match.ts             |  5 +-
 frontend/app/src/backend/tournament.ts        |  1 +
 .../groupSystem/ViewGroupTable.vue            | 12 +---
 .../competition/knockoutSystem/ViewMatch.vue  | 20 +-----
 .../views/overview/OverviewList.vue           | 68 ++++++++++++++-----
 .../views/player/ViewPlayerName.vue           |  2 +-
 .../components/views/player/ViewTeamNames.vue | 25 +++++++
 .../prepare/scheduleMatches/MatchEvent.vue    | 14 +---
 .../scheduleMatches/SchedulingCalendar.vue    |  8 +--
 frontend/app/src/i18n/de.json                 |  4 +-
 frontend/app/src/i18n/en.json                 |  4 +-
 15 files changed, 126 insertions(+), 88 deletions(-)
 create mode 100644 frontend/app/src/components/views/player/ViewTeamNames.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 0a539a3b..196d9a82 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -23,15 +23,6 @@
                            query = """
                                FROM Match m WHERE m.competition = :comp
                                AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
-                               """),
-               @NamedQuery(name = "filterMatches",
-                           query = """
-                               FROM Match m WHERE (:tour IS NULL OR m.competition.tournament = :tour)
-                               AND (:comp IS NULL OR  m.competition = :comp)
-                               AND (:player IS NULL OR m.teamA.playerA = :player OR m.teamA.playerB = :player
-                                           OR m.teamB.playerA = :player OR m.teamB.playerB = :player)
-                               AND :from <= m.begin
-                               AND m.end <= :to
                                """)})
 public class Match {
     @Id
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index ee24e47c..79f686da 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -37,13 +37,32 @@ public List<Match> nonGroupMatches(Competition competition) {
     public List<Match> filterMatches(Tournament tournament, Competition competition,
                                      Player player,
                                      Instant from, Instant to) {
-        return find("#filterMatches",
-            Parameters
-                .with("tour", tournament)
-                .and("comp", competition)
-                .and("player", player)
-                .and("from", from)
-                .and("to", to)
-        ).list();
+        StringBuilder query = new StringBuilder("FROM Match m WHERE TRUE");
+        Parameters pars = new Parameters();
+        if (tournament != null) {
+            query.append(" AND m.competition.tournament = :tour");
+            pars.and("tour", tournament);
+        }
+        if (competition != null) {
+            query.append(" AND m.competition = :comp");
+            pars.and("comp", competition);
+        }
+
+        if (player != null) {
+            query.append(" AND (m.teamA.playerA = :player OR m.teamA.playerB = :player");
+            query.append(" OR m.teamB.playerA = :player OR m.teamB.playerB = :player)");
+            pars.and("player", player);
+        }
+
+        if (from != null) {
+            query.append(" AND :from <= m.begin");
+            pars.and("from", from);
+        }
+        if (to != null) {
+            query.append(" AND m.end <= :to");
+            pars.and("to", to);
+        }
+
+        return find(query.toString(), pars).stream().toList();
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index b1e223d2..36bf299a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -43,8 +43,8 @@ public List<jUserMatchEvent> getMatches(
         Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
         Player player = playerId == null ? null : players.getById(UUID.fromString(playerId));
-        Instant fromD = from == null ? Instant.MIN : Instant.parse(from);
-        Instant toD = to == null ? Instant.MAX : Instant.parse(to);
+        Instant fromD = from == null ? null : Instant.parse(from);
+        Instant toD = to == null ? null : Instant.parse(to);
 
         if (player == null && tournament == null)
             throw new BadRequestException("Need to specify at least a tournament or a player");
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index d2b9244a..517aa7f8 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -3,6 +3,7 @@ quarkus.http.cors.origins=*
 quarkus.http.host=0.0.0.0
 quarkus.http.port=2000
 quarkus.banner.path=banner.txt
+quarkus.live-reload.instrumentation=true
 # datasource configuration
 %dev.quarkus.datasource.db-kind=postgresql
 %dev.quarkus.datasource.username=hibernate
diff --git a/frontend/app/src/backend/match.ts b/frontend/app/src/backend/match.ts
index 15f581ba..d09a5eaa 100644
--- a/frontend/app/src/backend/match.ts
+++ b/frontend/app/src/backend/match.ts
@@ -60,13 +60,11 @@ export function getFilteredMatches(
 			from,
 			to,
 		],
-		queryFn: () => {
-			if (!from.value || !to.value) return []
+		queryFn: async () => {
 			return axios
 				.get(`matches`, {
 					params: {
 						tour: route.params.tourId,
-						comp: route.params.compId,
 						player: route.params.playerId,
 						from: from.value,
 						to: to.value,
@@ -77,5 +75,6 @@ export function getFilteredMatches(
 					return matches.map(annotatedMatchServerToClient)
 				})
 		},
+		placeholderData: (data) => data,
 	})
 }
diff --git a/frontend/app/src/backend/tournament.ts b/frontend/app/src/backend/tournament.ts
index 4db2e3c6..ca93cd83 100644
--- a/frontend/app/src/backend/tournament.ts
+++ b/frontend/app/src/backend/tournament.ts
@@ -47,6 +47,7 @@ export function getTournamentDetails(
 	toast: ToastServiceMethods,
 ) {
 	return useQuery({
+		enabled: computed(() => !!route.params.tourId),
 		queryKey: ["tournament", computed(() => route.params.tourId)],
 		queryFn: async () => {
 			return axios
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 7b6751b0..29358156 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -15,10 +15,7 @@
 					@mouseover="headerHover(team.id)"
 					@mouseleave="hoverLeave()"
 				>
-					<ViewPlayerName :player="team.playerA" :inverted="true" />
-					<template v-if="team.playerB">
-						<ViewPlayerName :player="team.playerB" :inverted="true" />
-					</template>
+					<ViewTeamNames :team="team" :inverted="true" />
 				</th>
 			</template>
 		</tr>
@@ -29,10 +26,7 @@
 					@mouseover="headerHover(team.id)"
 					@mouseleave="hoverLeave()"
 				>
-					<ViewPlayerName :player="team.playerA" :inverted="true" />
-					<template v-if="team.playerB">
-						<ViewPlayerName :player="team.playerB" :inverted="true" />
-					</template>
+					<ViewTeamNames :team="team" :inverted="true" />
 				</th>
 				<template
 					v-for="(teamB, indexB) in props.group.teams.slice().reverse()"
@@ -71,7 +65,7 @@ import { useI18n } from "vue-i18n"
 import ViewMatch from "@/components/views/competition/groupSystem/ViewMatch.vue"
 import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
-import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index b7bd7eac..7672bd68 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -7,14 +7,7 @@
 	>
 		<tr :class="{ winner: props.match.finished && !props.match.winner }">
 			<td class="name">
-				<ViewPlayerName :player="props.match.teamA?.playerA" :inverted="true" />
-				<template v-if="props.mode === Mode.DOUBLE">
-					<br />
-					<ViewPlayerName
-						:player="props.match.teamA?.playerB"
-						:inverted="true"
-					/>
-				</template>
+				<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 			</td>
 
 			<template v-if="props.match.sets !== null">
@@ -25,14 +18,7 @@
 		</tr>
 		<tr :class="{ winner: props.match.finished && props.match.winner }">
 			<td class="name">
-				<ViewPlayerName :player="props.match.teamB?.playerA" :inverted="true" />
-				<template v-if="props.mode === Mode.DOUBLE">
-					<br />
-					<ViewPlayerName
-						:player="props.match.teamB?.playerB"
-						:inverted="true"
-					/>
-				</template>
+				<ViewTeamNames :team="props.match.teamB" :inverted="true" />
 			</td>
 
 			<template v-if="props.match.sets !== null">
@@ -47,7 +33,7 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Mode } from "@/interfaces/competition"
-import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
 
 const props = defineProps<{
 	match: KnockoutMatch
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 8dbd6f57..2e57d5f2 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -6,7 +6,6 @@
 		:loading="!matches"
 		:value="matches"
 		filter-display="row"
-		:global-filter-fields="['title']"
 	>
 		<template #empty> No matches found.</template>
 		<template #loading> Loading matches...</template>
@@ -86,8 +85,30 @@
 		<Column
 			sortable
 			field="begin"
-			:header="t('general.begin')"
+			:header="t('general.from')"
 			data-type="date"
+			:show-clear-button="false"
+		>
+			<template #body="{ data }">
+				{{ data.begin?.toLocaleString(t("lang"), dateOptions) }}
+			</template>
+			<template #filter="{ filterModel, filterCallback }">
+				<Calendar
+					v-model="filterModel.value"
+					:date-format="t('date_format')"
+					:placeholder="t('date_format')"
+					:mask="t('date_format')"
+					show-time
+					@date-select="filterCallback()"
+				/>
+			</template>
+		</Column>
+		<Column
+			sortable
+			field="end"
+			:header="t('general.to')"
+			data-type="date"
+			:show-clear-button="false"
 		>
 			<template #body="{ data }">
 				{{ data.begin?.toLocaleString(t("lang"), dateOptions) }}
@@ -110,11 +131,7 @@
 			:show-filter-menu="false"
 		>
 			<template #body="{ data }">
-				{{ data.teamA?.playerA?.name }}
-				<template v-if="data.teamA?.playerB">
-					<br />
-					{{ data.teamA?.playerB?.name }}
-				</template>
+				<ViewTeamNames :team="<Team>data.teamA" />
 			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
@@ -134,11 +151,7 @@
 			:show-filter-menu="false"
 		>
 			<template #body="{ data }">
-				{{ data.teamB?.playerA?.name }}
-				<template v-if="data.teamB?.playerB">
-					<br />
-					{{ data.teamB?.playerB?.name }}
-				</template>
+				<ViewTeamNames :team="<Team>data.teamB" />
 			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
@@ -157,19 +170,26 @@
 </template>
 
 <script setup lang="ts">
-import { genTitle } from "@/backend/tournament"
+import { genTitle, getTournamentDetails } from "@/backend/tournament"
 import { useRoute } from "vue-router"
 import { useI18n } from "vue-i18n"
-import { ref } from "vue"
+import { computed, ref } from "vue"
 import { getTournamentCourts } from "@/backend/court"
 import { FilterMatchMode, FilterService } from "primevue/api"
-import { DataTableFilterMeta } from "primevue/datatable"
+import {
+	DataTableFilterMeta,
+	DataTableFilterMetaData,
+} from "primevue/datatable"
 import { Team } from "@/interfaces/team"
 import { AnnotatedMatch } from "@/interfaces/match"
 import { getFilteredMatches } from "@/backend/match"
+import { useToast } from "primevue/usetoast"
+import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: courts } = getTournamentCourts(route)
 
 const TEAMS_FILTER = "TEAMS_FILTER"
@@ -178,12 +198,21 @@ const TITLE_FILTER = "TITLE_FILTER"
 FilterService.register(TEAMS_FILTER, teamFilter)
 FilterService.register(TITLE_FILTER, titleFilter)
 
+const endFallback = new Date()
+endFallback.setMonth(endFallback.getMonth() + 2)
 const filters = ref<DataTableFilterMeta>({
 	tourName: { value: null, matchMode: FilterMatchMode.CONTAINS },
 	compName: { value: null, matchMode: FilterMatchMode.CONTAINS },
 	title: { value: null, matchMode: TITLE_FILTER },
 	court: { value: null, matchMode: FilterMatchMode.IN },
-	begin: { value: null, matchMode: FilterMatchMode.DATE_AFTER },
+	begin: {
+		value: tournament.value ? tournament.value?.game_phase.begin : new Date(),
+		matchMode: FilterMatchMode.DATE_AFTER,
+	},
+	end: {
+		value: tournament.value ? tournament.value?.game_phase.end : endFallback,
+		matchMode: FilterMatchMode.DATE_BEFORE,
+	},
 	teamA: { value: null, matchMode: TEAMS_FILTER },
 	teamB: { value: null, matchMode: TEAMS_FILTER },
 })
@@ -194,6 +223,7 @@ function teamFilter(team: Team | null, filter: string | null) {
 	const playerB = team?.playerB?.name.toLowerCase() || ""
 	return playerA.includes(filterValue) || playerB.includes(filterValue)
 }
+
 function titleFilter(
 	title: AnnotatedMatch["title"] | null,
 	filter: string | null,
@@ -206,8 +236,10 @@ function titleFilter(
 const { data: matches } = getFilteredMatches(
 	route,
 	t,
-	ref(undefined),
-	ref(undefined),
+	computed(() => (<DataTableFilterMetaData>filters.value.begin).value) ||
+		new Date(),
+	computed(() => (<DataTableFilterMetaData>filters.value.end).value) ||
+		new Date().setMonth(new Date().getMonth() + 2),
 )
 
 const dateOptions: Intl.DateTimeFormatOptions = {
diff --git a/frontend/app/src/components/views/player/ViewPlayerName.vue b/frontend/app/src/components/views/player/ViewPlayerName.vue
index e7806eef..6ab5c663 100644
--- a/frontend/app/src/components/views/player/ViewPlayerName.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerName.vue
@@ -18,7 +18,7 @@ import { router } from "@/main"
 const props = withDefaults(
 	defineProps<{
 		player?: Player | null
-		inverted: boolean
+		inverted?: boolean
 	}>(),
 	{
 		player: null,
diff --git a/frontend/app/src/components/views/player/ViewTeamNames.vue b/frontend/app/src/components/views/player/ViewTeamNames.vue
new file mode 100644
index 00000000..7b4d904c
--- /dev/null
+++ b/frontend/app/src/components/views/player/ViewTeamNames.vue
@@ -0,0 +1,25 @@
+<template>
+	<ViewPlayerName :player="props.team?.playerA" :inverted="props.inverted" />
+	<template v-if="props.team?.playerB">
+		<br />
+		<ViewPlayerName :player="props.team?.playerB" :inverted="props.inverted" />
+	</template>
+</template>
+
+<script setup lang="ts">
+import { Team } from "@/interfaces/team"
+import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+
+const props = withDefaults(
+	defineProps<{
+		team?: Team | null
+		inverted?: boolean
+	}>(),
+	{
+		team: null,
+		inverted: false,
+	},
+)
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index dacce48d..b5c9ca07 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -7,20 +7,12 @@
 		<ul class="mt-1 pt-0 pl-4">
 			<li v-if="props.match.teamA">
 				<template v-if="props.match.teamA.playerA">
-					<ViewPlayerName :player="props.match.teamA.playerA" />
-					<template v-if="props.match.teamA.playerB">
-						<br />
-						<ViewPlayerName :player="props.match.teamA.playerB" />
-					</template>
+					<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 				</template>
 			</li>
 			<li v-if="props.match.teamB">
 				<template v-if="props.match.teamB.playerA">
-					<ViewPlayerName :player="props.match.teamB.playerA" />
-					<template v-if="props.match.teamB.playerB">
-						<br />
-						<ViewPlayerName :player="props.match.teamB.playerB" />
-					</template>
+					<ViewTeamNames :team="props.match.teamB" :inverted="true" />
 				</template>
 			</li>
 		</ul>
@@ -32,7 +24,7 @@ import { Competition } from "@/interfaces/competition"
 import { AnnotatedMatch } from "@/interfaces/match"
 import { genTitle } from "@/backend/tournament"
 import { useI18n } from "vue-i18n"
-import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 071cf63f..57489041 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -74,13 +74,7 @@ const { data: groups } = getGroup(
 
 const curStart = ref<Date | undefined>()
 const curEnd = ref<Date | undefined>()
-const { data: exMatches } = getTournamentMatchEvents(
-	route,
-	t,
-	curStart,
-	curEnd,
-	computed(() => props.courts),
-)
+const { data: exMatches } = getTournamentMatchEvents(route, t, curStart, curEnd)
 
 const events = defineModel<MatchCalEvent[]>({ default: [] })
 watch(
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index cdf74174..2e353710 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -37,7 +37,9 @@
 		"options": "Optionen",
 		"courts": "Plätze",
 		"any": "Beliebig",
-		"filter_by_name": "Nach Name filtern"
+		"filter_by_name": "Nach Name filtern",
+		"from": "Von",
+		"to": "Bis"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Spielerregistrierung",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 4b7de565..25515c9b 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -37,7 +37,9 @@
 		"result": "Result",
 		"courts": "Courts",
 		"any": "Any",
-		"filter_by_name": "Filter by name"
+		"filter_by_name": "Filter by name",
+		"from": "From",
+		"to": "To"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",

From c142920ce205de0635990e061128d0d7f53c1457 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 01:02:09 +0200
Subject: [PATCH 133/247] =?UTF-8?q?=E2=9C=A8=20Link=20to=20competition=20a?=
 =?UTF-8?q?nd=20tournament?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/calendar/ViewCalendar.vue    | 20 ++++++++------
 .../src/components/links/LinkCompetition.vue  | 27 +++++++++++++++++++
 .../LinkPlayerName.vue}                       |  0
 .../LinkTeamNames.vue}                        |  2 +-
 .../src/components/links/LinkTournament.vue   | 25 +++++++++++++++++
 .../groupSystem/ViewGroupTable.vue            |  2 +-
 .../competition/knockoutSystem/ViewMatch.vue  |  2 +-
 .../views/competition/signup/ViewTable.vue    |  2 +-
 .../views/overview/OverviewList.vue           | 13 ++++++++-
 .../prepare/scheduleMatches/MatchEvent.vue    |  8 ++++--
 10 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 frontend/app/src/components/links/LinkCompetition.vue
 rename frontend/app/src/components/{views/player/ViewPlayerName.vue => links/LinkPlayerName.vue} (100%)
 rename frontend/app/src/components/{views/player/ViewTeamNames.vue => links/LinkTeamNames.vue} (86%)
 create mode 100644 frontend/app/src/components/links/LinkTournament.vue

diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index a2c1652e..dd4c0577 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -16,6 +16,7 @@
 		sticky-split-labels
 		:min-event-width="props.minEventWidth"
 		:min-cell-width="props.minCellWidth"
+		:min-split-width="props.minSplitWidth"
 		:time-cell-height="props.timeCellHeight"
 		:snap-to-time="props.snapToTime"
 		:time-step="props.timeStep"
@@ -54,6 +55,7 @@ import VueCal from "vue-cal"
 import "vue-cal/dist/vuecal.css"
 import { Ref, ref, watch } from "vue"
 import { CalEvent, DaySplit, View } from "@/calendar/CalendarInterfaces"
+import { sleep } from "@/backend/Tracker"
 
 const props = withDefaults(
 	defineProps<{
@@ -112,13 +114,6 @@ watch([vuecal, () => props.selectedDate], () => {
 	// needed to always trigger the onViewChange
 	vuecal.value.previous()
 	vuecal.value.switchView("day", props.selectedDate)
-
-	const calendar = document.querySelector("#vuecal .vuecal__bg")
-	if (calendar)
-		calendar.scrollTo({
-			top: (60 / props.timeStep) * 8 * props.timeCellHeight,
-			behavior: "smooth",
-		})
 })
 
 function previous() {
@@ -171,14 +166,23 @@ function onEventChange({
 	emit("onEventChange", event, originalEvent)
 }
 
-function onViewChange({
+async function onViewChange({
 	startDate,
 	endDate,
 }: {
 	startDate: Date
 	endDate: Date
 }) {
+	console.log("view change")
 	emit("onViewChange", startDate, endDate)
+
+	await sleep(500)
+	const calendar = document.querySelector("#vuecal .vuecal__bg")
+	if (calendar)
+		calendar.scrollTo({
+			top: (60 / props.timeStep) * 8 * props.timeCellHeight,
+			behavior: "smooth",
+		})
 }
 </script>
 
diff --git a/frontend/app/src/components/links/LinkCompetition.vue b/frontend/app/src/components/links/LinkCompetition.vue
new file mode 100644
index 00000000..eb6d14ba
--- /dev/null
+++ b/frontend/app/src/components/links/LinkCompetition.vue
@@ -0,0 +1,27 @@
+<template>
+	<span class="cursor-pointer hover:underline" @click="click">
+		{{ props.competition }}
+	</span>
+</template>
+
+<script setup lang="ts">
+import { router } from "@/main"
+
+const props = defineProps<{
+	tournament?: string
+	competition?: string
+}>()
+
+function click() {
+	if (props.tournament && props.competition)
+		router.push({
+			name: "Competition",
+			params: {
+				tourId: props.tournament,
+				compId: props.competition,
+			},
+		})
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/player/ViewPlayerName.vue b/frontend/app/src/components/links/LinkPlayerName.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewPlayerName.vue
rename to frontend/app/src/components/links/LinkPlayerName.vue
diff --git a/frontend/app/src/components/views/player/ViewTeamNames.vue b/frontend/app/src/components/links/LinkTeamNames.vue
similarity index 86%
rename from frontend/app/src/components/views/player/ViewTeamNames.vue
rename to frontend/app/src/components/links/LinkTeamNames.vue
index 7b4d904c..7f5f4d65 100644
--- a/frontend/app/src/components/views/player/ViewTeamNames.vue
+++ b/frontend/app/src/components/links/LinkTeamNames.vue
@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import { Team } from "@/interfaces/team"
-import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+import ViewPlayerName from "@/components/links/LinkPlayerName.vue"
 
 const props = withDefaults(
 	defineProps<{
diff --git a/frontend/app/src/components/links/LinkTournament.vue b/frontend/app/src/components/links/LinkTournament.vue
new file mode 100644
index 00000000..24bc3852
--- /dev/null
+++ b/frontend/app/src/components/links/LinkTournament.vue
@@ -0,0 +1,25 @@
+<template>
+	<span class="cursor-pointer hover:underline" @click="click">
+		{{ props.tournament }}
+	</span>
+</template>
+
+<script setup lang="ts">
+import { router } from "@/main"
+
+const props = defineProps<{
+	tournament?: string
+}>()
+
+function click() {
+	if (props.tournament)
+		router.push({
+			name: "Competitions",
+			params: {
+				tourId: props.tournament,
+			},
+		})
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 29358156..a5071040 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -65,7 +65,7 @@ import { useI18n } from "vue-i18n"
 import ViewMatch from "@/components/views/competition/groupSystem/ViewMatch.vue"
 import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
-import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
+import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 7672bd68..8fa9e11a 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -33,7 +33,7 @@
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Mode } from "@/interfaces/competition"
-import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
+import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 
 const props = defineProps<{
 	match: KnockoutMatch
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index 7e14065f..00e2c7f2 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -171,7 +171,7 @@ import { useToast } from "primevue/usetoast"
 import { getCanEdit } from "@/backend/security"
 import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUpSepByComp } from "@/backend/signup"
-import ViewPlayerName from "@/components/views/player/ViewPlayerName.vue"
+import ViewPlayerName from "@/components/links/LinkPlayerName.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 2e57d5f2..0327327c 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -16,6 +16,9 @@
 			:header="t('general.tournament')"
 			:show-filter-menu="false"
 		>
+			<template #body="{ data }">
+				<LinkTournament :tournament="data.tourName" />
+			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
 					v-model="filterModel.value"
@@ -33,6 +36,12 @@
 			:header="t('general.competition')"
 			:show-filter-menu="false"
 		>
+			<template #body="{ data }">
+				<LinkCompetition
+					:tournament="data.tourName"
+					:competition="data.compName"
+				/>
+			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<InputText
 					v-model="filterModel.value"
@@ -184,7 +193,9 @@ import { Team } from "@/interfaces/team"
 import { AnnotatedMatch } from "@/interfaces/match"
 import { getFilteredMatches } from "@/backend/match"
 import { useToast } from "primevue/usetoast"
-import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
+import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
+import LinkTournament from "@/components/links/LinkTournament.vue"
+import LinkCompetition from "@/components/links/LinkCompetition.vue"
 
 const route = useRoute()
 const { t } = useI18n({ inheritLocale: true })
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index b5c9ca07..458f90ab 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -2,7 +2,10 @@
 	<div class="w-full flex flex-column p-1 text-left">
 		<strong>{{ genTitle(props.match.title, t) }}</strong>
 		<i>
-			{{ props.match.compName }}
+			<LinkCompetition
+				:tournament="props.match.tourName"
+				:competition="props.match.compName"
+			/>
 		</i>
 		<ul class="mt-1 pt-0 pl-4">
 			<li v-if="props.match.teamA">
@@ -24,7 +27,8 @@ import { Competition } from "@/interfaces/competition"
 import { AnnotatedMatch } from "@/interfaces/match"
 import { genTitle } from "@/backend/tournament"
 import { useI18n } from "vue-i18n"
-import ViewTeamNames from "@/components/views/player/ViewTeamNames.vue"
+import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
+import LinkCompetition from "@/components/links/LinkCompetition.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 

From 4a068c60deb5e196e504b1244534f26026f94c76 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 18 Sep 2024 12:34:08 +0200
Subject: [PATCH 134/247] =?UTF-8?q?=E2=9C=85=20Adjust=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/TestCourtResource.java     |  5 -----
 .../resources/TestTournamentResource.java              | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
index 7e3ab5d1..6fa77ba3 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
@@ -143,11 +143,6 @@ public void delCourtNotFound() {
 
     @Test
     public void unauthorized() {
-        given()
-            .get("/court")
-            .then().assertThat()
-            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
-
         given()
             .contentType(ContentType.JSON)
             .body("""
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index 82adf689..f77333bc 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -472,7 +472,6 @@ public void updateCourtsUnknownTour() {
     }
 
     @Test
-    @TestSecurity(user = "testUser", roles = {"director"})
     public void getCourts() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException {
         Panache.getTransactionManager().begin();
         Tournament tournament = tournaments.getByName("Clubmeisterschaft");
@@ -490,19 +489,10 @@ public void getCourts() throws SystemException, NotSupportedException, Heuristic
     }
 
     @Test
-    @TestSecurity(user = "testUser", roles = {"director"})
     public void getCourtsUnknownTour() {
         given()
             .get("/tournament/Random Clubmeisterschaft/courts")
             .then().assertThat()
             .statusCode(Response.Status.NOT_FOUND.getStatusCode());
     }
-
-    @Test
-    public void getCourtsUnauthorized() {
-        given()
-            .get("/tournament/Clubmeisterschaft/courts")
-            .then().assertThat()
-            .statusCode(Response.Status.UNAUTHORIZED.getStatusCode());
-    }
 }

From 79a030fbb8bcb8a93f546a7ad5143621b13f806c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 19 Sep 2024 18:46:26 +0200
Subject: [PATCH 135/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Load=20more=20lazy?=
 =?UTF-8?q?=20decrease=20query=20size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      | 29 +++++++++++++------
 .../db/entities/competition/Competition.java  |  3 ++
 .../db/entities/competition/Team.java         |  2 +-
 .../db/entities/groups/FinalOfGroup.java      |  4 +--
 .../db/entities/groups/MatchOfGroup.java      |  4 +--
 .../db/entities/knockout/NextMatch.java       |  6 ++--
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 196d9a82..e8dea3e8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -7,6 +7,11 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import io.smallrye.common.constraint.NotNull;
 import jakarta.persistence.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.*;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -31,10 +36,11 @@ public class Match {
     private UUID id;
 
     @NotNull
-    @ManyToOne
+    @Fetch(FetchMode.SELECT)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "competition_id")
     private Competition competition;
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "court")
     private Court court;
 
@@ -48,29 +54,34 @@ public class Match {
     @Column(name = "winner")
     private Boolean winner;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "team_a")
     private Team teamA;
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "team_b")
     private Team teamB;
 
     @Column(name = "number")
     private int number;
 
-    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SELECT)
+    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private NextMatch dependentOn;
 
-    @OneToMany(mappedBy = "previousA", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SELECT)
+    @OneToMany(mappedBy = "previousA", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Collection<NextMatch> previousOfA;
 
-    @OneToMany(mappedBy = "previousB", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SELECT)
+    @OneToMany(mappedBy = "previousB", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Collection<NextMatch> previousOfB;
 
-    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SELECT)
+    @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private FinalOfGroup finalOfGroup;
 
-    @OneToOne(mappedBy = "match", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SELECT)
+    @OneToOne(mappedBy = "match", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private MatchOfGroup group;
 
     @OneToMany(mappedBy = "key.match", cascade = CascadeType.REMOVE, orphanRemoval = true)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index 969411ed..878f994e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -4,6 +4,8 @@
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import jakarta.persistence.*;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 
 import java.time.LocalDate;
 import java.util.Comparator;
@@ -29,6 +31,7 @@ public class Competition {
     @Column(name = "name", nullable = false)
     private String name;
 
+    @Fetch(FetchMode.SELECT)
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "tournament_id", nullable = false)
     private Tournament tournament;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
index 108f888f..9514624e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
@@ -25,7 +25,7 @@ public class Team extends PanacheEntityBase {
     @Column(name = "id", nullable = false)
     private UUID id;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "competition", referencedColumnName = "id")
     private Competition competition;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
index 7c029e17..12d9902c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
@@ -21,10 +21,10 @@ public class FinalOfGroup {
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_a", referencedColumnName = "id", nullable = false)
     private Group groupA;
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_b", referencedColumnName = "id", nullable = false)
     private Group groupB;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
index 2d2f78bd..23e275db 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
@@ -12,12 +12,12 @@ public class MatchOfGroup {
     @Id
     private UUID id;
 
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_id", referencedColumnName = "id", nullable = false)
     private Group group;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
+    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     @JoinColumn(name = "match", referencedColumnName = "id", nullable = false)
     private Match match;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
index 19f5b5fe..fef0c3e4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
@@ -13,14 +13,14 @@ public class NextMatch {
     private UUID id;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
+    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "previous_a", referencedColumnName = "id", nullable = false)
     private Match previousA;
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "previous_b", referencedColumnName = "id", nullable = false)
     private Match previousB;
 

From 7be2fc1c67b26804199144beaacace3cf7f25284 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 20 Sep 2024 19:39:26 +0200
Subject: [PATCH 136/247] =?UTF-8?q?=F0=9F=90=9B=20Show=20correct=20end=20d?=
 =?UTF-8?q?ate=20in=20overview=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/components/views/overview/OverviewList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 0327327c..0d1ce1cc 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -120,7 +120,7 @@
 			:show-clear-button="false"
 		>
 			<template #body="{ data }">
-				{{ data.begin?.toLocaleString(t("lang"), dateOptions) }}
+				{{ data.end?.toLocaleString(t("lang"), dateOptions) }}
 			</template>
 			<template #filter="{ filterModel, filterCallback }">
 				<Calendar

From f45fa1890b34743503a9ac183166f7d9e3ca09b2 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 19 Sep 2024 22:17:41 +0200
Subject: [PATCH 137/247] =?UTF-8?q?=E2=9C=A8=20use=20criteria=20api=20for?=
 =?UTF-8?q?=20filtering=20matches=20instead=20of=20stringbuilding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/MatchRepository.java      | 67 +++++++++++++------
 .../resources/MatchResource.java              | 40 ++++++-----
 .../src/main/resources/application.properties |  6 +-
 3 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 79f686da..9ba9bb9d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -4,12 +4,20 @@
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.transaction.Transactional;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -22,6 +30,10 @@ public class MatchRepository implements PanacheRepository<Match> {
     @Inject
     MatchOfGroupRepository matchOfGroups;
 
+    @Inject
+    EntityManager em;
+
+
     public Match findById(UUID id) {
         return find("id", id).firstResult();
     }
@@ -34,35 +46,52 @@ public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
 
-    public List<Match> filterMatches(Tournament tournament, Competition competition,
-                                     Player player,
-                                     Instant from, Instant to) {
-        StringBuilder query = new StringBuilder("FROM Match m WHERE TRUE");
-        Parameters pars = new Parameters();
-        if (tournament != null) {
-            query.append(" AND m.competition.tournament = :tour");
-            pars.and("tour", tournament);
-        }
+    @Transactional
+    public List<jUserMatch> filterMatches(Tournament tournament, Competition competition,
+                                          Player player,
+                                          Instant from, Instant to) {
+
+        CriteriaBuilder cb = em.getCriteriaBuilder();
+        CriteriaQuery<Match> q = cb.createQuery(Match.class);
+        Root<Match> root = q.from(Match.class);
+        q.select(root);
+        Predicate predicate = applyAllValidPredicates(cb, root, q, tournament, competition, player, from, to);
+        q.where(predicate);
+
+        List<Match> result = em.createQuery(q).getResultList();
+        return result.stream().map(jUserMatch::new).toList();
+
+    }
+
+    private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root, CriteriaQuery<Match> query, Tournament tournament, Competition competition, Player player, Instant from, Instant to) {
+        List<Predicate> predicates = new ArrayList<>();
         if (competition != null) {
-            query.append(" AND m.competition = :comp");
-            pars.and("comp", competition);
+            predicates.add(cb.equal(root.get("competition"), competition));
+
+        }
+
+        if (tournament != null) {
+            predicates.add(cb.equal(root.get("competition").get("tournament"), tournament));
         }
 
         if (player != null) {
-            query.append(" AND (m.teamA.playerA = :player OR m.teamA.playerB = :player");
-            query.append(" OR m.teamB.playerA = :player OR m.teamB.playerB = :player)");
-            pars.and("player", player);
+            predicates.add(cb.or(
+                    cb.equal(root.get("teamA").get("playerA"), player),
+                    cb.equal(root.get("teamA").get("playerB"), player),
+                    cb.equal(root.get("teamB").get("playerA"), player),
+                    cb.equal(root.get("teamB").get("playerB"), player)
+            ));
         }
 
         if (from != null) {
-            query.append(" AND :from <= m.begin");
-            pars.and("from", from);
+            predicates.add(cb.greaterThanOrEqualTo(root.get("begin"), from));
         }
+
         if (to != null) {
-            query.append(" AND m.end <= :to");
-            pars.and("to", to);
+            predicates.add(cb.lessThanOrEqualTo(root.get("end"), to));
         }
 
-        return find(query.toString(), pars).stream().toList();
+        Predicate finalPredicate = cb.and(predicates.toArray(new Predicate[0]));
+        return finalPredicate;
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 36bf299a..5a10596a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -5,10 +5,13 @@
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.*;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.*;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 
 import java.time.Instant;
@@ -33,24 +36,29 @@ public class MatchResource {
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserMatchEvent> getMatches(
-                                            @QueryParam("tour") String tourName,
-                                            @QueryParam("comp") String compName,
-                                            @QueryParam("player") String playerId,
-                                            @QueryParam("from") String from,
-                                            @QueryParam("to") String to
+    public List<jUserMatch> getMatches(
+            @QueryParam("tour") String tourName,
+            @QueryParam("comp") String compName,
+            @QueryParam("player") String playerId,
+            @QueryParam("from") String from,
+            @QueryParam("to") String to
     ) {
         Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
-        Player player = playerId == null ? null : players.getById(UUID.fromString(playerId));
-        Instant fromD = from == null ? null : Instant.parse(from);
-        Instant toD = to == null ? null : Instant.parse(to);
+        Player player = playerId.isEmpty() ? null : players.getById(UUID.fromString(playerId));
+        Instant fromD = from.isEmpty() ? null : Instant.parse(from);
+        Instant toD = to.isEmpty() ? null : Instant.parse(to);
 
-        if (player == null && tournament == null)
-            throw new BadRequestException("Need to specify at least a tournament or a player");
 
-        return this.matches.filterMatches(tournament, competition, player, fromD, toD).stream()
-            .map(jUserMatchEvent::new)
-            .toList();
+        System.out.println(competition);
+//        if (player == null && tournament == null)
+//            throw new BadRequestException("Need to specify at least a tournament or a player");
+
+        List<jUserMatch> matchList = matches.filterMatches(tournament, competition, player, fromD, toD);
+        System.out.println(matchList.size());
+        return matchList;
+//        return this.matches.filterMatches(tournament, competition, player, fromD, toD).stream()
+//            .map(jUserMatchEvent::new)
+//            .toList();
     }
 }
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 517aa7f8..ed01c4df 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -4,6 +4,10 @@ quarkus.http.host=0.0.0.0
 quarkus.http.port=2000
 quarkus.banner.path=banner.txt
 quarkus.live-reload.instrumentation=true
+
+log4j.logger.org.hibernate.SQL=DEBUG
+log4j.logger.org.hibernate.type=TRACE
+
 # datasource configuration
 %dev.quarkus.datasource.db-kind=postgresql
 %dev.quarkus.datasource.username=hibernate
@@ -48,4 +52,4 @@ quarkus.mailer.mock=false
 %test.quarkus.mailer.from=tournament@planner.de
 %test.quarkus.mailer.host=mail@host.de
 %test.quarkus.mailer.username=user
-%test.quarkus.mailer.password=1234
\ No newline at end of file
+%test.quarkus.mailer.password=1234

From 030b25d25c0859ca7177ae9cee30d90929795c41 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 20 Sep 2024 21:15:25 +0200
Subject: [PATCH 138/247] =?UTF-8?q?=F0=9F=90=9B=20Check=20params=20for=20n?=
 =?UTF-8?q?ull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/MatchResource.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 5a10596a..6ac24665 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -45,9 +45,9 @@ public List<jUserMatch> getMatches(
     ) {
         Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
-        Player player = playerId.isEmpty() ? null : players.getById(UUID.fromString(playerId));
-        Instant fromD = from.isEmpty() ? null : Instant.parse(from);
-        Instant toD = to.isEmpty() ? null : Instant.parse(to);
+        Player player = playerId == null ? null : players.getById(UUID.fromString(playerId));
+        Instant fromD = from == null ? null : Instant.parse(from);
+        Instant toD = to == null ? null : Instant.parse(to);
 
 
         System.out.println(competition);

From ae9fa08710567a122e18d6fa75548d76e66f95e4 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Fri, 20 Sep 2024 22:43:55 +0200
Subject: [PATCH 139/247] =?UTF-8?q?=F0=9F=8E=A8=20=EF=B8=8Fadd=20type=20sa?=
 =?UTF-8?q?fety?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |  7 +++++
 .../db/repositories/MatchRepository.java      | 27 ++++++++-----------
 .../resources/MatchResource.java              | 12 +++------
 .../src/main/resources/application.properties |  4 +--
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 74672378..7ad463b5 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -68,6 +68,13 @@
             <artifactId>quarkus-hibernate-orm-panache</artifactId>
         </dependency>
 
+        <!-- JPA Metamodel classes used for criteria api -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>6.1.7.Final</version>
+        </dependency>
+
         <!-- JDBC driver dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 9ba9bb9d..0efcb60d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -1,9 +1,12 @@
 package de.secretj12.turnierplaner.db.repositories;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Match_;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.db.entities.competition.Competition_;
+import de.secretj12.turnierplaner.db.entities.competition.Team_;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
@@ -50,7 +53,6 @@ public List<Match> nonGroupMatches(Competition competition) {
     public List<jUserMatch> filterMatches(Tournament tournament, Competition competition,
                                           Player player,
                                           Instant from, Instant to) {
-
         CriteriaBuilder cb = em.getCriteriaBuilder();
         CriteriaQuery<Match> q = cb.createQuery(Match.class);
         Root<Match> root = q.from(Match.class);
@@ -60,37 +62,30 @@ public List<jUserMatch> filterMatches(Tournament tournament, Competition competi
 
         List<Match> result = em.createQuery(q).getResultList();
         return result.stream().map(jUserMatch::new).toList();
-
     }
 
     private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root, CriteriaQuery<Match> query, Tournament tournament, Competition competition, Player player, Instant from, Instant to) {
         List<Predicate> predicates = new ArrayList<>();
         if (competition != null) {
-            predicates.add(cb.equal(root.get("competition"), competition));
-
+            predicates.add(cb.equal(root.get(Match_.COMPETITION), competition));
         }
-
         if (tournament != null) {
-            predicates.add(cb.equal(root.get("competition").get("tournament"), tournament));
+            predicates.add(cb.equal(root.get(Match_.COMPETITION).get(Competition_.TOURNAMENT), tournament));
         }
-
         if (player != null) {
             predicates.add(cb.or(
-                    cb.equal(root.get("teamA").get("playerA"), player),
-                    cb.equal(root.get("teamA").get("playerB"), player),
-                    cb.equal(root.get("teamB").get("playerA"), player),
-                    cb.equal(root.get("teamB").get("playerB"), player)
+                    cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_A), player),
+                    cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_B), player),
+                    cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_A), player),
+                    cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_B), player)
             ));
         }
-
         if (from != null) {
-            predicates.add(cb.greaterThanOrEqualTo(root.get("begin"), from));
+            predicates.add(cb.greaterThanOrEqualTo(root.get(Match_.BEGIN), from));
         }
-
         if (to != null) {
-            predicates.add(cb.lessThanOrEqualTo(root.get("end"), to));
+            predicates.add(cb.lessThanOrEqualTo(root.get(Match_.END), to));
         }
-
         Predicate finalPredicate = cb.and(predicates.toArray(new Predicate[0]));
         return finalPredicate;
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 6ac24665..7951dd8a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -8,10 +8,7 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 
 import java.time.Instant;
@@ -51,14 +48,11 @@ public List<jUserMatch> getMatches(
 
 
         System.out.println(competition);
-//        if (player == null && tournament == null)
-//            throw new BadRequestException("Need to specify at least a tournament or a player");
+        if (player == null && tournament == null)
+            throw new BadRequestException("Need to specify at least a tournament or a player");
 
         List<jUserMatch> matchList = matches.filterMatches(tournament, competition, player, fromD, toD);
         System.out.println(matchList.size());
         return matchList;
-//        return this.matches.filterMatches(tournament, competition, player, fromD, toD).stream()
-//            .map(jUserMatchEvent::new)
-//            .toList();
     }
 }
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index ed01c4df..6b6bbfc3 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -5,9 +5,6 @@ quarkus.http.port=2000
 quarkus.banner.path=banner.txt
 quarkus.live-reload.instrumentation=true
 
-log4j.logger.org.hibernate.SQL=DEBUG
-log4j.logger.org.hibernate.type=TRACE
-
 # datasource configuration
 %dev.quarkus.datasource.db-kind=postgresql
 %dev.quarkus.datasource.username=hibernate
@@ -53,3 +50,4 @@ quarkus.mailer.mock=false
 %test.quarkus.mailer.host=mail@host.de
 %test.quarkus.mailer.username=user
 %test.quarkus.mailer.password=1234
+

From 6be10635395b61f4cd4f0e4a62f5aed9b554c648 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sat, 21 Sep 2024 15:04:25 +0200
Subject: [PATCH 140/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20return=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/repositories/MatchRepository.java   | 9 +++++----
 .../secretj12/turnierplaner/resources/MatchResource.java | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 0efcb60d..8f370b0b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -8,6 +8,7 @@
 import de.secretj12.turnierplaner.db.entities.competition.Competition_;
 import de.secretj12.turnierplaner.db.entities.competition.Team_;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -50,9 +51,9 @@ public List<Match> nonGroupMatches(Competition competition) {
     }
 
     @Transactional
-    public List<jUserMatch> filterMatches(Tournament tournament, Competition competition,
-                                          Player player,
-                                          Instant from, Instant to) {
+    public List<jUserMatchEvent> filterMatches(Tournament tournament, Competition competition,
+                                               Player player,
+                                               Instant from, Instant to) {
         CriteriaBuilder cb = em.getCriteriaBuilder();
         CriteriaQuery<Match> q = cb.createQuery(Match.class);
         Root<Match> root = q.from(Match.class);
@@ -61,7 +62,7 @@ public List<jUserMatch> filterMatches(Tournament tournament, Competition competi
         q.where(predicate);
 
         List<Match> result = em.createQuery(q).getResultList();
-        return result.stream().map(jUserMatch::new).toList();
+        return result.stream().map(jUserMatchEvent::new).toList();
     }
 
     private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root, CriteriaQuery<Match> query, Tournament tournament, Competition competition, Player player, Instant from, Instant to) {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 7951dd8a..bfbea262 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -6,6 +6,7 @@
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.*;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
@@ -33,7 +34,7 @@ public class MatchResource {
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserMatch> getMatches(
+    public List<jUserMatchEvent> getMatches(
             @QueryParam("tour") String tourName,
             @QueryParam("comp") String compName,
             @QueryParam("player") String playerId,
@@ -51,7 +52,7 @@ public List<jUserMatch> getMatches(
         if (player == null && tournament == null)
             throw new BadRequestException("Need to specify at least a tournament or a player");
 
-        List<jUserMatch> matchList = matches.filterMatches(tournament, competition, player, fromD, toD);
+        List<jUserMatchEvent> matchList = matches.filterMatches(tournament, competition, player, fromD, toD);
         System.out.println(matchList.size());
         return matchList;
     }

From 292eed3cbedea8a3a7680c1407fd7d833f7513b3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 21 Sep 2024 16:07:09 +0200
Subject: [PATCH 141/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Formatter=20&=20re?=
 =?UTF-8?q?move=20transaction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/MatchRepository.java      | 38 ++++++++-----------
 .../resources/MatchResource.java              | 28 ++++++--------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 8f370b0b..40b7ea32 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -7,18 +7,14 @@
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.entities.competition.Competition_;
 import de.secretj12.turnierplaner.db.entities.competition.Team_;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
-import jakarta.transaction.Transactional;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -34,9 +30,6 @@ public class MatchRepository implements PanacheRepository<Match> {
     @Inject
     MatchOfGroupRepository matchOfGroups;
 
-    @Inject
-    EntityManager em;
-
 
     public Match findById(UUID id) {
         return find("id", id).firstResult();
@@ -50,22 +43,22 @@ public List<Match> nonGroupMatches(Competition competition) {
         return find("#nonGroupMatches", Parameters.with("comp", competition)).list();
     }
 
-    @Transactional
-    public List<jUserMatchEvent> filterMatches(Tournament tournament, Competition competition,
-                                               Player player,
-                                               Instant from, Instant to) {
-        CriteriaBuilder cb = em.getCriteriaBuilder();
+    public List<Match> filterMatches(Tournament tournament, Competition competition,
+                                     Player player,
+                                     Instant from, Instant to) {
+        CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
         CriteriaQuery<Match> q = cb.createQuery(Match.class);
         Root<Match> root = q.from(Match.class);
         q.select(root);
-        Predicate predicate = applyAllValidPredicates(cb, root, q, tournament, competition, player, from, to);
+        Predicate predicate = applyAllValidPredicates(cb, root, tournament, competition, player, from, to);
         q.where(predicate);
 
-        List<Match> result = em.createQuery(q).getResultList();
-        return result.stream().map(jUserMatchEvent::new).toList();
+        return getEntityManager().createQuery(q).getResultList();
     }
 
-    private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root, CriteriaQuery<Match> query, Tournament tournament, Competition competition, Player player, Instant from, Instant to) {
+    private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root,
+                                              Tournament tournament, Competition competition, Player player,
+                                              Instant from, Instant to) {
         List<Predicate> predicates = new ArrayList<>();
         if (competition != null) {
             predicates.add(cb.equal(root.get(Match_.COMPETITION), competition));
@@ -75,11 +68,11 @@ private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root,
         }
         if (player != null) {
             predicates.add(cb.or(
-                    cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_A), player),
-                    cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_B), player),
-                    cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_A), player),
-                    cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_B), player)
-            ));
+                cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_A), player),
+                cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_B), player),
+                cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_A), player),
+                cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_B), player)
+                                ));
         }
         if (from != null) {
             predicates.add(cb.greaterThanOrEqualTo(root.get(Match_.BEGIN), from));
@@ -87,7 +80,6 @@ private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root,
         if (to != null) {
             predicates.add(cb.lessThanOrEqualTo(root.get(Match_.END), to));
         }
-        Predicate finalPredicate = cb.and(predicates.toArray(new Predicate[0]));
-        return finalPredicate;
+        return cb.and(predicates.toArray(new Predicate[0]));
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index bfbea262..a93027f0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -4,10 +4,11 @@
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import de.secretj12.turnierplaner.db.repositories.*;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
+import de.secretj12.turnierplaner.db.repositories.MatchRepository;
+import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
-import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
@@ -26,20 +27,16 @@ public class MatchResource {
     @Inject
     MatchRepository matches;
     @Inject
-    CourtRepositiory courts;
-    @Inject
     PlayerRepository players;
-    @Inject
-    SecurityIdentity securityIdentity;
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserMatchEvent> getMatches(
-            @QueryParam("tour") String tourName,
-            @QueryParam("comp") String compName,
-            @QueryParam("player") String playerId,
-            @QueryParam("from") String from,
-            @QueryParam("to") String to
+                                            @QueryParam("tour") String tourName,
+                                            @QueryParam("comp") String compName,
+                                            @QueryParam("player") String playerId,
+                                            @QueryParam("from") String from,
+                                            @QueryParam("to") String to
     ) {
         Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
@@ -47,13 +44,10 @@ public List<jUserMatchEvent> getMatches(
         Instant fromD = from == null ? null : Instant.parse(from);
         Instant toD = to == null ? null : Instant.parse(to);
 
-
-        System.out.println(competition);
         if (player == null && tournament == null)
             throw new BadRequestException("Need to specify at least a tournament or a player");
 
-        List<jUserMatchEvent> matchList = matches.filterMatches(tournament, competition, player, fromD, toD);
-        System.out.println(matchList.size());
-        return matchList;
+        return matches.filterMatches(tournament, competition, player, fromD, toD)
+            .stream().map(jUserMatchEvent::new).toList();
     }
 }

From e01b314c5218fb8e0122bc0d4f21911a313c4976 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 21 Sep 2024 16:39:05 +0200
Subject: [PATCH 142/247] =?UTF-8?q?=F0=9F=8E=A8=20Format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/repositories/MatchRepository.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
index 40b7ea32..a3b826cf 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
@@ -72,7 +72,7 @@ private Predicate applyAllValidPredicates(CriteriaBuilder cb, Root<Match> root,
                 cb.equal(root.get(Match_.TEAM_A).get(Team_.PLAYER_B), player),
                 cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_A), player),
                 cb.equal(root.get(Match_.TEAM_B).get(Team_.PLAYER_B), player)
-                                ));
+            ));
         }
         if (from != null) {
             predicates.add(cb.greaterThanOrEqualTo(root.get(Match_.BEGIN), from));

From 317e3c214244bd8c21bcd3f5c1b225f27ef714f3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 19 Sep 2024 21:33:41 +0200
Subject: [PATCH 143/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Do=20more=20in=20k?=
 =?UTF-8?q?nockout=20and=20group=20tools?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/GroupTools.java    |  3 +++
 .../turnierplaner/modifier/KnockoutTools.java | 24 +++++++++++++++++--
 .../resources/CompetitionResource.java        | 19 +--------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
index 6534782c..1b4a41fa 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
@@ -34,6 +34,9 @@ public class GroupTools {
 
     // TODO please add tests for me
     public void generateMatches(Competition competition, List<Set<Team>> nGroups) {
+        competition.setFinale(null);
+        competition.setThirdPlace(null);
+
         List<Group> groups = competition.getGroups();
         int prevGroupsSize = groups.size();
         createGroups(competition, groups, nGroups);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index a11622c9..629e3e08 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -24,7 +24,27 @@ public class KnockoutTools {
     @Inject
     CompetitionRepository competitions;
 
-    public Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
+    public void updateKnockoutTree(Competition competition, jUserKnockoutMatch tree) {
+        Match finale = competition.getFinale();
+        if (finale == null)
+            finale = new Match();
+
+        jUserKnockoutMatch curTree = tree;
+        int total = 1;
+        while (curTree.getPreviousA() != null) {
+            curTree = curTree.getPreviousA();
+            total++;
+        }
+        competition.setTotal(total);
+
+        updateKnockoutTree(competition, tree, finale, total - 1);
+        updateThirdPlace(competition, finale, total);
+
+        competition.setFinale(finale);
+        competitions.persist(competition);
+    }
+
+    private Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
         if (tree == null)
             return null;
 
@@ -75,7 +95,7 @@ private Team selectTeam(Match match) {
         return null;
     }
 
-    public void updateThirdPlace(Competition competition, Match finale, int total) {
+    private void updateThirdPlace(Competition competition, Match finale, int total) {
         Match thirdPlace = competition.getThirdPlace();
 
         // cover deletion of third place
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 5b35a670..7e9334cc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -447,25 +447,10 @@ public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
         checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
-        Match finale = competition.getFinale();
-        if (finale == null)
-            finale = new Match();
-
-
-        jUserKnockoutMatch curTree = tree;
-        int total = 1;
-        while (curTree.getPreviousA() != null) {
-            curTree = curTree.getPreviousA();
-            total++;
-        }
-        competition.setTotal(total);
 
-        knockoutTools.updateKnockoutTree(competition, tree, finale, total - 1);
-        knockoutTools.updateThirdPlace(competition, finale, total);
+        knockoutTools.updateKnockoutTree(competition, tree);
 
-        // TODO only set progress if everything is assigned
         competition.setcProgress(CreationProgress.SCHEDULING);
-        competition.setFinale(finale);
         competitions.persist(competition);
         return true;
     }
@@ -497,8 +482,6 @@ public boolean initializeMatchesGroups(@PathParam("tourName") String tourName,
 
         Competition competition = competitions.getByName(tourName, compName);
 
-        competition.setFinale(null);
-        competition.setThirdPlace(null);
         groupTools.generateMatches(competition, groups);
 
         competition.setcProgress(CreationProgress.SCHEDULING);

From 3d6a736de8e1fed35871e18ffbc8e6052fecd44c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 20 Sep 2024 15:48:39 +0200
Subject: [PATCH 144/247] =?UTF-8?q?=E2=9C=85=20Add=20tests=20for=20knockou?=
 =?UTF-8?q?t=20generation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |   3 -
 .../db/entities/competition/Competition.java  |   4 +
 .../db/entities/knockout/NextMatch.java       |   2 +-
 .../turnierplaner/modifier/KnockoutTools.java | 112 ++-
 .../modifier/TestKnockoutTools.java           | 756 +++++++++++++++++-
 5 files changed, 822 insertions(+), 55 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index e8dea3e8..6c457273 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -64,15 +64,12 @@ public class Match {
     @Column(name = "number")
     private int number;
 
-    @Fetch(FetchMode.SELECT)
     @OneToOne(mappedBy = "nextMatch", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private NextMatch dependentOn;
 
-    @Fetch(FetchMode.SELECT)
     @OneToMany(mappedBy = "previousA", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Collection<NextMatch> previousOfA;
 
-    @Fetch(FetchMode.SELECT)
     @OneToMany(mappedBy = "previousB", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Collection<NextMatch> previousOfB;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index 878f994e..fb687906 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -6,6 +6,8 @@
 import jakarta.persistence.*;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.LocalDate;
 import java.util.Comparator;
@@ -75,9 +77,11 @@ public class Competition {
     @Column(name = "totalRounds")
     private int total;
 
+    @OnDelete(action = OnDeleteAction.SET_NULL)
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "finale_id")
     private Match finale;
+    @OnDelete(action = OnDeleteAction.SET_NULL)
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "thirdPlace_id")
     private Match thirdPlace;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
index fef0c3e4..a5ba3b3c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
@@ -13,7 +13,7 @@ public class NextMatch {
     private UUID id;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index 629e3e08..def5c71a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -11,6 +11,7 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.ws.rs.BadRequestException;
 
 @ApplicationScoped
 public class KnockoutTools {
@@ -36,49 +37,67 @@ public void updateKnockoutTree(Competition competition, jUserKnockoutMatch tree)
             total++;
         }
         competition.setTotal(total);
+        int tCount = countTeams(tree, total);
 
-        updateKnockoutTree(competition, tree, finale, total - 1);
-        updateThirdPlace(competition, finale, total);
+        competition.setFinale(updateKnockoutTree(competition, tree, finale, total - 1));
+        competition.setThirdPlace(updateThirdPlace(competition, finale, total, tCount));
 
-        competition.setFinale(finale);
         competitions.persist(competition);
     }
 
-    private Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
-        if (tree == null)
-            return null;
-
-        if (tree.getPreviousA() == null || tree.getPreviousB() == null)
-            deletePrevious(match);
+    private int countTeams(jUserKnockoutMatch tree, int total) {
+        int c = 0;
+        if (tree.getPreviousA() != null)
+            c += countTeams(tree.getPreviousA(), total - 1);
+        if (tree.getPreviousB() != null)
+            c += countTeams(tree.getPreviousB(), total - 1);
 
-        Match a, b;
-        if (match.getDependentOn() != null) {
-            a = match.getDependentOn().getPreviousA();
-            updateKnockoutTree(competition, tree.getPreviousA(), a, number - 1);
-            b = match.getDependentOn().getPreviousB();
-            updateKnockoutTree(competition, tree.getPreviousB(), b, number - 1);
-        } else if (tree.getPreviousA() != null && tree.getPreviousB() != null) {
-            NextMatch nMatch = new NextMatch();
-            a = updateKnockoutTree(competition, tree.getPreviousA(), new Match(), number - 1);
-            b = updateKnockoutTree(competition, tree.getPreviousB(), new Match(), number - 1);
-            nMatch.setPreviousA(a);
-            nMatch.setPreviousB(b);
-            nMatch.setNextMatch(match);
-            nextMatches.persist(nMatch);
-            match.setDependentOn(nMatch);
-        } else
-            a = b = null;
+        if (tree.getPreviousA() == null) {
+            if (total != 1)
+                throw new BadRequestException("Invalid tree");
+            if (tree.getTeamA() != null)
+                c++;
+            if (tree.getTeamB() != null)
+                c++;
+        }
+        return c;
+    }
 
+    private Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
         if (tree.getPreviousA() == null) {
             match.setTeamA(tree.getTeamA() == null ? null : teams.findById(tree.getTeamA().getId()));
             match.setTeamB(tree.getTeamB() == null ? null : teams.findById(tree.getTeamB().getId()));
-        } else if (tree.getPreviousA().getPreviousA() == null) {
-            match.setTeamA(selectTeam(a));
-            match.setTeamB(selectTeam(b));
+            matches.persist(match);
+            deletePrevious(match);
+        } else {
+            Match a, b;
+            if (match.getDependentOn() == null) {
+                NextMatch nMatch = new NextMatch();
+                a = updateKnockoutTree(competition, tree.getPreviousA(), new Match(), number - 1);
+                b = updateKnockoutTree(competition, tree.getPreviousB(), new Match(), number - 1);
+                nMatch.setPreviousA(a);
+                nMatch.setPreviousB(b);
+                nMatch.setNextMatch(match);
+                nextMatches.persist(nMatch);
+                match.setDependentOn(nMatch);
+            } else {
+                a = updateKnockoutTree(competition, tree.getPreviousA(), match.getDependentOn().getPreviousA(),
+                    number - 1);
+                b = updateKnockoutTree(competition, tree.getPreviousB(), match.getDependentOn().getPreviousB(),
+                    number - 1);
+            }
+
+            if (tree.getPreviousA().getPreviousA() == null) {
+                match.setTeamA(selectTeam(a));
+                match.setTeamB(selectTeam(b));
+            } else {
+                match.setTeamA(null);
+                match.setTeamB(null);
+            }
         }
+
         match.setCompetition(competition);
         match.setFinished(false);
-        match.setWinner(true);
         match.setNumber(number);
         matches.persist(match);
 
@@ -95,15 +114,18 @@ private Team selectTeam(Match match) {
         return null;
     }
 
-    private void updateThirdPlace(Competition competition, Match finale, int total) {
+    private Match updateThirdPlace(Competition competition, Match finale, int total, int tCount) {
         Match thirdPlace = competition.getThirdPlace();
 
         // cover deletion of third place
-        if (competition.getTeams().size() <= 3) {
-            if (thirdPlace != null) {
+        if (tCount <= 2) {
+            // third place will be deleted by deletePrevious
+            return null;
+        }
+        if (tCount == 3) {
+            if (thirdPlace != null)
                 matches.delete(thirdPlace);
-            }
-            return;
+            return null;
         }
 
         if (thirdPlace == null) {
@@ -120,8 +142,7 @@ private void updateThirdPlace(Competition competition, Match finale, int total)
 
             matches.persist(thirdPlace);
             nextMatches.persist(nMatch);
-            competition.setThirdPlace(thirdPlace);
-            competitions.persist(competition);
+            return thirdPlace;
         } else {
             // update third place if already existing
             NextMatch nMatch = thirdPlace.getDependentOn();
@@ -132,17 +153,22 @@ private void updateThirdPlace(Competition competition, Match finale, int total)
             nextMatches.persist(nMatch);
 
             thirdPlace.setNumber(total - 1);
-            matches.persist(thirdPlace);
+            return thirdPlace;
         }
     }
 
     private void deletePrevious(Match match) {
         if (match.getDependentOn() != null) {
-            deletePrevious(match.getDependentOn().getPreviousA());
-            matches.delete(match.getDependentOn().getPreviousA());
-            deletePrevious(match.getDependentOn().getPreviousB());
-            matches.delete(match.getDependentOn().getPreviousB());
-            nextMatches.delete(match.getDependentOn());
+            Match a = match.getDependentOn().getPreviousA();
+            Match b = match.getDependentOn().getPreviousB();
+            NextMatch nm = match.getDependentOn();
+
+            deletePrevious(a);
+            deletePrevious(b);
+            nm.setNextMatch(null);
+            match.setDependentOn(null);
+            matches.delete(a);
+            matches.delete(b);
         }
     }
 }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
index 02452d80..97952979 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
@@ -1,21 +1,26 @@
 package de.secretj12.turnierplaner.modifier;
 
+import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
-import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import de.secretj12.turnierplaner.db.entities.competition.CompetitionType;
-import de.secretj12.turnierplaner.db.entities.competition.Team;
-import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
-import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
-import de.secretj12.turnierplaner.db.repositories.TeamRepository;
-import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.repositories.*;
+import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.http.ContentType;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.*;
 
 @QuarkusTest
 public class TestKnockoutTools {
@@ -28,6 +33,10 @@ public class TestKnockoutTools {
     PlayerRepository playerRepository;
     @Inject
     TeamRepository teamRepository;
+    @Inject
+    MatchRepository matchRepository;
+    @Inject
+    NextMatchRepository nextMatchRepository;
 
     @BeforeEach
     @Transactional
@@ -44,11 +53,30 @@ public void addData() {
 
         Competition comp = new Competition();
         comp.setName("Herren");
+        comp.setDescription("Empty description");
+        comp.setMode(CompetitionMode.DOUBLES);
         comp.setType(CompetitionType.KNOCKOUT);
+        comp.setSignup(CompetitionSignUp.TOGETHER);
+        comp.setPlayerASex(Sex.MALE);
         comp.setTournament(tour);
+        comp.setcProgress(CreationProgress.GAMES);
         competitionRepository.persist(comp);
+    }
 
-        for (int i = 0; i < 8; i++) {
+    @AfterEach
+    @Transactional
+    public void deleteData() {
+        nextMatchRepository.deleteAll();
+        matchRepository.deleteAll();
+        teamRepository.deleteAll();
+        playerRepository.deleteAll();
+        competitionRepository.deleteAll();
+        tournamentRepository.deleteAll();
+    }
+
+    @Transactional
+    public void generateTeams(Competition comp, int num) {
+        for (int i = 0; i < num; i++) {
             Player pA = new Player();
             pA.setFirstName("firstA");
             pA.setLastName("lastA");
@@ -66,4 +94,716 @@ public void addData() {
         }
     }
 
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen2Teams() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 2);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "teamA": {
+                    "id": "%s"
+                  },
+                  "teamB": {
+                    "id": "%s"
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        competitionRepository.getEntityManager().clear();
+        competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(1, generated.size());
+        assertEquals(teams.get(0).getId(), generated.getFirst().getTeamA().getId());
+        assertEquals(teams.get(1).getId(), generated.getFirst().getTeamB().getId());
+
+        assertEquals(generated.getFirst().getId(), competition.getFinale().getId());
+        assertNull(competition.getThirdPlace());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen3Teams() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 3);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "previousA": {
+                    "teamA": {
+                      "id": "%s"
+                    }
+                  },
+                  "previousB": {
+                    "teamA": {
+                      "id": "%s"
+                    },
+                    "teamB": {
+                      "id": "%s"
+                    }
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        competitionRepository.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(3, generated.size());
+
+        assertEquals(teams.get(0).getId(), newComp.getFinale().getTeamA().getId());
+        assertEquals(teams.get(0).getId(), newComp.getFinale().getDependentOn().getPreviousA().getTeamA().getId());
+
+        assertEquals(teams.get(1).getId(), newComp.getFinale().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(2).getId(), newComp.getFinale().getDependentOn().getPreviousB().getTeamB().getId());
+
+        assertNull(newComp.getThirdPlace());
+        assertTrue(generated.stream().map(Match::getId).anyMatch(id -> newComp.getFinale().getId() == id));
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen4Teams() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 4);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "previousA": {
+                    "teamA": {
+                      "id": "%s"
+                    },
+                    "teamB": {
+                      "id": "%s"
+                    }
+                  },
+                  "previousB": {
+                    "teamA": {
+                      "id": "%s"
+                    },
+                    "teamB": {
+                      "id": "%s"
+                    }
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        competitionRepository.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(4, generated.size());
+
+        assertEquals(teams.get(0).getId(), newComp.getFinale().getDependentOn().getPreviousA().getTeamA().getId());
+        assertEquals(teams.get(1).getId(), newComp.getFinale().getDependentOn().getPreviousA().getTeamB().getId());
+        assertEquals(teams.get(2).getId(), newComp.getFinale().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(3).getId(), newComp.getFinale().getDependentOn().getPreviousB().getTeamB().getId());
+
+        assertTrue(generated.stream().map(Match::getId).anyMatch(id -> newComp.getFinale().getId() == id));
+        assertNotNull(newComp.getThirdPlace());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousA().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousA().getId());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousB().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen8Teams() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 8);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "previousA": {
+                    "previousA": {
+                      "teamA": {
+                        "id": "%s"
+                      },
+                      "teamB": {
+                        "id": "%s"
+                      }
+                    },
+                    "previousB": {
+                      "teamA": {
+                        "id": "%s"
+                      },
+                      "teamB": {
+                        "id": "%s"
+                      }
+                    }
+                  },
+                  "previousB": {
+                    "previousA": {
+                      "teamA": {
+                        "id": "%s"
+                      },
+                      "teamB": {
+                        "id": "%s"
+                      }
+                    },
+                    "previousB": {
+                      "teamA": {
+                        "id": "%s"
+                      },
+                      "teamB": {
+                        "id": "%s"
+                      }
+                    }
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        competitionRepository.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(8, generated.size());
+
+        assertEquals(teams.get(0).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getTeamA().getId());
+        assertEquals(teams.get(1).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getTeamB().getId());
+        assertEquals(teams.get(2).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(3).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getTeamB().getId());
+        assertEquals(teams.get(4).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getTeamA().getId());
+        assertEquals(teams.get(5).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getTeamB().getId());
+        assertEquals(teams.get(6).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(7).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getTeamB().getId());
+
+        assertTrue(generated.stream().map(Match::getId).anyMatch(id -> newComp.getFinale().getId() == id));
+        assertNotNull(newComp.getThirdPlace());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousA().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousA().getId());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousB().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen13Teams() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 12);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "previousA": {
+                    "previousA": {
+                      "previousA": {
+                        "teamA": {
+                          "id": "%s"
+                        },
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      },
+                      "previousB": {
+                        "teamA": {
+                          "id": "%s"
+                        }
+                      }
+                    },
+                    "previousB": {
+                      "previousA": {
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      },
+                      "previousB": {
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      }
+                    }
+                  },
+                  "previousB": {
+                    "previousA": {
+                      "previousA": {
+                        "teamA": {
+                          "id": "%s"
+                        },
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      },
+                      "previousB": {
+                        "teamA": {
+                          "id": "%s"
+                        },
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      }
+                    },
+                    "previousB": {
+                      "previousA": {
+                        "teamA": {
+                          "id": "%s"
+                        }
+                      },
+                      "previousB": {
+                        "teamA": {
+                          "id": "%s"
+                        },
+                        "teamB": {
+                          "id": "%s"
+                        }
+                      }
+                    }
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        competitionRepository.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(16, generated.size());
+
+        assertEquals(teams.get(0).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousA()
+                .getTeamA().getId());
+        assertEquals(teams.get(1).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousA()
+                .getTeamB().getId());
+        assertEquals(teams.get(2).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousB()
+                .getTeamA().getId());
+        assertEquals(teams.get(2).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA().getTeamB().getId());
+        assertEquals(teams.get(3).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getDependentOn()
+                .getPreviousA()
+                .getTeamB().getId());
+        assertEquals(teams.get(3).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(4).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getDependentOn()
+                .getPreviousB()
+                .getTeamB().getId());
+        assertEquals(teams.get(4).getId(),
+            newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB().getTeamB().getId());
+        assertEquals(teams.get(5).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousA()
+                .getTeamA().getId());
+        assertEquals(teams.get(6).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousA()
+                .getTeamB().getId());
+        assertEquals(teams.get(7).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousB()
+                .getTeamA().getId());
+        assertEquals(teams.get(8).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA().getDependentOn()
+                .getPreviousB()
+                .getTeamB().getId());
+        assertEquals(teams.get(9).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getDependentOn()
+                .getPreviousA()
+                .getTeamA().getId());
+        assertEquals(teams.get(9).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getTeamA().getId());
+        assertEquals(teams.get(10).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getDependentOn()
+                .getPreviousB()
+                .getTeamA().getId());
+        assertEquals(teams.get(11).getId(),
+            newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB().getDependentOn()
+                .getPreviousB()
+                .getTeamB().getId());
+
+        assertTrue(generated.stream().map(Match::getId).anyMatch(id -> newComp.getFinale().getId() == id));
+        assertNotNull(newComp.getThirdPlace());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousA().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousA().getId());
+        assertEquals(newComp.getFinale().getDependentOn().getPreviousB().getId(),
+            newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    public void unauthorized() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 2);
+        var teams = competition.getTeams();
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "teamA": {
+                    "id": "%s"
+                  },
+                  "teamB": {
+                    "id": "%s"
+                  }
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initKnockout")
+            .then()
+            .assertThat()
+            .statusCode(401);
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen2to3Teams() {
+        gen2Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen3Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen3to2Teams() {
+        gen3Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen2Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen2to4Teams() {
+        gen2Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen4Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen4to2Teams() {
+        gen2Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen2Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen3to4Teams() {
+        gen3Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match a = competition.getFinale().getDependentOn().getPreviousA();
+
+        Panache.getEntityManager().clear();
+        gen4Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen4to3Teams() {
+        gen4Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match a = competition.getFinale().getDependentOn().getPreviousA();
+
+        Panache.getEntityManager().clear();
+        gen3Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen2to8Teams() {
+        gen2Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen8Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen3to8Teams() {
+        gen3Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match a = competition.getFinale().getDependentOn().getPreviousA();
+
+        Panache.getEntityManager().clear();
+        gen8Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen4to8Teams() {
+        gen4Teams();
+        competitionRepository.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match thi = competition.getThirdPlace();
+        Match a = fin.getDependentOn().getPreviousA();
+        Match b = fin.getDependentOn().getPreviousB();
+        competitionRepository.getEntityManager().clear();
+
+        gen8Teams();
+
+        competitionRepository.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Match> generated = matchRepository.listAll();
+        assertEquals(8, generated.size());
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(thi.getId(), newComp.getThirdPlace().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+        assertEquals(b.getId(), newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen8to2Teams() {
+        gen8Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen2Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen8to3Teams() {
+        gen8Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match a = competition.getFinale().getDependentOn().getPreviousA();
+
+        Panache.getEntityManager().clear();
+        gen3Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen8to4Teams() {
+        gen8Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match thi = competition.getThirdPlace();
+        Match a = fin.getDependentOn().getPreviousA();
+        Match b = fin.getDependentOn().getPreviousB();
+
+        Panache.getEntityManager().clear();
+        gen4Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(thi.getId(), newComp.getThirdPlace().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+        assertEquals(b.getId(), newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen2to2Teams() {
+        gen2Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+
+        Panache.getEntityManager().clear();
+        gen2Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen3to3Teams() {
+        gen3Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match a = competition.getFinale().getDependentOn().getPreviousA();
+
+        Panache.getEntityManager().clear();
+        gen3Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen4to4Teams() {
+        gen4Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match thi = competition.getThirdPlace();
+        Match a = fin.getDependentOn().getPreviousA();
+        Match b = fin.getDependentOn().getPreviousB();
+
+        Panache.getEntityManager().clear();
+        gen4Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(thi.getId(), newComp.getThirdPlace().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+        assertEquals(b.getId(), newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+    }
+
+    @Test
+    @TestSecurity(user = "testuser", roles = "director")
+    public void gen8to8Teams() {
+        gen8Teams();
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        Match fin = competition.getFinale();
+        Match thi = competition.getThirdPlace();
+        Match a = fin.getDependentOn().getPreviousA();
+        Match b = fin.getDependentOn().getPreviousB();
+        Match aa = a.getDependentOn().getPreviousA();
+        Match ab = a.getDependentOn().getPreviousB();
+        Match ba = b.getDependentOn().getPreviousA();
+        Match bb = b.getDependentOn().getPreviousB();
+
+        Panache.getEntityManager().clear();
+        gen8Teams();
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        assertEquals(fin.getId(), newComp.getFinale().getId());
+        assertEquals(thi.getId(), newComp.getThirdPlace().getId());
+        assertEquals(a.getId(), newComp.getFinale().getDependentOn().getPreviousA().getId());
+        assertEquals(b.getId(), newComp.getThirdPlace().getDependentOn().getPreviousB().getId());
+        assertEquals(aa.getId(), newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousA()
+            .getId());
+        assertEquals(ab.getId(), newComp.getFinale().getDependentOn().getPreviousA().getDependentOn().getPreviousB()
+            .getId());
+        assertEquals(ba.getId(), newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousA()
+            .getId());
+        assertEquals(bb.getId(), newComp.getFinale().getDependentOn().getPreviousB().getDependentOn().getPreviousB()
+            .getId());
+    }
 }

From b00dc3ff1090db36c24f8e5760f0a7813abe8dbb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 20 Sep 2024 23:33:46 +0200
Subject: [PATCH 145/247] =?UTF-8?q?=E2=9C=85=20Add=20first=20generation=20?=
 =?UTF-8?q?tests=20for=20group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/GroupTools.java    |   3 +-
 .../modifier/TestGroupTools.java              | 254 ++++++++++++++++++
 2 files changed, 255 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
index 1b4a41fa..daedf464 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
@@ -100,8 +100,7 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
         if (groups.size() == 1) {
             competition.setTotal(0);
             competitions.persist(competition);
-        }
-        if (groups.size() == 2) { // finale and game for third place needed
+        } else if (groups.size() == 2) { // finale and game for third place needed
             Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1), 1, 0);
             competition.setFinale(finale);
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
new file mode 100644
index 00000000..e118cfc0
--- /dev/null
+++ b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
@@ -0,0 +1,254 @@
+package de.secretj12.turnierplaner.modifier;
+
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.entities.groups.Group;
+import de.secretj12.turnierplaner.db.repositories.*;
+import io.quarkus.hibernate.orm.panache.Panache;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.http.ContentType;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.*;
+
+@QuarkusTest
+public class TestGroupTools {
+
+    private static final Logger log = LoggerFactory.getLogger(TestGroupTools.class);
+    @Inject
+    TournamentRepository tournamentRepository;
+    @Inject
+    CompetitionRepository competitionRepository;
+    @Inject
+    PlayerRepository playerRepository;
+    @Inject
+    TeamRepository teamRepository;
+    @Inject
+    MatchRepository matchRepository;
+    @Inject
+    NextMatchRepository nextMatchRepository;
+    @Inject
+    MatchOfGroupRepository matchOfGroupRepository;
+    @Inject
+    GroupRepository groupRepository;
+    @Inject
+    FinalOfGroupRepository finalOfGroupRepository;
+
+
+    @BeforeEach
+    @Transactional
+    public void addData() {
+        Tournament tour = new Tournament();
+        tour.setName("Clubmeisterschaft");
+        tour.setDescription("Anmeldung abgeschlossen");
+        tour.setBeginRegistration(Instant.now().minus(10, ChronoUnit.DAYS));
+        tour.setEndRegistration(Instant.now().minus(5, ChronoUnit.DAYS));
+        tour.setBeginGamePhase(Instant.now().plus(5, ChronoUnit.DAYS));
+        tour.setEndGamePhase(Instant.now().plus(10, ChronoUnit.DAYS));
+        tour.setVisible(true);
+        tournamentRepository.persist(tour);
+
+        Competition comp = new Competition();
+        comp.setName("Herren");
+        comp.setDescription("Empty description");
+        comp.setMode(CompetitionMode.DOUBLES);
+        comp.setType(CompetitionType.GROUPS);
+        comp.setSignup(CompetitionSignUp.TOGETHER);
+        comp.setPlayerASex(Sex.MALE);
+        comp.setTournament(tour);
+        comp.setcProgress(CreationProgress.GAMES);
+        competitionRepository.persist(comp);
+    }
+
+    @AfterEach
+    @Transactional
+    public void deleteData() {
+        matchOfGroupRepository.deleteAll();
+        nextMatchRepository.deleteAll();
+        finalOfGroupRepository.deleteAll();
+        groupRepository.deleteAll();
+        matchRepository.deleteAll();
+        teamRepository.deleteAll();
+        playerRepository.deleteAll();
+        competitionRepository.deleteAll();
+        tournamentRepository.deleteAll();
+    }
+
+    @Transactional
+    public void generateTeams(Competition comp, int num) {
+        for (int i = 0; i < num; i++) {
+            Player pA = new Player();
+            pA.setFirstName("firstA");
+            pA.setLastName("lastA");
+            playerRepository.persist(pA);
+            Player pB = new Player();
+            pB.setFirstName("firstB");
+            pB.setLastName("lastB");
+            playerRepository.persist(pB);
+
+            Team team = new Team();
+            team.setPlayerA(pA);
+            team.setPlayerB(pB);
+            team.setCompetition(comp);
+            teamRepository.persist(team);
+        }
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+                "2, 1",
+                "5, 1",
+                "10, 1",
+                "20, 1",
+                "2, 2",
+                "5, 2",
+                "10, 2",
+                "20, 2",
+                "2, 4",
+                "5, 4",
+                "10, 4",
+                "20, 4",
+                "2, 8",
+                "5, 8",
+                "10, 8",
+                "20, 8",
+    })
+    @TestSecurity(user = "testuser", roles = "director")
+    public void genGroups(int groupSize, int groupCount) {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, groupSize * groupCount);
+        var teams = competition.getTeams();
+
+        String teamTemp = "{ \"id\": \"%s\" }";
+        String groupTemp = "[ %s ]";
+        String bodyTemp = """
+            {
+              "groups": [
+                %s
+              ]
+            }
+            """;
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format(bodyTemp, Stream.iterate(0, n -> n + 1)
+                .limit(groupCount)
+                .map(gi -> Stream.iterate(0, n -> n + 1).limit(groupSize)
+                    .map(ti -> String.format(teamTemp, teams.get(groupSize * gi + ti).getId()))
+                    .collect(Collectors.joining(", "))
+                )
+                .map(s -> String.format(groupTemp, s))
+                .collect(Collectors.joining(",\n"))))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initGroups")
+            .then()
+            .assertThat()
+            .statusCode(200);
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Group> groups = newComp.getGroups();
+
+        assertEquals(groupCount, groups.size());
+        int ggC = groupSize * (groupSize - 1) / 2;
+        for (int i = 0; i < groupCount; i++) {
+            Group group = groups.get(i);
+            assertEquals(ggC, group.getMatches().size());
+            checkGroup(teams.subList(i * groupSize, (i + 1) * groupSize), group.getMatches());
+        }
+
+        List<Match> matches = newComp.getMatches();
+        int kgC = groupCount == 1 ? 0 : groupCount;
+        assertEquals(groupCount * ggC + kgC, matches.size());
+
+        Match fin = newComp.getFinale();
+        Match thi = newComp.getThirdPlace();
+        if (groupCount == 1) {
+            assertNull(fin);
+            assertNull(thi);
+            return;
+        } else {
+            assertNotNull(fin);
+            assertNotNull(thi);
+        }
+
+        if (groupCount == 2) {
+            assertEquals(2, thi.getFinalOfGroup().getPos());
+            assertEquals(groups.get(0).getId(), thi.getFinalOfGroup().getGroupA().getId());
+            assertEquals(groups.get(1).getId(), thi.getFinalOfGroup().getGroupB().getId());
+        } else {
+            assertFalse(thi.getDependentOn().isWinner());
+            assertEquals(fin.getDependentOn().getPreviousA().getId(), thi.getDependentOn().getPreviousA().getId());
+            assertEquals(fin.getDependentOn().getPreviousB().getId(), thi.getDependentOn().getPreviousB().getId());
+        }
+        List<Match> finMatches = flatMatches(List.of(newComp.getFinale()));
+        assertEquals(groupCount / 2, finMatches.size());
+        for (int i = 0; i < groupCount / 2; i++) {
+            assertEquals(groups.get(2 * i).getId(), finMatches.get(i).getFinalOfGroup().getGroupA().getId());
+            assertEquals(groups.get(2 * i + 1).getId(), finMatches.get(i).getFinalOfGroup().getGroupB().getId());
+        }
+    }
+
+    @Test
+    public void unauthorized() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        generateTeams(competition, 2);
+        var teams = competition.getTeams();
+        given()
+            .contentType(ContentType.JSON)
+            .body(String.format("""
+                {
+                  "groups": [
+                    [
+                      { "id": "%s" }, { "id": "%s" }
+                    ]
+                  ]
+                }
+                """, teams.stream().map(Team::getId).toArray()))
+            .post("/tournament/Clubmeisterschaft/competition/Herren/initGroups")
+            .then()
+            .assertThat()
+            .statusCode(401);
+    }
+
+    private void checkGroup(List<Team> teams, Set<Match> matches) {
+        for (Team t1 : teams) {
+            for (Team t2 : teams) {
+                if (t1.getId().equals(t2.getId()))
+                    continue;
+
+                assertTrue(matches.stream().anyMatch(m -> checkTeams(t1, t2, m)));
+            }
+        }
+    }
+
+    private boolean checkTeams(Team t1, Team t2, Match m) {
+        return (m.getTeamA().getId().equals(t1.getId()) && m.getTeamB().getId().equals(t2.getId()))
+            || (m.getTeamA().getId().equals(t2.getId()) && m.getTeamB().getId().equals(t1.getId()));
+    }
+
+    private List<Match> flatMatches(List<Match> matches) {
+        if (matches.getFirst().getDependentOn() == null)
+            return matches;
+        return flatMatches(matches.stream()
+            .flatMap(m -> Stream.of(m.getDependentOn().getPreviousA(), m.getDependentOn().getPreviousB()))
+            .toList());
+    }
+}

From 8c9e14d7dee4843605d78211451a3b9d5365f627 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 21 Sep 2024 15:50:53 +0200
Subject: [PATCH 146/247] =?UTF-8?q?=E2=9C=85=20Add=20changing=20tests=20fo?=
 =?UTF-8?q?r=20group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |   2 +-
 .../db/entities/groups/FinalOfGroup.java      |   2 +-
 .../turnierplaner/modifier/GroupTools.java    | 103 +++++++++++-------
 .../modifier/TestGroupTools.java              |  66 ++++++++++-
 4 files changed, 126 insertions(+), 47 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 6c457273..c0d5a552 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -38,7 +38,7 @@ public class Match {
     @NotNull
     @Fetch(FetchMode.SELECT)
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "competition_id")
+    @JoinColumn(name = "competition_id", nullable = false)
     private Competition competition;
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "court")
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
index 12d9902c..ad144949 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
@@ -17,7 +17,7 @@ public class FinalOfGroup {
     private int pos;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true)
+    @OneToOne(cascade = CascadeType.REMOVE)
     @JoinColumn(name = "next_match", referencedColumnName = "id", nullable = false)
     private Match nextMatch;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
index daedf464..801b9a68 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
@@ -34,13 +34,28 @@ public class GroupTools {
 
     // TODO please add tests for me
     public void generateMatches(Competition competition, List<Set<Team>> nGroups) {
+        Match thirdP = competition.getThirdPlace();
         competition.setFinale(null);
         competition.setThirdPlace(null);
 
+        if (thirdP != null) {
+            if (thirdP.getDependentOn() != null) {
+                NextMatch nm = thirdP.getDependentOn();
+                nm.setNextMatch(null);
+                thirdP.setDependentOn(null);
+                nextMatchRepository.delete(nm);
+            }
+            if (thirdP.getFinalOfGroup() != null) {
+                FinalOfGroup fog = thirdP.getFinalOfGroup();
+                fog.setNextMatch(null);
+                thirdP.setFinalOfGroup(null);
+                finalOfGroupRepository.delete(fog);
+            }
+        }
+
         List<Group> groups = competition.getGroups();
-        int prevGroupsSize = groups.size();
         createGroups(competition, groups, nGroups);
-        createKnockoutTree(competition, prevGroupsSize, groups);
+        createKnockoutTree(competition, groups, thirdP);
     }
 
     private void createGroups(Competition competition, List<Group> exGroups, List<Set<Team>> nGroups) {
@@ -96,36 +111,49 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
         }
     }
 
-    private void createKnockoutTree(Competition competition, int prevGroupsSize, List<Group> groups) {
+    private void createKnockoutTree(Competition competition, List<Group> groups, Match thirdP) {
         if (groups.size() == 1) {
             competition.setTotal(0);
             competitions.persist(competition);
+            if (thirdP != null)
+                matchRepository.delete(thirdP);
         } else if (groups.size() == 2) { // finale and game for third place needed
-            Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1), 1, 0);
+            Match finale = finaleOfGroups(competition, groups.get(0), groups.get(1));
             competition.setFinale(finale);
 
             // create third place match
-            Match thirdPlace = finaleOfGroups(competition, groups.get(0), groups.get(1), 2, 0);
-            competition.setThirdPlace(thirdPlace);
+            if (thirdP == null)
+                thirdP = new Match();
+            thirdP.setNumber(0);
+            thirdP.setDependentOn(null);
+            thirdP.setCompetition(competition);
+            matchRepository.persist(thirdP);
+
+            FinalOfGroup fog = new FinalOfGroup();
+            fog.setPos(2);
+            fog.setGroupA(groups.get(0));
+            fog.setGroupB(groups.get(1));
+            fog.setNextMatch(thirdP);
+            finalOfGroupRepository.persist(fog);
+
             competition.setTotal(1);
+            competition.setThirdPlace(thirdP);
             competitions.persist(competition);
         } else if (groups.size() > 2) { // knockout tree needed
-            if (prevGroupsSize == 2) // delete previous game for third place
-                matchRepository.delete(finaleOfGroups(competition, groups.get(0), groups.get(1), 2, -1));
-
             List<Match> matches = new ArrayList<>();
             for (int i = 0; i < groups.size() / 2; i++)
-                matches.add(finaleOfGroups(competition, groups.get(2 * i), groups.get(2 * i + 1), 1, 0));
+                matches.add(finaleOfGroups(competition, groups.get(2 * i), groups.get(2 * i + 1)));
 
             int counter = 0;
             do {
                 counter++;
                 List<Match> newMatches = new ArrayList<>();
                 for (int i = 0; i < matches.size() / 2; i++) {
-                    Optional<NextMatch> exNext = matches.get(i).getPreviousOfA() == null ? Optional.empty() : matches
-                        .get(2 * i).getPreviousOfA()
-                        .stream().filter(NextMatch::isWinner)
-                        .findFirst();
+                    Optional<NextMatch> exNext = matches.get(2 * i).getPreviousOfA() == null ? Optional
+                        .empty() : matches
+                            .get(2 * i).getPreviousOfA()
+                            .stream().filter(NextMatch::isWinner)
+                            .findFirst();
                     if (exNext.isEmpty()) {
                         Match m = new Match();
                         m.setNumber(counter);
@@ -151,29 +179,20 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
                 }
 
                 if (matches.size() == 2) {
-                    Optional<NextMatch> exNext = matches.getFirst().getPreviousOfA() == null ? Optional
-                        .empty() : matches.getFirst().getPreviousOfA()
-                            .stream().filter(nm -> !nm.isWinner())
-                            .findAny();
-                    if (exNext.isEmpty()) {
-                        Match m = new Match();
-                        m.setNumber(counter);
-                        m.setCompetition(competition);
-                        matchRepository.persist(m);
-                        competition.setThirdPlace(m);
-
-                        NextMatch nextMatch = new NextMatch();
-                        nextMatch.setPreviousA(matches.get(0));
-                        nextMatch.setPreviousB(matches.get(1));
-                        nextMatch.setNextMatch(m);
-                        nextMatch.setWinner(false);
-                        nextMatchRepository.persist(nextMatch);
-                    } else {
-                        Match m = exNext.get().getNextMatch();
-                        m.setNumber(counter);
-                        matchRepository.persist(m);
-                        competition.setThirdPlace(m);
-                    }
+                    if (thirdP == null)
+                        thirdP = new Match();
+                    thirdP.setNumber(counter);
+                    thirdP.setCompetition(competition);
+                    matchRepository.persist(thirdP);
+
+                    NextMatch nextMatch = new NextMatch();
+                    nextMatch.setNextMatch(thirdP);
+                    nextMatch.setPreviousA(matches.get(0));
+                    nextMatch.setPreviousB(matches.get(1));
+                    nextMatch.setWinner(false);
+                    nextMatchRepository.persist(nextMatch);
+
+                    competition.setThirdPlace(thirdP);
                 }
                 matches = newMatches;
             } while (matches.size() > 1);
@@ -184,27 +203,27 @@ private void createKnockoutTree(Competition competition, int prevGroupsSize, Lis
         }
     }
 
-    private Match finaleOfGroups(Competition competition, Group g1, Group g2, int pos, int number) {
+    private Match finaleOfGroups(Competition competition, Group g1, Group g2) {
         Optional<FinalOfGroup> exFin = g1.getFinalOfGroupA() == null ? Optional.empty() : g1.getFinalOfGroupA().stream()
-            .filter(fog -> fog.getPos() == pos)
+            .filter(fog -> fog.getPos() == 1)
             .findFirst();
         if (exFin.isEmpty()) {
             Match finale = new Match();
-            finale.setNumber(number);
+            finale.setNumber(0);
             finale.setCompetition(competition);
             matchRepository.persist(finale);
 
             FinalOfGroup fog = new FinalOfGroup();
             fog.setGroupA(g1);
             fog.setGroupB(g2);
-            fog.setPos(pos);
+            fog.setPos(1);
             fog.setNextMatch(finale);
             finalOfGroupRepository.persist(fog);
 
             return finale;
         } else {
             Match match = exFin.get().getNextMatch();
-            match.setNumber(number);
+            match.setNumber(0);
             matchRepository.persist(match);
             return match;
         }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
index e118cfc0..b930e3cc 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
@@ -228,6 +228,66 @@ public void unauthorized() {
             .statusCode(401);
     }
 
+    @ParameterizedTest
+    @CsvSource({
+                "4, 1, 4, 1",
+                "8, 1, 4, 2",
+                "3, 1, 5, 4",
+                "3, 1, 7, 8",
+                "6, 2, 2, 1",
+                "6, 2, 8, 2",
+                "5, 2, 2, 4",
+                "7, 2, 9, 8",
+                "6, 4, 5, 1",
+                "6, 4, 2, 2",
+                "3, 4, 8, 4",
+                "7, 4, 3, 8",
+                "5, 8, 8, 1",
+                "4, 8, 5, 2",
+                "3, 8, 4, 4",
+                "2, 8, 3, 8",
+                "32, 1, 2, 16",
+                "2, 16, 32, 1"
+    })
+    @TestSecurity(user = "testuser", roles = "director")
+    public void genGroupsChange(int groupSizeFrom, int groupCountFrom, int groupSizeTo, int groupCountTo) {
+        genGroups(groupSizeFrom, groupCountFrom);
+
+        Panache.getEntityManager().clear();
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Group> groups = competition.getGroups();
+        List<Set<Match>> matches = groups.stream().map(Group::getMatches).toList();
+        // necessary to preload matches
+        matches.stream().forEach(ms -> ms.forEach(Match::getTeamA));
+        matches.stream().forEach(ms -> ms.forEach(Match::getTeamB));
+        Match fin = competition.getFinale();
+        List<Match> firstMatches = groupCountFrom > 1 ? flatMatches(List.of(fin)) : List.of();
+
+        Panache.getEntityManager().clear();
+        genGroups(groupSizeTo, groupCountTo);
+
+        Panache.getEntityManager().clear();
+        Competition newComp = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Group> newGroups = newComp.getGroups();
+        Match newFin = newComp.getFinale();
+        List<Match> newFirstMatches = groupCountTo > 1 ? flatMatches(List.of(newFin)) : List.of();
+
+        for (int i = 0; i < Math.min(groupCountFrom, groupCountTo); i++) {
+            for (Match m : matches.get(i)) {
+                for (Match nm : newGroups.get(i).getMatches()) {
+                    if (checkTeams(m.getTeamA(), m.getTeamB(), nm))
+                        assertEquals(m.getId(), nm.getId());
+                }
+            }
+        }
+        for (int i = 0; i < Math.min(groupCountFrom, groupCountTo); i++) {
+            assertEquals(groups.get(i).getId(), newGroups.get(i).getId());
+        }
+        for (int i = 0; i < Math.min(groupCountFrom, groupCountTo) / 2; i++) {
+            assertEquals(firstMatches.get(i).getId(), newFirstMatches.get(i).getId());
+        }
+    }
+
     private void checkGroup(List<Team> teams, Set<Match> matches) {
         for (Team t1 : teams) {
             for (Team t2 : teams) {
@@ -239,9 +299,9 @@ private void checkGroup(List<Team> teams, Set<Match> matches) {
         }
     }
 
-    private boolean checkTeams(Team t1, Team t2, Match m) {
-        return (m.getTeamA().getId().equals(t1.getId()) && m.getTeamB().getId().equals(t2.getId()))
-            || (m.getTeamA().getId().equals(t2.getId()) && m.getTeamB().getId().equals(t1.getId()));
+    private boolean checkTeams(Team tA, Team tB, Match m) {
+        return (m.getTeamA().getId().equals(tA.getId()) && m.getTeamB().getId().equals(tB.getId()))
+            || (m.getTeamA().getId().equals(tB.getId()) && m.getTeamB().getId().equals(tA.getId()));
     }
 
     private List<Match> flatMatches(List<Match> matches) {

From 509c34dc59b027c2611753245df9f7826430e9d4 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 21 Sep 2024 19:28:09 +0200
Subject: [PATCH 147/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20knockout=20tools?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/modifier/KnockoutTools.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
index def5c71a..91f01dd7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
@@ -64,10 +64,14 @@ private int countTeams(jUserKnockoutMatch tree, int total) {
     }
 
     private Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tree, Match match, int number) {
+        match.setFinished(false);
+        match.setNumber(number);
+        match.setCompetition(competition);
+        matches.persist(match);
+
         if (tree.getPreviousA() == null) {
             match.setTeamA(tree.getTeamA() == null ? null : teams.findById(tree.getTeamA().getId()));
             match.setTeamB(tree.getTeamB() == null ? null : teams.findById(tree.getTeamB().getId()));
-            matches.persist(match);
             deletePrevious(match);
         } else {
             Match a, b;
@@ -96,11 +100,7 @@ private Match updateKnockoutTree(Competition competition, jUserKnockoutMatch tre
             }
         }
 
-        match.setCompetition(competition);
-        match.setFinished(false);
-        match.setNumber(number);
         matches.persist(match);
-
         return match;
     }
 

From 2c791f6d78572a6121e7ee3dff53c0630554d54d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 21 Sep 2024 19:36:21 +0200
Subject: [PATCH 148/247] =?UTF-8?q?=E2=9C=85=20Add=20first=20model=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/TestDeletionBehaviour.java          | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java

diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
new file mode 100644
index 00000000..09faf68b
--- /dev/null
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -0,0 +1,107 @@
+package de.secretj12.turnierplaner.model;
+
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
+import de.secretj12.turnierplaner.db.repositories.*;
+import io.quarkus.hibernate.orm.panache.Panache;
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@QuarkusTest
+public class TestDeletionBehaviour {
+
+    @Inject
+    TournamentRepository tournamentRepository;
+    @Inject
+    CompetitionRepository competitionRepository;
+    @Inject
+    MatchRepository matchRepository;
+    @Inject
+    NextMatchRepository nextMatchRepository;
+    @Inject
+    FinalOfGroupRepository finalOfGroupRepository;
+    @Inject
+    GroupRepository groupRepository;
+
+    @BeforeEach
+    @Transactional
+    public void addData() {
+        Tournament tour = new Tournament();
+        tour.setName("Clubmeisterschaft");
+        tour.setDescription("Anmeldung abgeschlossen");
+        tour.setBeginRegistration(Instant.now().minus(10, ChronoUnit.DAYS));
+        tour.setEndRegistration(Instant.now().minus(5, ChronoUnit.DAYS));
+        tour.setBeginGamePhase(Instant.now().plus(5, ChronoUnit.DAYS));
+        tour.setEndGamePhase(Instant.now().plus(10, ChronoUnit.DAYS));
+        tour.setVisible(true);
+        tournamentRepository.persist(tour);
+
+        Competition comp = new Competition();
+        comp.setName("Herren");
+        comp.setDescription("Empty description");
+        comp.setMode(CompetitionMode.DOUBLES);
+        comp.setType(CompetitionType.GROUPS);
+        comp.setSignup(CompetitionSignUp.TOGETHER);
+        comp.setPlayerASex(Sex.MALE);
+        comp.setTournament(tour);
+        comp.setcProgress(CreationProgress.GAMES);
+        competitionRepository.persist(comp);
+    }
+
+    @AfterEach
+    @Transactional
+    public void deleteData() {
+        matchRepository.deleteAll();
+        competitionRepository.deleteAll();
+        tournamentRepository.deleteAll();
+    }
+
+    @Test
+    @Transactional
+    public void nextDeletion() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        Match f = new Match();
+        f.setCompetition(competition);
+        matchRepository.persist(f);
+        Match a = new Match();
+        a.setCompetition(competition);
+        matchRepository.persist(a);
+        Match b = new Match();
+        b.setCompetition(competition);
+        matchRepository.persist(b);
+        competition.setFinale(f);
+        competitionRepository.persist(competition);
+
+        NextMatch nm = new NextMatch();
+        nm.setNextMatch(f);
+        nm.setPreviousA(a);
+        nm.setPreviousB(b);
+        nextMatchRepository.persist(nm);
+
+        Panache.getEntityManager().flush();
+        Panache.getEntityManager().clear();
+
+        assertEquals(3, matchRepository.listAll().size());
+        competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        matchRepository.delete(competition.getFinale().getDependentOn().getPreviousA());
+        competition.setFinale(competition.getFinale().getDependentOn().getPreviousB());
+        competitionRepository.persist(competition);
+
+        Panache.getEntityManager().flush();
+        Panache.getEntityManager().clear();
+
+        assertEquals(1, matchRepository.listAll().size());
+    }
+}

From 95ac842c80bed34c980df590116840598ecc7c78 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 24 Sep 2024 00:18:06 +0200
Subject: [PATCH 149/247] =?UTF-8?q?=E2=9C=85=20Test=20group=20deletion=20f?=
 =?UTF-8?q?or=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/entities/groups/FinalOfGroup.java      |   2 +-
 .../db/entities/groups/Group.java             |   2 +-
 .../db/entities/groups/MatchOfGroup.java      |   2 +-
 .../src/main/resources/application.properties |   1 -
 .../model/TestDeletionBehaviour.java          | 113 ++++++++++++++++++
 5 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
index ad144949..17fdcf30 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
@@ -13,7 +13,7 @@ public class FinalOfGroup {
     @Id
     private UUID id;
 
-    @Column(name = "position")
+    @Column(name = "position", nullable = false)
     private int pos;
 
     @MapsId
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
index 7e65bbed..19b7a634 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
@@ -22,7 +22,7 @@ public class Group {
     @Column(name = "index")
     private int index;
     @ManyToOne
-    @JoinColumn(name = "competition_id")
+    @JoinColumn(name = "competition_id", nullable = false)
     private Competition competition;
 
     @OneToMany(mappedBy = "groupA", cascade = CascadeType.REMOVE, orphanRemoval = true)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
index 23e275db..d18a4483 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
@@ -17,7 +17,7 @@ public class MatchOfGroup {
     private Group group;
 
     @MapsId
-    @OneToOne(cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
     @JoinColumn(name = "match", referencedColumnName = "id", nullable = false)
     private Match match;
 
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 6b6bbfc3..4d3b7f89 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -50,4 +50,3 @@ quarkus.mailer.mock=false
 %test.quarkus.mailer.host=mail@host.de
 %test.quarkus.mailer.username=user
 %test.quarkus.mailer.password=1234
-
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
index 09faf68b..e23ce58f 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -3,6 +3,9 @@
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.entities.groups.FinalOfGroup;
+import de.secretj12.turnierplaner.db.entities.groups.Group;
+import de.secretj12.turnierplaner.db.entities.groups.MatchOfGroup;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.*;
 import io.quarkus.hibernate.orm.panache.Panache;
@@ -15,6 +18,7 @@
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -33,6 +37,8 @@ public class TestDeletionBehaviour {
     FinalOfGroupRepository finalOfGroupRepository;
     @Inject
     GroupRepository groupRepository;
+    @Inject
+    MatchOfGroupRepository matchOfGroupRepository;
 
     @BeforeEach
     @Transactional
@@ -62,7 +68,11 @@ public void addData() {
     @AfterEach
     @Transactional
     public void deleteData() {
+        matchOfGroupRepository.deleteAll();
+        finalOfGroupRepository.deleteAll();
+        nextMatchRepository.deleteAll();
         matchRepository.deleteAll();
+        groupRepository.deleteAll();
         competitionRepository.deleteAll();
         tournamentRepository.deleteAll();
     }
@@ -104,4 +114,107 @@ public void nextDeletion() {
 
         assertEquals(1, matchRepository.listAll().size());
     }
+
+    @Test
+    @Transactional
+    public void groupDeletion() {
+        Competition competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+
+        Group gA = new Group();
+        gA.setCompetition(competition);
+        gA.setIndex(0);
+        groupRepository.persist(gA);
+        Group gB = new Group();
+        gB.setCompetition(competition);
+        gB.setIndex(1);
+        groupRepository.persist(gB);
+        Group gC = new Group();
+        gC.setCompetition(competition);
+        gC.setIndex(2);
+        groupRepository.persist(gC);
+        Group gD = new Group();
+        gD.setCompetition(competition);
+        gD.setIndex(3);
+        groupRepository.persist(gD);
+
+        Match gmA = new Match();
+        gmA.setCompetition(competition);
+        matchRepository.persist(gmA);
+        Match gmA2 = new Match();
+        gmA2.setCompetition(competition);
+        matchRepository.persist(gmA2);
+        Match gmB = new Match();
+        gmB.setCompetition(competition);
+        matchRepository.persist(gmB);
+        Match gmC = new Match();
+        gmC.setCompetition(competition);
+        matchRepository.persist(gmC);
+        Match gmD = new Match();
+        gmD.setCompetition(competition);
+        matchRepository.persist(gmD);
+
+        MatchOfGroup mogA = new MatchOfGroup();
+        mogA.setMatch(gmA);
+        mogA.setGroup(gA);
+        matchOfGroupRepository.persist(mogA);
+        MatchOfGroup mogA2 = new MatchOfGroup();
+        mogA2.setMatch(gmA2);
+        mogA2.setGroup(gA);
+        matchOfGroupRepository.persist(mogA2);
+        MatchOfGroup mogB = new MatchOfGroup();
+        mogB.setMatch(gmB);
+        mogB.setGroup(gB);
+        matchOfGroupRepository.persist(mogB);
+        MatchOfGroup mogC = new MatchOfGroup();
+        mogC.setMatch(gmC);
+        mogC.setGroup(gC);
+        matchOfGroupRepository.persist(mogC);
+        MatchOfGroup mogD = new MatchOfGroup();
+        mogD.setMatch(gmD);
+        mogD.setGroup(gD);
+        matchOfGroupRepository.persist(mogD);
+
+        Match f = new Match();
+        f.setCompetition(competition);
+        matchRepository.persist(f);
+        Match a = new Match();
+        a.setCompetition(competition);
+        matchRepository.persist(a);
+        Match b = new Match();
+        b.setCompetition(competition);
+        matchRepository.persist(b);
+        competitionRepository.persist(competition);
+
+        NextMatch nm = new NextMatch();
+        nm.setNextMatch(f);
+        nm.setPreviousA(a);
+        nm.setPreviousB(b);
+        nextMatchRepository.persist(nm);
+
+        FinalOfGroup fogA = new FinalOfGroup();
+        fogA.setGroupA(gA);
+        fogA.setGroupB(gB);
+        fogA.setNextMatch(a);
+        fogA.setPos(1);
+        finalOfGroupRepository.persist(fogA);
+        FinalOfGroup fogB = new FinalOfGroup();
+        fogB.setGroupA(gC);
+        fogB.setGroupB(gD);
+        fogB.setNextMatch(b);
+        fogB.setPos(1);
+        finalOfGroupRepository.persist(fogB);
+
+        Panache.getEntityManager().flush();
+        Panache.getEntityManager().clear();
+
+        assertEquals(8, matchRepository.listAll().size());
+        competition = competitionRepository.getByName("Clubmeisterschaft", "Herren");
+        List<Group> groups = competition.getGroups();
+        groupRepository.delete(groups.getFirst());
+
+        Panache.getEntityManager().flush();
+        Panache.getEntityManager().clear();
+
+        assertEquals(4, matchRepository.listAll().size());
+    }
 }

From 960661134979bfc67fd6d86c395c6459be5037b6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 24 Sep 2024 00:28:56 +0200
Subject: [PATCH 150/247] =?UTF-8?q?=F0=9F=94=A5=20Delete=20matches=20endpo?=
 =?UTF-8?q?int=20in=20tournament?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/TournamentResource.java         | 36 -------------------
 frontend/app/src/backend/match.ts             |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 4b9714cf..753790c6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -8,7 +8,6 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -18,9 +17,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import org.jboss.resteasy.reactive.Separator;
 
-import java.time.Instant;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -161,39 +158,6 @@ public String updateTournament(jDirectorTournamentUpdate tournament) {
         return "successfully changed";
     }
 
-    @GET
-    @Path("/{tourId}/matches")
-    @RolesAllowed("director")
-    @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserMatchEvent> getMatchesAt(@PathParam("tourId") String tourId,
-                                              @QueryParam("from") String from,
-                                              @QueryParam("to") String to,
-                                              @QueryParam("courts") @Separator(",") List<String> courts
-    ) {
-        Tournament tournament = tournaments.getByName(tourId);
-
-        Instant fromD = from == null ? null : Instant.parse(from);
-        Instant toD = to == null ? null : Instant.parse(to);
-        return tournament
-            .getCompetitions()
-            .stream().flatMap(competition -> competition.getMatches().stream())
-            .map(jUserMatchEvent::new)
-            .filter(match -> {
-                if (courts != null
-                    && (match.getCourt() == null || !courts.contains(match.getCourt())))
-                    return false;
-                if (fromD != null
-                    && (match.getBegin() == null || match.getEnd().isBefore(fromD)))
-                    return false;
-                if (toD != null
-                    && (match.getEnd() == null || match.getBegin().isAfter(toD)))
-                    return false;
-
-                return true;
-            })
-            .toList();
-    }
-
     private void checkTournamentAccessibility(Tournament tournament) {
         if (tournament == null)
             throw new NotFoundException("Tournament could not be found");
diff --git a/frontend/app/src/backend/match.ts b/frontend/app/src/backend/match.ts
index d09a5eaa..081c232b 100644
--- a/frontend/app/src/backend/match.ts
+++ b/frontend/app/src/backend/match.ts
@@ -62,7 +62,7 @@ export function getFilteredMatches(
 		],
 		queryFn: async () => {
 			return axios
-				.get(`matches`, {
+				.get(`/matches`, {
 					params: {
 						tour: route.params.tourId,
 						player: route.params.playerId,

From 263fcdc30c6111092ef6597b0bd33af5236c7a74 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 24 Sep 2024 00:31:07 +0200
Subject: [PATCH 151/247] =?UTF-8?q?=F0=9F=94=A5=20Delete=20player=20regist?=
 =?UTF-8?q?er=20endpoint=20in=20competition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CompetitionResource.java        | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 7e9334cc..74e0db3e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -15,8 +15,6 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorScheduleMatch;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.group.jUserGroupSystem;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerSignUpForm;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
@@ -352,31 +350,6 @@ public String updateTeams(@PathParam("tourName") String tourName, @PathParam("co
         return "Teams updated";
     }
 
-    @POST
-    @Transactional
-    @Path("/{compName}/signUpRegister/{playerSide}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public jUserPlayer registerSignUpPlayer(@PathParam("tourName") String tourName,
-                                            @PathParam("compName") String compName,
-                                            @PathParam("playerSide") String playerSide,
-                                            jUserPlayerRegistrationForm playerForm) {
-        Player newPlayer = playersResource.adminPlayerRegistration(playerForm);
-
-        Competition competition = competitions.getByName(tourName, compName);
-
-        Team team = new Team();
-        if (playerSide.equals("playerA")) {
-            team.setPlayerA(newPlayer);
-        } else {
-            team.setPlayerB(newPlayer);
-        }
-        team.setCompetition(competition);
-        teams.persist(team);
-
-        return new jUserPlayer(newPlayer);
-    }
-
     private boolean conditionsFailA(Competition comp, Player player) {
         return (comp.getPlayerASex() == Sex.FEMALE && player.getSex() == SexType.MALE)
             || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)

From 03624638d8f4ebbd7efe6e53aa68b72982f9dba5 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 12:52:16 +0200
Subject: [PATCH 152/247] =?UTF-8?q?=F0=9F=91=B7=20Add=20type=20check=20bef?=
 =?UTF-8?q?ore=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index 5e51d842..fc4b6dd7 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -2,7 +2,7 @@
 	"name": "turnierplaner",
 	"version": "0.0.0",
 	"scripts": {
-		"build": "vite build",
+		"build": "vue-tsc --noEmit && vite build",
 		"dev": "vite",
 		"preview": "vite preview --port 5050",
 		"lint:validate": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .vue,.ts,.tsx,.js,.jsx",
@@ -29,7 +29,7 @@
 		"sortablejs": "^1.15.1",
 		"uuid": "^9.0.1",
 		"vee-validate": "^4.12.3",
-		"vue": "^3.3.12",
+		"vue": "^3.5.8",
 		"vue-axios": "^3.5.2",
 		"vue-cal": "^4.9.0",
 		"vue-i18n": "^9.8.0",
@@ -53,6 +53,7 @@
 		"unplugin-vue-components": "^0.26.0",
 		"vite": "^5.0.10",
 		"vue-component-type-helpers": "^2.1.6",
-		"vue-loader-v16": "^16.0.0-beta.5.4"
+		"vue-loader-v16": "^16.0.0-beta.5.4",
+		"vue-tsc": "^2.1.6"
 	}
 }

From 138d4e4b195482cab8e6a69ba21b89b4be68bb12 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 12:52:32 +0200
Subject: [PATCH 153/247] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20Fix=20typing=20?=
 =?UTF-8?q?issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/groupSystem/ViewGroupList.vue   | 10 ++++++----
 .../competition/knockoutSystem/ViewKnockoutTree.vue   |  8 ++++++--
 .../components/views/overview/OverviewCalendar.vue    |  8 +-------
 .../components/views/prepare/ViewPrepareMatches.vue   |  8 ++++----
 .../prepare/assignMatches/AssginMatchesHelper.ts      |  8 ++++++--
 .../views/prepare/editTeams/ViewEditTeams.vue         |  4 ++--
 .../scheduleMatches/MatchesContainerDraggable.vue     |  1 +
 .../prepare/scheduleMatches/SchedulingCalendar.vue    |  1 +
 frontend/app/src/draggable/DraggablePanel.vue         | 11 +++++++++--
 frontend/app/src/main.ts                              | 10 ++++++++++
 10 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue
index 759d6e6d..edc5eee5 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue
@@ -14,12 +14,14 @@
 			<tbody class="table-group-divider">
 				<tr
 					v-for="match in props.group.matches"
-					:key="match.teamA?.id + match.teamB?.id"
+					:key="(match.teamA?.id || '') + (match.teamB?.id || '')"
 				>
-					<td>{{ new Date(match.begin).toLocaleTimeString() }}</td>
+					<td v-if="match.begin">
+						{{ new Date(match.begin).toLocaleTimeString() }}
+					</td>
 					<td>{{ match.court }}</td>
-					<td>{{ match.teamA.playerA.firstName }}</td>
-					<td>{{ match.teamB.playerA.firstName }}</td>
+					<td>{{ match.teamA?.playerA?.name }}</td>
+					<td>{{ match.teamB?.playerA?.name }}</td>
 				</tr>
 			</tbody>
 		</table>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
index b9829528..019caf25 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
@@ -18,7 +18,11 @@
 						}"
 					>
 						<div
-							:ref="(el: HTMLElement) => setEl(level, index, el)"
+							:ref="
+								<VNodeRef>(
+									(<unknown>((el: HTMLElement) => setEl(level, index, el)))
+								)
+							"
 							style="height: fit-content; flex: 1 0 auto"
 						>
 							<slot
@@ -137,7 +141,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref, watch } from "vue"
+import { computed, Ref, ref, VNodeRef, watch } from "vue"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { Team } from "@/interfaces/team"
 
diff --git a/frontend/app/src/components/views/overview/OverviewCalendar.vue b/frontend/app/src/components/views/overview/OverviewCalendar.vue
index 4013edf7..7335315e 100644
--- a/frontend/app/src/components/views/overview/OverviewCalendar.vue
+++ b/frontend/app/src/components/views/overview/OverviewCalendar.vue
@@ -40,13 +40,7 @@ const curEnd = ref<Date | undefined>()
 
 const { data: courts } = getTournamentCourts(route)
 const { data: tournament } = getTournamentDetails(route, t, toast)
-const { data: matches } = getTournamentMatchEvents(
-	route,
-	t,
-	curStart,
-	curEnd,
-	courts,
-)
+const { data: matches } = getTournamentMatchEvents(route, t, curStart, curEnd)
 
 function onViewChange(startDate: Date, endDate: Date) {
 	curStart.value = startDate
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index 6db38fd8..fa202e05 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -196,22 +196,22 @@ function nextPage() {
 
 const stepList = ref([
 	{
-		label: $t("ViewPrepare.steps.settings"),
+		label: <string>(<unknown>$t("ViewPrepare.steps.settings")),
 		name: "settings",
 		index: 1,
 	},
 	{
-		label: $t("ViewPrepare.steps.editTeams"),
+		label: <string>(<unknown>$t("ViewPrepare.steps.editTeams")),
 		name: "editTeams",
 		index: 2,
 	},
 	{
-		label: $t("ViewPrepare.steps.assignMatches"),
+		label: <string>(<unknown>$t("ViewPrepare.steps.assignMatches")),
 		name: "assignMatches",
 		index: 3,
 	},
 	{
-		label: $t("ViewPrepare.steps.scheduleMatches"),
+		label: <string>(<unknown>$t("ViewPrepare.steps.scheduleMatches")),
 		name: "scheduleMatches",
 		index: 4,
 	},
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts b/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
index cae555a3..c164c14b 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
@@ -16,12 +16,16 @@ export function genRandomizeItems(
 ) {
 	return ref([
 		{
-			label: computed(() => t("ViewPrepare.editTeams.reroll")),
+			label: <string>(
+				(<unknown>computed(() => t("ViewPrepare.editTeams.reroll")))
+			),
 			icon: "pi pi-refresh",
 			command: reroll,
 		},
 		{
-			label: computed(() => t("ViewPrepare.editTeams.reset")),
+			label: <string>(
+				(<unknown>computed(() => t("ViewPrepare.editTeams.reset")))
+			),
 			icon: "pi pi-times",
 			command: reset,
 		},
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index 6a359e76..fd0e2131 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -228,12 +228,12 @@ async function reroll() {
 
 const randomizeItems = ref([
 	{
-		label: $t("ViewPrepare.editTeams.reroll"),
+		label: <string>(<unknown>$t("ViewPrepare.editTeams.reroll")),
 		icon: "pi pi-refresh",
 		command: reroll,
 	},
 	{
-		label: $t("ViewPrepare.editTeams.reset"),
+		label: <string>(<unknown>$t("ViewPrepare.editTeams.reset")),
 		icon: "pi pi-times",
 		command: clearTeams,
 	},
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index 65a5b682..a13adbdb 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -76,6 +76,7 @@ function addMatch(match: Match, title: AnnotatedMatch["title"]) {
 		matches.value.push({
 			title,
 			compName: <string>route.params.compId,
+			tourName: <string>route.params.tourId,
 			...match,
 		})
 }
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 57489041..55a04a60 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -133,6 +133,7 @@ function addMatch(match: Match, title: AnnotatedMatch["title"]) {
 			data: {
 				title,
 				compName: <string>route.params.compId,
+				tourName: <string>route.params.tourId,
 				...match,
 			},
 		})
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/frontend/app/src/draggable/DraggablePanel.vue
index 92c177b4..28a1ee94 100644
--- a/frontend/app/src/draggable/DraggablePanel.vue
+++ b/frontend/app/src/draggable/DraggablePanel.vue
@@ -61,6 +61,12 @@ watch(container, () => {
 
 const emit = defineEmits(["onRemove"])
 
+interface Event extends Sortable.SortableEvent {
+	originalEvent: {
+		clientY: number
+	}
+}
+
 function create() {
 	let el = container.value
 	if (!el) return
@@ -88,9 +94,10 @@ function create() {
 		onChoose: (event: Sortable.SortableEvent) => {
 			if (event.oldIndex === undefined) return
 			selectedElement = props.list[event.oldIndex]
-			if (event.originalEvent) {
+			if ((<Event>event).originalEvent) {
 				offsetY =
-					event.originalEvent.clientY - event.target.getBoundingClientRect().top
+					(<Event>event).originalEvent.clientY -
+					event.target.getBoundingClientRect().top
 			}
 		},
 		onRemove: (event: Sortable.SortableEvent) => {
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 0584fc05..1bdefe42 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -67,6 +67,16 @@ const options: I18nOptions = {
 
 const i18n = createI18n<false, typeof options>(options)
 
+declare module "@vue/runtime-core" {
+	interface ComponentCustomProperties {
+		$i18n: {
+			locale: string
+			availableLocales: string[]
+		}
+		$t: (_: string) => string
+	}
+}
+
 /* add font awesome icon component */
 const app = createApp(App)
 

From 6633ceb397b3f8d468ecb1945fef31ce2b6c3b5d Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 1 Sep 2024 21:26:56 +0200
Subject: [PATCH 154/247] =?UTF-8?q?=F0=9F=9A=A7=20add=20scoring=20update?=
 =?UTF-8?q?=20for=20knockout=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 .../turnierplaner/db/entities/NumberSets.java |   5 +
 .../db/entities/competition/Competition.java  |  12 +
 .../db/repositories/SetRepository.java        |   7 +-
 .../resources/CompetitionResource.java        |  62 ++---
 .../resources/MatchRessource.java             |   0
 .../turnierplaner/resources/SetResource.java  |  64 +++++
 .../competition/jDirectorCompetitionAdd.java  |   5 +
 .../user/competition/jUserCompetition.java    |  14 ++
 .../jsonEntities/user/jNumberSets.java        |   5 +
 .../startup/testdata/TestdataGenerator.java   |  20 +-
 .../turnierplaner/tools/CommonHelpers.java    |  25 ++
 .../{modifier => tools}/GroupTools.java       |   2 +-
 .../{modifier => tools}/KnockoutTools.java    |   2 +-
 .../{modifier => tools}/TestGroupTools.java   |   0
 .../TestKnockoutTools.java                    |   2 +-
 frontend/app/package.json                     |   2 +-
 .../src/components/items/PlayerPointRow.vue   |  44 ++++
 .../components/items/UpdatePointsDialog.vue   | 125 ++++++++++
 .../views/competition/ViewCompetition.vue     |   1 +
 .../components/views/competition/ViewGame.vue |   4 +-
 .../groupSystem/ViewGroupSystem.vue           |   7 +-
 .../groupSystem/ViewGroupTable.vue            |  12 +-
 .../knockoutSystem/ViewKnockoutSystem.vue     |  22 +-
 .../views/competitions/FormCompetition.vue    | 232 +++++++++++-------
 .../competitions/ViewCreateCompetition.vue    |   2 +
 frontend/app/src/i18n/de.json                 |   7 +-
 frontend/app/src/i18n/en.json                 |   7 +-
 frontend/app/src/interfaces/competition.ts    |  12 +
 frontend/app/src/interfaces/match.ts          |   6 +
 30 files changed, 557 insertions(+), 154 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
 rename backend/src/main/java/de/secretj12/turnierplaner/{modifier => tools}/GroupTools.java (99%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{modifier => tools}/KnockoutTools.java (99%)
 rename backend/src/test/java/de/secretj12/turnierplaner/{modifier => tools}/TestGroupTools.java (100%)
 rename backend/src/test/java/de/secretj12/turnierplaner/{modifier => tools}/TestKnockoutTools.java (99%)
 create mode 100644 frontend/app/src/components/items/PlayerPointRow.vue
 create mode 100644 frontend/app/src/components/items/UpdatePointsDialog.vue

diff --git a/.gitignore b/.gitignore
index da7485b7..6b07b77a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,5 @@ node_modules/**
 package-lock.json
 
 keycloak-19.0.1/**
-backend/.mvn
\ No newline at end of file
+backend/.mvn
+/src/main/webui/node_modules/*
\ No newline at end of file
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
new file mode 100644
index 00000000..e2ecca80
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.db.entities;
+
+public enum NumberSets {
+    THREE, FIVE
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index fb687906..997ac209 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -1,6 +1,7 @@
 package de.secretj12.turnierplaner.db.entities.competition;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import jakarta.persistence.*;
@@ -48,6 +49,9 @@ public class Competition {
     @Column(name = "signup", nullable = false)
     private CompetitionSignUp signup;
 
+    @Column(name = "number_sets", nullable = false)
+    private NumberSets numberSets;
+
     @Column(name = "playerA_sex", nullable = false)
     private Sex playerASex;
     @Column(name = "playerA_has_min_age")
@@ -294,4 +298,12 @@ public int getTotal() {
     public void setTotal(int total) {
         this.total = total;
     }
+
+    public NumberSets getNumberSets() {
+        return numberSets;
+    }
+
+    public void setNumberSets(NumberSets numberSets) {
+        this.numberSets = numberSets;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
index 2491cac2..0fc871be 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
@@ -1,11 +1,12 @@
 package de.secretj12.turnierplaner.db.repositories;
 
-import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import de.secretj12.turnierplaner.db.entities.Set;
-
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class SetRepository implements PanacheRepository<Set> {
-
+    public Set findById(Set.SetKey key) {
+        return find("key", key).firstResult();
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 74e0db3e..306b250e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -7,8 +7,6 @@
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.db.repositories.*;
-import de.secretj12.turnierplaner.modifier.GroupTools;
-import de.secretj12.turnierplaner.modifier.KnockoutTools;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionUpdate;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorGroupsDivision;
@@ -19,6 +17,9 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutSystem;
+import de.secretj12.turnierplaner.tools.CommonHelpers;
+import de.secretj12.turnierplaner.tools.GroupTools;
+import de.secretj12.turnierplaner.tools.KnockoutTools;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
@@ -38,7 +39,8 @@
 @Path("/tournament/{tourName}/competition")
 public class CompetitionResource {
     // TODO always check for current progress
-
+    @Inject
+    CommonHelpers common;
     @Inject
     PlayerResource playersResource;
     @Inject
@@ -66,7 +68,7 @@ public class CompetitionResource {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserCompetition> getAllCompetitions(@PathParam("tourName") String tourName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
         return competitions.listByName(tourName).stream().map(jUserCompetition::new).toList();
     }
 
@@ -86,7 +88,7 @@ public List<jDirectorCompetitionUpdate> getPrepareCompetitions(@PathParam("tourN
     @Produces(MediaType.APPLICATION_JSON)
     public jUserCompetition getCompetition(@PathParam("tourName") String tourName,
                                            @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         if (securityIdentity.hasRole("director"))
             return new jDirectorCompetitionUpdate(competitions.getByName(tourName, compName));
@@ -157,13 +159,13 @@ public String updateCompetition(@PathParam("tourName") String tourName, jDirecto
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserTeam> getSignedUpPlayers(@PathParam("tourName") String tourName,
                                               @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new NotFoundException("Competition was not found");
 
         if (!securityIdentity.hasRole("director")
-            && (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+                && (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
                 || competition.getTournament().getBeginGamePhase().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
@@ -180,18 +182,18 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
         // TODO better checks if team or members of it are already registered in team
         // TODO check if both layers are the same
         // TODO check if players match conditions
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new BadRequestException("Competition doesn't exist");
 
         if (!securityIdentity.hasRole("director") && // or registration phase
-            (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
-                || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
+                (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+                        || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
         if (competition.getMode() == CompetitionMode.SINGLES
-            || (competition.getSignup() == CompetitionSignUp.INDIVIDUAL
+                || (competition.getSignup() == CompetitionSignUp.INDIVIDUAL
                 && !competition.isPlayerBdifferent())) {
             // single mode or double with individual registration but same constraints
             // -> every registration as player A and player B is null
@@ -207,9 +209,9 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
             List<Team> regTeams = competition.getTeams();
             if (regTeams != null
-                && regTeams.stream()
+                    && regTeams.stream()
                     .anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(playerA.getId()))
-                        || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
+                            || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                 throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
 
             Team team = new Team();
@@ -236,7 +238,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                     List<Team> regTeams = competition.getTeams();
                     if (regTeams != null
-                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(
+                            && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(
                             playerA.getId()))
                             || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                         throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
@@ -255,7 +257,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                     List<Team> regTeams = competition.getTeams();
                     if (regTeams != null
-                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
+                            && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
                             && t.getPlayerA().getId().equals(playerB.getId()))
                             || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
                         throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
@@ -284,13 +286,13 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                 List<Team> regTeams = competition.getTeams();
                 if (regTeams != null
-                    && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
+                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
                         && t.getPlayerA().getId().equals(playerA.getId()))
                         || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                     throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
                 if (regTeams != null && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
-                    && t.getPlayerA().getId().equals(playerB.getId()))
-                    || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
+                        && t.getPlayerA().getId().equals(playerB.getId()))
+                        || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
                     throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
 
                 Team team = new Team();
@@ -313,7 +315,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
     @Produces(MediaType.APPLICATION_JSON)
     public String updateTeams(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
                               List<jUserTeam> teams) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new BadRequestException("Competition doesn't exist");
@@ -352,16 +354,16 @@ public String updateTeams(@PathParam("tourName") String tourName, @PathParam("co
 
     private boolean conditionsFailA(Competition comp, Player player) {
         return (comp.getPlayerASex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-            || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)
-            || (comp.playerAhasMinAge() && comp.getPlayerAminAge().isBefore(player.getBirthday()))
-            || (comp.playerAhasMaxAge() && comp.getPlayerAmaxAge().isAfter(player.getBirthday()));
+                || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+                || (comp.playerAhasMinAge() && comp.getPlayerAminAge().isBefore(player.getBirthday()))
+                || (comp.playerAhasMaxAge() && comp.getPlayerAmaxAge().isAfter(player.getBirthday()));
     }
 
     private boolean conditionsFailB(Competition comp, Player player) {
         return (comp.getPlayerBSex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-            || (comp.getPlayerBSex() == Sex.MALE && player.getSex() == SexType.FEMALE)
-            || (comp.playerBhasMinAge() && comp.getPlayerBminAge().isBefore(player.getBirthday()))
-            || (comp.playerBhasMaxAge() && comp.getPlayerBmaxAge().isAfter(player.getBirthday()));
+                || (comp.getPlayerBSex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+                || (comp.playerBhasMinAge() && comp.getPlayerBminAge().isBefore(player.getBirthday()))
+                || (comp.playerBhasMaxAge() && comp.getPlayerBmaxAge().isAfter(player.getBirthday()));
     }
 
     @GET
@@ -369,7 +371,7 @@ private boolean conditionsFailB(Competition comp, Player player) {
     @Produces(MediaType.APPLICATION_JSON)
     public jUserKnockoutSystem getKnockoutMatches(@PathParam("tourName") String tourName,
                                                   @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new NotFoundException("Could not find competition");
@@ -386,7 +388,7 @@ public jUserKnockoutSystem getKnockoutMatches(@PathParam("tourName") String tour
     @Produces(MediaType.APPLICATION_JSON)
     public jUserGroupSystem getGroupMatches(@PathParam("tourName") String tourName,
                                             @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         if (competition == null) throw new NotFoundException("Competition as not found");
@@ -417,7 +419,7 @@ private void checkTournamentAccessibility(String tourName) {
     @Produces(MediaType.TEXT_PLAIN)
     public boolean initializeMatchesKnockout(@PathParam("tourName") String tourName,
                                              @PathParam("compName") String compName, jUserKnockoutMatch tree) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
 
@@ -438,7 +440,7 @@ public boolean initializeMatchesGroups(@PathParam("tourName") String tourName,
         if (division.getGroups().stream().anyMatch(g -> g.size() <= 1))
             throw new BadRequestException("At least 2 groups per team needed");
 
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         // @formatter:off
         List<Set<Team>> groups = division.getGroups().stream()
@@ -479,7 +481,7 @@ private void checkGroupsCount(int count) {
     @Produces(MediaType.APPLICATION_JSON)
     public jDirectorGroupsDivision groupsDivision(@PathParam("tourName") String tourName,
                                                   @PathParam("compName") String compName) {
-        checkTournamentAccessibility(tourName);
+        common.checkTournamentAccessibility(tourName);
 
         Competition competition = competitions.getByName(tourName, compName);
         List<Group> groups = competition.getGroups();
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
new file mode 100644
index 00000000..7c150fb3
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -0,0 +1,64 @@
+package de.secretj12.turnierplaner.resources;
+
+
+import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.Set;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.repositories.MatchRepository;
+import de.secretj12.turnierplaner.db.repositories.SetRepository;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
+import de.secretj12.turnierplaner.tools.CommonHelpers;
+import io.quarkus.security.UnauthorizedException;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+
+import java.time.Instant;
+import java.util.List;
+
+@RolesAllowed("director")
+@Path("/tournament/{tourName}/competition/{matchId}/set")
+public class SetResource {
+    @Inject
+    TournamentRepository tournaments;
+    @Inject
+    SetRepository setRepository;
+    @Inject
+    MatchRepository matchRepository;
+
+
+    @POST
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") Long matchId,
+                                List<jUserSet> sets) {
+        Tournament tournament = tournaments.getByName(tourName);
+        Instant beginGamePhase = tournament.getBeginGamePhase();
+        if (beginGamePhase != null && beginGamePhase.isAfter(Instant.now()))
+            throw new UnauthorizedException("Cannot update matches before game phase has begun");
+
+        Match match = matchRepository.findById(matchId);
+        if (match == null)
+            throw new NotFoundException("Could find match");
+
+        for (jUserSet jSet : sets) {
+            Set.SetKey setKey = new Set.SetKey();
+            setKey.setMatch(match);
+            setKey.setIndex(jSet.getIndex());
+
+            Set set = new Set();
+            set.setKey(setKey);
+            set.setScoreA(jSet.getScoreA());
+            set.setScoreB(jSet.getScoreB());
+
+            setRepository.persist(set);
+        }
+
+        return "Updated matches";
+    }
+
+
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
index 9858be32..814db6be 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
@@ -1,5 +1,6 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
 
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
 
@@ -15,6 +16,10 @@ public jDirectorCompetitionAdd(Competition competition) {
     public void toDB(Competition competition) {
         competition.setName(getName());
         competition.setDescription(getDescription());
+        competition.setNumberSets(switch (getNumberSets()) {
+            case THREE -> NumberSets.THREE;
+            case FIVE -> NumberSets.FIVE;
+        });
         switch (getType()) {
             case KNOCKOUT -> competition.setType(CompetitionType.KNOCKOUT);
             case GROUPS -> competition.setType(CompetitionType.GROUPS);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
index ed97fc69..b380698f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
@@ -5,6 +5,7 @@
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorMode;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorSignUp;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorValidSex;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jNumberSets;
 import jakarta.ws.rs.NotFoundException;
 
 public class jUserCompetition {
@@ -13,6 +14,7 @@ public class jUserCompetition {
     private jUserCompetitionType type;
     private jDirectorMode mode;
     private jDirectorSignUp signUp;
+    private jNumberSets numberSets;
     private jUserConfigPlayerA playerA;
     private jUserConfigPlayerB playerB;
     private CreationProgress cProgress;
@@ -38,6 +40,10 @@ public jUserCompetition(Competition competition) {
             case INDIVIDUAL -> jDirectorSignUp.INDIVIDUAL;
             case TOGETHER -> jDirectorSignUp.TOGETHER;
         };
+        this.numberSets = switch (competition.getNumberSets()) {
+            case THREE -> jNumberSets.THREE;
+            case FIVE -> jNumberSets.FIVE;
+        };
         this.playerA = new jUserConfigPlayerA();
         this.playerA.setSex(switch (competition.getPlayerASex()) {
             case MALE -> jDirectorValidSex.MALE;
@@ -128,4 +134,12 @@ public CreationProgress getcProgress() {
     public void setcProgress(CreationProgress cProgress) {
         this.cProgress = cProgress;
     }
+
+    public jNumberSets getNumberSets() {
+        return numberSets;
+    }
+
+    public void setNumberSets(jNumberSets numberSets) {
+        this.numberSets = numberSets;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
new file mode 100644
index 00000000..b3e5d644
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.user;
+
+public enum jNumberSets {
+    THREE, FIVE
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index d0188570..7ac62da4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -76,13 +76,13 @@ public void generateData() {
         // @formatter:on
 
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2026", "Anmeldung ausstehend", true,
-            compSetting);
+                compSetting);
         createTournament(TDate.REGISTRATION_OPEN, "Clubmeisterschaft 2025", "Anmeldung offen", true, compSetting);
         createTournament(TDate.BEFORE_GAMEPHASE, "Clubmeisterschaft 2024", "Anmeldung vorbei", true, compSetting);
         createTournament(TDate.GAMEPHASE_OPEN, "Clubmeisterschaft 2023", "Spielphase offen", true, compSetting);
         createTournament(TDate.AFTER_GAMEPHASE, "Clubmeisterschaft 2022", "Spielphase vorbei", true, compSetting);
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2027", "Noch in der Planung", false,
-            compSetting);
+                compSetting);
     }
 
     private void createTournament(TDate tDate, String name, String description, boolean visible,
@@ -136,8 +136,8 @@ private void createSets(Match match) {
         int numberOfSets = 2;
         int winDif = 0;
         List<Tuple2<Integer, Integer>> possibleResults = List.of(Tuple2.of(6, 0), Tuple2.of(6, 1), Tuple2.of(6, 2),
-            Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
-            Tuple2.of(7, 6));
+                Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
+                Tuple2.of(7, 6));
         for (int i = 0; i < numberOfSets; i++) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
@@ -267,9 +267,9 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
             groups[k].setCompetition(competition);
             groupRepository.persist(groups[k]);
             for (int i = k * compSettings.getNumberOfGroups() / compSettings.getNumberOfGroups(); i < compSettings
-                .getTeamNumbers() / compSettings.getNumberOfGroups() * (k + 1); i++) {
+                    .getTeamNumbers() / compSettings.getNumberOfGroups() * (k + 1); i++) {
                 for (int j = i + 1; j < compSettings.getTeamNumbers() / compSettings
-                    .getNumberOfGroups() * (k + 1); j++) {
+                        .getNumberOfGroups() * (k + 1); j++) {
                     Match match = createMatch(courts[i * j % 4], competition);
                     match.setTeamA(groupTeams[i]);
                     match.setTeamB(groupTeams[j]);
@@ -504,10 +504,14 @@ private void addCompetition(Tournament t, TDate tDate,
             competition.setType(compSetting.getCompetitionType());
             switch (tDate) {
                 case BEFORE_REGISTRATION, REGISTRATION_OPEN, BEFORE_GAMEPHASE -> competition.setcProgress(
-                    CreationProgress.TEAMS);
+                        CreationProgress.TEAMS);
                 case GAMEPHASE_OPEN, AFTER_GAMEPHASE -> competition.setcProgress(
-                    CreationProgress.SCHEDULING);
+                        CreationProgress.SCHEDULING);
             }
+            if (Math.random() > 0.9) {
+                competition.setNumberSets(NumberSets.FIVE);
+            } else
+                competition.setNumberSets(NumberSets.THREE);
             competitions.persist(competition);
             switch (tDate) {
                 case BEFORE_REGISTRATION -> {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
new file mode 100644
index 00000000..b27c4fc1
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
@@ -0,0 +1,25 @@
+package de.secretj12.turnierplaner.tools;
+
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import io.quarkus.security.UnauthorizedException;
+import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.NotFoundException;
+
+@ApplicationScoped
+public class CommonHelpers {
+    @Inject
+    TournamentRepository tournaments;
+    
+    @Inject
+    SecurityIdentity securityIdentity;
+
+    public void checkTournamentAccessibility(String tourName) {
+        Tournament tournament = tournaments.getByName(tourName);
+        if (tournament == null) throw new NotFoundException("Tournament could not be found");
+        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
+            throw new UnauthorizedException("Cannot access tournament");
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
similarity index 99%
rename from backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
rename to backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
index 801b9a68..18f68384 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.modifier;
+package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
similarity index 99%
rename from backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
rename to backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
index 91f01dd7..b28a6dae 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/modifier/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.modifier;
+package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/modifier/TestGroupTools.java
rename to backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
similarity index 99%
rename from backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
rename to backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
index 97952979..8417911b 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/modifier/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.modifier;
+package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Player;
diff --git a/frontend/app/package.json b/frontend/app/package.json
index fc4b6dd7..2d4d1420 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -16,7 +16,7 @@
 	"dependencies": {
 		"@tanstack/vue-query": "^5.52.0",
 		"@tanstack/vue-query-devtools": "^5.52.0",
-		"@vee-validate/yup": "^4.12.3",
+		"@vee-validate/yup": "^4.13.2",
 		"@vue/cli": "^5.0.8",
 		"axios": "^1.6.2",
 		"keycloak-js": "^23.0.3",
diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/frontend/app/src/components/items/PlayerPointRow.vue
new file mode 100644
index 00000000..b89a1a48
--- /dev/null
+++ b/frontend/app/src/components/items/PlayerPointRow.vue
@@ -0,0 +1,44 @@
+<template>
+	<div class="grid">
+		<div class="col-fixed" style="width: 300px">
+			<div class="text-center p-3 border-round-sm bg-primary font-bold">
+				{{ props.team?.playerA?.firstName }}
+				{{ props.team?.playerA?.lastName }}
+				{{ props.team?.playerB?.firstName }}
+				{{ props.team?.playerB?.lastName }}
+			</div>
+		</div>
+		<div
+			class="col-fixed"
+			style="width: 140px"
+			v-if="gamePoints"
+			v-for="(p, i) in gamePoints"
+		>
+			<InputNumber
+				v-model="gamePoints[i]"
+				:max="100"
+				:min="0"
+				:pt="{
+					input: { root: { style: 'width: 120px', class: 'text-center' } },
+				}"
+				class="p-inputnumber-input"
+				input-style-class="p-inputnumber"
+				inputId="minmax-buttons"
+				mode="decimal"
+				styleClass="p-inputnumber"
+			/>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { Team } from "@/interfaces/team"
+
+const gamePoints = defineModel("gamePoints", { type: Array<number> })
+const props = defineProps<{
+	team: Team | undefined | null
+	gamePoints: Array<number>
+}>()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
new file mode 100644
index 00000000..c5d75e79
--- /dev/null
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -0,0 +1,125 @@
+<template>
+	<Dialog
+		v-model:visible="visible"
+		:style="{ width: '50rem' }"
+		header="Update Score"
+		modal
+	>
+		<span class="text-surface-500 dark:text-surface-400 block mb-2">{{
+			t("general.update_score")
+		}}</span>
+		<div class="grid">
+			<div class="col-fixed" style="width: 300px"></div>
+			<div
+				class="col-fixed flex justify-content-center flex-wrap"
+				style="width: 140px"
+				v-for="n in numberSets"
+			>
+				<RadioButton
+					v-model="selectedSet"
+					:inputId="n.toString()"
+					name="sets"
+					:value="(n - 1).toString()"
+				/>
+				<label class="ml-2" :for="n.toString()">Set {{ n }}</label>
+			</div>
+		</div>
+		<PlayerPointRow
+			:team="currentMatch?.teamA"
+			:game-points="team1GamePoints"
+			v-if="visible"
+		/>
+		<PlayerPointRow
+			:team="currentMatch?.teamB"
+			:game-points="team2GamePoints"
+			v-if="visible"
+		/>
+		<divider />
+		<div class="grid">
+			<div class="col" v-for="n in 7">
+				<Button
+					:label="'6:' + (n - 1)"
+					@click="updatePoints(6, n - 1)"
+					v-if="n - 1 <= 4"
+				/>
+				<Button
+					:label="'7:' + (n - 1)"
+					@click="updatePoints(7, n - 1)"
+					v-else
+				/>
+			</div>
+		</div>
+		<div class="grid">
+			<div class="col" v-for="n in 7">
+				<Button
+					:label="n - 1 + ':6'"
+					@click="updatePoints(n - 1, 6)"
+					v-if="n - 1 <= 4"
+				/>
+				<Button :label="n - 1 + ':7'" @click="updatePoints(n - 1, 7)" v-else />
+			</div>
+		</div>
+		<divider />
+		<div class="flex justify-content-end flex-wrap gap-2">
+			<Button
+				label="Cancel"
+				severity="secondary"
+				type="button"
+				@click="savePoints"
+			></Button>
+			<Button label="Save" type="button" @click="visible = false"></Button>
+		</div>
+	</Dialog>
+</template>
+<script lang="ts" setup>
+import { Match } from "@/interfaces/match"
+import { ref } from "vue"
+import { useI18n } from "vue-i18n"
+import PlayerPointRow from "@/components/items/PlayerPointRow.vue"
+import { NumberSets } from "@/interfaces/competition"
+
+const props = defineProps<{
+	numberSets: NumberSets
+}>()
+
+const numberSets = props.numberSets ? 3 : 5
+
+const { t } = useI18n({ inheritLocale: true })
+const currentMatch = ref<Match | null>(null)
+const visible = ref(false)
+const selectedSet = ref("0")
+
+const team1GamePoints = ref<number[]>([])
+const team2GamePoints = ref<number[]>([])
+
+const showPopUp = function (match: Match) {
+	currentMatch.value = match
+	team1GamePoints.value = match.sets?.map((set) => set.scoreA) ?? []
+	team2GamePoints.value = match.sets?.map((set) => set.scoreB) ?? []
+	console.log(team1GamePoints.value)
+	visible.value = true
+}
+
+const savePoints = function () {
+	visible.value = false
+}
+
+const updatePoints = function (point1: number, point2: number) {
+	team1GamePoints.value[Number(selectedSet.value)] = point1
+	team2GamePoints.value[Number(selectedSet.value)] = point2
+}
+
+defineExpose({
+	showPopUp,
+})
+</script>
+
+<style scoped>
+.p-inputnumber input {
+	width: 100%;
+}
+
+.p-inputnumber-input input {
+	width: 100%;
+}
+</style>
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index 3260914e..7d9e098c 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -42,6 +42,7 @@
 					v-if="competition"
 					:tour-type="competition.tourType"
 					:mode="competition.mode"
+					:number-sets="competition.numberSets"
 				/>
 			</template>
 		</template>
diff --git a/frontend/app/src/components/views/competition/ViewGame.vue b/frontend/app/src/components/views/competition/ViewGame.vue
index 951c50d9..29b6616e 100644
--- a/frontend/app/src/components/views/competition/ViewGame.vue
+++ b/frontend/app/src/components/views/competition/ViewGame.vue
@@ -4,6 +4,7 @@
 		<ViewKnockoutSystem
 			v-else-if="props.tourType === CompType.KNOCKOUT"
 			:mode="props.mode"
+			:number-sets="props.numberSets"
 		/>
 		<p v-else>Invalid type</p>
 	</Suspense>
@@ -12,11 +13,12 @@
 <script lang="ts" setup>
 import ViewGroupSystem from "@/components/views/competition/groupSystem/ViewGroupSystem.vue"
 import ViewKnockoutSystem from "@/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue"
-import { Mode, CompType } from "@/interfaces/competition"
+import { Mode, NumberSets, CompType } from "@/interfaces/competition"
 
 const props = defineProps<{
 	tourType: CompType
 	mode: Mode
+	numberSets: NumberSets
 }>()
 </script>
 
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index a38dc5c4..9f12c50e 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -2,12 +2,7 @@
 	<!-- TODO show on card -->
 	<!-- TODO add toggle to show as list? -->
 	<template v-if="groupSystem">
-		<ViewGroupTable
-			v-for="group in groupSystem.groups"
-			:key="group.index"
-			:group="group"
-			style="width: 1000px"
-		/>
+		<ViewGroupTable v-for="group in groupSystem.groups" :group="group" />
 	</template>
 
 	<!-- TODO show finals -->
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index a5071040..789c7e4d 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -49,13 +49,17 @@
 						@mouseleave="hoverLeave()"
 					>
 						<div>
-							<ViewMatch :match="findMatch(team, teamB)" />
+							<ViewMatch
+								:match="findMatch(team)"
+								@click="showPopUp(findMatch(teamA, teamB))"
+							/>
 						</div>
 					</td>
 				</template>
 			</tr>
 		</template>
 	</table>
+	<UpdatePointsDialog ref="dialog" />
 </template>
 
 <script setup lang="ts">
@@ -65,6 +69,7 @@ import { useI18n } from "vue-i18n"
 import ViewMatch from "@/components/views/competition/groupSystem/ViewMatch.vue"
 import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
+import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
 import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 
 const { t } = useI18n({ inheritLocale: true })
@@ -104,6 +109,11 @@ function hoverLeave() {
 	hoverIdB.value = null
 	hoverTeam.value = null
 }
+
+const dialog = ref()
+const showPopUp = function (match: Match) {
+	dialog.value.showPopUp(match)
+}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 5a3c38e3..aeaf9643 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -1,5 +1,5 @@
 <template>
-	<p>Knockout system</p>
+	<p>Knockout system test</p>
 	<template v-if="knockoutSystem">
 		<ViewKnockoutTree
 			:finale="knockoutSystem.finale ?? undefined"
@@ -11,34 +11,48 @@
 			:titles="knockoutTitle(t)"
 		>
 			<template #match="{ match }">
-				<ViewMatch v-if="match" :match="match" :mode="props.mode" />
+				<ViewMatch
+					v-if="match"
+					:match="match"
+					:mode="props.mode"
+					@click="showPopUp(match)"
+				/>
 			</template>
 			<template #additional="{ match }">
 				<ViewMatchDate v-if="match" :match="match" />
 			</template>
 		</ViewKnockoutTree>
 	</template>
+	<UpdatePointsDialog ref="dialog" :number-sets="props.numberSets" />
 </template>
 
 <script lang="ts" setup>
 import { useRoute } from "vue-router"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
-import { Mode } from "@/interfaces/competition"
+import { Mode, NumberSets } from "@/interfaces/competition"
 import { getKnockout } from "@/backend/knockout"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
 import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { useI18n } from "vue-i18n"
+import { ref } from "vue"
+import { Match } from "@/interfaces/match"
+import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 
 const props = defineProps<{
 	mode: Mode
+	numberSets: NumberSets
 }>()
 
 const route = useRoute()
 const { data: knockoutSystem } = getKnockout(route)
-// TODO implement view
+const dialog = ref()
+
+const showPopUp = function (match: Match) {
+	dialog.value.showPopUp(match)
+}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 7e502324..95ad5fd8 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -9,7 +9,8 @@
 				class="w-full"
 				maxlength="30"
 				type="text"
-				v-bind="name"
+				v-model="name"
+				v-bind="nameAttrs"
 			/>
 			<InlineMessage v-if="errors.name" class="mt-2"
 				>{{ t(errors.name || "") }}
@@ -23,7 +24,8 @@
 				class="text-base text-color surface-overlay p-2 border-1 border-solid surface-border border-round appearance-none outline-none focus:border-primary w-full"
 				rows="4"
 				type="text"
-				v-bind="description"
+				v-model="description"
+				v-bind="descriptionAttrs"
 			></textarea>
 		</div>
 		<Divider align="left">
@@ -47,7 +49,8 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="selectedTourType"
+				v-model="selectedTourType"
+				v-bind="selectedTourTypeAttrs"
 			>
 				<template #value="slotProps">
 					<div v-if="slotProps.value" class="flex align-items-center">
@@ -94,7 +97,8 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="selectedTourMode"
+				v-model="selectedTourMode"
+				v-bind="selectedTourModeAttrs"
 			>
 				<template #value="slotProps">
 					<div v-if="slotProps.value" class="flex align-items-center">
@@ -151,7 +155,8 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="signUp"
+				v-model="signUp"
+				v-bind="signUpAttrs"
 			>
 				<template #value="slotProps">
 					<div v-if="slotProps.value" class="flex align-items-center">
@@ -191,6 +196,19 @@
 			</Dropdown>
 		</div>
 
+		<div class="field col-12 md:col-6 md:mr-8">
+			<label for="numberSets">{{ t("CompetitionSettings.numberSets") }}</label>
+			<Dropdown
+				v-model="numberSets"
+				v-bind="numberSetsAtrrs"
+				:options="numberSetsOptions"
+				optionLabel="name"
+				option-value="value"
+				:placeholder="t('CompetitionSettings.numberSets')"
+				class="w-full"
+			/>
+		</div>
+
 		<Divider align="left">
 			<b>{{ t("CompetitionSettings.player") }}</b>
 		</Divider>
@@ -200,7 +218,8 @@
 				:binary="true"
 				:disabled="disabled"
 				input-id="playerB_different_input"
-				v-bind="playerB_different"
+				v-model="playerB_different"
+				v-bind="playerB_differentAttrs"
 			/>
 			<label class="ml-2 mb-0 mt-1" for="playerB_different_input">{{
 				t("CompetitionSettings.differentB")
@@ -239,7 +258,8 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="playerASex"
+				v-model="playerASex"
+				v-bind="playerASexAttrs"
 			>
 				<template #option="slotProps">
 					<div>
@@ -283,20 +303,22 @@
 			}}</label>
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
-					id="minAge"
+					id="minAgeA"
 					:binary="true"
 					:disabled="disabled"
-					v-bind="playerAHasMinAge"
+					v-model="playerAHasMinAge"
+					v-bind="playerAHasMinAgeAttrs"
 				/>
 
 				<Calendar
-					id="minAge"
+					id="minAgeA"
 					:date-format="t('date_format')"
-					:disabled="!playerAHasMinAge.modelValue || disabled"
+					:disabled="!playerAHasMinAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-bind="playerAMinAge"
+					v-model="playerAMinAge"
+					v-bind="playerAMinAgeAttrs"
 				/>
 			</div>
 		</div>
@@ -305,16 +327,21 @@
 				t("CompetitionSettings.minAge")
 			}}</label>
 			<div class="flex flex-row align-items-center gap-2">
-				<Checkbox id="minAge" :binary="true" v-bind="playerBHasMinAge" />
-
+				<Checkbox
+					id="minAgeB"
+					:binary="true"
+					v-model="playerBHasMinAge"
+					v-bind="playerBHasMinAgeAttrs"
+				/>
 				<Calendar
-					id="minAge"
+					id="minAgeB"
 					:date-format="t('date_format')"
-					:disabled="!playerBHasMinAge.modelValue || disabled"
+					:disabled="!playerBHasMinAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-bind="playerBMinAge"
+					v-model="playerBMinAge"
+					v-bind="playerBMinAgeAttrs"
 				/>
 			</div>
 		</div>
@@ -331,20 +358,22 @@
 			}}</label>
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
-					id="minAge"
+					id="maxAgeA"
 					:binary="true"
 					:disabled="disabled"
-					v-bind="playerAHasMaxAge"
+					v-model="playerAHasMaxAge"
+					v-bind="playerAHasMaxAgeAttrs"
 				/>
 
 				<Calendar
-					id="minAge"
+					id="maxAgeA"
 					:date-format="t('date_format')"
-					:disabled="!playerAHasMaxAge.modelValue || disabled"
+					:disabled="!playerAHasMaxAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-bind="playerAMaxAge"
+					v-model="playerAMaxAge"
+					v-bind="playerAMaxAgeAttrs"
 				/>
 			</div>
 		</div>
@@ -354,20 +383,22 @@
 			}}</label>
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
-					id="minAge"
+					id="maxAgeB"
 					:binary="true"
 					:disabled="disabled"
-					v-bind="playerBHasMaxAge"
+					v-model="playerBHasMaxAge"
+					v-bind="playerBHasMaxAgeAttrs"
 				/>
 
 				<Calendar
-					id="minAge"
+					id="maxAgeB"
 					:date-format="t('date_format')"
-					:disabled="!playerBHasMaxAge.modelValue || disabled"
+					:disabled="!playerBHasMaxAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-bind="playerBMaxAge"
+					v-model="playerBMaxAge"
+					v-bind="playerBMaxAgeAttrs"
 				/>
 			</div>
 		</div>
@@ -375,12 +406,14 @@
 </template>
 
 <script lang="ts" setup>
+import { ref } from "vue"
 import { useI18n } from "vue-i18n"
 import {
 	Competition,
 	CompetitionForm,
 	competitionFormToServer,
 	Mode,
+	NumberSets,
 	Sex,
 	SignUp,
 	CompType,
@@ -403,74 +436,89 @@ const props = withDefaults(
 	},
 )
 
-const { values, defineInputBinds, errors, defineComponentBinds, handleSubmit } =
-	useForm<CompetitionForm>({
-		validationSchema: toTypedSchema(
-			object({
-				name: string().min(4).max(40).required(),
-				description: string().max(50),
-				tourType: mixed().oneOf(Object.values(CompType)).required(),
-				mode: mixed().oneOf(Object.values(Mode)).required(),
-				signUp: mixed().oneOf(Object.values(SignUp)).required(),
+const { values, defineField, errors, handleSubmit } = useForm<CompetitionForm>({
+	validationSchema: toTypedSchema(
+		object({
+			name: string().min(4).max(40).required(),
+			description: string().max(50),
+			tourType: mixed().oneOf(Object.values(CompType)).required(),
+			mode: mixed().oneOf(Object.values(Mode)).required(),
+			signUp: mixed().oneOf(Object.values(SignUp)).required(),
+			numberSets: mixed().oneOf(Object.values(NumberSets)).required(),
 
-				playerA_Sex: mixed().oneOf(Object.values(Sex)).required(),
-				playerA_hasMinAge: boolean(),
-				playerA_minAge: date(),
-				playerA_hasMaxAge: boolean(),
-				playerA_maxAge: date(),
+			playerA_Sex: mixed().oneOf(Object.values(Sex)).required(),
+			playerA_hasMinAge: boolean(),
+			playerA_minAge: date(),
+			playerA_hasMaxAge: boolean(),
+			playerA_maxAge: date(),
 
-				playerB_different: boolean(),
-				playerB_Sex: mixed().oneOf(Object.values(Sex)),
-				playerB_hasMinAge: boolean(),
-				playerB_minAge: date(),
-				playerB_hasMaxAge: boolean(),
-				playerB_maxAge: date(),
-			}),
-		),
-		initialValues: {
-			name: props.competition.name ? props.competition.name : undefined,
-			description: props.competition.description,
-			tourType: props.competition.tourType,
-			mode: props.competition.mode,
-			signUp: props.competition.signUp,
-			playerA_Sex: props.competition.playerA.sex,
-			playerA_hasMinAge: props.competition.playerA.hasMinAge,
-			playerA_minAge: props.competition.playerA.minAge
-				? props.competition.playerA.minAge
-				: new Date(),
-			playerA_hasMaxAge: props.competition.playerA.hasMaxAge,
-			playerA_maxAge: props.competition.playerA.maxAge
-				? props.competition.playerA.maxAge
-				: new Date(),
-			playerB_different: props.competition.playerB.different,
-			playerB_Sex: props.competition.playerB.sex,
-			playerB_hasMinAge: props.competition.playerB.hasMinAge,
-			playerB_minAge: props.competition.playerB.minAge
-				? props.competition.playerB.minAge
-				: new Date(),
-			playerB_hasMaxAge: props.competition.playerB.hasMaxAge,
-			playerB_maxAge: props.competition.playerB.maxAge
-				? props.competition.playerB.maxAge
-				: new Date(),
-		},
-	})
+			playerB_different: boolean(),
+			playerB_Sex: mixed().oneOf(Object.values(Sex)),
+			playerB_hasMinAge: boolean(),
+			playerB_minAge: date(),
+			playerB_hasMaxAge: boolean(),
+			playerB_maxAge: date(),
+		}),
+	),
+	initialValues: {
+		name: props.competition.name ? props.competition.name : undefined,
+		description: props.competition.description,
+		tourType: props.competition.tourType,
+		mode: props.competition.mode,
+		signUp: props.competition.signUp,
+		numberSets: props.competition.numberSets,
+
+		playerA_Sex: props.competition.playerA.sex,
+		playerA_hasMinAge: props.competition.playerA.hasMinAge,
+		playerA_minAge: props.competition.playerA.minAge
+			? props.competition.playerA.minAge
+			: new Date(),
+		playerA_hasMaxAge: props.competition.playerA.hasMaxAge,
+		playerA_maxAge: props.competition.playerA.maxAge
+			? props.competition.playerA.maxAge
+			: new Date(),
+
+		playerB_different: props.competition.playerB.different,
+		playerB_Sex: props.competition.playerB.sex,
+		playerB_hasMinAge: props.competition.playerB.hasMinAge,
+		playerB_minAge: props.competition.playerB.minAge
+			? props.competition.playerB.minAge
+			: new Date(),
+		playerB_hasMaxAge: props.competition.playerB.hasMaxAge,
+		playerB_maxAge: props.competition.playerB.maxAge
+			? props.competition.playerB.maxAge
+			: new Date(),
+	},
+})
+console.log(values)
+
+const [name, nameAttrs] = defineField("name")
+const [description, descriptionAttrs] = defineField("description")
+const [selectedTourType, selectedTourTypeAttrs] = defineField("tourType")
+const [selectedTourMode, selectedTourModeAttrs] = defineField("mode")
+const [signUp, signUpAttrs] = defineField("signUp")
+const [numberSets, numberSetsAtrrs] = defineField("numberSets")
+const [playerB_different, playerB_differentAttrs] =
+	defineField("playerB_different")
+const [playerASex, playerASexAttrs] = defineField("playerA_Sex")
+const [playerBSex, playerBSexAttrs] = defineField("playerB_Sex")
+const [playerAHasMinAge, playerAHasMinAgeAttrs] =
+	defineField("playerA_hasMinAge")
+const [playerBHasMinAge, playerBHasMinAgeAttrs] =
+	defineField("playerB_hasMinAge")
+const [playerAHasMaxAge, playerAHasMaxAgeAttrs] =
+	defineField("playerA_hasMaxAge")
+const [playerBHasMaxAge, playerBHasMaxAgeAttrs] =
+	defineField("playerB_hasMaxAge")
+const [playerAMinAge, playerAMinAgeAttrs] = defineField("playerA_minAge")
+const [playerAMaxAge, playerAMaxAgeAttrs] = defineField("playerA_maxAge")
+const [playerBMinAge, playerBMinAgeAttrs] = defineField("playerB_minAge")
+const [playerBMaxAge, playerBMaxAgeAttrs] = defineField("playerB_maxAge")
 
-const name = defineInputBinds("name")
-const description = defineInputBinds("description")
-const selectedTourType = defineComponentBinds("tourType")
-const selectedTourMode = defineComponentBinds("mode")
-const signUp = defineComponentBinds("signUp")
-const playerB_different = defineComponentBinds("playerB_different")
-const playerASex = defineComponentBinds("playerA_Sex")
-const playerBSex = defineComponentBinds("playerB_Sex")
-const playerAHasMinAge = defineComponentBinds("playerA_hasMinAge")
-const playerBHasMinAge = defineComponentBinds("playerB_hasMinAge")
-const playerAHasMaxAge = defineComponentBinds("playerA_hasMaxAge")
-const playerBHasMaxAge = defineComponentBinds("playerB_hasMaxAge")
-const playerAMinAge = defineComponentBinds("playerA_minAge")
-const playerAMaxAge = defineComponentBinds("playerA_maxAge")
-const playerBMinAge = defineComponentBinds("playerB_minAge")
-const playerBMaxAge = defineComponentBinds("playerB_maxAge")
+const numberSetsOptions = ref([
+	{ name: "3", value: NumberSets.THREE },
+	{ name: "5", value: NumberSets.FIVE },
+])
 
 const onSubmit = handleSubmit((values) => {
 	emit(
diff --git a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
index d11a1817..d3883b92 100644
--- a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
+++ b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
@@ -32,6 +32,7 @@ import {
 	Competition,
 	CompetitionServer,
 	Mode,
+	NumberSets,
 	Progress,
 	Sex,
 	SignUp,
@@ -52,6 +53,7 @@ const competition = reactive<Competition>({
 	tourType: CompType.KNOCKOUT,
 	mode: Mode.SINGLE,
 	signUp: SignUp.INDIVIDUAL,
+	numberSets: NumberSets.THREE,
 	playerA: {
 		sex: Sex.ANY,
 		hasMinAge: false,
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 2e353710..38d4b2b4 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -39,7 +39,9 @@
 		"any": "Beliebig",
 		"filter_by_name": "Nach Name filtern",
 		"from": "Von",
-		"to": "Bis"
+		"to": "Bis",
+		"tournament_tree": "Turnierbaum",
+		"update_score": "Aktualisieren Sie die Punkte für das Spiel"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Spielerregistrierung",
@@ -140,7 +142,8 @@
 		"maxAge": "Maximalalter",
 		"missingAge": "Bitte wähle ein Datum",
 		"playerA": "Spieler 1",
-		"playerB": "Spieler 2"
+		"playerB": "Spieler 2",
+		"numberSets": "Anzahl der Sätze"
 	},
 	"ViewSignUp": {
 		"atLeastOneLetter": "Bitte tippe mindestens einen Buchstaben ein",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 25515c9b..99b47b41 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -39,7 +39,9 @@
 		"any": "Any",
 		"filter_by_name": "Filter by name",
 		"from": "From",
-		"to": "To"
+		"to": "To",
+		"tournament_tree": "Tournament tree",
+		"update_score": "Update the score for the game"
 	},
 	"ViewPlayerRegistration": {
 		"headline": "Player Registration",
@@ -143,7 +145,8 @@
 		"maxAge": "Maximum age",
 		"missingAge": "Please choose a date",
 		"playerA": "Player 1",
-		"playerB": "Player 2"
+		"playerB": "Player 2",
+		"numberSets": "Choose the number of sets"
 	},
 	"ViewSignUp": {
 		"atLeastOneLetter": "Please type at least one letter",
diff --git a/frontend/app/src/interfaces/competition.ts b/frontend/app/src/interfaces/competition.ts
index ae3a39fc..7d48464d 100644
--- a/frontend/app/src/interfaces/competition.ts
+++ b/frontend/app/src/interfaces/competition.ts
@@ -16,6 +16,11 @@ export enum Mode {
 	DOUBLE = "DOUBLE",
 }
 
+export enum NumberSets {
+	THREE = "THREE",
+	FIVE = "FIVE",
+}
+
 export enum SignUp {
 	INDIVIDUAL = "INDIVIDUAL",
 	TOGETHER = "TOGETHER",
@@ -45,6 +50,7 @@ export interface Competition {
 	tourType: CompType
 	mode: Mode
 	signUp: SignUp
+	numberSets: NumberSets
 	playerA: settingsPlayer
 	playerB: settingsPlayerB
 	cProgress: Progress
@@ -57,6 +63,7 @@ export const CompetitionDefault: Competition = {
 	tourType: CompType.KNOCKOUT,
 	mode: Mode.SINGLE,
 	signUp: SignUp.INDIVIDUAL,
+	numberSets: NumberSets.THREE,
 	playerA: {
 		sex: Sex.ANY,
 		hasMinAge: false,
@@ -82,6 +89,7 @@ export interface CompetitionServer {
 	type: CompType
 	mode: Mode
 	signUp: SignUp
+	numberSets: NumberSets
 	playerA: {
 		sex: Sex
 		hasMinAge: boolean
@@ -114,6 +122,7 @@ export interface CompetitionForm {
 	tourType: CompType
 	mode: Mode
 	signUp: SignUp
+	numberSets: NumberSets
 	playerA_Sex: Sex
 	playerA_hasMinAge: boolean
 	playerA_minAge: Date | undefined
@@ -142,6 +151,7 @@ export function competitionFormToServer(
 		type: form.tourType,
 		mode: form.mode,
 		signUp: form.signUp,
+		numberSets: form.numberSets,
 		playerA: {
 			sex: form.playerA_Sex,
 			hasMinAge: form.playerA_hasMinAge,
@@ -170,6 +180,7 @@ export function competitionClientToServer(
 		type: competition.tourType,
 		mode: competition.mode,
 		signUp: competition.signUp,
+		numberSets: competition.numberSets,
 		playerA: {
 			sex: competition.playerA.sex,
 			hasMinAge: competition.playerA.hasMinAge,
@@ -206,6 +217,7 @@ export function competitionServerToClient(
 		tourType: competition.type,
 		mode: competition.mode,
 		signUp: competition.signUp,
+		numberSets: competition.numberSets,
 		playerA: {
 			sex: competition.playerA.sex,
 			hasMinAge: competition.playerA.hasMinAge,
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index e42c311b..db1b01d0 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -11,7 +11,13 @@ export interface Game {
 	scoreB: number
 }
 
+export interface SetKey {
+	match_id: string
+	index: number
+}
+
 export interface Set {
+	// key: SetKey
 	index: number
 	scoreA: number
 	scoreB: number

From 54689ebb089713f16d0122e217a02add2368fcaf Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 24 Sep 2024 23:42:49 +0200
Subject: [PATCH 155/247] =?UTF-8?q?=F0=9F=9A=A7=20add=20saving=20of=20poin?=
 =?UTF-8?q?ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/SetResource.java  |  2 +
 .../src/components/items/PlayerPointRow.vue   |  1 -
 .../components/items/UpdatePointsDialog.vue   | 44 ++++++++++++++++---
 .../groupSystem/ViewGroupTable.vue            |  2 +-
 frontend/app/src/interfaces/match.ts          |  5 ---
 5 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index 7c150fb3..400ca2b6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -33,6 +33,7 @@ public class SetResource {
     @POST
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
     public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") Long matchId,
                                 List<jUserSet> sets) {
         Tournament tournament = tournaments.getByName(tourName);
@@ -56,6 +57,7 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
 
             setRepository.persist(set);
         }
+        System.out.println("Updated matches");
 
         return "Updated matches";
     }
diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/frontend/app/src/components/items/PlayerPointRow.vue
index b89a1a48..9829d40b 100644
--- a/frontend/app/src/components/items/PlayerPointRow.vue
+++ b/frontend/app/src/components/items/PlayerPointRow.vue
@@ -37,7 +37,6 @@ import { Team } from "@/interfaces/team"
 const gamePoints = defineModel("gamePoints", { type: Array<number> })
 const props = defineProps<{
 	team: Team | undefined | null
-	gamePoints: Array<number>
 }>()
 </script>
 
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index c5d75e79..6d07d858 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -1,7 +1,11 @@
 <template>
 	<Dialog
 		v-model:visible="visible"
-		:style="{ width: '50rem' }"
+		:style="[
+			props.numberSets === NumberSets.THREE
+				? { width: '50rem' }
+				: { width: '70rem' },
+		]"
 		header="Update Score"
 		modal
 	>
@@ -26,12 +30,12 @@
 		</div>
 		<PlayerPointRow
 			:team="currentMatch?.teamA"
-			:game-points="team1GamePoints"
+			v-model:game-points="team1GamePoints"
 			v-if="visible"
 		/>
 		<PlayerPointRow
 			:team="currentMatch?.teamB"
-			:game-points="team2GamePoints"
+			v-model:game-points="team2GamePoints"
 			v-if="visible"
 		/>
 		<divider />
@@ -73,18 +77,29 @@
 </template>
 <script lang="ts" setup>
 import { Match } from "@/interfaces/match"
-import { ref } from "vue"
+import { computed, ref } from "vue"
 import { useI18n } from "vue-i18n"
 import PlayerPointRow from "@/components/items/PlayerPointRow.vue"
 import { NumberSets } from "@/interfaces/competition"
+import { useUpdateSet } from "@/backend/set"
+import { useRoute } from "vue-router"
+import { useToast } from "primevue/usetoast"
+import { useQueryClient } from "@tanstack/vue-query"
+
+const { t } = useI18n({ inheritLocale: true })
+const toast = useToast()
+
+const route = useRoute()
+const queryClient = useQueryClient()
 
 const props = defineProps<{
 	numberSets: NumberSets
 }>()
 
-const numberSets = props.numberSets ? 3 : 5
+const numberSets = computed(() =>
+	props.numberSets === NumberSets.THREE ? 3 : 5,
+)
 
-const { t } = useI18n({ inheritLocale: true })
 const currentMatch = ref<Match | null>(null)
 const visible = ref(false)
 const selectedSet = ref("0")
@@ -96,11 +111,26 @@ const showPopUp = function (match: Match) {
 	currentMatch.value = match
 	team1GamePoints.value = match.sets?.map((set) => set.scoreA) ?? []
 	team2GamePoints.value = match.sets?.map((set) => set.scoreB) ?? []
-	console.log(team1GamePoints.value)
+	for (let i = team1GamePoints.value.length; i < numberSets.value; i++) {
+		team1GamePoints.value.push(0)
+		team2GamePoints.value.push(0)
+	}
+	console.log(props.numberSets)
+	console.log(numberSets.value)
 	visible.value = true
 }
+const { mutate: updateSet } = useUpdateSet(route, t, toast)
 
 const savePoints = function () {
+	if (!currentMatch.value || !currentMatch.value.id) return
+	updateSet({
+		matchId: currentMatch.value!.id,
+		sets: team1GamePoints.value.map((scoreA, index) => ({
+			index,
+			scoreA,
+			scoreB: team2GamePoints.value[index],
+		})),
+	})
 	visible.value = false
 }
 
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 789c7e4d..9896c338 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -51,7 +51,7 @@
 						<div>
 							<ViewMatch
 								:match="findMatch(team)"
-								@click="showPopUp(findMatch(teamA, teamB))"
+								@click="showPopUp(findMatch(team))"
 							/>
 						</div>
 					</td>
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index db1b01d0..62e64635 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -11,11 +11,6 @@ export interface Game {
 	scoreB: number
 }
 
-export interface SetKey {
-	match_id: string
-	index: number
-}
-
 export interface Set {
 	// key: SetKey
 	index: number

From 4ad072095f3db65d14842585e834030d27a27e1f Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 25 Sep 2024 23:33:40 +0200
Subject: [PATCH 156/247] =?UTF-8?q?=F0=9F=9A=A7=20first=20working=20versio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/SetRepository.java        | 11 ++++++++++
 .../resources/MatchRessource.java             |  0
 .../turnierplaner/resources/SetResource.java  | 21 ++++++++++++++-----
 .../resources/jsonEntities/user/jUserSet.java |  6 ++++++
 .../components/items/UpdatePointsDialog.vue   | 20 +++++++++++-------
 5 files changed, 46 insertions(+), 12 deletions(-)
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
index 0fc871be..eca23432 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
@@ -1,12 +1,23 @@
 package de.secretj12.turnierplaner.db.repositories;
 
+import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Set;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.transaction.Transactional;
+
+import java.util.List;
 
 @ApplicationScoped
 public class SetRepository implements PanacheRepository<Set> {
     public Set findById(Set.SetKey key) {
         return find("key", key).firstResult();
     }
+
+    @Transactional
+    public void updateSets(Match match, List<jUserSet> sets) {
+
+
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index 400ca2b6..e0bd4893 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -18,6 +18,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
 @RolesAllowed("director")
 @Path("/tournament/{tourName}/competition/{matchId}/set")
@@ -31,29 +32,39 @@ public class SetResource {
 
 
     @POST
-    @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
-    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") Long matchId,
+    @Transactional
+    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") UUID matchId,
                                 List<jUserSet> sets) {
+        System.out.println("tourName: " + tourName);
+        System.out.println("matchId: " + matchId);
+        System.out.println("sets: " + sets);
         Tournament tournament = tournaments.getByName(tourName);
         Instant beginGamePhase = tournament.getBeginGamePhase();
         if (beginGamePhase != null && beginGamePhase.isAfter(Instant.now()))
             throw new UnauthorizedException("Cannot update matches before game phase has begun");
 
         Match match = matchRepository.findById(matchId);
+        System.out.println(match);
         if (match == null)
-            throw new NotFoundException("Could find match");
+            throw new InternalServerErrorException("Could find match");
 
         for (jUserSet jSet : sets) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
             setKey.setIndex(jSet.getIndex());
 
-            Set set = new Set();
-            set.setKey(setKey);
+            Set set = setRepository.findById(setKey);
+
+            if (set == null) {
+                set = new Set();
+                set.setKey(setKey);
+            }
             set.setScoreA(jSet.getScoreA());
             set.setScoreB(jSet.getScoreB());
+            System.out.println(set.getScoreA());
+            System.out.println(set.getScoreB());
 
             setRepository.persist(set);
         }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
index de6a83d6..b501a1b9 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
@@ -7,6 +7,12 @@ public class jUserSet {
     private int scoreA;
     private int scoreB;
 
+    public jUserSet(long index, int scoreA, int scoreB) {
+        this.index = index;
+        this.scoreA = scoreA;
+        this.scoreB = scoreB;
+    }
+
     public jUserSet(Set set) {
         this.scoreA = set.getScoreA();
         this.scoreB = set.getScoreB();
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 6d07d858..7fa3f867 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -71,7 +71,7 @@
 				type="button"
 				@click="savePoints"
 			></Button>
-			<Button label="Save" type="button" @click="visible = false"></Button>
+			<Button label="Save" type="button" @click="savePoints"></Button>
 		</div>
 	</Dialog>
 </template>
@@ -122,14 +122,20 @@ const showPopUp = function (match: Match) {
 const { mutate: updateSet } = useUpdateSet(route, t, toast)
 
 const savePoints = function () {
-	if (!currentMatch.value || !currentMatch.value.id) return
+	if (!currentMatch.value || !currentMatch.value.id) {
+		console.log("No match")
+		return
+	}
+	console.log("saving..")
+	const sets = team1GamePoints.value.map((scoreA, index) => ({
+		index: index,
+		scoreA: scoreA,
+		scoreB: team2GamePoints.value[index],
+	}))
+	console.log(sets)
 	updateSet({
 		matchId: currentMatch.value!.id,
-		sets: team1GamePoints.value.map((scoreA, index) => ({
-			index,
-			scoreA,
-			scoreB: team2GamePoints.value[index],
-		})),
+		sets: sets,
 	})
 	visible.value = false
 }

From fb4846a966cc73711bbf03ad380005f17cf68b1b Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Sun, 1 Sep 2024 21:26:56 +0200
Subject: [PATCH 157/247] =?UTF-8?q?=F0=9F=9A=A7=20add=20scoring=20update?=
 =?UTF-8?q?=20for=20knockout=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/MatchRessource.java             |  0
 frontend/app/src/backend/set.ts               | 36 +++++++++++++++++++
 frontend/app/src/interfaces/match.ts          |  5 +++
 3 files changed, 41 insertions(+)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
 create mode 100644 frontend/app/src/backend/set.ts

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/app/src/backend/set.ts b/frontend/app/src/backend/set.ts
new file mode 100644
index 00000000..87435895
--- /dev/null
+++ b/frontend/app/src/backend/set.ts
@@ -0,0 +1,36 @@
+import { useMutation } from "@tanstack/vue-query"
+import { Set } from "@/interfaces/match"
+import axios from "axios"
+import { RouteLocationNormalizedLoaded } from "vue-router"
+import { ToastServiceMethods } from "primevue/toastservice"
+
+export function useUpdateSet(
+	route: RouteLocationNormalizedLoaded,
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useMutation({
+		mutationFn: (data: { sets: Set[]; matchId: string }) =>
+			axios.post(
+				`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
+				data.sets,
+			),
+		onSuccess() {
+			toast.add({
+				severity: "success",
+				summary: t("general.success"),
+				detail: t("general.saved"),
+				life: 3000,
+			})
+		},
+		onError(error) {
+			toast.add({
+				severity: "error",
+				summary: t("general.failure"),
+				detail: t("general.error_saving"),
+				life: 3000,
+			})
+			console.log(error)
+		},
+	})
+}
diff --git a/frontend/app/src/interfaces/match.ts b/frontend/app/src/interfaces/match.ts
index 62e64635..db1b01d0 100644
--- a/frontend/app/src/interfaces/match.ts
+++ b/frontend/app/src/interfaces/match.ts
@@ -11,6 +11,11 @@ export interface Game {
 	scoreB: number
 }
 
+export interface SetKey {
+	match_id: string
+	index: number
+}
+
 export interface Set {
 	// key: SetKey
 	index: number

From 8ef649dc6b69172084f4b75eeb2ff14a782b177a Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 26 Sep 2024 22:29:12 +0200
Subject: [PATCH 158/247] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20fix=20groups=20?=
 =?UTF-8?q?not=20being=20properly=20displayed,=20only=20show=20pop=20up=20?=
 =?UTF-8?q?when=20being=20able=20to=20edit,=20show=20popup=20for=20groups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/competition/ViewGame.vue |  5 +++-
 .../groupSystem/ViewGroupSystem.vue           | 10 +++++++-
 .../groupSystem/ViewGroupTable.vue            | 24 ++++++++++++++-----
 .../knockoutSystem/ViewKnockoutSystem.vue     | 14 ++++++++---
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/frontend/app/src/components/views/competition/ViewGame.vue b/frontend/app/src/components/views/competition/ViewGame.vue
index 29b6616e..9c93efd6 100644
--- a/frontend/app/src/components/views/competition/ViewGame.vue
+++ b/frontend/app/src/components/views/competition/ViewGame.vue
@@ -1,6 +1,9 @@
 <template>
 	<Suspense>
-		<ViewGroupSystem v-if="props.tourType === CompType.GROUPS" />
+		<ViewGroupSystem
+			v-if="props.tourType === CompType.GROUPS"
+			:number-sets="props.numberSets"
+		/>
 		<ViewKnockoutSystem
 			v-else-if="props.tourType === CompType.KNOCKOUT"
 			:mode="props.mode"
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index 9f12c50e..de4eb0d3 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -2,7 +2,11 @@
 	<!-- TODO show on card -->
 	<!-- TODO add toggle to show as list? -->
 	<template v-if="groupSystem">
-		<ViewGroupTable v-for="group in groupSystem.groups" :group="group" />
+		<ViewGroupTable
+			v-for="group in groupSystem.groups"
+			:group="group"
+			:number-sets="props.numberSets"
+		/>
 	</template>
 
 	<!-- TODO show finals -->
@@ -12,9 +16,13 @@
 import { useRoute } from "vue-router"
 import ViewGroupTable from "@/components/views/competition/groupSystem/ViewGroupTable.vue"
 import { getGroup } from "@/backend/group"
+import { Mode, NumberSets } from "@/interfaces/competition"
 
 const route = useRoute()
 const { data: groupSystem } = getGroup(route)
+const props = defineProps<{
+	numberSets: NumberSets
+}>()
 </script>
 
 <style>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 9896c338..9f1eed85 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -50,8 +50,8 @@
 					>
 						<div>
 							<ViewMatch
-								:match="findMatch(team)"
-								@click="showPopUp(findMatch(team))"
+								:match="findMatch(team, teamB)"
+								@click="showPopUp(findMatch(team, teamB))"
 							/>
 						</div>
 					</td>
@@ -59,25 +59,37 @@
 			</tr>
 		</template>
 	</table>
-	<UpdatePointsDialog ref="dialog" />
+	<UpdatePointsDialog
+		v-if="canEdit"
+		:number-sets="props.numberSets"
+		ref="dialog"
+	/>
 </template>
 
 <script setup lang="ts">
 import { Group } from "@/interfaces/groupSystem"
-import { ref } from "vue"
+import { inject, ref } from "vue"
 import { useI18n } from "vue-i18n"
 import ViewMatch from "@/components/views/competition/groupSystem/ViewMatch.vue"
 import { Match } from "@/interfaces/match"
 import { Team } from "@/interfaces/team"
-import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
 import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
+import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
+import { NumberSets } from "@/interfaces/competition"
+import { getCanEdit } from "@/backend/security"
+import { useRoute } from "vue-router"
 
 const { t } = useI18n({ inheritLocale: true })
 
 const props = defineProps<{
 	group: Group
+	numberSets: NumberSets
 }>()
 
+const route = useRoute()
+const isLoggedIn = inject("loggedIn", ref(false))
+const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
+
 function findMatch(teamA: Team, teamB: Team): Match {
 	const match: Match | undefined = props.group.matches.find((match) => {
 		if (match.teamA === null || match.teamB === null) return false
@@ -112,7 +124,7 @@ function hoverLeave() {
 
 const dialog = ref()
 const showPopUp = function (match: Match) {
-	dialog.value.showPopUp(match)
+	if (canEdit) dialog.value.showPopUp(match)
 }
 </script>
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index aeaf9643..c28e8b6a 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -23,7 +23,11 @@
 			</template>
 		</ViewKnockoutTree>
 	</template>
-	<UpdatePointsDialog ref="dialog" :number-sets="props.numberSets" />
+	<UpdatePointsDialog
+		v-if="canEdit"
+		ref="dialog"
+		:number-sets="props.numberSets"
+	/>
 </template>
 
 <script lang="ts" setup>
@@ -35,9 +39,10 @@ import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.v
 import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { useI18n } from "vue-i18n"
-import { ref } from "vue"
+import { inject, ref } from "vue"
 import { Match } from "@/interfaces/match"
 import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
+import { getCanEdit } from "@/backend/security"
 
 const { t } = useI18n({ inheritLocale: true })
 
@@ -47,11 +52,14 @@ const props = defineProps<{
 }>()
 
 const route = useRoute()
+const isLoggedIn = inject("loggedIn", ref(false))
+const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
+
 const { data: knockoutSystem } = getKnockout(route)
 const dialog = ref()
 
 const showPopUp = function (match: Match) {
-	dialog.value.showPopUp(match)
+	if (canEdit) dialog.value.showPopUp(match)
 }
 </script>
 

From 311ce2685790e44d95156d659efab28b65a901c3 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 26 Sep 2024 22:30:14 +0200
Subject: [PATCH 159/247] =?UTF-8?q?=F0=9F=8E=A8=20format=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CompetitionResource.java        | 34 +++++++++----------
 .../startup/testdata/TestdataGenerator.java   | 16 ++++-----
 .../turnierplaner/tools/CommonHelpers.java    |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 306b250e..0fa00dad 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -165,7 +165,7 @@ public List<jUserTeam> getSignedUpPlayers(@PathParam("tourName") String tourName
         if (competition == null) throw new NotFoundException("Competition was not found");
 
         if (!securityIdentity.hasRole("director")
-                && (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+            && (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
                 || competition.getTournament().getBeginGamePhase().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
@@ -188,12 +188,12 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
         if (competition == null) throw new BadRequestException("Competition doesn't exist");
 
         if (!securityIdentity.hasRole("director") && // or registration phase
-                (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
-                        || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
+            (competition.getTournament().getBeginRegistration().isAfter(Instant.now())
+                || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
         if (competition.getMode() == CompetitionMode.SINGLES
-                || (competition.getSignup() == CompetitionSignUp.INDIVIDUAL
+            || (competition.getSignup() == CompetitionSignUp.INDIVIDUAL
                 && !competition.isPlayerBdifferent())) {
             // single mode or double with individual registration but same constraints
             // -> every registration as player A and player B is null
@@ -209,9 +209,9 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
             List<Team> regTeams = competition.getTeams();
             if (regTeams != null
-                    && regTeams.stream()
+                && regTeams.stream()
                     .anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(playerA.getId()))
-                            || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
+                        || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                 throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
 
             Team team = new Team();
@@ -238,7 +238,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                     List<Team> regTeams = competition.getTeams();
                     if (regTeams != null
-                            && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(
+                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null && t.getPlayerA().getId().equals(
                             playerA.getId()))
                             || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                         throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
@@ -257,7 +257,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                     List<Team> regTeams = competition.getTeams();
                     if (regTeams != null
-                            && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
+                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
                             && t.getPlayerA().getId().equals(playerB.getId()))
                             || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
                         throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
@@ -286,13 +286,13 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
 
                 List<Team> regTeams = competition.getTeams();
                 if (regTeams != null
-                        && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
+                    && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
                         && t.getPlayerA().getId().equals(playerA.getId()))
                         || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerA.getId()))))
                     throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
                 if (regTeams != null && regTeams.stream().anyMatch(t -> (t.getPlayerA() != null
-                        && t.getPlayerA().getId().equals(playerB.getId()))
-                        || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
+                    && t.getPlayerA().getId().equals(playerB.getId()))
+                    || (t.getPlayerB() != null && t.getPlayerB().getId().equals(playerB.getId()))))
                     throw new WebApplicationException("Player already registered", Response.Status.CONFLICT);
 
                 Team team = new Team();
@@ -354,16 +354,16 @@ public String updateTeams(@PathParam("tourName") String tourName, @PathParam("co
 
     private boolean conditionsFailA(Competition comp, Player player) {
         return (comp.getPlayerASex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-                || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)
-                || (comp.playerAhasMinAge() && comp.getPlayerAminAge().isBefore(player.getBirthday()))
-                || (comp.playerAhasMaxAge() && comp.getPlayerAmaxAge().isAfter(player.getBirthday()));
+            || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+            || (comp.playerAhasMinAge() && comp.getPlayerAminAge().isBefore(player.getBirthday()))
+            || (comp.playerAhasMaxAge() && comp.getPlayerAmaxAge().isAfter(player.getBirthday()));
     }
 
     private boolean conditionsFailB(Competition comp, Player player) {
         return (comp.getPlayerBSex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-                || (comp.getPlayerBSex() == Sex.MALE && player.getSex() == SexType.FEMALE)
-                || (comp.playerBhasMinAge() && comp.getPlayerBminAge().isBefore(player.getBirthday()))
-                || (comp.playerBhasMaxAge() && comp.getPlayerBmaxAge().isAfter(player.getBirthday()));
+            || (comp.getPlayerBSex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+            || (comp.playerBhasMinAge() && comp.getPlayerBminAge().isBefore(player.getBirthday()))
+            || (comp.playerBhasMaxAge() && comp.getPlayerBmaxAge().isAfter(player.getBirthday()));
     }
 
     @GET
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 7ac62da4..79294105 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -76,13 +76,13 @@ public void generateData() {
         // @formatter:on
 
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2026", "Anmeldung ausstehend", true,
-                compSetting);
+            compSetting);
         createTournament(TDate.REGISTRATION_OPEN, "Clubmeisterschaft 2025", "Anmeldung offen", true, compSetting);
         createTournament(TDate.BEFORE_GAMEPHASE, "Clubmeisterschaft 2024", "Anmeldung vorbei", true, compSetting);
         createTournament(TDate.GAMEPHASE_OPEN, "Clubmeisterschaft 2023", "Spielphase offen", true, compSetting);
         createTournament(TDate.AFTER_GAMEPHASE, "Clubmeisterschaft 2022", "Spielphase vorbei", true, compSetting);
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2027", "Noch in der Planung", false,
-                compSetting);
+            compSetting);
     }
 
     private void createTournament(TDate tDate, String name, String description, boolean visible,
@@ -136,8 +136,8 @@ private void createSets(Match match) {
         int numberOfSets = 2;
         int winDif = 0;
         List<Tuple2<Integer, Integer>> possibleResults = List.of(Tuple2.of(6, 0), Tuple2.of(6, 1), Tuple2.of(6, 2),
-                Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
-                Tuple2.of(7, 6));
+            Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
+            Tuple2.of(7, 6));
         for (int i = 0; i < numberOfSets; i++) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
@@ -267,9 +267,9 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
             groups[k].setCompetition(competition);
             groupRepository.persist(groups[k]);
             for (int i = k * compSettings.getNumberOfGroups() / compSettings.getNumberOfGroups(); i < compSettings
-                    .getTeamNumbers() / compSettings.getNumberOfGroups() * (k + 1); i++) {
+                .getTeamNumbers() / compSettings.getNumberOfGroups() * (k + 1); i++) {
                 for (int j = i + 1; j < compSettings.getTeamNumbers() / compSettings
-                        .getNumberOfGroups() * (k + 1); j++) {
+                    .getNumberOfGroups() * (k + 1); j++) {
                     Match match = createMatch(courts[i * j % 4], competition);
                     match.setTeamA(groupTeams[i]);
                     match.setTeamB(groupTeams[j]);
@@ -504,9 +504,9 @@ private void addCompetition(Tournament t, TDate tDate,
             competition.setType(compSetting.getCompetitionType());
             switch (tDate) {
                 case BEFORE_REGISTRATION, REGISTRATION_OPEN, BEFORE_GAMEPHASE -> competition.setcProgress(
-                        CreationProgress.TEAMS);
+                    CreationProgress.TEAMS);
                 case GAMEPHASE_OPEN, AFTER_GAMEPHASE -> competition.setcProgress(
-                        CreationProgress.SCHEDULING);
+                    CreationProgress.SCHEDULING);
             }
             if (Math.random() > 0.9) {
                 competition.setNumberSets(NumberSets.FIVE);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
index b27c4fc1..68ee9a54 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
@@ -12,7 +12,7 @@
 public class CommonHelpers {
     @Inject
     TournamentRepository tournaments;
-    
+
     @Inject
     SecurityIdentity securityIdentity;
 

From c6daf5d5c7a1aabac567e3a2e4b26edea8ce2219 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 26 Sep 2024 22:52:51 +0200
Subject: [PATCH 160/247] =?UTF-8?q?=E2=9C=A8=20=20only=20save=20changed=20?=
 =?UTF-8?q?sets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/items/UpdatePointsDialog.vue   | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 7fa3f867..49efc57d 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -84,13 +84,11 @@ import { NumberSets } from "@/interfaces/competition"
 import { useUpdateSet } from "@/backend/set"
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
-import { useQueryClient } from "@tanstack/vue-query"
 
 const { t } = useI18n({ inheritLocale: true })
 const toast = useToast()
 
 const route = useRoute()
-const queryClient = useQueryClient()
 
 const props = defineProps<{
 	numberSets: NumberSets
@@ -111,6 +109,7 @@ const showPopUp = function (match: Match) {
 	currentMatch.value = match
 	team1GamePoints.value = match.sets?.map((set) => set.scoreA) ?? []
 	team2GamePoints.value = match.sets?.map((set) => set.scoreB) ?? []
+	// fill the rest up with 0
 	for (let i = team1GamePoints.value.length; i < numberSets.value; i++) {
 		team1GamePoints.value.push(0)
 		team2GamePoints.value.push(0)
@@ -127,19 +126,36 @@ const savePoints = function () {
 		return
 	}
 	console.log("saving..")
-	const sets = team1GamePoints.value.map((scoreA, index) => ({
-		index: index,
-		scoreA: scoreA,
-		scoreB: team2GamePoints.value[index],
-	}))
+	const sets = getAllChangedSets()
 	console.log(sets)
-	updateSet({
-		matchId: currentMatch.value!.id,
-		sets: sets,
-	})
+	if (sets.length > 0)
+		updateSet({
+			matchId: currentMatch.value!.id,
+			sets: sets,
+		})
 	visible.value = false
 }
 
+// return list of sets that contain all set that differ from the beginning
+const getAllChangedSets = function () {
+	let changedSets = []
+	for (let i = 0; i < numberSets.value; i++) {
+		const a = currentMatch.value?.sets?.[i].scoreA
+		const b = currentMatch.value?.sets?.[i].scoreB
+		if (
+			(team1GamePoints.value[i] != 0 && team1GamePoints.value[i] !== a) ||
+			(team2GamePoints.value[i] != 0 && team2GamePoints.value[i] !== b)
+		) {
+			changedSets.push({
+				index: i,
+				scoreA: team1GamePoints.value[i],
+				scoreB: team2GamePoints.value[i],
+			})
+		}
+	}
+	return changedSets
+}
+
 const updatePoints = function (point1: number, point2: number) {
 	team1GamePoints.value[Number(selectedSet.value)] = point1
 	team2GamePoints.value[Number(selectedSet.value)] = point2

From 36a41e402f7959697d4dede0dd5c451e18c85118 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 16:52:44 +0200
Subject: [PATCH 161/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20set=20order=20bein?=
 =?UTF-8?q?g=20displayed=20in=20the=20wrong=20order,=20show=20popup=20only?=
 =?UTF-8?q?=20when=20being=20a=20director?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Set.java        | 18 ++++++------
 .../resources/MatchRessource.java             |  0
 .../turnierplaner/resources/SetResource.java  |  6 ----
 .../jsonEntities/user/jUserMatch.java         |  3 +-
 .../resources/jsonEntities/user/jUserSet.java | 20 ++++++-------
 .../startup/testdata/TestdataGenerator.java   | 29 ++++++++++++-------
 frontend/app/src/backend/set.ts               | 24 +++++++++++----
 .../components/items/UpdatePointsDialog.vue   | 25 ++++++++++++----
 .../groupSystem/ViewGroupTable.vue            |  2 +-
 .../knockoutSystem/ViewKnockoutSystem.vue     |  4 ++-
 .../competition/knockoutSystem/ViewMatch.vue  |  5 ++--
 11 files changed, 84 insertions(+), 52 deletions(-)
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
index c9f314e7..a9e93117 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
@@ -13,9 +13,9 @@ public class Set {
     private SetKey key;
 
     @Column(name = "score_a")
-    private int scoreA;
+    private byte scoreA;
     @Column(name = "score_b")
-    private int scoreB;
+    private byte scoreB;
 
     public SetKey getKey() {
         return key;
@@ -25,19 +25,19 @@ public void setKey(SetKey key) {
         this.key = key;
     }
 
-    public int getScoreA() {
+    public byte getScoreA() {
         return scoreA;
     }
 
-    public void setScoreA(int scoreA) {
+    public void setScoreA(byte scoreA) {
         this.scoreA = scoreA;
     }
 
-    public int getScoreB() {
+    public byte getScoreB() {
         return scoreB;
     }
 
-    public void setScoreB(int scoreB) {
+    public void setScoreB(byte scoreB) {
         this.scoreB = scoreB;
     }
 
@@ -47,13 +47,13 @@ public static class SetKey implements Serializable {
         @JoinColumn(name = "match_id")
         private Match match;
         @Column(name = "index")
-        private long index;
+        private byte index;
 
-        public long getIndex() {
+        public byte getIndex() {
             return index;
         }
 
-        public void setIndex(long id) {
+        public void setIndex(byte id) {
             this.index = id;
         }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchRessource.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index e0bd4893..72229a49 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -37,9 +37,6 @@ public class SetResource {
     @Transactional
     public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") UUID matchId,
                                 List<jUserSet> sets) {
-        System.out.println("tourName: " + tourName);
-        System.out.println("matchId: " + matchId);
-        System.out.println("sets: " + sets);
         Tournament tournament = tournaments.getByName(tourName);
         Instant beginGamePhase = tournament.getBeginGamePhase();
         if (beginGamePhase != null && beginGamePhase.isAfter(Instant.now()))
@@ -63,9 +60,6 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
             }
             set.setScoreA(jSet.getScoreA());
             set.setScoreB(jSet.getScoreB());
-            System.out.println(set.getScoreA());
-            System.out.println(set.getScoreB());
-
             setRepository.persist(set);
         }
         System.out.println("Updated matches");
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index 4836a063..71f44df2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -5,6 +5,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 
@@ -41,7 +42,7 @@ public jUserMatch(Match match) {
         if (match.getTeamB() != null)
             this.teamB = new jUserTeam(match.getTeamB());
 
-        this.sets = match.getSets().stream().map(jUserSet::new).toList();
+        this.sets = match.getSets().stream().map(jUserSet::new).sorted(Comparator.comparingInt(jUserSet::getIndex)).toList();
     }
 
     public UUID getId() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
index b501a1b9..fe1189b6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
@@ -3,11 +3,11 @@
 import de.secretj12.turnierplaner.db.entities.Set;
 
 public class jUserSet {
-    private long index;
-    private int scoreA;
-    private int scoreB;
+    private byte index;
+    private byte scoreA;
+    private byte scoreB;
 
-    public jUserSet(long index, int scoreA, int scoreB) {
+    public jUserSet(byte index, byte scoreA, byte scoreB) {
         this.index = index;
         this.scoreA = scoreA;
         this.scoreB = scoreB;
@@ -19,27 +19,27 @@ public jUserSet(Set set) {
         this.index = set.getKey().getIndex();
     }
 
-    public long getIndex() {
+    public byte getIndex() {
         return index;
     }
 
-    public void setIndex(long index) {
+    public void setIndex(byte index) {
         this.index = index;
     }
 
-    public int getScoreA() {
+    public byte getScoreA() {
         return scoreA;
     }
 
-    public void setScoreA(int scoreA) {
+    public void setScoreA(byte scoreA) {
         this.scoreA = scoreA;
     }
 
-    public int getScoreB() {
+    public byte getScoreB() {
         return scoreB;
     }
 
-    public void setScoreB(int scoreB) {
+    public void setScoreB(byte scoreB) {
         this.scoreB = scoreB;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 79294105..e800fcf5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -133,19 +133,26 @@ private void createTournament(TDate tDate, String name, String description, bool
 
     private void createSets(Match match) {
         ArrayList<Set> setArrayList = new ArrayList<>();
-        int numberOfSets = 2;
+        byte numberOfSets = 2;
         int winDif = 0;
-        List<Tuple2<Integer, Integer>> possibleResults = List.of(Tuple2.of(6, 0), Tuple2.of(6, 1), Tuple2.of(6, 2),
-            Tuple2.of(6, 3), Tuple2.of(6, 4), Tuple2.of(6, 5), Tuple2.of(7, 5),
-            Tuple2.of(7, 6));
-        for (int i = 0; i < numberOfSets; i++) {
+        List<Tuple2<Byte, Byte>> possibleResults = List.of(
+                Tuple2.of((byte) 6, (byte) 0),
+                Tuple2.of((byte) 6, (byte) 1),
+                Tuple2.of((byte) 6, (byte) 2),
+                Tuple2.of((byte) 6, (byte) 3),
+                Tuple2.of((byte) 6, (byte) 4),
+                Tuple2.of((byte) 6, (byte) 5),
+                Tuple2.of((byte) 7, (byte) 5),
+                Tuple2.of((byte) 7, (byte) 6)
+        );
+        for (byte i = 0; i < numberOfSets; i++) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
             setKey.setIndex(i);
             Set set = new Set();
             set.setKey(setKey);
 
-            int r = random.nextInt(possibleResults.size());
+            byte r = (byte) random.nextInt(possibleResults.size());
             switch (random.nextInt(Math.abs(winDif) + 2)) {
                 case 0 -> {
                     set.setScoreA(possibleResults.get(r).getItem1());
@@ -181,14 +188,14 @@ private void createSets(Match match) {
             Set set = new Set();
             set.setKey(setKey);
 
-            int winner;
-            int looser;
+            byte winner;
+            byte looser;
             if (random.nextInt(10) < 9) {
                 winner = 10;
-                looser = random.nextInt(9);
+                looser = (byte) random.nextInt(9);
             } else {
-                winner = random.nextInt(11, 20);
-                looser = winner - 2;
+                winner = (byte) random.nextInt(11, 20);
+                looser = (byte) (winner - 2);
             }
             if (random.nextBoolean()) {
                 set.setScoreA(winner);
diff --git a/frontend/app/src/backend/set.ts b/frontend/app/src/backend/set.ts
index 87435895..b26a5ebb 100644
--- a/frontend/app/src/backend/set.ts
+++ b/frontend/app/src/backend/set.ts
@@ -1,4 +1,4 @@
-import { useMutation } from "@tanstack/vue-query"
+import { useMutation, useQueryClient } from "@tanstack/vue-query"
 import { Set } from "@/interfaces/match"
 import axios from "axios"
 import { RouteLocationNormalizedLoaded } from "vue-router"
@@ -9,12 +9,26 @@ export function useUpdateSet(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
+	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: (data: { sets: Set[]; matchId: string }) =>
-			axios.post(
-				`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
-				data.sets,
-			),
+			axios
+				.post(
+					`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
+					data.sets,
+				)
+				.then(() => {
+					queryClient.invalidateQueries({
+						queryKey: ["knockout", route.params.tourId, route.params.compId],
+						refetchType: "all",
+					})
+				})
+				.then(() => {
+					queryClient.invalidateQueries({
+						queryKey: ["group", route.params.tourId, route.params.compId],
+						refetchType: "all",
+					})
+				}),
 		onSuccess() {
 			toast.add({
 				severity: "success",
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 49efc57d..7332bf0a 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -69,7 +69,7 @@
 				label="Cancel"
 				severity="secondary"
 				type="button"
-				@click="savePoints"
+				@click="cancel"
 			></Button>
 			<Button label="Save" type="button" @click="savePoints"></Button>
 		</div>
@@ -120,6 +120,10 @@ const showPopUp = function (match: Match) {
 }
 const { mutate: updateSet } = useUpdateSet(route, t, toast)
 
+const cancel = function () {
+	visible.value = false
+}
+
 const savePoints = function () {
 	if (!currentMatch.value || !currentMatch.value.id) {
 		console.log("No match")
@@ -140,17 +144,28 @@ const savePoints = function () {
 const getAllChangedSets = function () {
 	let changedSets = []
 	for (let i = 0; i < numberSets.value; i++) {
-		const a = currentMatch.value?.sets?.[i].scoreA
-		const b = currentMatch.value?.sets?.[i].scoreB
+		console.log("i ", i)
+		console.log("currentmatch ", currentMatch.value?.sets)
+		console.log("currentmatch ", currentMatch.value?.sets?.[i])
 		if (
-			(team1GamePoints.value[i] != 0 && team1GamePoints.value[i] !== a) ||
-			(team2GamePoints.value[i] != 0 && team2GamePoints.value[i] !== b)
+			!currentMatch.value?.sets?.length ||
+			i > currentMatch.value?.sets?.length - 1
 		) {
 			changedSets.push({
 				index: i,
 				scoreA: team1GamePoints.value[i],
 				scoreB: team2GamePoints.value[i],
 			})
+			continue
+		}
+		const a = currentMatch.value?.sets?.[i].scoreA
+		const b = currentMatch.value?.sets?.[i].scoreB
+		if (team1GamePoints.value[i] !== a || team2GamePoints.value[i] !== b) {
+			changedSets.push({
+				index: i,
+				scoreA: team1GamePoints.value[i],
+				scoreB: team2GamePoints.value[i],
+			})
 		}
 	}
 	return changedSets
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 9f1eed85..e1da718c 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -124,7 +124,7 @@ function hoverLeave() {
 
 const dialog = ref()
 const showPopUp = function (match: Match) {
-	if (canEdit) dialog.value.showPopUp(match)
+	if (canEdit.value) dialog.value.showPopUp(match)
 }
 </script>
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index c28e8b6a..ddbdf4fe 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -59,7 +59,9 @@ const { data: knockoutSystem } = getKnockout(route)
 const dialog = ref()
 
 const showPopUp = function (match: Match) {
-	if (canEdit) dialog.value.showPopUp(match)
+	if (canEdit.value) {
+		dialog.value.showPopUp(match)
+	}
 }
 </script>
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 8fa9e11a..3d425197 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -9,10 +9,9 @@
 			<td class="name">
 				<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 			</td>
-
 			<template v-if="props.match.sets !== null">
 				<td v-for="set in props.match.sets" :key="set.index" class="result">
-					{{ set.scoreA }}
+					{{ set.scoreA }} {{ set.index }}
 				</td>
 			</template>
 		</tr>
@@ -23,7 +22,7 @@
 
 			<template v-if="props.match.sets !== null">
 				<td v-for="set in props.match.sets" :key="set.index" class="result">
-					{{ set.scoreB }}
+					{{ set.scoreB }} {{ set.index }}
 				</td>
 			</template>
 		</tr>

From b86c4cd11e58123774c7b5780117ea65ff18e0ee Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 19:50:43 +0200
Subject: [PATCH 162/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20use=20common=20hel?=
 =?UTF-8?q?per=20in=20TournamentResource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/CompetitionResource.java        |  7 -----
 .../resources/TournamentResource.java         | 28 +++++++------------
 .../turnierplaner/tools/CommonHelpers.java    |  6 ++++
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 0fa00dad..1a3ef46a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -405,13 +405,6 @@ public jUserGroupSystem getGroupMatches(@PathParam("tourName") String tourName,
         return new jUserGroupSystem(groups, finale, thirdPlace);
     }
 
-    private void checkTournamentAccessibility(String tourName) {
-        Tournament tournament = tournaments.getByName(tourName);
-        if (tournament == null) throw new NotFoundException("Tournament could not be found");
-        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
-            throw new UnauthorizedException("Cannot access tournament");
-    }
-
     @POST
     @Transactional
     @RolesAllowed("director")
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 753790c6..e38e86f5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -3,13 +3,12 @@
 import de.secretj12.turnierplaner.db.entities.Court;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
-import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
-import io.quarkus.security.UnauthorizedException;
+import de.secretj12.turnierplaner.tools.CommonHelpers;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -33,7 +32,7 @@ public class TournamentResource {
     @Inject
     SecurityIdentity securityIdentity;
     @Inject
-    MatchRepository matches;
+    CommonHelpers common;
 
     @GET
     @Path("/list")
@@ -42,15 +41,15 @@ public class TournamentResource {
     public List<jUserTournament> getAllTournaments() {
         if (securityIdentity.hasRole("director"))
             return tournaments.streamAll()
-                .map(jDirectorTournamentAdd::new)
-                .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
-                .map(t -> (jUserTournament) t).toList();
+                    .map(jDirectorTournamentAdd::new)
+                    .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
+                    .map(t -> (jUserTournament) t).toList();
         else
             return tournaments.listAllVisible()
-                .stream()
-                .map(jUserTournament::new)
-                .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
-                .toList();
+                    .stream()
+                    .map(jUserTournament::new)
+                    .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
+                    .toList();
     }
 
     @GET
@@ -66,7 +65,7 @@ public Boolean canCreate() {
     @Produces(MediaType.APPLICATION_JSON)
     public jUserTournament getTournament(@PathParam("tourName") String name) {
         Tournament tournament = tournaments.getByName(name);
-        checkTournamentAccessibility(tournament);
+        common.checkTournamentAccessibility(tournament);
         if (securityIdentity.hasRole("director"))
             return new jDirectorTournamentUpdate(tournament);
         else
@@ -157,11 +156,4 @@ public String updateTournament(jDirectorTournamentUpdate tournament) {
         tournaments.persist(dbTournament);
         return "successfully changed";
     }
-
-    private void checkTournamentAccessibility(Tournament tournament) {
-        if (tournament == null)
-            throw new NotFoundException("Tournament could not be found");
-        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
-            throw new UnauthorizedException("Cannot access tournament");
-    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
index 68ee9a54..c91a54a7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
@@ -22,4 +22,10 @@ public void checkTournamentAccessibility(String tourName) {
         if (!securityIdentity.hasRole("director") && !tournament.isVisible())
             throw new UnauthorizedException("Cannot access tournament");
     }
+
+    public void checkTournamentAccessibility(Tournament tournament) {
+        if (tournament == null) throw new NotFoundException("Tournament could not be found");
+        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
+            throw new UnauthorizedException("Cannot access tournament");
+    }
 }

From 0668b0073aa5df9fbbb4d03b83586edbe4451d5b Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:21:33 +0200
Subject: [PATCH 163/247] =?UTF-8?q?=E2=9C=A8=20keep=20same=20order=20in=20?=
 =?UTF-8?q?group=20table=20after=20reloads?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsonEntities/user/group/jUserGroup.java   |  8 +++---
 frontend/app/package.json                     |  2 +-
 frontend/app/src/interfaces/groupSystem.ts    | 25 +++++++++----------
 frontend/app/tsconfig.json                    |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
index 4ced07aa..df1b7af3 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
@@ -17,10 +17,10 @@ public class jUserGroup {
     public jUserGroup(Group group) {
         this.index = group.getIndex();
         this.teams = group.getMatches().stream()
-            .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB()))
-            .map(Team::getId)
-            .distinct()
-            .toList();
+                .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB()))
+                .map(Team::getId)
+                .distinct()
+                .toList();
         this.matches = group.getMatches().stream().map(jUserMatch::new).toList();
     }
 
diff --git a/frontend/app/package.json b/frontend/app/package.json
index 2d4d1420..f167a4cb 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -48,7 +48,7 @@
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-vue": "^9.19.2",
 		"prettier": "^3.1.1",
-		"typescript": "~5.3.3",
+		"typescript": "~5.6.2",
 		"unplugin-auto-import": "^0.17.2",
 		"unplugin-vue-components": "^0.26.0",
 		"vite": "^5.0.10",
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 6f2200b0..ee5ed208 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -56,24 +56,23 @@ export function groupSystemServerToClient(
 	}
 }
 
-function uniqueBy<T>(arr: T[], compareFn: (a: T, b: T) => boolean): T[] {
-	return arr.filter(
-		(item, index, self) =>
-			index === self.findIndex((other) => compareFn(item, other)),
-	)
-}
-
 function groupServerToClient(group: GroupServer): Group {
 	const matches = group.matches.map((match) => matchServerToClient(match))
-	const teams: Team[] = []
-	matches.filter((m) => {
-		if (m.teamA) teams.push(m.teamA)
-		if (m.teamB) teams.push(m.teamB)
-	})
+	const teams = [
+		...new Map(
+			matches
+				.flatMap((m) => [m.teamA, m.teamB])
+				.filter((t) => t !== null)
+				.sort((a, b) =>
+					(a?.playerA?.name ?? "").localeCompare(b?.playerA?.name ?? ""),
+				)
+				.map((t) => [t?.id, t]),
+		).values(),
+	]
 	return {
 		index: group.index,
 		matches,
-		teams: uniqueBy(teams, (t1, t2) => t1.id === t2.id),
+		teams: teams,
 	}
 }
 
diff --git a/frontend/app/tsconfig.json b/frontend/app/tsconfig.json
index 3aa6e116..b197aa9a 100644
--- a/frontend/app/tsconfig.json
+++ b/frontend/app/tsconfig.json
@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
 		"resolveJsonModule": true,
-		"target": "es5",
+		"target": "es6",
 		"module": "esnext",
 		"strict": true,
 		"jsx": "preserve",

From ce1e7a19dff2f5fe290197f6a5947cbe99b0ecbc Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:29:49 +0200
Subject: [PATCH 164/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20use=20byte=20for?=
 =?UTF-8?q?=20group=20index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secretj12/turnierplaner/db/entities/groups/Group.java | 6 +++---
 .../resources/jsonEntities/user/group/jUserGroup.java     | 6 +++---
 .../turnierplaner/startup/testdata/TestdataGenerator.java | 4 ++--
 .../java/de/secretj12/turnierplaner/tools/GroupTools.java | 2 +-
 .../turnierplaner/model/TestDeletionBehaviour.java        | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
index 19b7a634..511c275e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
@@ -20,7 +20,7 @@ public class Group {
     @OneToMany(mappedBy = "group", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private Set<MatchOfGroup> matchesOfGroup;
     @Column(name = "index")
-    private int index;
+    private byte index;
     @ManyToOne
     @JoinColumn(name = "competition_id", nullable = false)
     private Competition competition;
@@ -46,11 +46,11 @@ public void setCompetition(Competition competition) {
         this.competition = competition;
     }
 
-    public int getIndex() {
+    public byte getIndex() {
         return index;
     }
 
-    public void setIndex(int index) {
+    public void setIndex(byte index) {
         this.index = index;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
index df1b7af3..275946a1 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
@@ -10,7 +10,7 @@
 
 public class jUserGroup {
 
-    private long index;
+    private byte index;
     private List<UUID> teams;
     private List<jUserMatch> matches;
 
@@ -24,11 +24,11 @@ public jUserGroup(Group group) {
         this.matches = group.getMatches().stream().map(jUserMatch::new).toList();
     }
 
-    public long getIndex() {
+    public byte getIndex() {
         return index;
     }
 
-    public void setIndex(long index) {
+    public void setIndex(byte index) {
         this.index = index;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index e800fcf5..4eb4d0af 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -268,9 +268,9 @@ private void addTeamsAndMatchesToGroup(Competition competition, CompetitionSetti
         Team[] groupTeams = createTeams(competition, compSettings);
 
         Group[] groups = new Group[compSettings.getNumberOfGroups()];
-        for (int k = 0; k < compSettings.getNumberOfGroups(); k++) {
+        for (byte k = 0; k < compSettings.getNumberOfGroups(); k++) {
             groups[k] = new Group();
-            groups[k].setIndex(k + 1);
+            groups[k].setIndex((byte) (k + 1));
             groups[k].setCompetition(competition);
             groupRepository.persist(groups[k]);
             for (int i = k * compSettings.getNumberOfGroups() / compSettings.getNumberOfGroups(); i < compSettings
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
index 18f68384..e6e63376 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
@@ -75,7 +75,7 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
                 teams = teamsOfGroup(group);
             } else {
                 group = new Group();
-                group.setIndex(index);
+                group.setIndex((byte)index);
                 group.setCompetition(competition);
                 groupsRepository.persist(group);
                 exGroups.add(group);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
index e23ce58f..f389fcbe 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -122,19 +122,19 @@ public void groupDeletion() {
 
         Group gA = new Group();
         gA.setCompetition(competition);
-        gA.setIndex(0);
+        gA.setIndex((byte) 0);
         groupRepository.persist(gA);
         Group gB = new Group();
         gB.setCompetition(competition);
-        gB.setIndex(1);
+        gB.setIndex((byte) 1);
         groupRepository.persist(gB);
         Group gC = new Group();
         gC.setCompetition(competition);
-        gC.setIndex(2);
+        gC.setIndex((byte) 2);
         groupRepository.persist(gC);
         Group gD = new Group();
         gD.setCompetition(competition);
-        gD.setIndex(3);
+        gD.setIndex((byte) 3);
         groupRepository.persist(gD);
 
         Match gmA = new Match();

From 828b154b761dd708e9dc9fcbb86df32b36578c14 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:34:38 +0200
Subject: [PATCH 165/247] =?UTF-8?q?=F0=9F=8E=A8=20update=20formatter=20and?=
 =?UTF-8?q?=20format=20backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                  |  2 +-
 .../resources/TournamentResource.java            | 14 +++++++-------
 .../jsonEntities/user/group/jUserGroup.java      |  8 ++++----
 .../resources/jsonEntities/user/jUserMatch.java  |  3 ++-
 .../startup/testdata/TestdataGenerator.java      | 16 ++++++++--------
 .../turnierplaner/tools/GroupTools.java          |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 7ad463b5..83ff59bb 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>2.24.1</version>
                 <configuration>
                     <configFile>formatJava.xml</configFile>
                 </configuration>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index e38e86f5..d634e8b4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -41,15 +41,15 @@ public class TournamentResource {
     public List<jUserTournament> getAllTournaments() {
         if (securityIdentity.hasRole("director"))
             return tournaments.streamAll()
-                    .map(jDirectorTournamentAdd::new)
-                    .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
-                    .map(t -> (jUserTournament) t).toList();
+                .map(jDirectorTournamentAdd::new)
+                .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
+                .map(t -> (jUserTournament) t).toList();
         else
             return tournaments.listAllVisible()
-                    .stream()
-                    .map(jUserTournament::new)
-                    .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
-                    .toList();
+                .stream()
+                .map(jUserTournament::new)
+                .sorted(Comparator.comparing(jUserTournament::getBeginGamePhase))
+                .toList();
     }
 
     @GET
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
index 275946a1..0c864977 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
@@ -17,10 +17,10 @@ public class jUserGroup {
     public jUserGroup(Group group) {
         this.index = group.getIndex();
         this.teams = group.getMatches().stream()
-                .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB()))
-                .map(Team::getId)
-                .distinct()
-                .toList();
+            .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB()))
+            .map(Team::getId)
+            .distinct()
+            .toList();
         this.matches = group.getMatches().stream().map(jUserMatch::new).toList();
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
index 71f44df2..42fa44ce 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
@@ -42,7 +42,8 @@ public jUserMatch(Match match) {
         if (match.getTeamB() != null)
             this.teamB = new jUserTeam(match.getTeamB());
 
-        this.sets = match.getSets().stream().map(jUserSet::new).sorted(Comparator.comparingInt(jUserSet::getIndex)).toList();
+        this.sets = match.getSets().stream().map(jUserSet::new).sorted(Comparator.comparingInt(jUserSet::getIndex))
+            .toList();
     }
 
     public UUID getId() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 4eb4d0af..24b7cd8d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -136,14 +136,14 @@ private void createSets(Match match) {
         byte numberOfSets = 2;
         int winDif = 0;
         List<Tuple2<Byte, Byte>> possibleResults = List.of(
-                Tuple2.of((byte) 6, (byte) 0),
-                Tuple2.of((byte) 6, (byte) 1),
-                Tuple2.of((byte) 6, (byte) 2),
-                Tuple2.of((byte) 6, (byte) 3),
-                Tuple2.of((byte) 6, (byte) 4),
-                Tuple2.of((byte) 6, (byte) 5),
-                Tuple2.of((byte) 7, (byte) 5),
-                Tuple2.of((byte) 7, (byte) 6)
+            Tuple2.of((byte) 6, (byte) 0),
+            Tuple2.of((byte) 6, (byte) 1),
+            Tuple2.of((byte) 6, (byte) 2),
+            Tuple2.of((byte) 6, (byte) 3),
+            Tuple2.of((byte) 6, (byte) 4),
+            Tuple2.of((byte) 6, (byte) 5),
+            Tuple2.of((byte) 7, (byte) 5),
+            Tuple2.of((byte) 7, (byte) 6)
         );
         for (byte i = 0; i < numberOfSets; i++) {
             Set.SetKey setKey = new Set.SetKey();
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
index e6e63376..dcecb7ef 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
@@ -75,7 +75,7 @@ private void createGroups(Competition competition, List<Group> exGroups, List<Se
                 teams = teamsOfGroup(group);
             } else {
                 group = new Group();
-                group.setIndex((byte)index);
+                group.setIndex((byte) index);
                 group.setCompetition(competition);
                 groupsRepository.persist(group);
                 exGroups.add(group);

From aec347749d616f80e57e2bdfc92b27b4e3b9ba60 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:44:32 +0200
Subject: [PATCH 166/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20add=20localization?=
 =?UTF-8?q?=20to=20player=20overview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/views/player/ViewPlayerOverview.vue    | 4 +++-
 frontend/app/src/i18n/de.json                                 | 4 +++-
 frontend/app/src/i18n/en.json                                 | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
index 6184707c..af3f24d9 100644
--- a/frontend/app/src/components/views/player/ViewPlayerOverview.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
@@ -1,7 +1,9 @@
 <template>
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
-			<template #title> Player Overview - {{ player?.name }}</template>
+			<template #title>
+				{{ t("ViewPlayerOverview.header") }} - {{ player?.name }}</template
+			>
 			<template #content>
 				<OverviewList />
 			</template>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 38d4b2b4..c95d1051 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -40,7 +40,6 @@
 		"filter_by_name": "Nach Name filtern",
 		"from": "Von",
 		"to": "Bis",
-		"tournament_tree": "Turnierbaum",
 		"update_score": "Aktualisieren Sie die Punkte für das Spiel"
 	},
 	"ViewPlayerRegistration": {
@@ -202,6 +201,9 @@
 		"quarterfinals": "Viertelfinale",
 		"round": "Runde"
 	},
+	"ViewPlayerOverview": {
+		"header" : "Player Overview"
+	},
 	"ViewPrepare": {
 		"steps": {
 			"settings": "Einstellungen",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 99b47b41..7bf45f2b 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -40,7 +40,6 @@
 		"filter_by_name": "Filter by name",
 		"from": "From",
 		"to": "To",
-		"tournament_tree": "Tournament tree",
 		"update_score": "Update the score for the game"
 	},
 	"ViewPlayerRegistration": {
@@ -204,6 +203,9 @@
 		"quarterfinals": "Quarterfinales",
 		"round": "Round"
 	},
+	"ViewPlayerOverview": {
+		"header" : "Player Overview"
+	},
 	"ViewPrepare": {
 		"steps": {
 			"settings": "Einstellungen",

From c0ef68539b52d849b6cfc93811ebec2d46481b60 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:57:19 +0200
Subject: [PATCH 167/247] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20fix=20warning=20un?=
 =?UTF-8?q?supported=20dependencies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index f167a4cb..ae00f010 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -39,8 +39,8 @@
 	"devDependencies": {
 		"@types/sortablejs": "^1.15.7",
 		"@types/uuid": "^9.0.7",
-		"@typescript-eslint/eslint-plugin": "^6.14.0",
-		"@typescript-eslint/parser": "^6.14.0",
+		"@typescript-eslint/eslint-plugin": "^8.8.0",
+		"@typescript-eslint/parser": "^8.8.0",
 		"@vitejs/plugin-vue": "^4.5.2",
 		"@vue/cli-plugin-typescript": "~5.0.8",
 		"@vue/cli-service": "^5.0.8",
@@ -53,7 +53,7 @@
 		"unplugin-vue-components": "^0.26.0",
 		"vite": "^5.0.10",
 		"vue-component-type-helpers": "^2.1.6",
-		"vue-loader-v16": "^16.0.0-beta.5.4",
+		"vue-loader": "^17.4.2",
 		"vue-tsc": "^2.1.6"
 	}
 }

From 45e277cc1e664fadcf8d3fc15d8e39c5488f677d Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 22:57:26 +0200
Subject: [PATCH 168/247] =?UTF-8?q?=F0=9F=8E=A8=20format=20frontend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/items/PlayerPointRow.vue   |  8 ++---
 .../components/items/UpdatePointsDialog.vue   | 24 +++++++-------
 .../groupSystem/ViewGroupTable.vue            |  2 +-
 .../views/competitions/FormCompetition.vue    | 32 +++++++++----------
 frontend/app/src/i18n/de.json                 |  2 +-
 frontend/app/src/i18n/en.json                 |  2 +-
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/frontend/app/src/components/items/PlayerPointRow.vue
index 9829d40b..e30ef6a4 100644
--- a/frontend/app/src/components/items/PlayerPointRow.vue
+++ b/frontend/app/src/components/items/PlayerPointRow.vue
@@ -9,10 +9,10 @@
 			</div>
 		</div>
 		<div
+			v-for="(p, i) in gamePoints"
+			v-if="gamePoints"
 			class="col-fixed"
 			style="width: 140px"
-			v-if="gamePoints"
-			v-for="(p, i) in gamePoints"
 		>
 			<InputNumber
 				v-model="gamePoints[i]"
@@ -23,9 +23,9 @@
 				}"
 				class="p-inputnumber-input"
 				input-style-class="p-inputnumber"
-				inputId="minmax-buttons"
+				input-id="minmax-buttons"
 				mode="decimal"
-				styleClass="p-inputnumber"
+				style-class="p-inputnumber"
 			/>
 		</div>
 	</div>
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 7332bf0a..f2df1aa7 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -15,13 +15,13 @@
 		<div class="grid">
 			<div class="col-fixed" style="width: 300px"></div>
 			<div
+				v-for="n in numberSets"
 				class="col-fixed flex justify-content-center flex-wrap"
 				style="width: 140px"
-				v-for="n in numberSets"
 			>
 				<RadioButton
 					v-model="selectedSet"
-					:inputId="n.toString()"
+					:input-id="n.toString()"
 					name="sets"
 					:value="(n - 1).toString()"
 				/>
@@ -29,38 +29,38 @@
 			</div>
 		</div>
 		<PlayerPointRow
-			:team="currentMatch?.teamA"
-			v-model:game-points="team1GamePoints"
 			v-if="visible"
+			v-model:game-points="team1GamePoints"
+			:team="currentMatch?.teamA"
 		/>
 		<PlayerPointRow
-			:team="currentMatch?.teamB"
-			v-model:game-points="team2GamePoints"
 			v-if="visible"
+			v-model:game-points="team2GamePoints"
+			:team="currentMatch?.teamB"
 		/>
 		<divider />
 		<div class="grid">
-			<div class="col" v-for="n in 7">
+			<div v-for="n in 7" class="col">
 				<Button
+					v-if="n - 1 <= 4"
 					:label="'6:' + (n - 1)"
 					@click="updatePoints(6, n - 1)"
-					v-if="n - 1 <= 4"
 				/>
 				<Button
+					v-else
 					:label="'7:' + (n - 1)"
 					@click="updatePoints(7, n - 1)"
-					v-else
 				/>
 			</div>
 		</div>
 		<div class="grid">
-			<div class="col" v-for="n in 7">
+			<div v-for="n in 7" class="col">
 				<Button
+					v-if="n - 1 <= 4"
 					:label="n - 1 + ':6'"
 					@click="updatePoints(n - 1, 6)"
-					v-if="n - 1 <= 4"
 				/>
-				<Button :label="n - 1 + ':7'" @click="updatePoints(n - 1, 7)" v-else />
+				<Button v-else :label="n - 1 + ':7'" @click="updatePoints(n - 1, 7)" />
 			</div>
 		</div>
 		<divider />
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index e1da718c..d394dc70 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -61,8 +61,8 @@
 	</table>
 	<UpdatePointsDialog
 		v-if="canEdit"
-		:number-sets="props.numberSets"
 		ref="dialog"
+		:number-sets="props.numberSets"
 	/>
 </template>
 
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 95ad5fd8..64148f42 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -4,12 +4,12 @@
 			<label for="name">{{ t("general.name") }}</label>
 			<InputText
 				id="name"
+				v-model="name"
 				:class="{ 'p-invalid': errors.name }"
 				:disabled="disabled"
 				class="w-full"
 				maxlength="30"
 				type="text"
-				v-model="name"
 				v-bind="nameAttrs"
 			/>
 			<InlineMessage v-if="errors.name" class="mt-2"
@@ -20,11 +20,11 @@
 			<label for="description">{{ t("general.description") }}</label>
 			<textarea
 				id="description"
+				v-model="description"
 				:disabled="disabled"
 				class="text-base text-color surface-overlay p-2 border-1 border-solid surface-border border-round appearance-none outline-none focus:border-primary w-full"
 				rows="4"
 				type="text"
-				v-model="description"
 				v-bind="descriptionAttrs"
 			></textarea>
 		</div>
@@ -34,6 +34,7 @@
 		<div class="field col-12 md:col-6 md:mr-8">
 			<label for="name">{{ t("CompetitionSettings.type") }}</label>
 			<Dropdown
+				v-model="selectedTourType"
 				:disabled="disabled"
 				:options="[
 					{
@@ -49,7 +50,6 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-model="selectedTourType"
 				v-bind="selectedTourTypeAttrs"
 			>
 				<template #value="slotProps">
@@ -88,6 +88,7 @@
 		<div class="field col-6">
 			<label for="name">{{ t("CompetitionSettings.mode") }}</label>
 			<Dropdown
+				v-model="selectedTourMode"
 				:disabled="disabled"
 				:options="[
 					{ name: t('CompetitionSettings.single'), value: Mode.SINGLE },
@@ -97,7 +98,6 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-model="selectedTourMode"
 				v-bind="selectedTourModeAttrs"
 			>
 				<template #value="slotProps">
@@ -140,6 +140,7 @@
 		>
 			<label for="name">{{ t("CompetitionSettings.signup") }}</label>
 			<Dropdown
+				v-model="signUp"
 				:disabled="disabled"
 				:options="[
 					{
@@ -155,7 +156,6 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-model="signUp"
 				v-bind="signUpAttrs"
 			>
 				<template #value="slotProps">
@@ -202,7 +202,7 @@
 				v-model="numberSets"
 				v-bind="numberSetsAtrrs"
 				:options="numberSetsOptions"
-				optionLabel="name"
+				option-label="name"
 				option-value="value"
 				:placeholder="t('CompetitionSettings.numberSets')"
 				class="w-full"
@@ -215,10 +215,10 @@
 		<div class="field col-12 flex flex-row align-items-center mb-4">
 			<Checkbox
 				id="playerB_different"
+				v-model="playerB_different"
 				:binary="true"
 				:disabled="disabled"
 				input-id="playerB_different_input"
-				v-model="playerB_different"
 				v-bind="playerB_differentAttrs"
 			/>
 			<label class="ml-2 mb-0 mt-1" for="playerB_different_input">{{
@@ -248,6 +248,7 @@
 				t("CompetitionSettings.sex")
 			}}</label>
 			<Dropdown
+				v-model="playerASex"
 				:disabled="disabled"
 				:options="[
 					{ name: t('CompetitionSettings.male'), value: Sex.MALE },
@@ -258,7 +259,6 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-model="playerASex"
 				v-bind="playerASexAttrs"
 			>
 				<template #option="slotProps">
@@ -304,20 +304,20 @@
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
 					id="minAgeA"
+					v-model="playerAHasMinAge"
 					:binary="true"
 					:disabled="disabled"
-					v-model="playerAHasMinAge"
 					v-bind="playerAHasMinAgeAttrs"
 				/>
 
 				<Calendar
 					id="minAgeA"
+					v-model="playerAMinAge"
 					:date-format="t('date_format')"
 					:disabled="!playerAHasMinAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-model="playerAMinAge"
 					v-bind="playerAMinAgeAttrs"
 				/>
 			</div>
@@ -329,18 +329,18 @@
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
 					id="minAgeB"
-					:binary="true"
 					v-model="playerBHasMinAge"
+					:binary="true"
 					v-bind="playerBHasMinAgeAttrs"
 				/>
 				<Calendar
 					id="minAgeB"
+					v-model="playerBMinAge"
 					:date-format="t('date_format')"
 					:disabled="!playerBHasMinAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-model="playerBMinAge"
 					v-bind="playerBMinAgeAttrs"
 				/>
 			</div>
@@ -359,20 +359,20 @@
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
 					id="maxAgeA"
+					v-model="playerAHasMaxAge"
 					:binary="true"
 					:disabled="disabled"
-					v-model="playerAHasMaxAge"
 					v-bind="playerAHasMaxAgeAttrs"
 				/>
 
 				<Calendar
 					id="maxAgeA"
+					v-model="playerAMaxAge"
 					:date-format="t('date_format')"
 					:disabled="!playerAHasMaxAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-model="playerAMaxAge"
 					v-bind="playerAMaxAgeAttrs"
 				/>
 			</div>
@@ -384,20 +384,20 @@
 			<div class="flex flex-row align-items-center gap-2">
 				<Checkbox
 					id="maxAgeB"
+					v-model="playerBHasMaxAge"
 					:binary="true"
 					:disabled="disabled"
-					v-model="playerBHasMaxAge"
 					v-bind="playerBHasMaxAgeAttrs"
 				/>
 
 				<Calendar
 					id="maxAgeB"
+					v-model="playerBMaxAge"
 					:date-format="t('date_format')"
 					:disabled="!playerBHasMaxAge || disabled"
 					:manual-input="false"
 					class="w-full"
 					show-icon
-					v-model="playerBMaxAge"
 					v-bind="playerBMaxAgeAttrs"
 				/>
 			</div>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index c95d1051..ae43c186 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -202,7 +202,7 @@
 		"round": "Runde"
 	},
 	"ViewPlayerOverview": {
-		"header" : "Player Overview"
+		"header": "Player Overview"
 	},
 	"ViewPrepare": {
 		"steps": {
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 7bf45f2b..0040aa62 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -204,7 +204,7 @@
 		"round": "Round"
 	},
 	"ViewPlayerOverview": {
-		"header" : "Player Overview"
+		"header": "Player Overview"
 	},
 	"ViewPrepare": {
 		"steps": {

From 65600d286a093811cecf90a43cacd9ea0a01768c Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 23:35:07 +0200
Subject: [PATCH 169/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20name=20generation?=
 =?UTF-8?q?=20to=20not=20contain=20empty=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                            | 4 ++--
 .../turnierplaner/startup/testdata/TestdataGenerator.java  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 83ff59bb..0b7297ee 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>net.datafaker</groupId>
             <artifactId>datafaker</artifactId>
-            <version>1.9.0</version>
+            <version>2.4.0</version>
         </dependency>
     </dependencies>
     <build>
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.24.1</version>
+                <version>2.24.0</version>
                 <configuration>
                     <configFile>formatJava.xml</configFile>
                 </configuration>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 24b7cd8d..9a47b267 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -12,6 +12,7 @@
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import net.datafaker.Faker;
+import net.datafaker.providers.base.Name;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -217,9 +218,9 @@ private void createSets(Match match) {
 
     private Player createPlayer(AGE_RESTR ageRestr) {
         Player player = new Player();
-        String name = faker.harryPotter().character();
-        player.setFirstName(name.split(" ")[0]);
-        player.setLastName(name.contains(" ") ? name.split(" ", 2)[1] : "");
+        Name name = faker.name();
+        player.setFirstName(name.firstName());
+        player.setLastName(name.lastName());
         player.setEmail(player.getFirstName() + "." + player.getLastName() + "@gmail.com");
         player.setPhone(faker.phoneNumber().cellPhone());
         player.setMailVerified(true);

From 9bf4f5a64978a6e07a11403747e9526936e0d5f3 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Mon, 30 Sep 2024 23:35:33 +0200
Subject: [PATCH 170/247] =?UTF-8?q?=F0=9F=90=9B=20move=20click=20to=20set?=
 =?UTF-8?q?=20to=20not=20conflict=20with=20player=20overview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/items/UpdatePointsDialog.vue   |  3 --
 .../knockoutSystem/ViewKnockoutSystem.vue     | 20 +--------
 .../competition/knockoutSystem/ViewMatch.vue  | 42 ++++++++++++++++---
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index f2df1aa7..33c8c5ec 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -144,9 +144,6 @@ const savePoints = function () {
 const getAllChangedSets = function () {
 	let changedSets = []
 	for (let i = 0; i < numberSets.value; i++) {
-		console.log("i ", i)
-		console.log("currentmatch ", currentMatch.value?.sets)
-		console.log("currentmatch ", currentMatch.value?.sets?.[i])
 		if (
 			!currentMatch.value?.sets?.length ||
 			i > currentMatch.value?.sets?.length - 1
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index ddbdf4fe..dc4c5675 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -15,7 +15,7 @@
 					v-if="match"
 					:match="match"
 					:mode="props.mode"
-					@click="showPopUp(match)"
+					:numberSets="props.numberSets"
 				/>
 			</template>
 			<template #additional="{ match }">
@@ -23,11 +23,6 @@
 			</template>
 		</ViewKnockoutTree>
 	</template>
-	<UpdatePointsDialog
-		v-if="canEdit"
-		ref="dialog"
-		:number-sets="props.numberSets"
-	/>
 </template>
 
 <script lang="ts" setup>
@@ -39,10 +34,6 @@ import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.v
 import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { useI18n } from "vue-i18n"
-import { inject, ref } from "vue"
-import { Match } from "@/interfaces/match"
-import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
-import { getCanEdit } from "@/backend/security"
 
 const { t } = useI18n({ inheritLocale: true })
 
@@ -52,17 +43,8 @@ const props = defineProps<{
 }>()
 
 const route = useRoute()
-const isLoggedIn = inject("loggedIn", ref(false))
-const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
 
 const { data: knockoutSystem } = getKnockout(route)
-const dialog = ref()
-
-const showPopUp = function (match: Match) {
-	if (canEdit.value) {
-		dialog.value.showPopUp(match)
-	}
-}
 </script>
 
 <style scoped>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 3d425197..3ea6e08a 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -10,8 +10,13 @@
 				<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 			</td>
 			<template v-if="props.match.sets !== null">
-				<td v-for="set in props.match.sets" :key="set.index" class="result">
-					{{ set.scoreA }} {{ set.index }}
+				<td
+					v-for="set in props.match.sets"
+					:key="set.index"
+					class="result"
+					@click="showPopUp(props.match)"
+				>
+					{{ set.scoreA }}
 				</td>
 			</template>
 		</tr>
@@ -21,23 +26,50 @@
 			</td>
 
 			<template v-if="props.match.sets !== null">
-				<td v-for="set in props.match.sets" :key="set.index" class="result">
-					{{ set.scoreB }} {{ set.index }}
+				<td
+					v-for="set in props.match.sets"
+					:key="set.index"
+					class="result"
+					@click="showPopUp(props.match)"
+				>
+					{{ set.scoreB }}
 				</td>
 			</template>
 		</tr>
 	</table>
+	<UpdatePointsDialog
+		v-if="canEdit"
+		ref="dialog"
+		:number-sets="props.numberSets"
+	/>
 </template>
 
 <script setup lang="ts">
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { Mode } from "@/interfaces/competition"
+import { Mode, NumberSets } from "@/interfaces/competition"
 import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
+import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
+import { inject, ref } from "vue"
+import { Match } from "@/interfaces/match"
+import { getCanEdit } from "@/backend/security"
+import { useRoute } from "vue-router"
 
 const props = defineProps<{
 	match: KnockoutMatch
 	mode: Mode
+	numberSets: NumberSets
 }>()
+
+const isLoggedIn = inject("loggedIn", ref(false))
+const route = useRoute()
+const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
+const dialog = ref()
+
+const showPopUp = function (match: Match) {
+	if (canEdit.value) {
+		dialog.value.showPopUp(match)
+	}
+}
 </script>
 
 <style scoped>

From f21f2a2f26b9e76b1a1277791eb9b7ef5e1937e9 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 00:36:35 +0200
Subject: [PATCH 171/247] =?UTF-8?q?=F0=9F=8E=A8=20clean=20up=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/package.json                       |  4 ++--
 .../app/src/components/items/PlayerPointRow.vue | 17 +++++++++--------
 .../src/components/items/UpdatePointsDialog.vue |  9 +++++----
 .../competition/groupSystem/ViewGroupSystem.vue |  3 ++-
 .../knockoutSystem/ViewKnockoutSystem.vue       |  2 +-
 .../competition/knockoutSystem/ViewMatch.vue    |  4 ++--
 .../views/competitions/FormCompetition.vue      |  5 +++--
 frontend/app/src/i18n/de.json                   |  7 +++++--
 frontend/app/src/i18n/en.json                   |  5 ++++-
 frontend/app/src/main.ts                        |  4 +---
 10 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/frontend/app/package.json b/frontend/app/package.json
index ae00f010..53e3437d 100644
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -18,7 +18,7 @@
 		"@tanstack/vue-query-devtools": "^5.52.0",
 		"@vee-validate/yup": "^4.13.2",
 		"@vue/cli": "^5.0.8",
-		"axios": "^1.6.2",
+		"axios": "^1.7.7",
 		"keycloak-js": "^23.0.3",
 		"material-symbols": "^0.23.0",
 		"oidc-client-ts": "^2.4.0",
@@ -32,7 +32,7 @@
 		"vue": "^3.5.8",
 		"vue-axios": "^3.5.2",
 		"vue-cal": "^4.9.0",
-		"vue-i18n": "^9.8.0",
+		"vue-i18n": "^10.0.3",
 		"vue-password": "^3.1.0",
 		"vue-router": "^4.2.5"
 	},
diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/frontend/app/src/components/items/PlayerPointRow.vue
index e30ef6a4..d2cae9e4 100644
--- a/frontend/app/src/components/items/PlayerPointRow.vue
+++ b/frontend/app/src/components/items/PlayerPointRow.vue
@@ -2,24 +2,25 @@
 	<div class="grid">
 		<div class="col-fixed" style="width: 300px">
 			<div class="text-center p-3 border-round-sm bg-primary font-bold">
-				{{ props.team?.playerA?.firstName }}
-				{{ props.team?.playerA?.lastName }}
-				{{ props.team?.playerB?.firstName }}
-				{{ props.team?.playerB?.lastName }}
+				{{ props.team?.playerA?.name }}
+				{{ props.team?.playerB?.name }}
 			</div>
 		</div>
 		<div
-			v-for="(p, i) in gamePoints"
 			v-if="gamePoints"
-			class="col-fixed"
-			style="width: 140px"
+			class="col flex flex-row flex-wrap"
+			style="width: 100%"
 		>
 			<InputNumber
+				v-for="(p, i) in gamePoints"
+				:key="p"
 				v-model="gamePoints[i]"
 				:max="100"
 				:min="0"
 				:pt="{
-					input: { root: { style: 'width: 120px', class: 'text-center' } },
+					input: {
+						root: { style: 'width: 120px; height: 50px', class: 'text-center' },
+					},
 				}"
 				class="p-inputnumber-input"
 				input-style-class="p-inputnumber"
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 33c8c5ec..9c609cef 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -6,16 +6,17 @@
 				? { width: '50rem' }
 				: { width: '70rem' },
 		]"
-		header="Update Score"
+		:header="t('DialogUpdateScore.header')"
 		modal
 	>
 		<span class="text-surface-500 dark:text-surface-400 block mb-2">{{
-			t("general.update_score")
+			t("DialogUpdateScore.update_score")
 		}}</span>
 		<div class="grid">
 			<div class="col-fixed" style="width: 300px"></div>
 			<div
 				v-for="n in numberSets"
+				:key="n"
 				class="col-fixed flex justify-content-center flex-wrap"
 				style="width: 140px"
 			>
@@ -40,7 +41,7 @@
 		/>
 		<divider />
 		<div class="grid">
-			<div v-for="n in 7" class="col">
+			<div v-for="n in 7" :key="n" class="col">
 				<Button
 					v-if="n - 1 <= 4"
 					:label="'6:' + (n - 1)"
@@ -54,7 +55,7 @@
 			</div>
 		</div>
 		<div class="grid">
-			<div v-for="n in 7" class="col">
+			<div v-for="n in 7" :key="n" class="col">
 				<Button
 					v-if="n - 1 <= 4"
 					:label="n - 1 + ':6'"
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index de4eb0d3..20266afe 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -4,6 +4,7 @@
 	<template v-if="groupSystem">
 		<ViewGroupTable
 			v-for="group in groupSystem.groups"
+			:key="group.index"
 			:group="group"
 			:number-sets="props.numberSets"
 		/>
@@ -16,7 +17,7 @@
 import { useRoute } from "vue-router"
 import ViewGroupTable from "@/components/views/competition/groupSystem/ViewGroupTable.vue"
 import { getGroup } from "@/backend/group"
-import { Mode, NumberSets } from "@/interfaces/competition"
+import { NumberSets } from "@/interfaces/competition"
 
 const route = useRoute()
 const { data: groupSystem } = getGroup(route)
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index dc4c5675..e4d49f70 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -15,7 +15,7 @@
 					v-if="match"
 					:match="match"
 					:mode="props.mode"
-					:numberSets="props.numberSets"
+					:number-sets="props.numberSets"
 				/>
 			</template>
 			<template #additional="{ match }">
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 3ea6e08a..1b88936c 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -38,7 +38,7 @@
 		</tr>
 	</table>
 	<UpdatePointsDialog
-		v-if="canEdit"
+		v-if="canEdit && props.numberSets !== undefined"
 		ref="dialog"
 		:number-sets="props.numberSets"
 	/>
@@ -57,7 +57,7 @@ import { useRoute } from "vue-router"
 const props = defineProps<{
 	match: KnockoutMatch
 	mode: Mode
-	numberSets: NumberSets
+	numberSets?: NumberSets
 }>()
 
 const isLoggedIn = inject("loggedIn", ref(false))
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 64148f42..769d28b2 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -249,6 +249,7 @@
 			}}</label>
 			<Dropdown
 				v-model="playerASex"
+				v-bind="playerASexAttrs"
 				:disabled="disabled"
 				:options="[
 					{ name: t('CompetitionSettings.male'), value: Sex.MALE },
@@ -259,7 +260,6 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="playerASexAttrs"
 			>
 				<template #option="slotProps">
 					<div>
@@ -273,6 +273,7 @@
 				t("CompetitionSettings.sex")
 			}}</label>
 			<Dropdown
+				v-model="playerBSex"
 				:disabled="disabled"
 				:options="[
 					{ name: t('CompetitionSettings.male'), value: Sex.MALE },
@@ -283,7 +284,7 @@
 				class="w-full"
 				option-label="name"
 				option-value="value"
-				v-bind="playerBSex"
+				v-bind="playerBSexAttrs"
 			>
 				<template #option="slotProps">
 					<div>{{ slotProps.option.name }}</div>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index ae43c186..7f18dfc4 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -39,7 +39,10 @@
 		"any": "Beliebig",
 		"filter_by_name": "Nach Name filtern",
 		"from": "Von",
-		"to": "Bis",
+		"to": "Bis"
+	},
+	"DialogUpdateScore": {
+		"header": "Punkte Eintragung",
 		"update_score": "Aktualisieren Sie die Punkte für das Spiel"
 	},
 	"ViewPlayerRegistration": {
@@ -202,7 +205,7 @@
 		"round": "Runde"
 	},
 	"ViewPlayerOverview": {
-		"header": "Player Overview"
+		"header": "Spieler Übersicht"
 	},
 	"ViewPrepare": {
 		"steps": {
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 0040aa62..fa4a1135 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -39,7 +39,10 @@
 		"any": "Any",
 		"filter_by_name": "Filter by name",
 		"from": "From",
-		"to": "To",
+		"to": "To"
+	},
+	"DialogUpdateScore": {
+		"header": "Score Update",
 		"update_score": "Update the score for the game"
 	},
 	"ViewPlayerRegistration": {
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 1bdefe42..6053e266 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -50,9 +50,7 @@ const messages = languages
 
 export type MessageSchema = (typeof messages)["de"]
 
-declare module "vue-i18n" {
-	export interface DefineLocaleMessage extends MessageSchema {}
-}
+declare module "vue-i18n" {}
 
 const options: I18nOptions = {
 	locale: "de", // set locale

From 73c4912814efb5a042e7506629d1621f210c9887 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 13:10:49 +0200
Subject: [PATCH 172/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20tests=20and=20pack?=
 =?UTF-8?q?age=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition/jDirectorCompetitionAdd.java        |  8 ++++----
 .../resources/TestCompetitionResource.java          | 13 ++++++++++++-
 .../turnierplaner/resources/TestMatchResource.java  |  7 +++----
 .../turnierplaner/tools/TestGroupTools.java         |  4 +++-
 .../turnierplaner/tools/TestKnockoutTools.java      |  2 ++
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
index 814db6be..d6449c54 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
@@ -16,10 +16,10 @@ public jDirectorCompetitionAdd(Competition competition) {
     public void toDB(Competition competition) {
         competition.setName(getName());
         competition.setDescription(getDescription());
-        competition.setNumberSets(switch (getNumberSets()) {
-            case THREE -> NumberSets.THREE;
-            case FIVE -> NumberSets.FIVE;
-        });
+        switch (getNumberSets()) {
+            case THREE -> competition.setNumberSets(NumberSets.THREE);
+            case FIVE -> competition.setNumberSets(NumberSets.FIVE);
+        }
         switch (getType()) {
             case KNOCKOUT -> competition.setType(CompetitionType.KNOCKOUT);
             case GROUPS -> competition.setType(CompetitionType.GROUPS);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
index 3a68640c..f83024d0 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
@@ -1,5 +1,6 @@
 package de.secretj12.turnierplaner.resources;
 
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.SexType;
 import de.secretj12.turnierplaner.db.entities.Tournament;
@@ -81,6 +82,7 @@ public void addData() {
         comp20.setSignup(CompetitionSignUp.INDIVIDUAL);
         comp20.setPlayerASex(Sex.ANY);
         comp20.setTournament(tour20);
+        comp20.setNumberSets(NumberSets.THREE);
         competitions.persist(comp20);
         Competition comp21 = new Competition();
         comp21.setName("Herren");
@@ -92,6 +94,7 @@ public void addData() {
         comp21.setSignup(CompetitionSignUp.INDIVIDUAL);
         comp21.setPlayerASex(Sex.ANY);
         comp21.setTournament(tour21);
+        comp21.setNumberSets(NumberSets.THREE);
         competitions.persist(comp21);
         Competition comp22 = new Competition();
         comp22.setName("Damen");
@@ -103,6 +106,7 @@ public void addData() {
         comp22.setSignup(CompetitionSignUp.INDIVIDUAL);
         comp22.setPlayerASex(Sex.ANY);
         comp22.setTournament(tour22);
+        comp22.setNumberSets(NumberSets.THREE);
         competitions.persist(comp22);
 
         Player playerM = new Player();
@@ -294,7 +298,8 @@ public void addTournament() {
                       "sex": "ANY",
                       "hasMinAge": false,
                       "hasMaxAge": false
-                    }
+                    },
+                    "numberSets": "THREE"
                 }
                 """)
             .post("/tournament/Clubmeisterschaft 2021/competition/add")
@@ -479,6 +484,7 @@ public void updateTournament() {
                     "type": "KNOCKOUT",
                     "mode": "SINGLE",
                     "signUp": "INDIVIDUAL",
+                    "numberSets": "FIVE",
                     "playerA": {
                       "sex": "FEMALE",
                       "hasMinAge": false,
@@ -658,6 +664,7 @@ public void addComps() {
         compSingle.setSignup(CompetitionSignUp.INDIVIDUAL);
         compSingle.setPlayerASex(Sex.ANY);
         compSingle.setTournament(tour21);
+        compSingle.setNumberSets(NumberSets.THREE);
         competitions.persist(compSingle);
         Competition compDoubleIndSame = new Competition();
         compDoubleIndSame.setName("DoubleIndSame");
@@ -670,6 +677,7 @@ public void addComps() {
         compDoubleIndSame.setPlayerASex(Sex.ANY);
         compDoubleIndSame.setPlayerBdifferent(false);
         compDoubleIndSame.setTournament(tour21);
+        compDoubleIndSame.setNumberSets(NumberSets.FIVE);
         competitions.persist(compDoubleIndSame);
         Competition compDoubleIndDif = new Competition();
         compDoubleIndDif.setName("DoubleIndDif");
@@ -683,6 +691,7 @@ public void addComps() {
         compDoubleIndDif.setPlayerBdifferent(true);
         compDoubleIndDif.setPlayerBSex(Sex.FEMALE);
         compDoubleIndDif.setTournament(tour21);
+        compDoubleIndDif.setNumberSets(NumberSets.THREE);
         competitions.persist(compDoubleIndDif);
         Competition compDoubleTog = new Competition();
         compDoubleTog.setName("DoubleTog");
@@ -695,6 +704,7 @@ public void addComps() {
         compDoubleTog.setPlayerASex(Sex.ANY);
         compDoubleTog.setPlayerBSex(Sex.ANY);
         compDoubleTog.setTournament(tour21);
+        compDoubleTog.setNumberSets(NumberSets.THREE);
         competitions.persist(compDoubleTog);
 
         Tournament tour22 = tournaments.getByName("Clubmeisterschaft 2022");
@@ -708,6 +718,7 @@ public void addComps() {
         compSingle2.setSignup(CompetitionSignUp.INDIVIDUAL);
         compSingle2.setPlayerASex(Sex.ANY);
         compSingle2.setTournament(tour22);
+        compSingle2.setNumberSets(NumberSets.THREE);
         competitions.persist(compSingle2);
     }
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
index 03e0d119..6cb7b962 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
@@ -1,9 +1,6 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.db.entities.Court;
-import de.secretj12.turnierplaner.db.entities.CourtType;
-import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.*;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
@@ -71,6 +68,7 @@ public void addCourts() {
         comp.setSignup(CompetitionSignUp.INDIVIDUAL);
         comp.setPlayerASex(Sex.ANY);
         comp.setTournament(tour);
+        comp.setNumberSets(NumberSets.THREE);
         competitions.persist(comp);
 
         Competition comp2 = new Competition();
@@ -83,6 +81,7 @@ public void addCourts() {
         comp2.setSignup(CompetitionSignUp.INDIVIDUAL);
         comp2.setPlayerASex(Sex.ANY);
         comp2.setTournament(tour);
+        comp2.setNumberSets(NumberSets.THREE);
         competitions.persist(comp2);
 
         for (int i = 0; i < 5; i++) {
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
index b930e3cc..84d14fd3 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
@@ -1,6 +1,7 @@
-package de.secretj12.turnierplaner.modifier;
+package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
@@ -76,6 +77,7 @@ public void addData() {
         comp.setPlayerASex(Sex.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
+        comp.setNumberSets(NumberSets.THREE);
         competitionRepository.persist(comp);
     }
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
index 8417911b..1b787937 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
@@ -1,6 +1,7 @@
 package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
@@ -60,6 +61,7 @@ public void addData() {
         comp.setPlayerASex(Sex.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
+        comp.setNumberSets(NumberSets.THREE);
         competitionRepository.persist(comp);
     }
 

From 32a8947009ba4094270af60db1c6fe36b764b88b Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 13:15:01 +0200
Subject: [PATCH 173/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20remove=20unused=20?=
 =?UTF-8?q?typescript=20directive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/main.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index 6053e266..b5fcc4f7 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -58,7 +58,6 @@ const options: I18nOptions = {
 	warnHtmlMessage: false,
 	missingWarn: false,
 	fallbackWarn: false,
-	// @ts-expect-error "Not a fix datatype"
 	messages,
 	legacy: false,
 }

From 1449dd772bdea22d2aebc2ecb041b1cc9fa4f257 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 13:17:27 +0200
Subject: [PATCH 174/247] =?UTF-8?q?=F0=9F=8E=A8=20fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/model/TestDeletionBehaviour.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
index f389fcbe..10a4c035 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -1,6 +1,7 @@
 package de.secretj12.turnierplaner.model;
 
 import de.secretj12.turnierplaner.db.entities.Match;
+import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.FinalOfGroup;
@@ -62,6 +63,7 @@ public void addData() {
         comp.setPlayerASex(Sex.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
+        comp.setNumberSets(NumberSets.THREE);
         competitionRepository.persist(comp);
     }
 

From 76cefd688b1d77111c61bfa492a7f7298aafc759 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 13:55:26 +0200
Subject: [PATCH 175/247] =?UTF-8?q?=E2=9C=85=20Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      | 28 ++++++-------
 .../db/entities/competition/Competition.java  |  6 +--
 .../turnierplaner/startup/TestStartup.java    | 39 +++++++++++++++++++
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index c0d5a552..7d605622 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -7,11 +7,10 @@
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import io.smallrye.common.constraint.NotNull;
 import jakarta.persistence.*;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.NamedQueries;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.*;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -21,14 +20,14 @@
 @Entity
 @Table(name = "matches")
 @NamedQueries({
-               @NamedQuery(name = "deleteByComp",
-                           query = """
-                               DELETE FROM Match m WHERE m.competition = :comp"""),
-               @NamedQuery(name = "nonGroupMatches",
-                           query = """
-                               FROM Match m WHERE m.competition = :comp
-                               AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
-                               """)})
+    @NamedQuery(name = "deleteByComp",
+                query = """
+                    DELETE FROM Match m WHERE m.competition = :comp"""),
+    @NamedQuery(name = "nonGroupMatches",
+                query = """
+                    FROM Match m WHERE m.competition = :comp
+                    AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
+                    """)})
 public class Match {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -81,7 +80,8 @@ public class Match {
     @OneToOne(mappedBy = "match", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private MatchOfGroup group;
 
-    @OneToMany(mappedBy = "key.match", cascade = CascadeType.REMOVE, orphanRemoval = true)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @OneToMany(mappedBy = "key.match", cascade = CascadeType.REMOVE)
     private List<Set> sets;
 
     public UUID getId() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index 997ac209..e4850ed2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -90,13 +90,13 @@ public class Competition {
     @JoinColumn(name = "thirdPlace_id")
     private Match thirdPlace;
 
-    @OneToMany(mappedBy = "competition")
+    @OneToMany(mappedBy = "competition", cascade = CascadeType.REMOVE)
     private List<Team> teams;
 
-    @OneToMany(mappedBy = "competition")
+    @OneToMany(mappedBy = "competition", cascade = CascadeType.REMOVE)
     private List<Match> matches;
 
-    @OneToMany(mappedBy = "competition")
+    @OneToMany(mappedBy = "competition", cascade = CascadeType.REMOVE)
     private List<Group> groups;
 
     public UUID getId() {
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java b/backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
index dd816674..9664019f 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
@@ -1,13 +1,37 @@
 package de.secretj12.turnierplaner.startup;
 
+import de.secretj12.turnierplaner.db.repositories.*;
 import de.secretj12.turnierplaner.startup.testdata.TestdataGenerator;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
 public class TestStartup {
 
+    @Inject
+    TournamentRepository tournamentRepository;
+    @Inject
+    CompetitionRepository competitionRepository;
+    @Inject
+    PlayerRepository playerRepository;
+    @Inject
+    TeamRepository teamRepository;
+    @Inject
+    MatchRepository matchRepository;
+    @Inject
+    CourtRepositiory courtRepositiory;
+    @Inject
+    GroupRepository groupRepository;
+    @Inject
+    NextMatchRepository nextMatchRepository;
+    @Inject
+    MatchOfGroupRepository matchOfGroupRepository;
+    @Inject
+    FinalOfGroupRepository finalOfGroupRepository;
+
     @Inject
     TestdataGenerator testdataGenerator;
 
@@ -15,4 +39,19 @@ public class TestStartup {
     public void generateTestdata() {
         testdataGenerator.generateData();
     }
+
+    @AfterEach
+    @Transactional
+    public void afterEach() {
+        finalOfGroupRepository.deleteAll();
+        nextMatchRepository.deleteAll();
+        matchOfGroupRepository.deleteAll();
+        matchRepository.deleteAll();
+        teamRepository.deleteAll();
+        groupRepository.deleteAll();
+        playerRepository.deleteAll();
+        competitionRepository.deleteAll();
+        courtRepositiory.deleteAll();
+        tournamentRepository.deleteAll();
+    }
 }

From c29806b3f365d451c9ccbdf14f5ff55b7948ab3d Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 14:03:25 +0200
Subject: [PATCH 176/247] =?UTF-8?q?=F0=9F=8E=A8=20fix=20formatter=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                  |  2 +-
 .../turnierplaner/db/entities/Match.java         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 0b7297ee..d28c5db4 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.24.0</version>
+                <version>2.22.0</version>
                 <configuration>
                     <configFile>formatJava.xml</configFile>
                 </configuration>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index 7d605622..f1f69e5b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -20,14 +20,14 @@
 @Entity
 @Table(name = "matches")
 @NamedQueries({
-    @NamedQuery(name = "deleteByComp",
-                query = """
-                    DELETE FROM Match m WHERE m.competition = :comp"""),
-    @NamedQuery(name = "nonGroupMatches",
-                query = """
-                    FROM Match m WHERE m.competition = :comp
-                    AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
-                    """)})
+               @NamedQuery(name = "deleteByComp",
+                           query = """
+                               DELETE FROM Match m WHERE m.competition = :comp"""),
+               @NamedQuery(name = "nonGroupMatches",
+                           query = """
+                               FROM Match m WHERE m.competition = :comp
+                               AND NOT EXISTS (FROM MatchOfGroup mog WHERE mog.match = m)
+                               """)})
 public class Match {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)

From 96f95693b01eb749b923f6b2ed239b6031b8794c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 14:31:27 +0200
Subject: [PATCH 177/247] =?UTF-8?q?=F0=9F=9B=82=20Change=20report=20role?=
 =?UTF-8?q?=20to=20reporter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/SetResource.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index 72229a49..eb74928c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -8,7 +8,6 @@
 import de.secretj12.turnierplaner.db.repositories.SetRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
-import de.secretj12.turnierplaner.tools.CommonHelpers;
 import io.quarkus.security.UnauthorizedException;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -20,7 +19,7 @@
 import java.util.List;
 import java.util.UUID;
 
-@RolesAllowed("director")
+@RolesAllowed("reporter")
 @Path("/tournament/{tourName}/competition/{matchId}/set")
 public class SetResource {
     @Inject
@@ -43,7 +42,6 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
             throw new UnauthorizedException("Cannot update matches before game phase has begun");
 
         Match match = matchRepository.findById(matchId);
-        System.out.println(match);
         if (match == null)
             throw new InternalServerErrorException("Could find match");
 
@@ -62,7 +60,6 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
             set.setScoreB(jSet.getScoreB());
             setRepository.persist(set);
         }
-        System.out.println("Updated matches");
 
         return "Updated matches";
     }

From 81b99dbba69d135b58eec43528721d457b7c2e32 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 14:34:18 +0200
Subject: [PATCH 178/247] =?UTF-8?q?=F0=9F=92=84=20Change=20mouse=20to=20po?=
 =?UTF-8?q?inter=20when=20reporting=20possible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/groupSystem/ViewGroupTable.vue   | 10 +++++-----
 .../views/competition/knockoutSystem/ViewMatch.vue     |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index d394dc70..41865f89 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -38,6 +38,7 @@
 							index + indexB < props.group.teams.length - 1
 						"
 						:class="{
+							'cursor-pointer': canEdit,
 							highlightLow:
 								hoverIdA &&
 								hoverIdB &&
@@ -47,12 +48,10 @@
 						}"
 						@mouseover="matchHover(index, indexB)"
 						@mouseleave="hoverLeave()"
+						@click="showPopUp(findMatch(team, teamB))"
 					>
 						<div>
-							<ViewMatch
-								:match="findMatch(team, teamB)"
-								@click="showPopUp(findMatch(team, teamB))"
-							/>
+							<ViewMatch :match="findMatch(team, teamB)" />
 						</div>
 					</td>
 				</template>
@@ -123,7 +122,8 @@ function hoverLeave() {
 }
 
 const dialog = ref()
-const showPopUp = function (match: Match) {
+
+function showPopUp(match: Match) {
 	if (canEdit.value) dialog.value.showPopUp(match)
 }
 </script>
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 1b88936c..5ff7841b 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -14,6 +14,9 @@
 					v-for="set in props.match.sets"
 					:key="set.index"
 					class="result"
+					:class="{
+						'cursor-pointer': canEdit
+					}"
 					@click="showPopUp(props.match)"
 				>
 					{{ set.scoreA }}
@@ -30,6 +33,9 @@
 					v-for="set in props.match.sets"
 					:key="set.index"
 					class="result"
+					:class="{
+						'cursor-pointer': canEdit
+					}"
 					@click="showPopUp(props.match)"
 				>
 					{{ set.scoreB }}

From d2ef5788767e4bf5481f16bc12990cdcb16e5b2b Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 15:48:10 +0200
Subject: [PATCH 179/247] =?UTF-8?q?=F0=9F=92=84=20Add=20empty=20sets=20as?=
 =?UTF-8?q?=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition/knockoutSystem/ViewMatch.vue  | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 5ff7841b..199d5b69 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -9,38 +9,60 @@
 			<td class="name">
 				<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 			</td>
-			<template v-if="props.match.sets !== null">
+			<template v-if="props.match.sets && props.match.sets.length > 0">
 				<td
 					v-for="set in props.match.sets"
 					:key="set.index"
 					class="result"
 					:class="{
-						'cursor-pointer': canEdit
+						'cursor-pointer': canEdit,
 					}"
 					@click="showPopUp(props.match)"
 				>
 					{{ set.scoreA }}
 				</td>
 			</template>
+			<template v-else>
+				<td
+					v-for="set in [1, 2]"
+					:key="set"
+					class="result"
+					:class="{
+						'cursor-pointer': canEdit,
+					}"
+					@click="showPopUp(props.match)"
+				></td>
+			</template>
 		</tr>
 		<tr :class="{ winner: props.match.finished && props.match.winner }">
 			<td class="name">
 				<ViewTeamNames :team="props.match.teamB" :inverted="true" />
 			</td>
 
-			<template v-if="props.match.sets !== null">
+			<template v-if="props.match.sets && props.match.sets.length > 0">
 				<td
 					v-for="set in props.match.sets"
 					:key="set.index"
 					class="result"
 					:class="{
-						'cursor-pointer': canEdit
+						'cursor-pointer': canEdit,
 					}"
 					@click="showPopUp(props.match)"
 				>
 					{{ set.scoreB }}
 				</td>
 			</template>
+			<template v-else>
+				<td
+					v-for="set in [1, 2]"
+					:key="set"
+					class="result"
+					:class="{
+						'cursor-pointer': canEdit,
+					}"
+					@click="showPopUp(props.match)"
+				></td>
+			</template>
 		</tr>
 	</table>
 	<UpdatePointsDialog

From 20d52a45f6ea0248e0fb586d6879d13829d0a244 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 15:53:32 +0200
Subject: [PATCH 180/247] =?UTF-8?q?=F0=9F=92=84=20Update=20selected=20set?=
 =?UTF-8?q?=20for=20easier=20reporting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/components/items/PlayerPointRow.vue     | 2 +-
 frontend/app/src/components/items/UpdatePointsDialog.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/frontend/app/src/components/items/PlayerPointRow.vue
index d2cae9e4..6f8d903b 100644
--- a/frontend/app/src/components/items/PlayerPointRow.vue
+++ b/frontend/app/src/components/items/PlayerPointRow.vue
@@ -8,7 +8,7 @@
 		</div>
 		<div
 			v-if="gamePoints"
-			class="col flex flex-row flex-wrap"
+			class="col flex flex-row flex-wrap gap-2"
 			style="width: 100%"
 		>
 			<InputNumber
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 9c609cef..3197a47f 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -24,7 +24,7 @@
 					v-model="selectedSet"
 					:input-id="n.toString()"
 					name="sets"
-					:value="(n - 1).toString()"
+					:value="n - 1"
 				/>
 				<label class="ml-2" :for="n.toString()">Set {{ n }}</label>
 			</div>
@@ -101,7 +101,7 @@ const numberSets = computed(() =>
 
 const currentMatch = ref<Match | null>(null)
 const visible = ref(false)
-const selectedSet = ref("0")
+const selectedSet = ref(0)
 
 const team1GamePoints = ref<number[]>([])
 const team2GamePoints = ref<number[]>([])
@@ -170,8 +170,9 @@ const getAllChangedSets = function () {
 }
 
 const updatePoints = function (point1: number, point2: number) {
-	team1GamePoints.value[Number(selectedSet.value)] = point1
-	team2GamePoints.value[Number(selectedSet.value)] = point2
+	team1GamePoints.value[selectedSet.value] = point1
+	team2GamePoints.value[selectedSet.value] = point2
+	if (selectedSet.value < numberSets.value - 1) selectedSet.value++
 }
 
 defineExpose({

From 3def8e012f34b2dd7ca9a55fa543c25b4c50d66a Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 15:59:52 +0200
Subject: [PATCH 181/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Delete=20empty=20s?=
 =?UTF-8?q?ets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/SetResource.java  | 17 +++++++----
 frontend/app/src/backend/set.ts               | 29 ++++++++-----------
 .../components/items/UpdatePointsDialog.vue   |  3 --
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index eb74928c..756b8a96 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -52,13 +52,18 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
 
             Set set = setRepository.findById(setKey);
 
-            if (set == null) {
-                set = new Set();
-                set.setKey(setKey);
+            if (set != null && jSet.getScoreA() == 0 && jSet.getScoreB() == 0) {
+                setRepository.delete(set);
+            } else {
+                if (set == null) {
+                    set = new Set();
+                    set.setKey(setKey);
+                }
+
+                set.setScoreA(jSet.getScoreA());
+                set.setScoreB(jSet.getScoreB());
+                setRepository.persist(set);
             }
-            set.setScoreA(jSet.getScoreA());
-            set.setScoreB(jSet.getScoreB());
-            setRepository.persist(set);
         }
 
         return "Updated matches";
diff --git a/frontend/app/src/backend/set.ts b/frontend/app/src/backend/set.ts
index b26a5ebb..5e7e7a95 100644
--- a/frontend/app/src/backend/set.ts
+++ b/frontend/app/src/backend/set.ts
@@ -12,23 +12,10 @@ export function useUpdateSet(
 	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: (data: { sets: Set[]; matchId: string }) =>
-			axios
-				.post(
-					`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
-					data.sets,
-				)
-				.then(() => {
-					queryClient.invalidateQueries({
-						queryKey: ["knockout", route.params.tourId, route.params.compId],
-						refetchType: "all",
-					})
-				})
-				.then(() => {
-					queryClient.invalidateQueries({
-						queryKey: ["group", route.params.tourId, route.params.compId],
-						refetchType: "all",
-					})
-				}),
+			axios.post(
+				`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
+				data.sets,
+			),
 		onSuccess() {
 			toast.add({
 				severity: "success",
@@ -36,6 +23,14 @@ export function useUpdateSet(
 				detail: t("general.saved"),
 				life: 3000,
 			})
+			queryClient.invalidateQueries({
+				queryKey: ["knockout", route.params.tourId, route.params.compId],
+				refetchType: "all",
+			})
+			queryClient.invalidateQueries({
+				queryKey: ["group", route.params.tourId, route.params.compId],
+				refetchType: "all",
+			})
 		},
 		onError(error) {
 			toast.add({
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 3197a47f..692fa751 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -127,12 +127,9 @@ const cancel = function () {
 
 const savePoints = function () {
 	if (!currentMatch.value || !currentMatch.value.id) {
-		console.log("No match")
 		return
 	}
-	console.log("saving..")
 	const sets = getAllChangedSets()
-	console.log(sets)
 	if (sets.length > 0)
 		updateSet({
 			matchId: currentMatch.value!.id,

From 63eb88c01b330b411761596a2591c7ae702b88ad Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 16:12:28 +0200
Subject: [PATCH 182/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20not=20being=20able?=
 =?UTF-8?q?=20to=20update=20set=20if=20there=20is=20no=20set=20yet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/items/UpdatePointsDialog.vue   | 15 ++++---
 .../knockoutSystem/ViewKnockoutSystem.vue     |  1 +
 .../competition/knockoutSystem/ViewMatch.vue  | 44 ++++++++++---------
 .../assignMatches/AssignMatchesKnockout.vue   |  1 +
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 692fa751..5c51df94 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -142,17 +142,22 @@ const savePoints = function () {
 const getAllChangedSets = function () {
 	let changedSets = []
 	for (let i = 0; i < numberSets.value; i++) {
+		// case set does not exist yet
 		if (
 			!currentMatch.value?.sets?.length ||
 			i > currentMatch.value?.sets?.length - 1
 		) {
-			changedSets.push({
-				index: i,
-				scoreA: team1GamePoints.value[i],
-				scoreB: team2GamePoints.value[i],
-			})
+			// don't create a new set for 0 points
+			if (team1GamePoints.value[i] !== 0 || team2GamePoints.value[i] !== 0) {
+				changedSets.push({
+					index: i,
+					scoreA: team1GamePoints.value[i],
+					scoreB: team2GamePoints.value[i],
+				})
+			}
 			continue
 		}
+		// you can set a existing set to 0, additionally check that the value is not the same as before
 		const a = currentMatch.value?.sets?.[i].scoreA
 		const b = currentMatch.value?.sets?.[i].scoreB
 		if (team1GamePoints.value[i] !== a || team2GamePoints.value[i] !== b) {
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index e4d49f70..615cd6ea 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -16,6 +16,7 @@
 					:match="match"
 					:mode="props.mode"
 					:number-sets="props.numberSets"
+					:allow-update="true"
 				/>
 			</template>
 			<template #additional="{ match }">
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 199d5b69..320467a3 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -22,16 +22,17 @@
 					{{ set.scoreA }}
 				</td>
 			</template>
-			<template v-else>
+			<template v-else-if="allowUpdate">
 				<td
-					v-for="set in [1, 2]"
-					:key="set"
-					class="result"
+					rowspan="2"
+					class="empty-result"
 					:class="{
 						'cursor-pointer': canEdit,
 					}"
 					@click="showPopUp(props.match)"
-				></td>
+				>
+					<span class="material-symbols-outlined">add_circle</span>
+				</td>
 			</template>
 		</tr>
 		<tr :class="{ winner: props.match.finished && props.match.winner }">
@@ -52,17 +53,6 @@
 					{{ set.scoreB }}
 				</td>
 			</template>
-			<template v-else>
-				<td
-					v-for="set in [1, 2]"
-					:key="set"
-					class="result"
-					:class="{
-						'cursor-pointer': canEdit,
-					}"
-					@click="showPopUp(props.match)"
-				></td>
-			</template>
 		</tr>
 	</table>
 	<UpdatePointsDialog
@@ -82,11 +72,17 @@ import { Match } from "@/interfaces/match"
 import { getCanEdit } from "@/backend/security"
 import { useRoute } from "vue-router"
 
-const props = defineProps<{
-	match: KnockoutMatch
-	mode: Mode
-	numberSets?: NumberSets
-}>()
+const props = withDefaults(
+	defineProps<{
+		match: KnockoutMatch
+		mode: Mode
+		numberSets?: NumberSets | undefined
+		allowUpdate?: boolean
+	}>(),
+	{
+		allowUpdate: false,
+	},
+)
 
 const isLoggedIn = inject("loggedIn", ref(false))
 const route = useRoute()
@@ -144,6 +140,12 @@ td {
 	background-color: #fdfdfd;
 }
 
+.empty-result {
+	text-align: center;
+	width: 50px;
+	background-color: #fdfdfd;
+}
+
 .winner > .result {
 	background-color: #e0e0e0;
 }
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index fc8e528c..f7d589a9 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -107,6 +107,7 @@ const { data: signedUpTeams, isLoading: signedUpLoading } = getSignedUp(
 )
 const { data: knockoutSystem, isLoading: knockoutSystemLoading } =
 	getKnockout(route)
+// TODO update endpoint to not send sets
 const { mutate: initKnockout } = useInitKnockout(route, t, toast)
 
 const { data, reload } = track(

From 6bade172b0e9106cc122d5c65ccb5f3c87f7d1ce Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 13:12:56 +0200
Subject: [PATCH 183/247] =?UTF-8?q?=E2=9C=A8=20Add=20settings=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/header/HeaderRight.vue    | 12 ++++++++++++
 .../app/src/components/items/ItemCompetition.vue |  4 ----
 .../app/src/components/items/ItemTournament.vue  |  4 ----
 .../views/prepare/ViewPrepareMatches.vue         |  2 +-
 .../components/views/settings/ViewSettings.vue   | 16 ++++++++++++++++
 frontend/app/src/i18n/de.json                    |  2 +-
 frontend/app/src/i18n/en.json                    |  2 +-
 frontend/app/src/routes.ts                       |  5 +++++
 8 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 frontend/app/src/components/views/settings/ViewSettings.vue

diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index 456dd7b4..004891e5 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -1,5 +1,10 @@
 <template>
 	<div id="headerRight">
+		<Button v-if="isLoggedIn" rounded outlined size="small" @click="settings">
+			<template #icon>
+				<span class="material-symbols-outlined">settings</span>
+			</template>
+		</Button>
 		<Dropdown v-model="$i18n.locale" :options="$i18n.availableLocales" />
 
 		<span
@@ -20,10 +25,17 @@
 <script lang="ts" setup>
 import { auth } from "@/security/AuthService"
 import { inject, ref, watch } from "vue"
+import { router } from "@/main"
 
 const currentUser = ref<string>("")
 const isLoggedIn = inject("loggedIn", ref(false))
 
+function settings() {
+	router.push({
+		name: "Settings",
+	})
+}
+
 let windowWidth = ref(window.innerWidth)
 window.addEventListener("resize", () => {
 	windowWidth.value = window.innerWidth
diff --git a/frontend/app/src/components/items/ItemCompetition.vue b/frontend/app/src/components/items/ItemCompetition.vue
index 42934395..c9c0932e 100644
--- a/frontend/app/src/components/items/ItemCompetition.vue
+++ b/frontend/app/src/components/items/ItemCompetition.vue
@@ -76,10 +76,6 @@ function settings() {
 	bottom: 1.25rem;
 }
 
-.settings:hover {
-	filter: drop-shadow(0 0 6px #808080);
-}
-
 .settings:active {
 	color: #505050;
 }
diff --git a/frontend/app/src/components/items/ItemTournament.vue b/frontend/app/src/components/items/ItemTournament.vue
index d69003f8..de19c7d0 100644
--- a/frontend/app/src/components/items/ItemTournament.vue
+++ b/frontend/app/src/components/items/ItemTournament.vue
@@ -74,10 +74,6 @@ function settings() {
 	bottom: 1.25rem;
 }
 
-.settings:hover {
-	filter: drop-shadow(0 0 6px #808080);
-}
-
 .settings:active {
 	color: #505050;
 }
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index fa202e05..d78e927f 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -196,7 +196,7 @@ function nextPage() {
 
 const stepList = ref([
 	{
-		label: <string>(<unknown>$t("ViewPrepare.steps.settings")),
+		label: <string>(<unknown>$t("general.settings")),
 		name: "settings",
 		index: 1,
 	},
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
new file mode 100644
index 00000000..254408d0
--- /dev/null
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -0,0 +1,16 @@
+<template>
+	<div class="w-full p-2">
+		<Card style="margin-top: -10px !important">
+			<template #title>{{ t("general.settings") }}</template>
+			<template #content> TODO </template>
+		</Card>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 7f18dfc4..6b71614b 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -5,6 +5,7 @@
 	"no": "Nein",
 	"yes": "Ja",
 	"general": {
+		"settings": "Einstellungen",
 		"create": "Erstellen",
 		"update": "Aktualisieren",
 		"name": "Name",
@@ -209,7 +210,6 @@
 	},
 	"ViewPrepare": {
 		"steps": {
-			"settings": "Einstellungen",
 			"editTeams": "Teams auslosen",
 			"assignMatches": "Spiele auslosen",
 			"scheduleMatches": "Zeiteinteilung",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index fa4a1135..0ef93e56 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -5,6 +5,7 @@
 	"no": "No",
 	"yes": "Yes",
 	"general": {
+		"settings": "Settings",
 		"create": "Create",
 		"update": "Update",
 		"name": "Name",
@@ -211,7 +212,6 @@
 	},
 	"ViewPrepare": {
 		"steps": {
-			"settings": "Einstellungen",
 			"editTeams": "Edit teams",
 			"assignMatches": "Assign matches",
 			"scheduleMatches": "Schedule matches",
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index 6d372aaa..f3a3bf8b 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -5,6 +5,11 @@ export default [
 		component: () =>
 			import("@/components/views/tournaments/ViewTournaments.vue"),
 	},
+	{
+		path: "/settings",
+		name: "Settings",
+		component: () => import("@/components/views/settings/ViewSettings.vue"),
+	},
 	{
 		path: "/createTournament",
 		name: "Create tournament",

From 2bab12233eae58ae2644c29f89c3798d6c160dec Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 13:32:04 +0200
Subject: [PATCH 184/247] =?UTF-8?q?=E2=9C=A8=20Add=20courts=20to=20setting?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/settings/SettingsCourts.vue          | 18 ++++++++++++++++++
 .../components/views/settings/SettingsItem.vue |  9 +++++++++
 .../components/views/settings/ViewSettings.vue |  8 +++++++-
 frontend/app/src/main.ts                       |  2 ++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 frontend/app/src/components/views/settings/SettingsCourts.vue
 create mode 100644 frontend/app/src/components/views/settings/SettingsItem.vue

diff --git a/frontend/app/src/components/views/settings/SettingsCourts.vue b/frontend/app/src/components/views/settings/SettingsCourts.vue
new file mode 100644
index 00000000..ce48153f
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsCourts.vue
@@ -0,0 +1,18 @@
+<template>
+	<DataTable :value="courts" striped-rows class="w-full mb-2" size="small">
+		<Column field="name" :header="t('general.name')"></Column>
+		<Column field="courtType" :header="t('court.type')"></Column>
+	</DataTable>
+	<ViewCreateCourtSmall />
+</template>
+
+<script setup lang="ts">
+import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.vue"
+import { getCourts } from "@/backend/court"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n({ inheritLocale: true })
+const { data: courts } = getCourts()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/SettingsItem.vue b/frontend/app/src/components/views/settings/SettingsItem.vue
new file mode 100644
index 00000000..47455a83
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsItem.vue
@@ -0,0 +1,9 @@
+<template>
+	<div class="grid col-12 lg:col-6 xl:col-4">
+		<slot />
+	</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 254408d0..08044ebf 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -2,13 +2,19 @@
 	<div class="w-full p-2">
 		<Card style="margin-top: -10px !important">
 			<template #title>{{ t("general.settings") }}</template>
-			<template #content> TODO </template>
+			<template #content>
+				<SettingsItem>
+					<SettingsCourts />
+				</SettingsItem>
+			</template>
 		</Card>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { useI18n } from "vue-i18n"
+import SettingsCourts from "@/components/views/settings/SettingsCourts.vue"
+import SettingsItem from "@/components/views/settings/SettingsItem.vue"
 
 const { t } = useI18n({ inheritLocale: true })
 </script>
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index b5fcc4f7..b57680e2 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -19,6 +19,7 @@ import ToastService from "primevue/toastservice"
 import Toast from "primevue/toast"
 import Tooltip from "primevue/tooltip"
 import FocusTrap from "primevue/focustrap"
+import InputGroup from "primevue/inputgroup"
 
 /* Primevue styling */
 import "primeflex/primeflex.css"
@@ -117,6 +118,7 @@ app
 	.use(PrimeVue, { ripple: true })
 	.use(ToastService)
 	.component("Toast", Toast)
+	.component("InputGroup", InputGroup)
 	.directive("tooltip", Tooltip)
 	.directive("focustrap", FocusTrap)
 	.use(VueQueryPlugin, vueQueryPluginOptions)

From df3a2d5f57e1122c795f5ff30b6f878011ec2ee0 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 15:02:59 +0200
Subject: [PATCH 185/247] =?UTF-8?q?=E2=9C=A8=20Load=20language=20from=20ba?=
 =?UTF-8?q?ckend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/ConfigResource.java             | 24 +++++++++++++++++++
 .../jsonEntities/user/jUserConfig.java        | 22 +++++++++++++++++
 .../src/main/resources/application.properties |  5 ++++
 frontend/app/src/App.vue                      | 14 ++++++++++-
 frontend/app/src/backend/config.ts            | 16 +++++++++++++
 .../app/src/components/header/HeaderLeft.vue  |  2 +-
 .../app/src/components/header/HeaderRight.vue |  4 +++-
 .../views/competition/ViewCompetition.vue     |  2 +-
 .../groupSystem/ViewGroupTable.vue            |  2 +-
 .../competition/groupSystem/ViewMatch.vue     |  2 +-
 .../knockoutSystem/ViewKnockoutSystem.vue     |  2 +-
 .../knockoutSystem/ViewMatchDate.vue          |  2 +-
 .../competition/signup/ViewConditions.vue     |  2 +-
 .../views/competition/signup/ViewSignUp.vue   |  2 +-
 .../competition/signup/ViewSignUpForm.vue     |  2 +-
 .../views/competition/signup/ViewTable.vue    |  2 +-
 .../views/competitions/FormCompetition.vue    |  2 +-
 .../views/competitions/ViewCompetitions.vue   |  2 +-
 .../competitions/ViewCreateCompetition.vue    |  2 +-
 .../views/court/ViewCreateCourtSmall.vue      |  4 ++--
 .../views/overview/OverviewCalendar.vue       |  2 +-
 .../views/overview/OverviewList.vue           |  2 +-
 .../views/overview/ViewTournamentOverview.vue |  2 +-
 .../views/player/ViewPlayerOverview.vue       |  2 +-
 .../views/player/ViewPlayerRegistration.vue   |  2 +-
 .../views/player/ViewVerification.vue         |  2 +-
 .../views/prepare/ViewEditCompetition.vue     |  2 +-
 .../views/prepare/ViewEditPlayer.vue          |  2 +-
 .../views/prepare/ViewPrepareMatches.vue      |  2 +-
 .../assignMatches/AssignMatchesGroups.vue     |  2 +-
 .../assignMatches/AssignMatchesKnockout.vue   |  2 +-
 .../assignMatches/ViewAssignMatches.vue       |  2 +-
 .../views/prepare/editTeams/AddPlayer.vue     |  2 +-
 .../views/prepare/editTeams/DeleteBox.vue     |  2 +-
 .../views/prepare/editTeams/ViewEditTeams.vue |  2 +-
 .../prepare/scheduleMatches/MatchEvent.vue    |  2 +-
 .../MatchesContainerDraggable.vue             |  2 +-
 .../scheduleMatches/SchedulingCalendar.vue    |  2 +-
 .../scheduleMatches/ViewScheduleMatches.vue   |  2 +-
 .../views/settings/SettingsCourts.vue         |  2 +-
 .../views/settings/ViewSettings.vue           |  2 +-
 .../views/tournaments/FormTournament.vue      |  2 +-
 .../tournaments/ViewCreateTournament.vue      |  2 +-
 .../views/tournaments/ViewEditTournament.vue  |  2 +-
 .../views/tournaments/ViewTournaments.vue     |  2 +-
 frontend/app/src/interfaces/config.ts         |  4 ++++
 frontend/app/src/main.ts                      |  2 +-
 47 files changed, 128 insertions(+), 43 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
 create mode 100644 frontend/app/src/backend/config.ts
 create mode 100644 frontend/app/src/interfaces/config.ts

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
new file mode 100644
index 00000000..9fa5b080
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -0,0 +1,24 @@
+package de.secretj12.turnierplaner.resources;
+
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserConfig;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/config")
+public class ConfigResource {
+
+    @ConfigProperty(name = "club.name")
+    String name;
+    @ConfigProperty(name = "language.default")
+    String language;
+
+    @GET
+    @Path("/default")
+    public jUserConfig getDefaultConfig() {
+        var config = new jUserConfig();
+        config.setName(name);
+        config.setLanguage(language);
+        return config;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
new file mode 100644
index 00000000..0e769344
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
@@ -0,0 +1,22 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.user;
+
+public class jUserConfig {
+    private String name;
+    private String language;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+}
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 4d3b7f89..c951020d 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,3 +1,8 @@
+# properties
+club.name=Turnierplaner
+language.default=de
+
+# network configuration
 quarkus.http.cors=true
 quarkus.http.cors.origins=*
 quarkus.http.host=0.0.0.0
diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue
index d39dc08b..c0266299 100644
--- a/frontend/app/src/App.vue
+++ b/frontend/app/src/App.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import HeadContent from "@/components/header/HeadContent.vue"
-import { provide, ref } from "vue"
+import { provide, ref, watch } from "vue"
 import { access_token, auth } from "@/security/AuthService"
+import { getConfig } from "@/backend/config"
+import { useI18n } from "vue-i18n"
 
 let aside = false
 
@@ -32,6 +34,16 @@ auth.addUserUnloadedListener(() => {
 	access_token.value = null
 	loggedIn.value = false
 })
+
+const { data: config } = getConfig()
+const { locale } = useI18n()
+
+watch(config, () => {
+	if (config.value) {
+		console.log("update language")
+		locale.value = config.value.language
+	}
+})
 </script>
 
 <template>
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
new file mode 100644
index 00000000..0bd2ac74
--- /dev/null
+++ b/frontend/app/src/backend/config.ts
@@ -0,0 +1,16 @@
+import { useQuery } from "@tanstack/vue-query"
+import axios from "axios"
+import { Config } from "@/interfaces/config"
+
+export function getConfig() {
+	return useQuery({
+		queryKey: ["config", "default"],
+		queryFn: async () =>
+			axios.get("/config/default").then<Config>((response) => response.data),
+		placeholderData: {
+			name: "title",
+			language: "en",
+		},
+		staleTime: 0,
+	})
+}
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index a47862ad..11978a81 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -26,7 +26,7 @@ import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
 
 const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 function toHome() {
 	router.push({ name: "Tournaments" })
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index 004891e5..b5c848ab 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -5,7 +5,7 @@
 				<span class="material-symbols-outlined">settings</span>
 			</template>
 		</Button>
-		<Dropdown v-model="$i18n.locale" :options="$i18n.availableLocales" />
+		<Dropdown v-model="locale" :options="availableLocales" />
 
 		<span
 			v-if="!isLoggedIn"
@@ -26,9 +26,11 @@
 import { auth } from "@/security/AuthService"
 import { inject, ref, watch } from "vue"
 import { router } from "@/main"
+import { useI18n } from "vue-i18n"
 
 const currentUser = ref<string>("")
 const isLoggedIn = inject("loggedIn", ref(false))
+const { locale, availableLocales } = useI18n()
 
 function settings() {
 	router.push({
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index 7d9e098c..a88b074a 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -61,7 +61,7 @@ import { getTournamentDetails } from "@/backend/tournament"
 import { useToast } from "primevue/usetoast"
 import { getCompetitionDetails } from "@/backend/competition"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 41865f89..01f6cc5d 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -78,7 +78,7 @@ import { NumberSets } from "@/interfaces/competition"
 import { getCanEdit } from "@/backend/security"
 import { useRoute } from "vue-router"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = defineProps<{
 	group: Group
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
index cb29f746..083a961f 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
@@ -29,7 +29,7 @@
 import { Match } from "@/interfaces/match"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = withDefaults(
 	defineProps<{
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 615cd6ea..9be03fa3 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -36,7 +36,7 @@ import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMat
 import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = defineProps<{
 	mode: Mode
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
index 76db2365..3ded89fb 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
@@ -8,7 +8,7 @@
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = defineProps<{
 	match: KnockoutMatch
diff --git a/frontend/app/src/components/views/competition/signup/ViewConditions.vue b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
index bcd70c13..6cdf3629 100644
--- a/frontend/app/src/components/views/competition/signup/ViewConditions.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
@@ -44,7 +44,7 @@ import { useToast } from "primevue/usetoast"
 import { useRoute } from "vue-router"
 import { computed } from "vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 const route = useRoute()
 
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUp.vue b/frontend/app/src/components/views/competition/signup/ViewSignUp.vue
index 9bce9bab..f747ab65 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUp.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUp.vue
@@ -40,7 +40,7 @@ import ViewSignUpForm from "@/components/views/competition/signup/ViewSignUpForm
 import { Competition } from "@/interfaces/competition"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 let windowWidth = ref(window.innerWidth)
 window.addEventListener("resize", () => {
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
index c171017e..17ff1206 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
@@ -222,7 +222,7 @@ import {
 import { useQueryClient } from "@tanstack/vue-query"
 import { extractSearchPlayer, findPlayers } from "@/backend/player"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index 00e2c7f2..ee8a45a7 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -173,7 +173,7 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { getSignedUpSepByComp } from "@/backend/signup"
 import ViewPlayerName from "@/components/links/LinkPlayerName.vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 769d28b2..1b5a83cb 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -425,7 +425,7 @@ import { useForm } from "vee-validate"
 import { boolean, date, mixed, object, string } from "yup"
 import { toTypedSchema } from "@vee-validate/yup"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = withDefaults(
 	defineProps<{
diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
index 25353c25..e465d277 100644
--- a/frontend/app/src/components/views/competitions/ViewCompetitions.vue
+++ b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
@@ -100,7 +100,7 @@ import { getTournamentDetails } from "@/backend/tournament"
 import { useToast } from "primevue/usetoast"
 import { getCompetitionsList } from "@/backend/competition"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
index d3883b92..202af7b0 100644
--- a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
+++ b/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
@@ -41,7 +41,7 @@ import {
 import { useToast } from "primevue/usetoast"
 import { useAddCompetition } from "@/backend/competition"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
index 9234524e..4a8d35b8 100644
--- a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
+++ b/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
@@ -6,7 +6,7 @@
 			option-value="id"
 			:options="options"
 			option-label="name"
-			placeholder="Platztyp"
+			:placeholder="t('court.type')"
 		/>
 		<Button size="small" @click="add">Add</Button>
 	</InputGroup>
@@ -18,7 +18,7 @@ import { useCreateCourt } from "@/backend/court"
 import { useI18n } from "vue-i18n"
 import { useToast } from "primevue/usetoast"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 const { mutate: addCourt } = useCreateCourt()
 
diff --git a/frontend/app/src/components/views/overview/OverviewCalendar.vue b/frontend/app/src/components/views/overview/OverviewCalendar.vue
index 7335315e..4e3bcdb2 100644
--- a/frontend/app/src/components/views/overview/OverviewCalendar.vue
+++ b/frontend/app/src/components/views/overview/OverviewCalendar.vue
@@ -32,7 +32,7 @@ import {
 import { MatchCalEvent } from "@/components/views/prepare/scheduleMatches/ScheduleMatchesHelper"
 
 const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const curStart = ref<Date | undefined>()
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/frontend/app/src/components/views/overview/OverviewList.vue
index 0d1ce1cc..ecb06bc2 100644
--- a/frontend/app/src/components/views/overview/OverviewList.vue
+++ b/frontend/app/src/components/views/overview/OverviewList.vue
@@ -198,7 +198,7 @@ import LinkTournament from "@/components/links/LinkTournament.vue"
 import LinkCompetition from "@/components/links/LinkCompetition.vue"
 
 const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: courts } = getTournamentCourts(route)
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
index dd4abcc0..62e483e2 100644
--- a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
+++ b/frontend/app/src/components/views/overview/ViewTournamentOverview.vue
@@ -20,7 +20,7 @@ import OverviewCalendar from "@/components/views/overview/OverviewCalendar.vue"
 import OverviewList from "@/components/views/overview/OverviewList.vue"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const views = [
 	{
diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
index af3f24d9..e43b30a9 100644
--- a/frontend/app/src/components/views/player/ViewPlayerOverview.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerOverview.vue
@@ -19,7 +19,7 @@ import { useToast } from "primevue/usetoast"
 import OverviewList from "@/components/views/overview/OverviewList.vue"
 
 const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const { data: player } = getPlayer(route, t, toast)
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
index 573964f7..57897251 100644
--- a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
@@ -137,7 +137,7 @@ import { useToast } from "primevue/usetoast"
 import { PlayerRegistration } from "@/interfaces/player"
 import { useRegisterPlayer } from "@/backend/registration"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 const { mutate: register, isSuccess: registered } = useRegisterPlayer(t, toast)
 
diff --git a/frontend/app/src/components/views/player/ViewVerification.vue b/frontend/app/src/components/views/player/ViewVerification.vue
index f7200987..02babc59 100644
--- a/frontend/app/src/components/views/player/ViewVerification.vue
+++ b/frontend/app/src/components/views/player/ViewVerification.vue
@@ -20,7 +20,7 @@ import { useI18n } from "vue-i18n"
 import { useVerify } from "@/backend/registration"
 import { useToast } from "primevue/usetoast"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const { mutate: verify, isSuccess, isError } = useVerify()
diff --git a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
index 31726d65..515af933 100644
--- a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditCompetition.vue
@@ -33,7 +33,7 @@ import {
 import { useToast } from "primevue/usetoast"
 import { ref, watch } from "vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/prepare/ViewEditPlayer.vue b/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
index 36d44e2e..ecc3e99b 100644
--- a/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
+++ b/frontend/app/src/components/views/prepare/ViewEditPlayer.vue
@@ -39,7 +39,7 @@ import { Mode, SignUp } from "@/interfaces/competition"
 import Button from "primevue/button"
 import { getCompetitionDetails } from "@/backend/competition"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const router = useRouter()
 const route = useRoute()
 const toast = useToast()
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
index d78e927f..75fcce5d 100644
--- a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
+++ b/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
@@ -96,7 +96,7 @@ import { Progress, progressOrder } from "@/interfaces/competition"
 import Button from "primevue/button"
 import ViewEditTeams from "@/components/views/prepare/editTeams/ViewEditTeams.vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 function $t(name: string) {
 	return computed(() => t(name))
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
index f110018b..4705efd0 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
@@ -91,7 +91,7 @@ import {
 
 const route = useRoute()
 const toast = useToast()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const randomizeItems = genRandomizeItems(t, reroll, reset)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
index f7d589a9..3e61404d 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
@@ -94,7 +94,7 @@ import { knockoutTitle } from "@/components/views/competition/knockoutSystem/Kno
 
 const route = useRoute()
 const toast = useToast()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const randomizeItems = genRandomizeItems(t, reroll, reset)
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
index 54308ac6..1ae4ee21 100644
--- a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
+++ b/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
@@ -26,7 +26,7 @@ import { getCompetitionDetails } from "@/backend/competition"
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
 const knockoutRef = ref<InstanceType<typeof AssignMatchesKnockout> | null>(null)
diff --git a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
index 9ac4e0b7..f0c37433 100644
--- a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
@@ -45,7 +45,7 @@ import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute } from "vue-router"
 import { getTournamentDetails } from "@/backend/tournament"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const props = defineProps<{
diff --git a/frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue b/frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue
index 4e6be8f8..9d4354e9 100644
--- a/frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue
@@ -54,7 +54,7 @@ import PlayerCard from "@/components/views/prepare/components/PlayerCard.vue"
 import OverlayPanel from "primevue/overlaypanel"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = defineProps<{
 	group: string
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
index fd0e2131..589449d3 100644
--- a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
@@ -98,7 +98,7 @@ import { getSignedUpSeparated, useUpdateTeams } from "@/backend/signup"
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 function $t(name: string) {
 	return computed(() => t(name))
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
index 458f90ab..d6f4c774 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
@@ -30,7 +30,7 @@ import { useI18n } from "vue-i18n"
 import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 import LinkCompetition from "@/components/links/LinkCompetition.vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = defineProps<{
 	match: AnnotatedMatch
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
index a13adbdb..52661486 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
@@ -39,7 +39,7 @@ import {
 import MatchEvent from "@/components/views/prepare/scheduleMatches/MatchEvent.vue"
 
 const route = useRoute()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const { data: competition } = getCompetitionDetails(route, t, toast)
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
index 55a04a60..1bc18be2 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
@@ -58,7 +58,7 @@ const props = defineProps<{
 }>()
 watch(() => props.courts, reload)
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const route = useRoute()
 const toast = useToast()
 const { data: tournament } = getTournamentDetails(route, t, toast)
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
index 92956a5b..9a32733e 100644
--- a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
+++ b/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
@@ -54,7 +54,7 @@ import { AnnotatedMatch } from "@/interfaces/match"
 
 const route = useRoute()
 const router = useRouter()
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const isUpdating = defineModel<boolean>("isUpdating", { default: false })
diff --git a/frontend/app/src/components/views/settings/SettingsCourts.vue b/frontend/app/src/components/views/settings/SettingsCourts.vue
index ce48153f..f6af26bd 100644
--- a/frontend/app/src/components/views/settings/SettingsCourts.vue
+++ b/frontend/app/src/components/views/settings/SettingsCourts.vue
@@ -11,7 +11,7 @@ import ViewCreateCourtSmall from "@/components/views/court/ViewCreateCourtSmall.
 import { getCourts } from "@/backend/court"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const { data: courts } = getCourts()
 </script>
 
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 08044ebf..58775c57 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -16,7 +16,7 @@ import { useI18n } from "vue-i18n"
 import SettingsCourts from "@/components/views/settings/SettingsCourts.vue"
 import SettingsItem from "@/components/views/settings/SettingsItem.vue"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/tournaments/FormTournament.vue b/frontend/app/src/components/views/tournaments/FormTournament.vue
index 70097df2..7957c020 100644
--- a/frontend/app/src/components/views/tournaments/FormTournament.vue
+++ b/frontend/app/src/components/views/tournaments/FormTournament.vue
@@ -120,7 +120,7 @@ import Card from "primevue/card"
 import { array, boolean, date, mixed, object, setLocale, string } from "yup"
 import { toTypedSchema } from "@vee-validate/yup"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 
 const props = withDefaults(
 	defineProps<{
diff --git a/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue b/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
index f7b17f6a..cc7feb47 100644
--- a/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
+++ b/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
@@ -15,7 +15,7 @@ import { TournamentServer } from "@/interfaces/tournament"
 import { useI18n } from "vue-i18n"
 import { useAddTournament } from "@/backend/tournament"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 let tourName: string | null = null
diff --git a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
index c4cc5f66..fb7e37e1 100644
--- a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
+++ b/frontend/app/src/components/views/tournaments/ViewEditTournament.vue
@@ -26,7 +26,7 @@ import { useToast } from "primevue/usetoast"
 import { getTournamentDetails, useUpdateTournament } from "@/backend/tournament"
 import { router } from "@/main"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
diff --git a/frontend/app/src/components/views/tournaments/ViewTournaments.vue b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
index 3e3330a8..e0d3df8c 100644
--- a/frontend/app/src/components/views/tournaments/ViewTournaments.vue
+++ b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
@@ -31,7 +31,7 @@ import { getCanCreate } from "@/backend/security"
 import { getTournamentList } from "@/backend/tournament"
 import { useToast } from "primevue/usetoast"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
 
 const isLoggedIn = inject("loggedIn", ref(false))
diff --git a/frontend/app/src/interfaces/config.ts b/frontend/app/src/interfaces/config.ts
new file mode 100644
index 00000000..5e186f55
--- /dev/null
+++ b/frontend/app/src/interfaces/config.ts
@@ -0,0 +1,4 @@
+export interface Config {
+	name: string
+	language: string
+}
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts
index b57680e2..b41ae3a4 100644
--- a/frontend/app/src/main.ts
+++ b/frontend/app/src/main.ts
@@ -57,7 +57,7 @@ const options: I18nOptions = {
 	locale: "de", // set locale
 	fallbackLocale: "en", // set fallback locale
 	warnHtmlMessage: false,
-	missingWarn: false,
+	missingWarn: true,
 	fallbackWarn: false,
 	messages,
 	legacy: false,

From ac4f9e5a0a0a43956ab2b12b81ebba0b6bc2f6d2 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 15:05:56 +0200
Subject: [PATCH 186/247] =?UTF-8?q?=E2=9C=A8=20Load=20title=20from=20backe?=
 =?UTF-8?q?nd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/application.properties | 2 +-
 frontend/app/src/backend/config.ts                | 4 ----
 frontend/app/src/components/header/HeaderLeft.vue | 5 ++++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index c951020d..a907da07 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 # properties
-club.name=Turnierplaner
+club.name=title
 language.default=de
 
 # network configuration
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
index 0bd2ac74..a0f8abfa 100644
--- a/frontend/app/src/backend/config.ts
+++ b/frontend/app/src/backend/config.ts
@@ -7,10 +7,6 @@ export function getConfig() {
 		queryKey: ["config", "default"],
 		queryFn: async () =>
 			axios.get("/config/default").then<Config>((response) => response.data),
-		placeholderData: {
-			name: "title",
-			language: "en",
-		},
 		staleTime: 0,
 	})
 }
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index 11978a81..c39c8eb8 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -8,7 +8,7 @@
 		>
 		<div class="flex flex-row align-items-baseline gap-3">
 			<h1 id="colorHeadLine" class="m-0 cursor-pointer title" @click="toHome">
-				{{ t("title") }}
+				{{ config?.name ? t(config.name) : t("title") }}
 			</h1>
 			<h2 class="m-0 cursor-pointer" @click="toTournament">
 				{{ route.params.tourId }}
@@ -24,10 +24,13 @@
 import { router } from "@/main"
 import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
+import { getConfig } from "@/backend/config"
 
 const route = useRoute()
 const { t } = useI18n()
 
+const { data: config } = getConfig()
+
 function toHome() {
 	router.push({ name: "Tournaments" })
 }

From 6e98a59cc30248ec161af89e4281c6aafe49eaa6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 16:28:17 +0200
Subject: [PATCH 187/247] =?UTF-8?q?=E2=9C=A8=20Save=20language=20for=20eve?=
 =?UTF-8?q?ry=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Config.java     | 32 ++++++++++
 .../db/entities/DefaultConfig.java            | 40 +++++++++++++
 .../db/repositories/ConfigRepository.java     | 15 +++++
 .../repositories/DefaultConfigRepository.java |  9 +++
 .../resources/ConfigResource.java             | 59 +++++++++++++++----
 .../jsonEntities/user/jUserConfig.java        | 28 +++++++--
 .../turnierplaner/startup/Defaults.java       | 30 ++++++++++
 .../turnierplaner/startup/Startup.java        |  4 +-
 .../src/main/resources/application.properties |  4 +-
 frontend/app/src/App.vue                      |  7 ++-
 frontend/app/src/backend/config.ts            | 28 +++++++--
 .../app/src/components/header/HeaderLeft.vue  | 21 +++++--
 .../app/src/components/header/HeaderRight.vue |  9 ++-
 frontend/app/src/interfaces/config.ts         |  2 +-
 14 files changed, 253 insertions(+), 35 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
new file mode 100644
index 00000000..66ed05f5
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
@@ -0,0 +1,32 @@
+package de.secretj12.turnierplaner.db.entities;
+
+import jakarta.persistence.*;
+
+import java.util.UUID;
+
+@Entity
+@Table(name = "config")
+public class Config {
+
+    @Id
+    private UUID id;
+
+    @Column(name = "language")
+    private String language;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
new file mode 100644
index 00000000..57fafd4d
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
@@ -0,0 +1,40 @@
+package de.secretj12.turnierplaner.db.entities;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "default_config")
+public class DefaultConfig {
+
+    @Id
+    private int id;
+
+    private String title;
+    private String language;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
new file mode 100644
index 00000000..6b4fb852
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
@@ -0,0 +1,15 @@
+package de.secretj12.turnierplaner.db.repositories;
+
+import de.secretj12.turnierplaner.db.entities.Config;
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import jakarta.enterprise.context.ApplicationScoped;
+
+import java.util.UUID;
+
+@ApplicationScoped
+public class ConfigRepository implements PanacheRepository<Config> {
+
+    public Config findByUUID(UUID uuid) {
+        return find("FROM Config v WHERE v.id = ?1", uuid).firstResultOptional().orElse(null);
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
new file mode 100644
index 00000000..1d70fb8a
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
@@ -0,0 +1,9 @@
+package de.secretj12.turnierplaner.db.repositories;
+
+import de.secretj12.turnierplaner.db.entities.DefaultConfig;
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class DefaultConfigRepository implements PanacheRepository<DefaultConfig> {
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 9fa5b080..2aa8f21f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -1,24 +1,57 @@
 package de.secretj12.turnierplaner.resources;
 
+import de.secretj12.turnierplaner.db.entities.Config;
+import de.secretj12.turnierplaner.db.entities.DefaultConfig;
+import de.secretj12.turnierplaner.db.repositories.ConfigRepository;
+import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserConfig;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import java.util.UUID;
 
 @Path("/config")
 public class ConfigResource {
 
-    @ConfigProperty(name = "club.name")
-    String name;
-    @ConfigProperty(name = "language.default")
-    String language;
+    @Inject
+    DefaultConfigRepository defaultConfigRepository;
+    @Inject
+    ConfigRepository configRepository;
+
+    @Inject
+    SecurityIdentity securityIdentity;
+    @Inject
+    JsonWebToken jwt;
 
     @GET
-    @Path("/default")
-    public jUserConfig getDefaultConfig() {
-        var config = new jUserConfig();
-        config.setName(name);
-        config.setLanguage(language);
-        return config;
+    @Path("/load")
+    @Produces(MediaType.APPLICATION_JSON)
+    public jUserConfig loadUserConfig() {
+        Config config = null;
+        if (jwt.getSubject() != null)
+            config = configRepository.findByUUID(UUID.fromString(jwt.getSubject()));
+        return new jUserConfig(defaultConfigRepository.findById(0L), config);
+    }
+
+    @POST
+    @Path("/save")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void saveConfig(jUserConfig nConfig) {
+        UUID uuid = UUID.fromString(jwt.getSubject());
+        DefaultConfig defConfig = defaultConfigRepository.findById(0L);
+        Config config = configRepository.findByUUID(uuid);
+        if (config == null) {
+            config = new Config();
+            config.setId(uuid);
+            config.setLanguage(defConfig.getLanguage());
+        }
+        if (nConfig.getLanguage() != null)
+            config.setLanguage(nConfig.getLanguage());
+        configRepository.persist(config);
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
index 0e769344..367074c4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
@@ -1,15 +1,33 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
+import de.secretj12.turnierplaner.db.entities.Config;
+import de.secretj12.turnierplaner.db.entities.DefaultConfig;
+
 public class jUserConfig {
-    private String name;
+    private String title;
     private String language;
 
-    public String getName() {
-        return name;
+    public jUserConfig() {
+    }
+
+    public jUserConfig(DefaultConfig config) {
+        this(config, null);
+    }
+
+    public jUserConfig(DefaultConfig defConfig, Config config) {
+        this.title = defConfig.getTitle();
+        if (config == null)
+            this.language = defConfig.getLanguage();
+        else
+            this.language = config.getLanguage();
+    }
+
+    public String getTitle() {
+        return title;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
     public String getLanguage() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
new file mode 100644
index 00000000..99e0acb0
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
@@ -0,0 +1,30 @@
+package de.secretj12.turnierplaner.startup;
+
+import de.secretj12.turnierplaner.db.entities.DefaultConfig;
+import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@ApplicationScoped
+public class Defaults {
+    @ConfigProperty(name = "turnierplaner.club-name")
+    String clubName;
+    @ConfigProperty(name = "turnierplaner.language")
+    String language;
+    @Inject
+    DefaultConfigRepository defaultConfigRepository;
+
+    @Transactional
+    void addDefault() {
+        if (defaultConfigRepository.findById(0L) != null)
+            return;
+
+        var defaultConfig = new DefaultConfig();
+        defaultConfig.setId(0);
+        defaultConfig.setTitle(clubName);
+        defaultConfig.setLanguage(language);
+        defaultConfigRepository.persist(defaultConfig);
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java
index da0ac0b5..5f8c0889 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java
@@ -9,14 +9,16 @@
 
 @ApplicationScoped
 public class Startup {
+    @Inject
+    Defaults defaults;
     @Inject
     TestdataGenerator testdataGenerator;
 
-    @Inject
     @ConfigProperty(name = "turnierplaner.testdata", defaultValue = "false")
     Boolean addTestdata;
 
     void onStart(@Observes StartupEvent ev) {
+        defaults.addDefault();
         if (addTestdata) {
             testdataGenerator.generateData();
         }
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index a907da07..0a27ca60 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 # properties
-club.name=title
-language.default=de
+turnierplaner.club-name=title
+turnierplaner.language=de
 
 # network configuration
 quarkus.http.cors=true
diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue
index c0266299..3063a11c 100644
--- a/frontend/app/src/App.vue
+++ b/frontend/app/src/App.vue
@@ -35,12 +35,13 @@ auth.addUserUnloadedListener(() => {
 	loggedIn.value = false
 })
 
-const { data: config } = getConfig()
+const { data: config } = getConfig(loggedIn)
 const { locale } = useI18n()
 
-watch(config, () => {
+watch(config, async () => {
+	console.log("update settings")
 	if (config.value) {
-		console.log("update language")
+		console.log("update language: ", config.value.language)
 		locale.value = config.value.language
 	}
 })
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
index a0f8abfa..1500839a 100644
--- a/frontend/app/src/backend/config.ts
+++ b/frontend/app/src/backend/config.ts
@@ -1,12 +1,30 @@
-import { useQuery } from "@tanstack/vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import axios from "axios"
 import { Config } from "@/interfaces/config"
+import { Ref } from "vue"
 
-export function getConfig() {
+export function getConfig(isLoggedIn: Ref<boolean>) {
 	return useQuery({
-		queryKey: ["config", "default"],
+		queryKey: ["config", isLoggedIn],
 		queryFn: async () =>
-			axios.get("/config/default").then<Config>((response) => response.data),
-		staleTime: 0,
+			axios.get("/config/load").then<Config>((response) => response.data),
+	})
+}
+
+export function useSaveLanguage(isLoggedIn: Ref<boolean>) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: async (language: string) => {
+			if (isLoggedIn)
+				return axios.post("/config/save", {
+					language: language,
+				})
+		},
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["config", isLoggedIn.value],
+				refetchType: "all",
+			})
+		},
 	})
 }
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index c39c8eb8..af0bbe4d 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -8,12 +8,23 @@
 		>
 		<div class="flex flex-row align-items-baseline gap-3">
 			<h1 id="colorHeadLine" class="m-0 cursor-pointer title" @click="toHome">
-				{{ config?.name ? t(config.name) : t("title") }}
+				{{ config?.title ? t(config.title) : t("title") }}
 			</h1>
-			<h2 class="m-0 cursor-pointer" @click="toTournament">
+			<h2
+				v-if="route.params.tourId"
+				class="m-0 cursor-pointer"
+				@click="toTournament"
+			>
 				{{ route.params.tourId }}
 			</h2>
-			<h3 class="m-0 cursor-pointer" @click="toCompetition">
+			<h2 v-if="route.name === 'Settings'">
+				{{ t("general.settings") }}
+			</h2>
+			<h3
+				v-if="route.params.compId"
+				class="m-0 cursor-pointer"
+				@click="toCompetition"
+			>
 				{{ route.params.compId }}
 			</h3>
 		</div>
@@ -25,11 +36,13 @@ import { router } from "@/main"
 import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
 import { getConfig } from "@/backend/config"
+import { inject, ref } from "vue"
 
 const route = useRoute()
 const { t } = useI18n()
 
-const { data: config } = getConfig()
+const isLoggedIn = inject("loggedIn", ref(false))
+const { data: config } = getConfig(isLoggedIn)
 
 function toHome() {
 	router.push({ name: "Tournaments" })
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index b5c848ab..e1090059 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -5,7 +5,11 @@
 				<span class="material-symbols-outlined">settings</span>
 			</template>
 		</Button>
-		<Dropdown v-model="locale" :options="availableLocales" />
+		<Dropdown
+			v-model="locale"
+			:options="availableLocales"
+			@change="(event) => saveLanguage(event.value)"
+		/>
 
 		<span
 			v-if="!isLoggedIn"
@@ -27,11 +31,14 @@ import { auth } from "@/security/AuthService"
 import { inject, ref, watch } from "vue"
 import { router } from "@/main"
 import { useI18n } from "vue-i18n"
+import { useSaveLanguage } from "@/backend/config"
 
 const currentUser = ref<string>("")
 const isLoggedIn = inject("loggedIn", ref(false))
 const { locale, availableLocales } = useI18n()
 
+const { mutate: saveLanguage } = useSaveLanguage(isLoggedIn)
+
 function settings() {
 	router.push({
 		name: "Settings",
diff --git a/frontend/app/src/interfaces/config.ts b/frontend/app/src/interfaces/config.ts
index 5e186f55..4c9ba713 100644
--- a/frontend/app/src/interfaces/config.ts
+++ b/frontend/app/src/interfaces/config.ts
@@ -1,4 +1,4 @@
 export interface Config {
-	name: string
+	title: string
 	language: string
 }

From 5c64e6719ca8f4e0c0ef3dfac0a810b2b7b6d019 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 16:54:07 +0200
Subject: [PATCH 188/247] =?UTF-8?q?=E2=9C=A8=20Add=20saving=20of=20default?=
 =?UTF-8?q?=20language?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/ConfigResource.java             | 25 +++++++++++++++
 .../resources/TournamentResource.java         |  7 -----
 frontend/app/src/backend/config.ts            | 18 +++++++++++
 frontend/app/src/backend/security.ts          | 31 ++++++++++++++++---
 .../views/settings/SettingsGeneral.vue        | 26 ++++++++++++++++
 .../views/settings/SettingsItem.vue           |  2 +-
 .../views/settings/ViewSettings.vue           | 31 ++++++++++++++-----
 .../views/tournaments/ViewTournaments.vue     |  4 +--
 frontend/app/src/i18n/de.json                 |  4 +++
 frontend/app/src/i18n/en.json                 |  4 +++
 10 files changed, 130 insertions(+), 22 deletions(-)
 create mode 100644 frontend/app/src/components/views/settings/SettingsGeneral.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 2aa8f21f..4388770d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -6,6 +6,7 @@
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserConfig;
 import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
@@ -54,4 +55,28 @@ public void saveConfig(jUserConfig nConfig) {
             config.setLanguage(nConfig.getLanguage());
         configRepository.persist(config);
     }
+
+    @POST
+    @RolesAllowed("admin")
+    @Path("/saveDefault")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void saveConfigDefault(jUserConfig nConfig) {
+        DefaultConfig defConfig = defaultConfigRepository.findById(0L);
+        defConfig.setLanguage(nConfig.getLanguage());
+        defaultConfigRepository.persist(defConfig);
+    }
+
+    @GET
+    @Path("/isAdmin")
+    public boolean isAdmin() {
+        return securityIdentity.hasRole("admin");
+    }
+
+    @GET
+    @Path("/isDirector")
+    @Produces(MediaType.TEXT_PLAIN)
+    public Boolean canCreate() {
+        return securityIdentity.hasRole("director");
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index d634e8b4..518925e1 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -52,13 +52,6 @@ public List<jUserTournament> getAllTournaments() {
                 .toList();
     }
 
-    @GET
-    @Path("/canCreate")
-    @Produces(MediaType.TEXT_PLAIN)
-    public Boolean canCreate() {
-        return securityIdentity.hasRole("director");
-    }
-
     @GET
     @Path("/{tourName}/details")
     @Consumes(MediaType.TEXT_PLAIN)
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
index 1500839a..712f5db8 100644
--- a/frontend/app/src/backend/config.ts
+++ b/frontend/app/src/backend/config.ts
@@ -28,3 +28,21 @@ export function useSaveLanguage(isLoggedIn: Ref<boolean>) {
 		},
 	})
 }
+
+export function useSaveDefault(isLoggedIn: Ref<boolean>) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: async (language: string) => {
+			if (isLoggedIn)
+				return axios.post("/config/saveDefault", {
+					language: language,
+				})
+		},
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["config", isLoggedIn.value],
+				refetchType: "all",
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/backend/security.ts b/frontend/app/src/backend/security.ts
index 02e241c0..cfe46f03 100644
--- a/frontend/app/src/backend/security.ts
+++ b/frontend/app/src/backend/security.ts
@@ -3,21 +3,21 @@ import { auth } from "@/security/AuthService"
 import axios from "axios"
 import { useQuery } from "@tanstack/vue-query"
 
-export function getCanCreate(isLoggedIn: Ref<boolean>) {
+export function getIsDirector(isLoggedIn: Ref<boolean>) {
 	return useQuery({
 		queryKey: ["can_create", isLoggedIn],
-		queryFn: fetchCanCreate,
+		queryFn: fetchIsDirector,
 		placeholderData: false,
 		staleTime: 0,
 	})
 }
 
-async function fetchCanCreate() {
+async function fetchIsDirector() {
 	const user = await auth.getUser()
 	if (user === null) return false
 
 	return await axios
-		.get<boolean>("/tournament/canCreate")
+		.get<boolean>("/config/isDirector")
 		.then((response) => {
 			return response.data
 		})
@@ -48,3 +48,26 @@ async function fetchCanEdit(tourId: string) {
 			return false
 		})
 }
+
+export function getIsAdmin(isLoggedIn: Ref<boolean>) {
+	return useQuery({
+		queryKey: ["isAdmin", isLoggedIn],
+		queryFn: () => fetchIsAdmin(),
+		placeholderData: false,
+		staleTime: 0,
+	})
+}
+
+async function fetchIsAdmin() {
+	const user = await auth.getUser()
+	if (user === null) return false
+
+	return await axios
+		.get<boolean>(`/config/isAdmin`)
+		.then((response) => {
+			return response.data
+		})
+		.catch(() => {
+			return false
+		})
+}
diff --git a/frontend/app/src/components/views/settings/SettingsGeneral.vue b/frontend/app/src/components/views/settings/SettingsGeneral.vue
new file mode 100644
index 00000000..aed895f8
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsGeneral.vue
@@ -0,0 +1,26 @@
+<template>
+	<div class="flex flex-column">
+		<div class="flex flex-row">
+			<InputGroup>
+				<Dropdown v-model="loc" :options="availableLocales" />
+				<Button @click="() => saveLanguage(loc)">{{
+					t("settings.save_default")
+				}}</Button>
+			</InputGroup>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n"
+import { inject, ref } from "vue"
+import { useSaveDefault } from "@/backend/config"
+
+const { t, locale, availableLocales } = useI18n()
+const loc = ref(locale.value)
+const isLoggedIn = inject("loggedIn", ref(false))
+
+const { mutate: saveLanguage } = useSaveDefault(isLoggedIn)
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/SettingsItem.vue b/frontend/app/src/components/views/settings/SettingsItem.vue
index 47455a83..8640ce2f 100644
--- a/frontend/app/src/components/views/settings/SettingsItem.vue
+++ b/frontend/app/src/components/views/settings/SettingsItem.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="grid col-12 lg:col-6 xl:col-4">
+	<div class="col-12 lg:col-6 xl:col-4">
 		<slot />
 	</div>
 </template>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 58775c57..b6088dca 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -1,13 +1,21 @@
 <template>
-	<div class="w-full p-2">
-		<Card style="margin-top: -10px !important">
-			<template #title>{{ t("general.settings") }}</template>
-			<template #content>
-				<SettingsItem>
+	<div class="w-full p-2 pt-0 grid">
+		<SettingsItem v-if="isAdmin">
+			<Card>
+				<template #title>{{ t("general.courts") }}</template>
+				<template #content>
+					<SettingsGeneral />
+				</template>
+			</Card>
+		</SettingsItem>
+		<SettingsItem v-if="isDirector">
+			<Card>
+				<template #title>{{ t("general.courts") }}</template>
+				<template #content>
 					<SettingsCourts />
-				</SettingsItem>
-			</template>
-		</Card>
+				</template>
+			</Card>
+		</SettingsItem>
 	</div>
 </template>
 
@@ -15,8 +23,15 @@
 import { useI18n } from "vue-i18n"
 import SettingsCourts from "@/components/views/settings/SettingsCourts.vue"
 import SettingsItem from "@/components/views/settings/SettingsItem.vue"
+import SettingsGeneral from "@/components/views/settings/SettingsGeneral.vue"
+import { getIsAdmin, getIsDirector } from "@/backend/security"
+import { inject, ref } from "vue"
 
 const { t } = useI18n()
+
+const isLoggedIn = inject("loggedIn", ref(false))
+const { data: isAdmin } = getIsAdmin(isLoggedIn)
+const { data: isDirector } = getIsDirector(isLoggedIn)
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/tournaments/ViewTournaments.vue b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
index e0d3df8c..a083c27b 100644
--- a/frontend/app/src/components/views/tournaments/ViewTournaments.vue
+++ b/frontend/app/src/components/views/tournaments/ViewTournaments.vue
@@ -27,7 +27,7 @@ import Item from "../../items/ItemTournament.vue"
 import AddItem from "../../items/ItemAdd.vue"
 import { router } from "@/main"
 import { useI18n } from "vue-i18n"
-import { getCanCreate } from "@/backend/security"
+import { getIsDirector } from "@/backend/security"
 import { getTournamentList } from "@/backend/tournament"
 import { useToast } from "primevue/usetoast"
 
@@ -35,7 +35,7 @@ const { t } = useI18n()
 const toast = useToast()
 
 const isLoggedIn = inject("loggedIn", ref(false))
-const { data: canCreate } = getCanCreate(isLoggedIn)
+const { data: canCreate } = getIsDirector(isLoggedIn)
 const {
 	data: tournaments,
 	isLoading,
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 6b71614b..c008ac28 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -6,6 +6,7 @@
 	"yes": "Ja",
 	"general": {
 		"settings": "Einstellungen",
+		"general": "Allgemein",
 		"create": "Erstellen",
 		"update": "Aktualisieren",
 		"name": "Name",
@@ -257,5 +258,8 @@
 			"GRASS": "Gras"
 		},
 		"not_selected": "Alle Felder müssen ausgefüllt werden"
+	},
+	"settings": {
+		"save_default": "Als Standard speichern"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 0ef93e56..c29ea224 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -6,6 +6,7 @@
 	"yes": "Yes",
 	"general": {
 		"settings": "Settings",
+		"general": "General",
 		"create": "Create",
 		"update": "Update",
 		"name": "Name",
@@ -259,5 +260,8 @@
 			"GRASS": "Grass"
 		},
 		"not_selected": "All fields need to be filled"
+	},
+	"settings": {
+		"save_default": "Save as default"
 	}
 }

From b134446e70cfedd2565d9d6ebbe4039ced3d6572 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 17:14:25 +0200
Subject: [PATCH 189/247] =?UTF-8?q?=E2=9C=A8=20Add=20saving=20of=20title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/ConfigResource.java             | 17 ++++++++-
 .../jsonEntities/user/jUserConfig.java        |  2 +-
 .../turnierplaner/startup/Defaults.java       |  3 +-
 frontend/app/src/App.vue                      | 18 +++++----
 frontend/app/src/backend/config.ts            | 21 ++++++++---
 .../views/settings/SettingsGeneral.vue        | 37 ++++++++++++++++---
 .../views/settings/ViewSettings.vue           |  2 +-
 7 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 4388770d..92a54a74 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -58,7 +58,7 @@ public void saveConfig(jUserConfig nConfig) {
 
     @POST
     @RolesAllowed("admin")
-    @Path("/saveDefault")
+    @Path("/saveDefaultLanguage")
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
     public void saveConfigDefault(jUserConfig nConfig) {
@@ -67,6 +67,21 @@ public void saveConfigDefault(jUserConfig nConfig) {
         defaultConfigRepository.persist(defConfig);
     }
 
+    @POST
+    @RolesAllowed("admin")
+    @Path("/saveTitle")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void save(jUserConfig nConfig) {
+        DefaultConfig defConfig = defaultConfigRepository.findById(0L);
+        if (nConfig.getTitle() != null)
+            defConfig.setTitle(nConfig.getTitle());
+        else
+            defConfig.setTitle("title");
+
+        defaultConfigRepository.persist(defConfig);
+    }
+
     @GET
     @Path("/isAdmin")
     public boolean isAdmin() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
index 367074c4..f8ced1b8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
@@ -15,7 +15,7 @@ public jUserConfig(DefaultConfig config) {
     }
 
     public jUserConfig(DefaultConfig defConfig, Config config) {
-        this.title = defConfig.getTitle();
+        this.title = defConfig.getTitle() != null ? defConfig.getTitle() : "title";
         if (config == null)
             this.language = defConfig.getLanguage();
         else
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
index 99e0acb0..6aa050bb 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
@@ -24,7 +24,8 @@ void addDefault() {
         var defaultConfig = new DefaultConfig();
         defaultConfig.setId(0);
         defaultConfig.setTitle(clubName);
-        defaultConfig.setLanguage(language);
+        if (language != null && !language.isEmpty() && !language.equals("title"))
+            defaultConfig.setLanguage(language);
         defaultConfigRepository.persist(defaultConfig);
     }
 }
diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue
index 3063a11c..88c0c910 100644
--- a/frontend/app/src/App.vue
+++ b/frontend/app/src/App.vue
@@ -38,13 +38,17 @@ auth.addUserUnloadedListener(() => {
 const { data: config } = getConfig(loggedIn)
 const { locale } = useI18n()
 
-watch(config, async () => {
-	console.log("update settings")
-	if (config.value) {
-		console.log("update language: ", config.value.language)
-		locale.value = config.value.language
-	}
-})
+watch(
+	config,
+	async () => {
+		console.log("update settings")
+		if (config.value) {
+			console.log("update language: ", config.value.language)
+			locale.value = config.value.language
+		}
+	},
+	{ immediate: true },
+)
 </script>
 
 <template>
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
index 712f5db8..725feabd 100644
--- a/frontend/app/src/backend/config.ts
+++ b/frontend/app/src/backend/config.ts
@@ -12,7 +12,6 @@ export function getConfig(isLoggedIn: Ref<boolean>) {
 }
 
 export function useSaveLanguage(isLoggedIn: Ref<boolean>) {
-	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: async (language: string) => {
 			if (isLoggedIn)
@@ -20,6 +19,18 @@ export function useSaveLanguage(isLoggedIn: Ref<boolean>) {
 					language: language,
 				})
 		},
+	})
+}
+
+export function useSaveDefault(isLoggedIn: Ref<boolean>) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: async (language: string) => {
+			if (isLoggedIn)
+				return axios.post("/config/saveDefaultLanguage", {
+					language,
+				})
+		},
 		onSuccess() {
 			queryClient.invalidateQueries({
 				queryKey: ["config", isLoggedIn.value],
@@ -29,13 +40,13 @@ export function useSaveLanguage(isLoggedIn: Ref<boolean>) {
 	})
 }
 
-export function useSaveDefault(isLoggedIn: Ref<boolean>) {
+export function useSaveTitle(isLoggedIn: Ref<boolean>) {
 	const queryClient = useQueryClient()
 	return useMutation({
-		mutationFn: async (language: string) => {
+		mutationFn: async (title: string) => {
 			if (isLoggedIn)
-				return axios.post("/config/saveDefault", {
-					language: language,
+				return axios.post("/config/saveTitle", {
+					title,
 				})
 		},
 		onSuccess() {
diff --git a/frontend/app/src/components/views/settings/SettingsGeneral.vue b/frontend/app/src/components/views/settings/SettingsGeneral.vue
index aed895f8..f5916e43 100644
--- a/frontend/app/src/components/views/settings/SettingsGeneral.vue
+++ b/frontend/app/src/components/views/settings/SettingsGeneral.vue
@@ -1,11 +1,23 @@
 <template>
-	<div class="flex flex-column">
+	<div class="flex flex-column gap-2">
 		<div class="flex flex-row">
 			<InputGroup>
 				<Dropdown v-model="loc" :options="availableLocales" />
-				<Button @click="() => saveLanguage(loc)">{{
-					t("settings.save_default")
-				}}</Button>
+				<Button @click="() => saveLanguage(loc)"
+					>{{ t("settings.save_default") }}
+				</Button>
+			</InputGroup>
+		</div>
+		<div class="flex flex-row">
+			<InputGroup>
+				<InputText
+					v-model="title"
+					:disabled="!config"
+					:placeholder="t('general.title')"
+				/>
+				<Button @click="() => saveTitle(title)"
+					>{{ t("settings.save_default") }}
+				</Button>
 			</InputGroup>
 		</div>
 	</div>
@@ -13,14 +25,27 @@
 
 <script setup lang="ts">
 import { useI18n } from "vue-i18n"
-import { inject, ref } from "vue"
-import { useSaveDefault } from "@/backend/config"
+import { inject, ref, watch } from "vue"
+import { getConfig, useSaveDefault, useSaveTitle } from "@/backend/config"
 
 const { t, locale, availableLocales } = useI18n()
 const loc = ref(locale.value)
 const isLoggedIn = inject("loggedIn", ref(false))
 
+const { data: config } = getConfig(isLoggedIn)
 const { mutate: saveLanguage } = useSaveDefault(isLoggedIn)
+const { mutate: saveTitle } = useSaveTitle(isLoggedIn)
+const title = ref("")
+watch(
+	config,
+	() => {
+		if (config.value) {
+			if (config.value.title === "title") title.value = ""
+			else title.value = config.value.title
+		}
+	},
+	{ immediate: true },
+)
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index b6088dca..3a45bb6b 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -2,7 +2,7 @@
 	<div class="w-full p-2 pt-0 grid">
 		<SettingsItem v-if="isAdmin">
 			<Card>
-				<template #title>{{ t("general.courts") }}</template>
+				<template #title>{{ t("general.general") }}</template>
 				<template #content>
 					<SettingsGeneral />
 				</template>

From 9fa8358b1db4b169018997886e69bd64a5f824c3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 18:44:01 +0200
Subject: [PATCH 190/247] =?UTF-8?q?=E2=9C=A8=20Add=20team=20deletion=20at?=
 =?UTF-8?q?=20signup=20and=20fix=20verification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Player.java     | 60 +++++++++-----
 .../db/entities/VerificationCode.java         |  2 +-
 .../db/repositories/PlayerRepository.java     |  7 ++
 .../resources/CompetitionResource.java        | 20 +++++
 .../resources/PlayerResource.java             | 78 +++++++++++--------
 .../src/main/resources/application.properties |  1 +
 frontend/app/src/backend/player.ts            | 47 ++++++++++-
 frontend/app/src/backend/signup.ts            | 32 +++++++-
 .../app/src/components/header/HeaderLeft.vue  |  2 +-
 .../views/competition/signup/ViewTable.vue    | 23 +++---
 frontend/app/src/i18n/de.json                 |  3 +-
 frontend/app/src/i18n/en.json                 |  3 +-
 12 files changed, 206 insertions(+), 72 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index fac6e930..ff81849f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -5,29 +5,39 @@
 import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.LocalDate;
-import java.util.List;
 import java.util.UUID;
 
 @Entity
 @Table(name = "players")
-@NamedQueries(
-    @NamedQuery(name = "filter",
-                query = """
-                    SELECT p FROM Player p
-                    WHERE p.mailVerified = true
-                    AND (p.sex = :sex OR :ignoreSex = true)
-                    AND (p.birthday <= :minAge OR :ignoreMinAge = true)
-                    AND (p.birthday >= :maxAge OR :ignoreMaxAge = true)
-                    AND (lower(p.firstName) like CONCAT('%', lower(:search), '%')
-                    OR lower(p.lastName) = CONCAT('%', lower(:search), '%')
-                    OR lower(CONCAT(p.firstName, ' ', p.lastName)) like CONCAT('%', lower(:search), '%'))
-                    ORDER BY CASE
-                        WHEN lower(p.firstName) like CONCAT(lower(:search), '%') THEN 0
-                        WHEN lower(p.lastName) like CONCAT(lower(:search), '%') THEN 1
-                        ELSE 2
-                    END, p.firstName, p.lastName"""
-    )
-)
+@NamedQueries({
+               @NamedQuery(name = "filter",
+                           query = """
+                               SELECT p FROM Player p
+                               WHERE p.mailVerified = true
+                               AND (p.sex = :sex OR :ignoreSex = true)
+                               AND (p.birthday <= :minAge OR :ignoreMinAge = true)
+                               AND (p.birthday >= :maxAge OR :ignoreMaxAge = true)
+                               AND (lower(p.firstName) like CONCAT('%', lower(:search), '%')
+                               OR lower(p.lastName) = CONCAT('%', lower(:search), '%')
+                               OR lower(CONCAT(p.firstName, ' ', p.lastName)) like CONCAT('%', lower(:search), '%'))
+                               ORDER BY CASE
+                                   WHEN lower(p.firstName) like CONCAT(lower(:search), '%') THEN 0
+                                   WHEN lower(p.lastName) like CONCAT(lower(:search), '%') THEN 1
+                                   ELSE 2
+                               END, p.firstName, p.lastName"""
+               ),
+               @NamedQuery(name = "adminUnverified",
+                           query = """
+                               SELECT p FROM Player p
+                               WHERE p.adminVerified = false"""),
+               @NamedQuery(name = "deleteUnverified",
+                           query = """
+                               FROM Player p
+                               LEFT OUTER JOIN VerificationCode c
+                               WHERE p.mailVerified = false
+                               AND c.expiration_date < current_timestamp()
+                               """)
+})
 public class Player {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -57,9 +67,9 @@ public class Player {
     @Column(name = "admin_verified")
     private boolean adminVerified;
 
-    @OneToMany(mappedBy = "player")
+    @OneToOne(mappedBy = "player")
     @OnDelete(action = OnDeleteAction.CASCADE)
-    private List<VerificationCode> verificationCodes;
+    private VerificationCode verificationCode;
 
     public Player() {
     }
@@ -147,4 +157,12 @@ public boolean isAdminVerified() {
     public void setAdminVerified(boolean admin_verified) {
         this.adminVerified = admin_verified;
     }
+
+    public VerificationCode getVerificationCode() {
+        return verificationCode;
+    }
+
+    public void setVerificationCode(VerificationCode verificationCodes) {
+        this.verificationCode = verificationCodes;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
index 9c7c8e5a..6fd564e5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
@@ -13,7 +13,7 @@ public class VerificationCode {
     @Column(name = "id", nullable = false)
     private UUID id;
 
-    @ManyToOne
+    @OneToOne
     @JoinColumn(name = "player_id")
     private Player player;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index b683a7fa..b590e956 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -37,4 +37,11 @@ public Stream<Player> filter(String search, SexType sex, LocalDate minAge, Local
                 .page(0, 10).stream();
     }
 
+    public Stream<Player> adminUnverified() {
+        return find("#adminUnverified").stream();
+    }
+
+    public void deleteUnverified() {
+        delete("#deleteUnverified");
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 1a3ef46a..e52bd8a0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -307,6 +307,26 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
         return "Player registered";
     }
 
+    @POST
+    @Path("/{compName}/deleteTeam")
+    @Transactional
+    @RolesAllowed("director")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    public String deleteTeam(@PathParam("tourName") String tourName, @PathParam("compName") String compName,
+                             jUserTeam team) {
+        Team dbTeam = teams.findById(team.getId());
+        if (dbTeam == null)
+            throw new BadRequestException("Team does not exist");
+        Competition competition = competitions.getByName(tourName, compName);
+        switch (competition.getcProgress()) {
+            case GAMES, SCHEDULING:
+                throw new BadRequestException("Can't delete team after assigning teams");
+        }
+        teams.delete(dbTeam);
+        return "Team deleted";
+    }
+
     @POST
     @Transactional
     @RolesAllowed("director")
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index f6f9231a..250969a8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -13,11 +13,13 @@
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.smallrye.common.annotation.Blocking;
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import java.time.LocalDate;
 import java.time.Instant;
@@ -38,6 +40,9 @@ public class PlayerResource {
     @Inject
     SecurityIdentity securityIdentity;
 
+    @ConfigProperty(name = "turnierplaner.registration.expire")
+    public int expire;
+
     @GET
     @Path("/find")
     @Produces(MediaType.APPLICATION_JSON)
@@ -59,6 +64,14 @@ public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryP
         return playerRepository.filter(search, dbSex, minAge, maxAge).map(jUserPlayer::new).toList();
     }
 
+    @GET
+    @Path("/listUnverified")
+    @Produces(MediaType.APPLICATION_JSON)
+    @RolesAllowed("director")
+    public List<jUserPlayer> listUnverified() {
+        return playerRepository.adminUnverified().map(jUserPlayer::new).toList();
+    }
+
     @GET
     @Path("/{playerId}/details")
     @Produces(MediaType.APPLICATION_JSON)
@@ -76,7 +89,11 @@ public jUserPlayer getPlayer(@PathParam("playerId") UUID playerId) {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
     public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
-        if (playerRepository.getByName(playerForm.getFirstName(), playerForm.getLastName()) != null)
+        Player exPlayer = playerRepository.getByName(playerForm.getFirstName(), playerForm.getLastName());
+        if (exPlayer != null &&
+            (exPlayer.getVerificationCode() == null
+                || (exPlayer.getVerificationCode() != null && exPlayer.getVerificationCode().getExpirationDate()
+                    .isBefore(Instant.now()))))
             throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
 
         // TODO check phone number (only valid phone number)
@@ -92,14 +109,13 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         }
         newPlayer.setEmail(playerForm.getEmail());
         newPlayer.setPhone(playerForm.getPhone());
-        newPlayer.setMailVerified(false);
-        // TODO Admin verification
-        newPlayer.setAdminVerified(false);
+        newPlayer.setMailVerified(securityIdentity.hasRole("director"));
+        newPlayer.setAdminVerified(securityIdentity.hasRole("director"));
         playerRepository.persist(newPlayer);
 
         VerificationCode verificationCode = new VerificationCode();
         verificationCode.setPlayer(newPlayer);
-        verificationCode.setExpirationDate(Instant.now().plus(30, ChronoUnit.MINUTES));
+        verificationCode.setExpirationDate(Instant.now().plus(expire, ChronoUnit.MINUTES));
         verificationCodeRepository.persist(verificationCode);
 
         // TODO check for valid mail
@@ -113,32 +129,6 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         return "successfully added";
     }
 
-
-    @Transactional
-    public Player adminPlayerRegistration(jUserPlayerRegistrationForm playerForm) {
-        if (!securityIdentity.hasRole("director")) throw new ForbiddenException("No permission to create player");
-        if (playerRepository.getByName(playerForm.getFirstName(), playerForm.getLastName()) != null)
-            throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
-
-        Player newPlayer = new Player();
-        newPlayer.setFirstName(playerForm.getFirstName());
-        newPlayer.setLastName(playerForm.getLastName());
-        newPlayer.setBirthday(playerForm.getBirthday());
-        if (playerForm.getSex() == null) throw new BadRequestException("Sex is null");
-        switch (playerForm.getSex()) {
-            case MALE -> newPlayer.setSex(SexType.MALE);
-            case FEMALE -> newPlayer.setSex(SexType.FEMALE);
-        }
-        newPlayer.setEmail(playerForm.getEmail());
-        newPlayer.setPhone(playerForm.getPhone());
-        newPlayer.setMailVerified(true);
-        // TODO Admin verification
-        newPlayer.setAdminVerified(true);
-        playerRepository.persist(newPlayer);
-
-        return newPlayer;
-    }
-
     @GET
     @Transactional
     @Path("/verification")
@@ -149,15 +139,39 @@ public String verification(@QueryParam("code") String code) {
 
         Player player = verificationCode.getPlayer();
         player.setMailVerified(true);
+        player.setVerificationCode(null);
         playerRepository.persist(player);
         verificationCodeRepository.delete(verificationCode);
         return "Successfully verified!";
     }
 
+    @POST
+    @RolesAllowed("director")
+    @Transactional
+    @Path("/adminVerify")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String adminVerify(Player player) {
+        Player dbPlayer = playerRepository.getById(player.getId());
+        dbPlayer.setAdminVerified(true);
+        playerRepository.persist(dbPlayer);
+        return "Successfully verified!";
+    }
+
+    @POST
+    @RolesAllowed("director")
+    @Transactional
+    @Path("/delete")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String deletePlayer(Player player) {
+        Player dbPlayer = playerRepository.getById(player.getId());
+        playerRepository.delete(dbPlayer);
+        return "Successfully verified!";
+    }
+
     @Transactional
     @Scheduled(every = "30m", identity = "clear-verification-code")
     void clear() {
-        // TODO also delete player? otherwise not verified player, but no new one can be created because of duplicate
+        playerRepository.deleteUnverified();
         verificationCodeRepository.delete("FROM VerificationCode v WHERE v.expiration_date < current_timestamp()");
     }
 
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 0a27ca60..bccc6e73 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 # properties
 turnierplaner.club-name=title
 turnierplaner.language=de
+turnierplaner.registration.expire=1
 
 # network configuration
 quarkus.http.cors=true
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index f1f95356..edd285ed 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -1,9 +1,14 @@
 import { Competition, Sex } from "@/interfaces/competition"
 import axios from "axios"
-import { Player, PlayerServer, playerServerToClient } from "@/interfaces/player"
+import {
+	Player,
+	playerClientToServer,
+	PlayerServer,
+	playerServerToClient,
+} from "@/interfaces/player"
 import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
-import { useQuery } from "@tanstack/vue-query"
+import { useMutation, useQuery } from "@tanstack/vue-query"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 
 export interface searchPlayer {
@@ -79,6 +84,44 @@ export function findPlayers(
 	})
 }
 
+export function getUnverified(
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useQuery({
+		queryKey: ["unverifiedPlayer"],
+		queryFn: async () => {
+			return axios
+				.get<PlayerServer[]>(`/player/listUnverified`)
+				.then<Player[]>((result) => result.data.map(playerServerToClient))
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewCompetition.query_search_failed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
+				})
+		},
+	})
+}
+
+export function useAdminVerify() {
+	return useMutation({
+		mutationFn: async (player: Player) =>
+			axios.post(`player/adminVerify`, playerClientToServer(player)),
+	})
+}
+
+export function useDeletePlayer() {
+	return useMutation({
+		mutationFn: async (player: Player) =>
+			axios.post(`player/delete`, playerClientToServer(player)),
+	})
+}
+
 export function getPlayer(
 	route: RouteLocationNormalizedLoaded,
 	t: (s: string) => string,
diff --git a/frontend/app/src/backend/signup.ts b/frontend/app/src/backend/signup.ts
index a03c83c6..0085d57b 100644
--- a/frontend/app/src/backend/signup.ts
+++ b/frontend/app/src/backend/signup.ts
@@ -92,7 +92,7 @@ function separateByComp(
 			.map((team) => {
 				const player = team.playerA
 				if (player === null) throw new Error("Player A is null")
-				return playerServerToClient(player)
+				return teamServerToClient(team)
 			})
 	} else if (
 		competition.value.mode === Mode.DOUBLE &&
@@ -104,14 +104,14 @@ function separateByComp(
 			.map((team) => {
 				const player = team.playerA
 				if (player === null) throw new Error("Player A is null")
-				return playerServerToClient(player)
+				return teamServerToClient(team)
 			})
 		teamLists.playersB = signedUp.value
 			.filter((team) => team.playerB !== null)
 			.map((team) => {
 				const player = team.playerB
 				if (player === null) throw new Error("Player B is null")
-				return playerServerToClient(player)
+				return teamServerToClient(team)
 			})
 	} else if (
 		competition.value.mode === Mode.DOUBLE &&
@@ -135,7 +135,7 @@ function separateByComp(
 }
 
 function separate(signedUp: Ref<Team[]> | Ref<undefined>) {
-	const teamLists: TeamLists = {
+	const teamLists: TeamPlayerLists = {
 		playersA: [],
 		playersB: [],
 		teams: [],
@@ -154,6 +154,12 @@ function separate(signedUp: Ref<Team[]> | Ref<undefined>) {
 }
 
 export interface TeamLists {
+	playersA: Team[]
+	playersB: Team[]
+	teams: Team[]
+}
+
+export interface TeamPlayerLists {
 	playersA: Player[]
 	playersB: Player[]
 	teams: Team[]
@@ -208,3 +214,21 @@ export function useUpdateTeams(
 		},
 	})
 }
+
+export function useDeleteTeam(route: RouteLocationNormalizedLoaded) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: async (team: Team) =>
+			axios.post(
+				`/tournament/${route.params.tourId}/competition/${route.params.compId}/deleteTeam`,
+				{
+					id: team.id,
+				},
+			),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["signedUp", route.params.tourId, route.params.compId],
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index af0bbe4d..b09d5d35 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -17,7 +17,7 @@
 			>
 				{{ route.params.tourId }}
 			</h2>
-			<h2 v-if="route.name === 'Settings'">
+			<h2 v-if="route.name === 'Settings'" class="cursor-pointer">
 				{{ t("general.settings") }}
 			</h2>
 			<h3
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/frontend/app/src/components/views/competition/signup/ViewTable.vue
index ee8a45a7..39cddf81 100644
--- a/frontend/app/src/components/views/competition/signup/ViewTable.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewTable.vue
@@ -12,7 +12,7 @@
 			<Column :header="t('general.name')" field="name" sortable>
 				<template #body="{ data }">
 					<div class="flex justify-content-between align-items-center">
-						<ViewPlayerName :player="<Player>data" />
+						<ViewPlayerName :player="<Player>data.playerA" />
 						<Button
 							v-if="canEdit"
 							severity="danger"
@@ -84,7 +84,7 @@
 			<Column :header="t('general.name')" sortable field="name">
 				<template #body="{ data }">
 					<div class="flex justify-content-between align-items-center">
-						<ViewPlayerName :player="<Player>data" />
+						<ViewPlayerName :player="<Player>data.playerA" />
 						<Button
 							v-if="canEdit"
 							severity="danger"
@@ -114,7 +114,7 @@
 				<Column :header="t('ViewCompetition.playerA')" sortable field="name">
 					<template #body="{ data }">
 						<div class="flex justify-content-between align-items-center">
-							<ViewPlayerName :player="<Player>data" />
+							<ViewPlayerName :player="<Player>data.playerA" />
 							<Button
 								v-if="canEdit"
 								severity="danger"
@@ -141,7 +141,7 @@
 				<Column :header="t('ViewCompetition.playerB')" sortable field="name">
 					<template #body="{ data }">
 						<div class="flex justify-content-between align-items-center">
-							<ViewPlayerName :player="<Player>data" />
+							<ViewPlayerName :player="<Player>data.playerB" />
 							<Button
 								v-if="canEdit"
 								severity="danger"
@@ -170,8 +170,9 @@ import { Player } from "@/interfaces/player"
 import { useToast } from "primevue/usetoast"
 import { getCanEdit } from "@/backend/security"
 import { getCompetitionDetails } from "@/backend/competition"
-import { getSignedUpSepByComp } from "@/backend/signup"
+import { getSignedUpSepByComp, useDeleteTeam } from "@/backend/signup"
 import ViewPlayerName from "@/components/links/LinkPlayerName.vue"
+import { Team } from "@/interfaces/team"
 
 const { t } = useI18n()
 const toast = useToast()
@@ -183,13 +184,17 @@ const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
 
 const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: signedUp } = getSignedUpSepByComp(route, t, toast)
+const { mutate: deleteTeam } = useDeleteTeam(route)
 
-function deletePlayer(player: Player) {
-	console.log(player)
-	// TODO implement
+function deletePlayer(team: Team) {
+	deleteTeam(team)
 	toast.add({
 		severity: "success",
-		summary: t("ViewSignUp.playerDeleted"),
+		summary: t(
+			competition.value?.mode == Mode.SINGLE
+				? "ViewSignUp.playerDeleted"
+				: "ViewSignUp.teamDeleted",
+		),
 		life: 3000,
 	})
 }
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index c008ac28..f78ab49d 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -155,7 +155,8 @@
 		"selectPlayerFirst": "Bitte wähle zuerst einen Spieler aus",
 		"noPlayerFound": "Keinen Spieler gefunden",
 		"invalidMode": "Ungültiger Modus",
-		"playerDeleted": "Spieler gelöscht"
+		"playerDeleted": "Spieler gelöscht",
+		"teamDeleted": "Team gelöscht"
 	},
 	"ViewCreateCompetition": {
 		"header": "Neue Konkurrenz",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index c29ea224..58de00b8 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -158,7 +158,8 @@
 		"selectPlayerFirst": "Please select a player first",
 		"noPlayerFound": "No player found",
 		"invalidMode": "Invalid mode",
-		"playerDeleted": "Player deleted"
+		"playerDeleted": "Player deleted",
+		"teamDeleted": "Team deleted"
 	},
 	"ViewCreateCompetition": {
 		"header": "Create competition",

From 7785e7a4f15902936318b8ae2ae0d867a72e571e Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 19:07:31 +0200
Subject: [PATCH 191/247] =?UTF-8?q?=E2=9C=A8=20Add=20admin=20verification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Player.java     |  5 +-
 frontend/app/src/backend/player.ts            | 14 ++++-
 .../views/settings/SettingsPlayerVerify.vue   | 57 +++++++++++++++++++
 .../views/settings/ViewSettings.vue           |  9 +++
 frontend/app/src/i18n/de.json                 |  4 +-
 frontend/app/src/i18n/en.json                 |  4 +-
 6 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 frontend/app/src/components/views/settings/SettingsPlayerVerify.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index ff81849f..72505b52 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -1,8 +1,6 @@
 package de.secretj12.turnierplaner.db.entities;
 
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.LocalDate;
 import java.util.UUID;
@@ -67,8 +65,7 @@ public class Player {
     @Column(name = "admin_verified")
     private boolean adminVerified;
 
-    @OneToOne(mappedBy = "player")
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @OneToOne(mappedBy = "player", cascade = CascadeType.REMOVE)
     private VerificationCode verificationCode;
 
     public Player() {
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index edd285ed..940aa985 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -8,7 +8,7 @@ import {
 } from "@/interfaces/player"
 import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
-import { useMutation, useQuery } from "@tanstack/vue-query"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 
 export interface searchPlayer {
@@ -109,16 +109,28 @@ export function getUnverified(
 }
 
 export function useAdminVerify() {
+	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: async (player: Player) =>
 			axios.post(`player/adminVerify`, playerClientToServer(player)),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["unverifiedPlayer"],
+			})
+		},
 	})
 }
 
 export function useDeletePlayer() {
+	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: async (player: Player) =>
 			axios.post(`player/delete`, playerClientToServer(player)),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["unverifiedPlayer"],
+			})
+		},
 	})
 }
 
diff --git a/frontend/app/src/components/views/settings/SettingsPlayerVerify.vue b/frontend/app/src/components/views/settings/SettingsPlayerVerify.vue
new file mode 100644
index 00000000..93eb189c
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsPlayerVerify.vue
@@ -0,0 +1,57 @@
+<template>
+	<DataTable :value="unverified" striped-rows class="w-full mb-2" size="small">
+		<template #empty>
+			{{ t("settings.no_unverified") }}
+		</template>
+		<Column field="name" :header="t('general.name')">
+			<template #body="{ data }">
+				<div class="flex flex-row justify-content-between align-items-center">
+					<div>
+						{{ data.name }}
+					</div>
+					<div>
+						<Button
+							severity="success"
+							text
+							rounded
+							size="small"
+							class="h-2rem"
+							@click="verifyPlayer(data)"
+						>
+							<span class="material-symbols-outlined">check_circle</span>
+						</Button>
+						<Button
+							severity="danger"
+							text
+							rounded
+							size="small"
+							class="h-2rem"
+							@click="deletePlayer(data)"
+						>
+							<span class="material-symbols-outlined">delete_forever</span>
+						</Button>
+					</div>
+				</div>
+			</template>
+		</Column>
+	</DataTable>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n"
+import {
+	getUnverified,
+	useAdminVerify,
+	useDeletePlayer,
+} from "@/backend/player"
+import { useToast } from "primevue/usetoast"
+
+const { t } = useI18n()
+const toast = useToast()
+
+const { data: unverified } = getUnverified(t, toast)
+const { mutate: verifyPlayer } = useAdminVerify()
+const { mutate: deletePlayer } = useDeletePlayer()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 3a45bb6b..602e625e 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -16,6 +16,14 @@
 				</template>
 			</Card>
 		</SettingsItem>
+		<SettingsItem v-if="isDirector">
+			<Card>
+				<template #title>{{ t("settings.verification") }}</template>
+				<template #content>
+					<SettingsPlayerVerify />
+				</template>
+			</Card>
+		</SettingsItem>
 	</div>
 </template>
 
@@ -26,6 +34,7 @@ import SettingsItem from "@/components/views/settings/SettingsItem.vue"
 import SettingsGeneral from "@/components/views/settings/SettingsGeneral.vue"
 import { getIsAdmin, getIsDirector } from "@/backend/security"
 import { inject, ref } from "vue"
+import SettingsPlayerVerify from "@/components/views/settings/SettingsPlayerVerify.vue"
 
 const { t } = useI18n()
 
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index f78ab49d..0c9a2a09 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -261,6 +261,8 @@
 		"not_selected": "Alle Felder müssen ausgefüllt werden"
 	},
 	"settings": {
-		"save_default": "Als Standard speichern"
+		"save_default": "Als Standard speichern",
+		"verification": "Verifikation",
+		"no_unverified": "Es gibt aktuell keine unverifizierten Spieler"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 58de00b8..c5820f72 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -263,6 +263,8 @@
 		"not_selected": "All fields need to be filled"
 	},
 	"settings": {
-		"save_default": "Save as default"
+		"save_default": "Save as default",
+		"verification": "Verification",
+		"no_unverified": "No unverified player"
 	}
 }

From b1ff3de1dd9135d6516b659b24569fcd18b323e3 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 26 Sep 2024 19:38:11 +0200
Subject: [PATCH 192/247] =?UTF-8?q?=E2=9C=85=20Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                      |  6 +++++-
 .../secretj12/turnierplaner/db/entities/Player.java  |  9 +--------
 .../db/repositories/PlayerRepository.java            |  4 ----
 .../turnierplaner/resources/PlayerResource.java      | 12 ++++++++----
 .../turnierplaner/resources/TestPlayerResource.java  |  1 +
 .../resources/TestTournamentResource.java            |  4 ++--
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index d28c5db4..e9b92505 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -70,7 +70,7 @@
 
         <!-- JPA Metamodel classes used for criteria api -->
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
             <version>6.1.7.Final</version>
         </dependency>
@@ -91,6 +91,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-oidc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt</artifactId>
+        </dependency>
 
         <!-- mail -->
         <dependency>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index 72505b52..53e76c33 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -27,14 +27,7 @@ WHEN lower(p.lastName) like CONCAT(lower(:search), '%') THEN 1
                @NamedQuery(name = "adminUnverified",
                            query = """
                                SELECT p FROM Player p
-                               WHERE p.adminVerified = false"""),
-               @NamedQuery(name = "deleteUnverified",
-                           query = """
-                               FROM Player p
-                               LEFT OUTER JOIN VerificationCode c
-                               WHERE p.mailVerified = false
-                               AND c.expiration_date < current_timestamp()
-                               """)
+                               WHERE p.adminVerified = false""")
 })
 public class Player {
     @Id
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index b590e956..672b860f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -40,8 +40,4 @@ public Stream<Player> filter(String search, SexType sex, LocalDate minAge, Local
     public Stream<Player> adminUnverified() {
         return find("#adminUnverified").stream();
     }
-
-    public void deleteUnverified() {
-        delete("#deleteUnverified");
-    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 250969a8..c6cf77fa 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -21,8 +21,8 @@
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import java.time.LocalDate;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.UUID;
@@ -171,8 +171,12 @@ public String deletePlayer(Player player) {
     @Transactional
     @Scheduled(every = "30m", identity = "clear-verification-code")
     void clear() {
-        playerRepository.deleteUnverified();
-        verificationCodeRepository.delete("FROM VerificationCode v WHERE v.expiration_date < current_timestamp()");
+        List<VerificationCode> codes = verificationCodeRepository.find(
+            "FROM VerificationCode v WHERE v.expiration_date < " + "current_timestamp()").list();
+        for (var code : codes) {
+            if (code.getPlayer() != null)
+                playerRepository.delete(code.getPlayer());
+            verificationCodeRepository.delete(code);
+        }
     }
-
 }
\ No newline at end of file
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 1a56470a..0d02c2ad 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -64,6 +64,7 @@ public void addPlayer() {
     @AfterEach
     @Transactional
     public void delete() {
+        verificationCodes.deleteAll();
         players.deleteAll();
     }
 
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index f77333bc..f55c675b 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -103,7 +103,7 @@ public void getAllTournamentsAuthorized() {
     @Test
     public void testCanCreateUnauthorized() {
         given()
-            .get("/tournament/canCreate")
+            .get("/config/isDirector")
             .then()
             .assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
@@ -114,7 +114,7 @@ public void testCanCreateUnauthorized() {
     @TestSecurity(user = "testUser", roles = {"director"})
     public void testCanCreateAuthorized() {
         given()
-            .get("/tournament/canCreate")
+            .get("/config/isDirector")
             .then()
             .statusCode(Response.Status.OK.getStatusCode())
             .body(is("true"));

From 2120e41ae66afb01ec612eaf869bd3404e4811a6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 27 Sep 2024 15:15:02 +0200
Subject: [PATCH 193/247] =?UTF-8?q?=E2=9C=85=20Add=20setting=20to=20disabl?=
 =?UTF-8?q?e=20admin=20verification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/entities/DefaultConfig.java            |  9 ++++
 .../turnierplaner/db/entities/Player.java     |  1 +
 .../db/repositories/PlayerRepository.java     |  5 ++-
 .../resources/ConfigResource.java             | 15 ++++++-
 .../resources/PlayerResource.java             |  9 +++-
 .../jsonEntities/user/jUserConfig.java        | 10 +++++
 .../turnierplaner/startup/Defaults.java       |  3 ++
 .../src/main/resources/application.properties |  3 +-
 frontend/app/src/App.vue                      |  6 +--
 frontend/app/src/backend/config.ts            | 18 ++++++++
 frontend/app/src/backend/registration.ts      |  2 +-
 .../views/player/ViewPlayerRegistration.vue   | 12 +++---
 .../views/settings/SettingsGeneral.vue        | 41 ++++++++++++++++---
 frontend/app/src/i18n/de.json                 |  4 +-
 frontend/app/src/i18n/en.json                 |  4 +-
 frontend/app/src/interfaces/config.ts         |  1 +
 frontend/app/src/interfaces/player.ts         |  2 +-
 17 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
index 57fafd4d..95b62ce9 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
@@ -13,6 +13,7 @@ public class DefaultConfig {
 
     private String title;
     private String language;
+    private boolean adminVerificationNeeded;
 
     public int getId() {
         return id;
@@ -37,4 +38,12 @@ public String getLanguage() {
     public void setLanguage(String language) {
         this.language = language;
     }
+
+    public boolean isAdminVerificationNeeded() {
+        return adminVerificationNeeded;
+    }
+
+    public void setAdminVerificationNeeded(boolean adminVerificationNeeded) {
+        this.adminVerificationNeeded = adminVerificationNeeded;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index 53e76c33..2b6846b1 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -12,6 +12,7 @@
                            query = """
                                SELECT p FROM Player p
                                WHERE p.mailVerified = true
+                               AND (p.adminVerified = true OR :admin = true)
                                AND (p.sex = :sex OR :ignoreSex = true)
                                AND (p.birthday <= :minAge OR :ignoreMinAge = true)
                                AND (p.birthday >= :maxAge OR :ignoreMaxAge = true)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index 672b860f..08fdc771 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -25,9 +25,10 @@ public Player getByName(String first_name, String last_name) {
                 .firstResultOptional().orElse(null);
     }
 
-    public Stream<Player> filter(String search, SexType sex, LocalDate minAge, LocalDate maxAge) {
+    public Stream<Player> filter(String search, SexType sex, LocalDate minAge, LocalDate maxAge, boolean admin) {
         return find("#filter", Parameters
             .with("search", search)
+            .and("admin", admin)
             .and("sex", sex)
             .and("ignoreSex", sex == null)
             .and("minAge", minAge)
@@ -38,6 +39,6 @@ public Stream<Player> filter(String search, SexType sex, LocalDate minAge, Local
     }
 
     public Stream<Player> adminUnverified() {
-        return find("#adminUnverified").stream();
+        return find("#adminUnverified").page(0, 10).stream();
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 92a54a74..4fc78916 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -61,7 +61,7 @@ public void saveConfig(jUserConfig nConfig) {
     @Path("/saveDefaultLanguage")
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
-    public void saveConfigDefault(jUserConfig nConfig) {
+    public void saveDefaultLanguage(jUserConfig nConfig) {
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         defConfig.setLanguage(nConfig.getLanguage());
         defaultConfigRepository.persist(defConfig);
@@ -72,7 +72,7 @@ public void saveConfigDefault(jUserConfig nConfig) {
     @Path("/saveTitle")
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
-    public void save(jUserConfig nConfig) {
+    public void saveTitle(jUserConfig nConfig) {
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         if (nConfig.getTitle() != null)
             defConfig.setTitle(nConfig.getTitle());
@@ -82,6 +82,17 @@ public void save(jUserConfig nConfig) {
         defaultConfigRepository.persist(defConfig);
     }
 
+    @POST
+    @RolesAllowed("admin")
+    @Path("/saveIsAdminNeeded")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void saveIsAdminNeeded(jUserConfig nConfig) {
+        DefaultConfig defConfig = defaultConfigRepository.findById(0L);
+        defConfig.setAdminVerificationNeeded(nConfig.isAdminVerificationNeeded());
+        defaultConfigRepository.persist(defConfig);
+    }
+
     @GET
     @Path("/isAdmin")
     public boolean isAdmin() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index c6cf77fa..af06bf6d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -1,9 +1,11 @@
 package de.secretj12.turnierplaner.resources;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import de.secretj12.turnierplaner.db.entities.DefaultConfig;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.SexType;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
+import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
@@ -37,6 +39,8 @@ public class PlayerResource {
     Mailer mailer;
     MailTemplates mailTemplates = new MailTemplates();
 
+    @Inject
+    DefaultConfigRepository defaultConfigRepository;
     @Inject
     SecurityIdentity securityIdentity;
 
@@ -61,7 +65,10 @@ public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryP
         if (search.isEmpty()) {
             return List.of();
         }
-        return playerRepository.filter(search, dbSex, minAge, maxAge).map(jUserPlayer::new).toList();
+
+        DefaultConfig defConfig = defaultConfigRepository.findById(0L);
+        boolean admin = securityIdentity.hasRole("director") || !defConfig.isAdminVerificationNeeded();
+        return playerRepository.filter(search, dbSex, minAge, maxAge, admin).map(jUserPlayer::new).toList();
     }
 
     @GET
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
index f8ced1b8..ecb93ba4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
@@ -6,6 +6,7 @@
 public class jUserConfig {
     private String title;
     private String language;
+    private boolean adminVerificationNeeded;
 
     public jUserConfig() {
     }
@@ -20,6 +21,7 @@ public jUserConfig(DefaultConfig defConfig, Config config) {
             this.language = defConfig.getLanguage();
         else
             this.language = config.getLanguage();
+        this.adminVerificationNeeded = defConfig.isAdminVerificationNeeded();
     }
 
     public String getTitle() {
@@ -37,4 +39,12 @@ public String getLanguage() {
     public void setLanguage(String language) {
         this.language = language;
     }
+
+    public boolean isAdminVerificationNeeded() {
+        return adminVerificationNeeded;
+    }
+
+    public void setAdminVerificationNeeded(boolean adminVerificationNeeded) {
+        this.adminVerificationNeeded = adminVerificationNeeded;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
index 6aa050bb..88a4d56d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
@@ -13,6 +13,8 @@ public class Defaults {
     String clubName;
     @ConfigProperty(name = "turnierplaner.language")
     String language;
+    @ConfigProperty(name = "turnierplaner.admin-verification-needed")
+    boolean adminVerificationNeeded;
     @Inject
     DefaultConfigRepository defaultConfigRepository;
 
@@ -24,6 +26,7 @@ void addDefault() {
         var defaultConfig = new DefaultConfig();
         defaultConfig.setId(0);
         defaultConfig.setTitle(clubName);
+        defaultConfig.setAdminVerificationNeeded(adminVerificationNeeded);
         if (language != null && !language.isEmpty() && !language.equals("title"))
             defaultConfig.setLanguage(language);
         defaultConfigRepository.persist(defaultConfig);
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index bccc6e73..04dbc078 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,7 +1,8 @@
 # properties
 turnierplaner.club-name=title
 turnierplaner.language=de
-turnierplaner.registration.expire=1
+turnierplaner.registration.expire=30
+turnierplaner.admin-verification-needed=true
 
 # network configuration
 quarkus.http.cors=true
diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue
index 88c0c910..25287ac9 100644
--- a/frontend/app/src/App.vue
+++ b/frontend/app/src/App.vue
@@ -41,11 +41,7 @@ const { locale } = useI18n()
 watch(
 	config,
 	async () => {
-		console.log("update settings")
-		if (config.value) {
-			console.log("update language: ", config.value.language)
-			locale.value = config.value.language
-		}
+		if (config.value) locale.value = config.value.language
 	},
 	{ immediate: true },
 )
diff --git a/frontend/app/src/backend/config.ts b/frontend/app/src/backend/config.ts
index 725feabd..a36ffaf9 100644
--- a/frontend/app/src/backend/config.ts
+++ b/frontend/app/src/backend/config.ts
@@ -57,3 +57,21 @@ export function useSaveTitle(isLoggedIn: Ref<boolean>) {
 		},
 	})
 }
+
+export function useSaveIsAdminVerificationNeeded(isLoggedIn: Ref<boolean>) {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: async (adminVerificationNeeded: boolean) => {
+			if (isLoggedIn)
+				return axios.post("/config/saveIsAdminNeeded", {
+					adminVerificationNeeded,
+				})
+		},
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["config", isLoggedIn.value],
+				refetchType: "all",
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/backend/registration.ts b/frontend/app/src/backend/registration.ts
index 872eeb0a..c8a37b46 100644
--- a/frontend/app/src/backend/registration.ts
+++ b/frontend/app/src/backend/registration.ts
@@ -13,7 +13,7 @@ export function useRegisterPlayer(
 				firstName: reg.firstName,
 				lastName: reg.lastName,
 				sex: reg.sex,
-				birthdate: dateToJson(reg.birthdate),
+				birthday: dateToJson(reg.birthday),
 				email: reg.email,
 				phone: reg.phone,
 			})
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
index 57897251..45e70762 100644
--- a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
@@ -43,13 +43,13 @@
 						<Calendar
 							show-icon
 							class="w-full"
-							v-bind="birthdate"
+							v-bind="birthday"
 							:manual-input="false"
 							:date-format="t('date_format')"
-							:class="{ 'p-invalid': errors.birthdate }"
+							:class="{ 'p-invalid': errors.birthday }"
 						/>
-						<InlineMessage v-if="errors.birthdate" class="mt-2"
-							>{{ t(errors.birthdate || "") }}
+						<InlineMessage v-if="errors.birthday" class="mt-2"
+							>{{ t(errors.birthday || "") }}
 						</InlineMessage>
 					</div>
 					<div class="field col-6">
@@ -151,7 +151,7 @@ const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
 				firstName: string().min(4).max(40).required(),
 				lastName: string().min(4).max(40).required(),
 				sex: mixed().oneOf(Object.values(Sex)).required(),
-				birthdate: date().required(),
+				birthday: date().required(),
 				email: string().max(100).email().required(),
 				phone: string()
 					.matches(phoneRegExp, t("ViewPlayerRegistration.phone.correct"))
@@ -164,7 +164,7 @@ const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
 const firstName = defineInputBinds("firstName")
 const lastName = defineInputBinds("lastName")
 const sex = defineComponentBinds("sex")
-const birthdate = defineComponentBinds("birthdate")
+const birthday = defineComponentBinds("birthday")
 const email = defineInputBinds("email")
 const phone = defineInputBinds("phone")
 
diff --git a/frontend/app/src/components/views/settings/SettingsGeneral.vue b/frontend/app/src/components/views/settings/SettingsGeneral.vue
index f5916e43..cf0862ba 100644
--- a/frontend/app/src/components/views/settings/SettingsGeneral.vue
+++ b/frontend/app/src/components/views/settings/SettingsGeneral.vue
@@ -3,8 +3,8 @@
 		<div class="flex flex-row">
 			<InputGroup>
 				<Dropdown v-model="loc" :options="availableLocales" />
-				<Button @click="() => saveLanguage(loc)"
-					>{{ t("settings.save_default") }}
+				<Button @click="() => saveLanguage(loc)">
+					{{ t("settings.save_default") }}
 				</Button>
 			</InputGroup>
 		</div>
@@ -15,33 +15,62 @@
 					:disabled="!config"
 					:placeholder="t('general.title')"
 				/>
-				<Button @click="() => saveTitle(title)"
-					>{{ t("settings.save_default") }}
+				<Button @click="() => saveTitle(title)">
+					{{ t("settings.save_default") }}
 				</Button>
 			</InputGroup>
 		</div>
+		<div
+			class="mt-2 flex w-full flex-row align-items-center justify-content-between"
+		>
+			<div class="flex flex-row align-items-center">
+				<span class="mr-1">
+					{{ t("settings.admin_needed") }}
+				</span>
+				<span
+					v-tooltip.bottom="t('settings.admin_needed_summary')"
+					class="material-symbols-outlined cursor-pointer"
+				>
+					help
+				</span>
+			</div>
+			<InputSwitch
+				v-model="adminNeeded"
+				@change="() => saveAdminNeeded(adminNeeded)"
+			>
+				{{ t("settings.save_default") }}
+			</InputSwitch>
+		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { useI18n } from "vue-i18n"
 import { inject, ref, watch } from "vue"
-import { getConfig, useSaveDefault, useSaveTitle } from "@/backend/config"
+import {
+	getConfig,
+	useSaveDefault,
+	useSaveIsAdminVerificationNeeded,
+	useSaveTitle,
+} from "@/backend/config"
 
 const { t, locale, availableLocales } = useI18n()
-const loc = ref(locale.value)
 const isLoggedIn = inject("loggedIn", ref(false))
 
 const { data: config } = getConfig(isLoggedIn)
 const { mutate: saveLanguage } = useSaveDefault(isLoggedIn)
 const { mutate: saveTitle } = useSaveTitle(isLoggedIn)
+const { mutate: saveAdminNeeded } = useSaveIsAdminVerificationNeeded(isLoggedIn)
+const loc = ref(locale.value)
 const title = ref("")
+const adminNeeded = ref(false)
 watch(
 	config,
 	() => {
 		if (config.value) {
 			if (config.value.title === "title") title.value = ""
 			else title.value = config.value.title
+			adminNeeded.value = config.value.adminVerificationNeeded
 		}
 	},
 	{ immediate: true },
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 0c9a2a09..38a83335 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -263,6 +263,8 @@
 	"settings": {
 		"save_default": "Als Standard speichern",
 		"verification": "Verifikation",
-		"no_unverified": "Es gibt aktuell keine unverifizierten Spieler"
+		"no_unverified": "Es gibt aktuell keine unverifizierten Spieler",
+		"admin_needed": "Verifikation durch Admin nötig",
+		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können."
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index c5820f72..fafa0f24 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -265,6 +265,8 @@
 	"settings": {
 		"save_default": "Save as default",
 		"verification": "Verification",
-		"no_unverified": "No unverified player"
+		"no_unverified": "No unverified player",
+		"admin_needed": "Admin verification needed",
+		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition"
 	}
 }
diff --git a/frontend/app/src/interfaces/config.ts b/frontend/app/src/interfaces/config.ts
index 4c9ba713..a9faca30 100644
--- a/frontend/app/src/interfaces/config.ts
+++ b/frontend/app/src/interfaces/config.ts
@@ -1,4 +1,5 @@
 export interface Config {
 	title: string
 	language: string
+	adminVerificationNeeded: boolean
 }
diff --git a/frontend/app/src/interfaces/player.ts b/frontend/app/src/interfaces/player.ts
index 19c67096..c24c6f70 100644
--- a/frontend/app/src/interfaces/player.ts
+++ b/frontend/app/src/interfaces/player.ts
@@ -36,7 +36,7 @@ export interface PlayerRegistration {
 	firstName: string
 	lastName: string
 	sex: Sex
-	birthdate: Date
+	birthday: Date
 	email: string
 	phone: string
 }

From a9caacf07ea421745d7d76987fab92c6901637f4 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sun, 29 Sep 2024 23:09:34 +0200
Subject: [PATCH 194/247] =?UTF-8?q?=E2=9C=A8=20Add=20simple=20user=20manag?=
 =?UTF-8?q?ement=20to=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |  4 ++
 .../turnierplaner/resources/UserResource.java | 63 +++++++++++++++++++
 .../jsonEntities/admin/jAdminRole.java        | 11 ++++
 .../jsonEntities/admin/jAdminUser.java        | 44 +++++++++++++
 .../src/main/resources/application.properties |  9 +++
 frontend/app/src/backend/user.ts              | 23 +++++++
 .../views/settings/SettingsUser.vue           | 37 +++++++++++
 .../views/settings/ViewSettings.vue           |  9 +++
 frontend/app/src/i18n/de.json                 |  3 +-
 frontend/app/src/i18n/en.json                 |  3 +-
 frontend/app/src/interfaces/user.ts           | 12 ++++
 11 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
 create mode 100644 frontend/app/src/backend/user.ts
 create mode 100644 frontend/app/src/components/views/settings/SettingsUser.vue
 create mode 100644 frontend/app/src/interfaces/user.ts

diff --git a/backend/pom.xml b/backend/pom.xml
index e9b92505..1a47581b 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -95,6 +95,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-jwt</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-admin-rest-client</artifactId>
+        </dependency>
 
         <!-- mail -->
         <dependency>
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
new file mode 100644
index 00000000..f04249ac
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
@@ -0,0 +1,63 @@
+package de.secretj12.turnierplaner.resources;
+
+import de.secretj12.turnierplaner.resources.jsonEntities.admin.jAdminRole;
+import de.secretj12.turnierplaner.resources.jsonEntities.admin.jAdminUser;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.keycloak.admin.client.Keycloak;
+import org.keycloak.representations.idm.GroupRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+
+import java.util.List;
+
+@Path("/user")
+@RolesAllowed("admin")
+public class UserResource {
+
+    @Inject
+    Keycloak keycloak;
+
+    @ConfigProperty(name = "turniperlaner.keycloak.realm")
+    String realm;
+
+    @GET
+    @Path("/list")
+    public List<jAdminUser> list() {
+        return keycloak.realm(realm).users().list().stream().map(u -> new jAdminUser(u, getRole(u)))
+            .toList();
+    }
+
+    @POST
+    @Path("/updateUser")
+    public String updateUser(jAdminUser user) {
+        var kUser = keycloak.realm(realm).users().get(user.getId());
+        var oldGroup = keycloak.realm(realm).getGroupByPath(getRole(kUser).label);
+        var newGroup = keycloak.realm(realm).getGroupByPath(user.getRole().label);
+        kUser.leaveGroup(oldGroup.getId());
+        kUser.joinGroup(newGroup.getId());
+        return "User updated";
+    }
+
+    private jAdminRole getRole(UserRepresentation user) {
+        return getRole(keycloak.realm(realm).users().get(user.getId()));
+    }
+
+    private jAdminRole getRole(org.keycloak.admin.client.resource.UserResource user) {
+        var groups = user.groups().stream().map(GroupRepresentation::getName).toList();
+        if (groups.contains("admin"))
+            return jAdminRole.ADMIN;
+        else if (groups.contains("director"))
+            return jAdminRole.DIRECTOR;
+        else if (groups.contains("reporter"))
+            return jAdminRole.REPORTER;
+        else if (groups.contains("user"))
+            return jAdminRole.USER;
+        else
+            throw new InternalServerErrorException("Invalid role");
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java
new file mode 100644
index 00000000..c737ec57
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java
@@ -0,0 +1,11 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.admin;
+
+public enum jAdminRole {
+    USER("user"), REPORTER("reporter"), DIRECTOR("director"), ADMIN("admin");
+
+    public final String label;
+
+    jAdminRole(String label) {
+        this.label = label;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
new file mode 100644
index 00000000..028b4e3e
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
@@ -0,0 +1,44 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.admin;
+
+import org.keycloak.representations.idm.UserRepresentation;
+
+public class jAdminUser {
+
+    private String id;
+    private String username;
+
+    private jAdminRole role;
+
+    public jAdminUser() {
+    }
+
+    public jAdminUser(UserRepresentation user, jAdminRole role) {
+        this.id = user.getId();
+        this.username = user.getUsername();
+        this.role = role;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public jAdminRole getRole() {
+        return role;
+    }
+
+    public void setRole(jAdminRole role) {
+        this.role = role;
+    }
+}
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 04dbc078..3a58c973 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -3,6 +3,15 @@ turnierplaner.club-name=title
 turnierplaner.language=de
 turnierplaner.registration.expire=30
 turnierplaner.admin-verification-needed=true
+turniperlaner.keycloak.realm=Quarkus
+
+# key cloak admin
+quarkus.keycloak.admin-client.server-url=http://localhost:7777
+
+quarkus.keycloak.admin-client.realm=Quarkus
+quarkus.keycloak.admin-client.client-id=backend-quarkus
+quarkus.keycloak.admin-client.client-secret=**********
+quarkus.keycloak.admin-client.grant-type=CLIENT_CREDENTIALS
 
 # network configuration
 quarkus.http.cors=true
diff --git a/frontend/app/src/backend/user.ts b/frontend/app/src/backend/user.ts
new file mode 100644
index 00000000..823b3627
--- /dev/null
+++ b/frontend/app/src/backend/user.ts
@@ -0,0 +1,23 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
+import axios from "axios"
+import { User } from "@/interfaces/user"
+
+export function getUsers() {
+	return useQuery({
+		queryKey: ["users"],
+		queryFn: async () =>
+			axios.get<User[]>(`/user/list`).then<User[]>((result) => result.data),
+	})
+}
+
+export function useUpdateUser() {
+	const queryClient = useQueryClient()
+	return useMutation({
+		mutationFn: (user: User) => axios.post(`/user/updateUser`, user),
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ["users"],
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/settings/SettingsUser.vue b/frontend/app/src/components/views/settings/SettingsUser.vue
new file mode 100644
index 00000000..9f7aa075
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsUser.vue
@@ -0,0 +1,37 @@
+<template>
+	<DataTable :value="users" striped-rows class="w-full mb-2" size="small">
+		<template #empty>
+			{{ t("settings.no_unverified") }}
+		</template>
+		<Column field="username" :header="t('general.name')" />
+		<Column field="role" header="Rolle">
+			<template #body="{ data }">
+				<Dropdown
+					v-model="data.role"
+					:options="options"
+					@change="(event) => updateRole(data, event.value)"
+				/>
+			</template>
+		</Column>
+	</DataTable>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n"
+import { getUsers, useUpdateUser } from "@/backend/user"
+import { Role, User } from "@/interfaces/user"
+import { ref } from "vue"
+
+const { t } = useI18n()
+
+const { data: users } = getUsers()
+const { mutate: updateUserRole } = useUpdateUser()
+
+const options = ref([Role.USER, Role.REPORTER, Role.DIRECTOR, Role.ADMIN])
+
+function updateRole(user: User, role: Role) {
+	updateUserRole({ id: user.id, username: user.username, role })
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 602e625e..10ecbe54 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -24,6 +24,14 @@
 				</template>
 			</Card>
 		</SettingsItem>
+		<SettingsItem v-if="isAdmin">
+			<Card>
+				<template #title>{{ t("settings.user") }}</template>
+				<template #content>
+					<SettingsUser />
+				</template>
+			</Card>
+		</SettingsItem>
 	</div>
 </template>
 
@@ -35,6 +43,7 @@ import SettingsGeneral from "@/components/views/settings/SettingsGeneral.vue"
 import { getIsAdmin, getIsDirector } from "@/backend/security"
 import { inject, ref } from "vue"
 import SettingsPlayerVerify from "@/components/views/settings/SettingsPlayerVerify.vue"
+import SettingsUser from "@/components/views/settings/SettingsUser.vue"
 
 const { t } = useI18n()
 
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 38a83335..0c2c5eca 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -265,6 +265,7 @@
 		"verification": "Verifikation",
 		"no_unverified": "Es gibt aktuell keine unverifizierten Spieler",
 		"admin_needed": "Verifikation durch Admin nötig",
-		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können."
+		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können.",
+		"user": "Benutzerverwaltung"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index fafa0f24..3bf0e0eb 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -267,6 +267,7 @@
 		"verification": "Verification",
 		"no_unverified": "No unverified player",
 		"admin_needed": "Admin verification needed",
-		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition"
+		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition",
+		"user": "User management"
 	}
 }
diff --git a/frontend/app/src/interfaces/user.ts b/frontend/app/src/interfaces/user.ts
new file mode 100644
index 00000000..a1855080
--- /dev/null
+++ b/frontend/app/src/interfaces/user.ts
@@ -0,0 +1,12 @@
+export enum Role {
+	USER = "USER",
+	REPORTER = "REPORTER",
+	DIRECTOR = "DIRECTOR",
+	ADMIN = "ADMIN",
+}
+
+export interface User {
+	id: string
+	username: string
+	role: Role
+}

From 353b1d6f2cd4f7babc81deb9042f83bf2f4cf588 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 30 Sep 2024 00:45:00 +0200
Subject: [PATCH 195/247] =?UTF-8?q?=F0=9F=94=A7=20Update=20keycloak=20conf?=
 =?UTF-8?q?ig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/keycloak_realm.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/keycloak_realm.json b/backend/src/main/resources/keycloak_realm.json
index 4e3b5447..8471fd38 100644
--- a/backend/src/main/resources/keycloak_realm.json
+++ b/backend/src/main/resources/keycloak_realm.json
@@ -705,7 +705,7 @@
       "standardFlowEnabled": true,
       "implicitFlowEnabled": false,
       "directAccessGrantsEnabled": false,
-      "serviceAccountsEnabled": false,
+      "serviceAccountsEnabled": true,
       "publicClient": false,
       "frontchannelLogout": false,
       "protocol": "openid-connect",
@@ -2550,6 +2550,10 @@
       "clientRoles": {
         "backend-quarkus": [
           "uma_protection"
+        ],
+        "realm-management": [
+          "manage-users",
+          "view-realm"
         ]
       },
       "notBefore": 0,

From dad9a2744451e460afa8373e4aa54a792d59c12d Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 30 Sep 2024 00:47:26 +0200
Subject: [PATCH 196/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Add=20paginator=20?=
 =?UTF-8?q?for=20user=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/views/settings/SettingsUser.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/components/views/settings/SettingsUser.vue b/frontend/app/src/components/views/settings/SettingsUser.vue
index 9f7aa075..30c76b37 100644
--- a/frontend/app/src/components/views/settings/SettingsUser.vue
+++ b/frontend/app/src/components/views/settings/SettingsUser.vue
@@ -1,5 +1,13 @@
 <template>
-	<DataTable :value="users" striped-rows class="w-full mb-2" size="small">
+	<DataTable
+		v-if="users"
+		:value="users"
+		:paginator="users.length > 5"
+		:rows="5"
+		striped-rows
+		class="w-full mb-2"
+		size="small"
+	>
 		<template #empty>
 			{{ t("settings.no_unverified") }}
 		</template>

From ab6fe6e0591e50451c4beeddef17f4ccf6078208 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 30 Sep 2024 13:01:13 +0200
Subject: [PATCH 197/247] =?UTF-8?q?=E2=9C=A8=20Start=20player=20management?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/PlayerRepository.java     |  8 +-
 .../resources/PlayerResource.java             | 47 ++++++++---
 .../director/jDirectorPlayer.java             | 29 +++++++
 frontend/app/src/backend/player.ts            | 80 ++++++++-----------
 .../competition/signup/ViewSignUpForm.vue     | 12 +--
 .../views/prepare/editTeams/AddPlayer.vue     |  7 +-
 .../views/settings/SettingsPlayer.vue         | 23 ++++++
 .../views/settings/ViewSettings.vue           |  9 +++
 frontend/app/src/i18n/de.json                 |  6 +-
 frontend/app/src/i18n/en.json                 |  6 +-
 10 files changed, 154 insertions(+), 73 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
 create mode 100644 frontend/app/src/components/views/settings/SettingsPlayer.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index 08fdc771..119742cc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -4,8 +4,8 @@
 import de.secretj12.turnierplaner.db.entities.SexType;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
-
 import jakarta.enterprise.context.ApplicationScoped;
+
 import java.time.LocalDate;
 import java.util.UUID;
 import java.util.stream.Stream;
@@ -22,10 +22,10 @@ public Player getByName(String first_name, String last_name) {
         return find("FROM Player p WHERE p.firstName = :firstName and p.lastName = :lastName", Parameters
             .with("firstName", first_name)
             .and("lastName", last_name))
-                .firstResultOptional().orElse(null);
+            .firstResultOptional().orElse(null);
     }
 
-    public Stream<Player> filter(String search, SexType sex, LocalDate minAge, LocalDate maxAge, boolean admin) {
+    public Stream<Player> filter(String search, SexType sex, LocalDate minAge, LocalDate maxAge, boolean admin, int page, int pageSize) {
         return find("#filter", Parameters
             .with("search", search)
             .and("admin", admin)
@@ -35,7 +35,7 @@ public Stream<Player> filter(String search, SexType sex, LocalDate minAge, Local
             .and("ignoreMinAge", minAge == null)
             .and("maxAge", maxAge)
             .and("ignoreMaxAge", maxAge == null))
-                .page(0, 10).stream();
+            .page(page, pageSize).stream();
     }
 
     public Stream<Player> adminUnverified() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index af06bf6d..31a7a576 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -5,6 +5,8 @@
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.SexType;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
@@ -31,6 +33,8 @@
 
 @Path("/player")
 public class PlayerResource {
+    @Inject
+    CompetitionRepository competitionRepository;
     @Inject
     PlayerRepository playerRepository;
     @Inject
@@ -48,19 +52,28 @@ public class PlayerResource {
     public int expire;
 
     @GET
-    @Path("/find")
+    @Path("/compFind/{tourId}/{compId}/")
     @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryParam("sex") jUserSex sex,
-                                        @QueryParam("minAge") @JsonFormat(pattern = "yyyy-MM-dd") String minAgeS,
-                                        @QueryParam("maxAge") @JsonFormat(pattern = "yyyy-MM-dd") String maxAgeS) {
-        // TODO instead of filtering by params of client, better filter by given competition, prevents leak of birthday
-        // TODO only return verified accounts (except for admins)
-        LocalDate minAge = minAgeS != null ? LocalDate.parse(minAgeS) : null;
-        LocalDate maxAge = maxAgeS != null ? LocalDate.parse(maxAgeS) : null;
-
-        SexType dbSex = sex == null ? null : switch (sex) {
+    public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
+                                            @QueryParam("search") String search,
+                                            @DefaultValue("false") @QueryParam("playerB") boolean playerB) {
+        Competition competition = competitionRepository.getByName(tourId, compId);
+        if (competition == null)
+            throw new BadRequestException("Invalid competition");
+
+        LocalDate minAge =
+            playerB ?
+                (competition.playerBhasMinAge() ? competition.getPlayerBminAge() : null)
+                : (competition.playerAhasMinAge() ? competition.getPlayerAminAge() : null);
+        LocalDate maxAge =
+            playerB ?
+                (competition.playerBhasMaxAge() ? competition.getPlayerBmaxAge() : null)
+                : (competition.playerAhasMaxAge() ? competition.getPlayerAmaxAge() : null);
+
+        SexType dbSex = switch (playerB ? competition.getPlayerBSex() : competition.getPlayerASex()) {
             case MALE -> SexType.MALE;
             case FEMALE -> SexType.FEMALE;
+            case ANY -> null;
         };
         if (search.isEmpty()) {
             return List.of();
@@ -68,7 +81,17 @@ public List<jUserPlayer> listPlayer(@QueryParam("search") String search, @QueryP
 
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         boolean admin = securityIdentity.hasRole("director") || !defConfig.isAdminVerificationNeeded();
-        return playerRepository.filter(search, dbSex, minAge, maxAge, admin).map(jUserPlayer::new).toList();
+        return playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).map(jUserPlayer::new).toList();
+    }
+
+    @GET
+    @Path("/find")
+    @RolesAllowed("director")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<jUserPlayer> listPlayer(@QueryParam("search") String search,
+                                        @DefaultValue("0") @QueryParam("page") int page,
+                                        @DefaultValue("5") @QueryParam("pageSize") int pageSize) {
+        return playerRepository.filter(search, null, null, null, true, page, pageSize).map(jUserPlayer::new).toList();
     }
 
     @GET
@@ -100,7 +123,7 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         if (exPlayer != null &&
             (exPlayer.getVerificationCode() == null
                 || (exPlayer.getVerificationCode() != null && exPlayer.getVerificationCode().getExpirationDate()
-                    .isBefore(Instant.now()))))
+                                                                      .isBefore(Instant.now()))))
             throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
 
         // TODO check phone number (only valid phone number)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
new file mode 100644
index 00000000..8102748a
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
@@ -0,0 +1,29 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.director;
+
+import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSex;
+
+import java.util.UUID;
+
+public class jDirectorPlayer extends jUserPlayer {
+
+    private jUserSex sex;
+    
+    public jDirectorPlayer(UUID id, String firstName, String lastName, SexType sex) {
+        super(id, firstName, lastName);
+    }
+
+    public jDirectorPlayer(Player p) {
+        super(p);
+    }
+
+    public jUserSex getSex() {
+        return sex;
+    }
+
+    public void setSex(jUserSex sex) {
+        this.sex = sex;
+    }
+}
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 940aa985..e30c2482 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -1,4 +1,3 @@
-import { Competition, Sex } from "@/interfaces/competition"
 import axios from "axios"
 import {
 	Player,
@@ -11,63 +10,54 @@ import { computed, Ref } from "vue"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { RouteLocationNormalizedLoaded } from "vue-router"
 
-export interface searchPlayer {
-	sex: Sex
-	hasMinAge: boolean
-	minAge: Date | null
-	hasMaxAge: boolean
-	maxAge: Date | null
-}
-
-export function extractSearchPlayer(
-	competition: Ref<Competition> | Ref<undefined>,
+export function findCompPlayers(
+	search: Ref<string>,
+	route: RouteLocationNormalizedLoaded,
 	playerB: boolean,
-): Ref<searchPlayer> {
-	return computed(() => {
-		if (!competition.value) {
-			return {
-				sex: Sex.ANY,
-				hasMinAge: false,
-				minAge: null,
-				hasMaxAge: false,
-				maxAge: null,
-			}
-		}
-
-		const player = playerB
-			? competition.value.playerB
-			: competition.value.playerA
-		return {
-			sex: player.sex,
-			hasMinAge: player.hasMinAge,
-			minAge: player.minAge,
-			hasMaxAge: player.hasMaxAge,
-			maxAge: player.maxAge,
-		}
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useQuery({
+		queryKey: [
+			"searchPlayer",
+			search,
+			computed(() => route.params.tourId),
+			computed(() => route.params.compId),
+		],
+		queryFn: async () => {
+			return axios
+				.get<PlayerServer[]>(
+					`/player/compFind/${route.params.tourId}/${route.params.compId}?search=${search.value.toLowerCase()}` +
+						`playerB=${playerB}`,
+				)
+				.then<Player[]>((result) => result.data.map(playerServerToClient))
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("ViewCompetition.query_search_failed"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
+				})
+		},
 	})
 }
 
 export function findPlayers(
 	search: Ref<string>,
-	searchPlayer: Ref<searchPlayer>,
+	page: Ref<number>,
+	pageSize: Ref<number>,
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
 	return useQuery({
-		queryKey: ["searchPlayer", search, searchPlayer],
+		queryKey: ["searchPlayer", search],
 		queryFn: async () => {
 			return axios
 				.get<PlayerServer[]>(
-					`/player/find?search=${search.value.toLowerCase()}` +
-						(searchPlayer.value.sex !== Sex.ANY
-							? `&sex=${searchPlayer.value.sex}`
-							: "") +
-						(searchPlayer.value.hasMinAge && searchPlayer.value.minAge !== null
-							? `&minAge=${searchPlayer.value.minAge.toISOString().slice(0, 10)}`
-							: "") +
-						(searchPlayer.value.hasMaxAge && searchPlayer.value.maxAge !== null
-							? `&maxAge=${searchPlayer.value.maxAge.toISOString().slice(0, 10)}`
-							: ""),
+					`/player/find?search=${search.value.toLowerCase()}&page=${page.value}&pageSize=${pageSize.value}`,
 				)
 				.then<Player[]>((result) => result.data.map(playerServerToClient))
 				.catch((error) => {
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
index 17ff1206..3521ec5c 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
@@ -220,7 +220,7 @@ import {
 	useSignUpSingle,
 } from "@/backend/competition"
 import { useQueryClient } from "@tanstack/vue-query"
-import { extractSearchPlayer, findPlayers } from "@/backend/player"
+import { findCompPlayers } from "@/backend/player"
 
 const { t } = useI18n()
 const toast = useToast()
@@ -232,17 +232,19 @@ const { data: competition } = getCompetitionDetails(route, t, toast)
 
 const selectedPlayerA = ref<Player | null>(null)
 const searchA = ref<string>("")
-const { data: suggestionsPlayerA, isFetching: loadingA } = findPlayers(
+const { data: suggestionsPlayerA, isFetching: loadingA } = findCompPlayers(
 	searchA,
-	extractSearchPlayer(competition, false),
+	route,
+	false,
 	t,
 	toast,
 )
 const selectedPlayerB = ref<Player | null>(null)
 const searchB = ref<string>("")
-const { data: suggestionsPlayerB, isFetching: loadingB } = findPlayers(
+const { data: suggestionsPlayerB, isFetching: loadingB } = findCompPlayers(
 	searchB,
-	extractSearchPlayer(competition, true),
+	route,
+	true,
 	t,
 	toast,
 )
diff --git a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
index f0c37433..b35cba31 100644
--- a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
+++ b/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
@@ -40,7 +40,7 @@ import { Player } from "@/interfaces/player"
 import { Mode } from "@/interfaces/competition"
 import { ref } from "vue"
 import { useToast } from "primevue/usetoast"
-import { extractSearchPlayer, findPlayers } from "@/backend/player"
+import { findCompPlayers } from "@/backend/player"
 import { getCompetitionDetails } from "@/backend/competition"
 import { useRoute } from "vue-router"
 import { getTournamentDetails } from "@/backend/tournament"
@@ -58,9 +58,10 @@ const { data: tournament } = getTournamentDetails(route, t, toast)
 const { data: competition } = getCompetitionDetails(route, t, toast)
 const selectedPlayer = ref<Player | null>(null)
 const search = ref<string>("")
-const { data: suggestionsPlayer, isFetching: loading } = findPlayers(
+const { data: suggestionsPlayer, isFetching: loading } = findCompPlayers(
 	search,
-	extractSearchPlayer(competition, false),
+	route,
+	false,
 	t,
 	toast,
 )
diff --git a/frontend/app/src/components/views/settings/SettingsPlayer.vue b/frontend/app/src/components/views/settings/SettingsPlayer.vue
new file mode 100644
index 00000000..d602f873
--- /dev/null
+++ b/frontend/app/src/components/views/settings/SettingsPlayer.vue
@@ -0,0 +1,23 @@
+<template>
+	<DataTable :value="player" size="small">
+		<Column field="name" :header="t('general.name')" />
+		<Column field="sex" :header="t('general.sex')" />
+	</DataTable>
+</template>
+
+<script setup lang="ts">
+import { findPlayers } from "@/backend/player"
+import { ref } from "vue"
+import { useToast } from "primevue/usetoast"
+import { useI18n } from "vue-i18n"
+
+const { t } = useI18n()
+const toast = useToast()
+
+const search = ref("")
+const page = ref(0)
+const pageSize = ref(0)
+const { data: player } = findPlayers(search, page, pageSize, t, toast)
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/frontend/app/src/components/views/settings/ViewSettings.vue
index 10ecbe54..2ce0b7f5 100644
--- a/frontend/app/src/components/views/settings/ViewSettings.vue
+++ b/frontend/app/src/components/views/settings/ViewSettings.vue
@@ -32,6 +32,14 @@
 				</template>
 			</Card>
 		</SettingsItem>
+		<SettingsItem v-if="isDirector">
+			<Card>
+				<template #title>{{ t("settings.player") }}</template>
+				<template #content>
+					<SettingsPlayer />
+				</template>
+			</Card>
+		</SettingsItem>
 	</div>
 </template>
 
@@ -44,6 +52,7 @@ import { getIsAdmin, getIsDirector } from "@/backend/security"
 import { inject, ref } from "vue"
 import SettingsPlayerVerify from "@/components/views/settings/SettingsPlayerVerify.vue"
 import SettingsUser from "@/components/views/settings/SettingsUser.vue"
+import SettingsPlayer from "@/components/views/settings/SettingsPlayer.vue"
 
 const { t } = useI18n()
 
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 0c2c5eca..e0f8327d 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -41,7 +41,8 @@
 		"any": "Beliebig",
 		"filter_by_name": "Nach Name filtern",
 		"from": "Von",
-		"to": "Bis"
+		"to": "Bis",
+		"sex": "Geschlecht"
 	},
 	"DialogUpdateScore": {
 		"header": "Punkte Eintragung",
@@ -266,6 +267,7 @@
 		"no_unverified": "Es gibt aktuell keine unverifizierten Spieler",
 		"admin_needed": "Verifikation durch Admin nötig",
 		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können.",
-		"user": "Benutzerverwaltung"
+		"user": "Benutzerverwaltung",
+		"player": "Spielerverwaltung"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 3bf0e0eb..211ab882 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -41,7 +41,8 @@
 		"any": "Any",
 		"filter_by_name": "Filter by name",
 		"from": "From",
-		"to": "To"
+		"to": "To",
+		"sex": "Sex"
 	},
 	"DialogUpdateScore": {
 		"header": "Score Update",
@@ -268,6 +269,7 @@
 		"no_unverified": "No unverified player",
 		"admin_needed": "Admin verification needed",
 		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition",
-		"user": "User management"
+		"user": "User management",
+		"player": "Player management"
 	}
 }

From 742c456c7e2d98106156d82cdb8551da344b70ea Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 30 Sep 2024 13:09:37 +0200
Subject: [PATCH 198/247] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20player=20sex=20?=
 =?UTF-8?q?entities?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Player.java     |  8 ++--
 .../db/entities/{SexType.java => Sex.java}    |  2 +-
 .../db/entities/competition/Competition.java  | 20 ++++----
 .../competition/{Sex.java => SexFilter.java}  |  2 +-
 .../db/repositories/PlayerRepository.java     |  9 ++--
 .../resources/CompetitionResource.java        | 10 ++--
 .../resources/PlayerResource.java             | 30 +++++-------
 .../competition/jDirectorCompetitionAdd.java  | 12 ++---
 .../director/jDirectorPlayer.java             |  6 +--
 .../startup/testdata/CompetitionSettings.java | 12 ++---
 .../startup/testdata/TestdataGenerator.java   | 46 +++++++++----------
 .../model/TestDeletionBehaviour.java          |  2 +-
 .../resources/TestCompetitionResource.java    | 42 ++++++++---------
 .../resources/TestMatchResource.java          |  8 ++--
 .../resources/TestPlayerResource.java         | 12 ++---
 .../turnierplaner/tools/TestGroupTools.java   |  2 +-
 .../tools/TestKnockoutTools.java              |  2 +-
 17 files changed, 110 insertions(+), 115 deletions(-)
 rename backend/src/main/java/de/secretj12/turnierplaner/db/entities/{SexType.java => Sex.java} (75%)
 rename backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/{Sex.java => SexFilter.java} (77%)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index 2b6846b1..a1a5a66b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -42,7 +42,7 @@ public class Player {
     private String lastName;
 
     @Column(name = "sex")
-    private SexType sex;
+    private Sex sex;
 
     @Column(name = "birthday")
     private LocalDate birthday;
@@ -65,7 +65,7 @@ public class Player {
     public Player() {
     }
 
-    public Player(String firstName, String lastName, SexType sex, LocalDate birthday, String email, String phone,
+    public Player(String firstName, String lastName, Sex sex, LocalDate birthday, String email, String phone,
                   boolean mailVerified, boolean adminVerified) {
         this.firstName = firstName;
         this.lastName = lastName;
@@ -109,11 +109,11 @@ public void setBirthday(LocalDate birthday) {
         this.birthday = birthday;
     }
 
-    public SexType getSex() {
+    public Sex getSex() {
         return sex;
     }
 
-    public void setSex(SexType sex) {
+    public void setSex(Sex sex) {
         this.sex = sex;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/SexType.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
similarity index 75%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/SexType.java
rename to backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
index 346734ca..96223d72 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/SexType.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
@@ -1,5 +1,5 @@
 package de.secretj12.turnierplaner.db.entities;
 
-public enum SexType {
+public enum Sex {
     MALE, FEMALE
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index e4850ed2..f6ea75c2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -53,7 +53,7 @@ public class Competition {
     private NumberSets numberSets;
 
     @Column(name = "playerA_sex", nullable = false)
-    private Sex playerASex;
+    private SexFilter playerASexFilter;
     @Column(name = "playerA_has_min_age")
     private boolean playerAhasMinAge;
     @Column(name = "playerA_min_age")
@@ -66,7 +66,7 @@ public class Competition {
     @Column(name = "playerB_different")
     private boolean playerBdifferent;
     @Column(name = "playerB_sex")
-    private Sex playerBSex;
+    private SexFilter playerBSexFilter;
     @Column(name = "playerB_has_min_age")
     private boolean playerBhasMinAge;
     @Column(name = "playerB_min_age")
@@ -179,12 +179,12 @@ public void setSignup(CompetitionSignUp signup) {
         this.signup = signup;
     }
 
-    public Sex getPlayerASex() {
-        return playerASex;
+    public SexFilter getPlayerASex() {
+        return playerASexFilter;
     }
 
-    public void setPlayerASex(Sex playerASex) {
-        this.playerASex = playerASex;
+    public void setPlayerASex(SexFilter playerASexFilter) {
+        this.playerASexFilter = playerASexFilter;
     }
 
     public boolean playerAhasMinAge() {
@@ -227,12 +227,12 @@ public void setPlayerBdifferent(boolean playerBequalsA) {
         this.playerBdifferent = playerBequalsA;
     }
 
-    public Sex getPlayerBSex() {
-        return playerBSex;
+    public SexFilter getPlayerBSex() {
+        return playerBSexFilter;
     }
 
-    public void setPlayerBSex(Sex playerBSex) {
-        this.playerBSex = playerBSex;
+    public void setPlayerBSex(SexFilter playerBSexFilter) {
+        this.playerBSexFilter = playerBSexFilter;
     }
 
     public boolean playerBhasMinAge() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Sex.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
similarity index 77%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Sex.java
rename to backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
index 4da72c97..6b05808f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Sex.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
@@ -1,5 +1,5 @@
 package de.secretj12.turnierplaner.db.entities.competition;
 
-public enum Sex {
+public enum SexFilter {
     MALE, FEMALE, ANY
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index 119742cc..aa21bb44 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.db.repositories;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -22,10 +22,11 @@ public Player getByName(String first_name, String last_name) {
         return find("FROM Player p WHERE p.firstName = :firstName and p.lastName = :lastName", Parameters
             .with("firstName", first_name)
             .and("lastName", last_name))
-            .firstResultOptional().orElse(null);
+                .firstResultOptional().orElse(null);
     }
 
-    public Stream<Player> filter(String search, SexType sex, LocalDate minAge, LocalDate maxAge, boolean admin, int page, int pageSize) {
+    public Stream<Player> filter(String search, Sex sex, LocalDate minAge, LocalDate maxAge, boolean admin, int page,
+                                 int pageSize) {
         return find("#filter", Parameters
             .with("search", search)
             .and("admin", admin)
@@ -35,7 +36,7 @@ public Stream<Player> filter(String search, SexType sex, LocalDate minAge, Local
             .and("ignoreMinAge", minAge == null)
             .and("maxAge", maxAge)
             .and("ignoreMaxAge", maxAge == null))
-            .page(page, pageSize).stream();
+                .page(page, pageSize).stream();
     }
 
     public Stream<Player> adminUnverified() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index e52bd8a0..970f3321 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
@@ -373,15 +373,15 @@ public String updateTeams(@PathParam("tourName") String tourName, @PathParam("co
     }
 
     private boolean conditionsFailA(Competition comp, Player player) {
-        return (comp.getPlayerASex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-            || (comp.getPlayerASex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+        return (comp.getPlayerASex() == SexFilter.FEMALE && player.getSex() == Sex.MALE)
+            || (comp.getPlayerASex() == SexFilter.MALE && player.getSex() == Sex.FEMALE)
             || (comp.playerAhasMinAge() && comp.getPlayerAminAge().isBefore(player.getBirthday()))
             || (comp.playerAhasMaxAge() && comp.getPlayerAmaxAge().isAfter(player.getBirthday()));
     }
 
     private boolean conditionsFailB(Competition comp, Player player) {
-        return (comp.getPlayerBSex() == Sex.FEMALE && player.getSex() == SexType.MALE)
-            || (comp.getPlayerBSex() == Sex.MALE && player.getSex() == SexType.FEMALE)
+        return (comp.getPlayerBSex() == SexFilter.FEMALE && player.getSex() == Sex.MALE)
+            || (comp.getPlayerBSex() == SexFilter.MALE && player.getSex() == Sex.FEMALE)
             || (comp.playerBhasMinAge() && comp.getPlayerBminAge().isBefore(player.getBirthday()))
             || (comp.playerBhasMaxAge() && comp.getPlayerBmaxAge().isAfter(player.getBirthday()));
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 31a7a576..5fafc7dc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -1,9 +1,8 @@
 package de.secretj12.turnierplaner.resources;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import de.secretj12.turnierplaner.db.entities.DefaultConfig;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
@@ -12,7 +11,6 @@
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSex;
 import io.quarkus.mailer.Mailer;
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -61,18 +59,14 @@ public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @Pat
         if (competition == null)
             throw new BadRequestException("Invalid competition");
 
-        LocalDate minAge =
-            playerB ?
-                (competition.playerBhasMinAge() ? competition.getPlayerBminAge() : null)
-                : (competition.playerAhasMinAge() ? competition.getPlayerAminAge() : null);
-        LocalDate maxAge =
-            playerB ?
-                (competition.playerBhasMaxAge() ? competition.getPlayerBmaxAge() : null)
-                : (competition.playerAhasMaxAge() ? competition.getPlayerAmaxAge() : null);
-
-        SexType dbSex = switch (playerB ? competition.getPlayerBSex() : competition.getPlayerASex()) {
-            case MALE -> SexType.MALE;
-            case FEMALE -> SexType.FEMALE;
+        LocalDate minAge = playerB ? (competition.playerBhasMinAge() ? competition
+            .getPlayerBminAge() : null) : (competition.playerAhasMinAge() ? competition.getPlayerAminAge() : null);
+        LocalDate maxAge = playerB ? (competition.playerBhasMaxAge() ? competition
+            .getPlayerBmaxAge() : null) : (competition.playerAhasMaxAge() ? competition.getPlayerAmaxAge() : null);
+
+        Sex dbSex = switch (playerB ? competition.getPlayerBSex() : competition.getPlayerASex()) {
+            case MALE -> Sex.MALE;
+            case FEMALE -> Sex.FEMALE;
             case ANY -> null;
         };
         if (search.isEmpty()) {
@@ -123,7 +117,7 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         if (exPlayer != null &&
             (exPlayer.getVerificationCode() == null
                 || (exPlayer.getVerificationCode() != null && exPlayer.getVerificationCode().getExpirationDate()
-                                                                      .isBefore(Instant.now()))))
+                    .isBefore(Instant.now()))))
             throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
 
         // TODO check phone number (only valid phone number)
@@ -134,8 +128,8 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         newPlayer.setBirthday(playerForm.getBirthday());
         if (playerForm.getSex() == null) throw new BadRequestException("Sex is null");
         switch (playerForm.getSex()) {
-            case MALE -> newPlayer.setSex(SexType.MALE);
-            case FEMALE -> newPlayer.setSex(SexType.FEMALE);
+            case MALE -> newPlayer.setSex(Sex.MALE);
+            case FEMALE -> newPlayer.setSex(Sex.FEMALE);
         }
         newPlayer.setEmail(playerForm.getEmail());
         newPlayer.setPhone(playerForm.getPhone());
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
index d6449c54..09d068cc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
@@ -33,9 +33,9 @@ public void toDB(Competition competition) {
             case TOGETHER -> competition.setSignup(CompetitionSignUp.TOGETHER);
         }
         switch (getPlayerA().getSex()) {
-            case MALE -> competition.setPlayerASex(Sex.MALE);
-            case FEMALE -> competition.setPlayerASex(Sex.FEMALE);
-            case ANY -> competition.setPlayerASex(Sex.ANY);
+            case MALE -> competition.setPlayerASex(SexFilter.MALE);
+            case FEMALE -> competition.setPlayerASex(SexFilter.FEMALE);
+            case ANY -> competition.setPlayerASex(SexFilter.ANY);
         }
         competition.setPlayerAhasMinAge(getPlayerA().isHasMinAge());
         competition.setPlayerAminAge(getPlayerA().getMinAge());
@@ -43,9 +43,9 @@ public void toDB(Competition competition) {
         competition.setPlayerAmaxAge(getPlayerA().getMaxAge());
         competition.setPlayerBdifferent(getPlayerB().isDifferent());
         switch (getPlayerB().getSex()) {
-            case MALE -> competition.setPlayerBSex(Sex.MALE);
-            case FEMALE -> competition.setPlayerBSex(Sex.FEMALE);
-            case ANY -> competition.setPlayerBSex(Sex.ANY);
+            case MALE -> competition.setPlayerBSex(SexFilter.MALE);
+            case FEMALE -> competition.setPlayerBSex(SexFilter.FEMALE);
+            case ANY -> competition.setPlayerBSex(SexFilter.ANY);
         }
         competition.setPlayerBhasMinAge(getPlayerB().isHasMinAge());
         competition.setPlayerBminAge(getPlayerB().getMinAge());
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
index 8102748a..ef63eedb 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSex;
 
@@ -10,8 +10,8 @@
 public class jDirectorPlayer extends jUserPlayer {
 
     private jUserSex sex;
-    
-    public jDirectorPlayer(UUID id, String firstName, String lastName, SexType sex) {
+
+    public jDirectorPlayer(UUID id, String firstName, String lastName, Sex sex) {
         super(id, firstName, lastName);
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
index de3fe515..f7ec345f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
@@ -2,13 +2,13 @@
 
 import de.secretj12.turnierplaner.db.entities.competition.CompetitionMode;
 import de.secretj12.turnierplaner.db.entities.competition.CompetitionType;
-import de.secretj12.turnierplaner.db.entities.competition.Sex;
+import de.secretj12.turnierplaner.db.entities.competition.SexFilter;
 
 class CompetitionSettings {
     private String name;
     private CompetitionType competitionType;
     private CompetitionMode competitionMode;
-    private Sex sex;
+    private SexFilter sexFilter;
     private int teamNumbers;
     private boolean registerIndividual;
     private AGE_RESTR ageRestr;
@@ -16,12 +16,12 @@ class CompetitionSettings {
     private int numberOfGroups;
 
     public CompetitionSettings(String description, CompetitionType competitionType, CompetitionMode competitionMode,
-                               Sex sex, int playerNumbers, boolean registerIndividual, AGE_RESTR ageRestr,
+                               SexFilter sexFilter, int playerNumbers, boolean registerIndividual, AGE_RESTR ageRestr,
                                boolean differentConditions, int numberOfGroups) {
         this.name = description;
         this.competitionType = competitionType;
         this.competitionMode = competitionMode;
-        this.sex = sex;
+        this.sexFilter = sexFilter;
         this.teamNumbers = playerNumbers;
         this.registerIndividual = registerIndividual;
         this.ageRestr = ageRestr;
@@ -41,8 +41,8 @@ public CompetitionMode getCompetitionMode() {
         return competitionMode;
     }
 
-    public Sex getSex() {
-        return sex;
+    public SexFilter getSex() {
+        return sexFilter;
     }
 
     public int getTeamNumbers() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 9a47b267..9d955f9c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -67,13 +67,13 @@ public void generateData() {
 
         List<CompetitionSettings> compSetting = new ArrayList<>();
         // @formatter:off
-        compSetting.add(new CompetitionSettings("Single Groups", CompetitionType.GROUPS, CompetitionMode.SINGLES, Sex.MALE, 8, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Single U18", CompetitionType.GROUPS, CompetitionMode.SINGLES, Sex.MALE, 8, false, AGE_RESTR.U18, false, 2));
-        compSetting.add(new CompetitionSettings("Single Knockout", CompetitionType.KNOCKOUT, CompetitionMode.SINGLES, Sex.MALE, 16, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, Sex.MALE, 16, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double random", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, Sex.ANY, 32, true, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double O50", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, Sex.ANY, 8, false, AGE_RESTR.O50, true, 2));
-        compSetting.add(new CompetitionSettings("Double Mixed", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, Sex.ANY, 4, true, AGE_RESTR.O50, true, 2));
+        compSetting.add(new CompetitionSettings("Single Groups", CompetitionType.GROUPS, CompetitionMode.SINGLES, SexFilter.MALE, 8, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Single U18", CompetitionType.GROUPS, CompetitionMode.SINGLES, SexFilter.MALE, 8, false, AGE_RESTR.U18, false, 2));
+        compSetting.add(new CompetitionSettings("Single Knockout", CompetitionType.KNOCKOUT, CompetitionMode.SINGLES, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double random", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 32, true, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double O50", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 8, false, AGE_RESTR.O50, true, 2));
+        compSetting.add(new CompetitionSettings("Double Mixed", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 4, true, AGE_RESTR.O50, true, 2));
         // @formatter:on
 
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2026", "Anmeldung ausstehend", true,
@@ -238,10 +238,10 @@ private Team[] createTeams(Competition competition, CompetitionSettings competit
         Team[] teams = new Team[competitionSettings.getTeamNumbers()];
         for (int i = 0; i < competitionSettings.getTeamNumbers(); i++) {
             Player player = createPlayer(competitionSettings.getAgeRestr());
-            if (competitionSettings.getSex() == Sex.ANY) {
-                player.setSex(SexType.MALE);
+            if (competitionSettings.getSex() == SexFilter.ANY) {
+                player.setSex(Sex.MALE);
             } else {
-                player.setSex(SexType.FEMALE);
+                player.setSex(Sex.FEMALE);
             }
             players.persist(player);
 
@@ -251,10 +251,10 @@ private Team[] createTeams(Competition competition, CompetitionSettings competit
 
             if (competitionSettings.getCompetitionMode() == CompetitionMode.DOUBLES) {
                 Player player2 = createPlayer(competitionSettings.getAgeRestr());
-                if (competitionSettings.getSex() == Sex.ANY || competitionSettings.getSex() == Sex.FEMALE) {
-                    player2.setSex(SexType.FEMALE);
+                if (competitionSettings.getSex() == SexFilter.ANY || competitionSettings.getSex() == SexFilter.FEMALE) {
+                    player2.setSex(Sex.FEMALE);
                 } else {
-                    player2.setSex(SexType.FEMALE);
+                    player2.setSex(Sex.FEMALE);
                 }
                 players.persist(player2);
                 teams[i].setPlayerB(player2);
@@ -462,13 +462,13 @@ private void addCompetition(Tournament t, TDate tDate,
                 switch (compSetting.getSex()) {
                     case ANY -> throw new RuntimeException();
                     case MALE -> {
-                        competition.setPlayerASex(Sex.MALE);
-                        competition.setPlayerBSex(Sex.MALE);
+                        competition.setPlayerASex(SexFilter.MALE);
+                        competition.setPlayerBSex(SexFilter.MALE);
                         competition.setDescription("Herren-Konkurrenz");
                     }
                     case FEMALE -> {
-                        competition.setPlayerASex(Sex.FEMALE);
-                        competition.setPlayerBSex(Sex.FEMALE);
+                        competition.setPlayerASex(SexFilter.FEMALE);
+                        competition.setPlayerBSex(SexFilter.FEMALE);
                         competition.setDescription("Damen-Konkurrenz");
                     }
                 }
@@ -495,16 +495,16 @@ private void addCompetition(Tournament t, TDate tDate,
                 }
                 switch (compSetting.getSex()) {
                     case ANY -> {
-                        competition.setPlayerASex(Sex.MALE);
-                        competition.setPlayerBSex(Sex.FEMALE);
+                        competition.setPlayerASex(SexFilter.MALE);
+                        competition.setPlayerBSex(SexFilter.FEMALE);
                     }
                     case MALE -> {
-                        competition.setPlayerASex(Sex.MALE);
-                        competition.setPlayerBSex(Sex.MALE);
+                        competition.setPlayerASex(SexFilter.MALE);
+                        competition.setPlayerBSex(SexFilter.MALE);
                     }
                     case FEMALE -> {
-                        competition.setPlayerASex(Sex.FEMALE);
-                        competition.setPlayerBSex(Sex.FEMALE);
+                        competition.setPlayerASex(SexFilter.FEMALE);
+                        competition.setPlayerBSex(SexFilter.FEMALE);
                     }
                 }
             }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
index 10a4c035..04d50d8e 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -60,7 +60,7 @@ public void addData() {
         comp.setMode(CompetitionMode.DOUBLES);
         comp.setType(CompetitionType.GROUPS);
         comp.setSignup(CompetitionSignUp.TOGETHER);
-        comp.setPlayerASex(Sex.MALE);
+        comp.setPlayerASex(SexFilter.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
         comp.setNumberSets(NumberSets.THREE);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
index f83024d0..5bdbf312 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.NumberSets;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
@@ -77,10 +77,10 @@ public void addData() {
         comp20.setDescription("Offen für alle Herren");
         comp20.setMode(CompetitionMode.SINGLES);
         comp20.setType(CompetitionType.KNOCKOUT);
-        comp20.setPlayerASex(Sex.MALE);
+        comp20.setPlayerASex(SexFilter.MALE);
         comp20.setcProgress(TEAMS);
         comp20.setSignup(CompetitionSignUp.INDIVIDUAL);
-        comp20.setPlayerASex(Sex.ANY);
+        comp20.setPlayerASex(SexFilter.ANY);
         comp20.setTournament(tour20);
         comp20.setNumberSets(NumberSets.THREE);
         competitions.persist(comp20);
@@ -89,10 +89,10 @@ public void addData() {
         comp21.setDescription("Offen für alle Herren");
         comp21.setMode(CompetitionMode.SINGLES);
         comp21.setType(CompetitionType.KNOCKOUT);
-        comp21.setPlayerASex(Sex.MALE);
+        comp21.setPlayerASex(SexFilter.MALE);
         comp21.setcProgress(TEAMS);
         comp21.setSignup(CompetitionSignUp.INDIVIDUAL);
-        comp21.setPlayerASex(Sex.ANY);
+        comp21.setPlayerASex(SexFilter.ANY);
         comp21.setTournament(tour21);
         comp21.setNumberSets(NumberSets.THREE);
         competitions.persist(comp21);
@@ -101,10 +101,10 @@ public void addData() {
         comp22.setDescription("Offen für alle Damen");
         comp22.setMode(CompetitionMode.SINGLES);
         comp22.setType(CompetitionType.KNOCKOUT);
-        comp22.setPlayerASex(Sex.FEMALE);
+        comp22.setPlayerASex(SexFilter.FEMALE);
         comp22.setcProgress(TEAMS);
         comp22.setSignup(CompetitionSignUp.INDIVIDUAL);
-        comp22.setPlayerASex(Sex.ANY);
+        comp22.setPlayerASex(SexFilter.ANY);
         comp22.setTournament(tour22);
         comp22.setNumberSets(NumberSets.THREE);
         competitions.persist(comp22);
@@ -112,13 +112,13 @@ public void addData() {
         Player playerM = new Player();
         playerM.setFirstName("Rainer");
         playerM.setLastName("Zufall");
-        playerM.setSex(SexType.MALE);
+        playerM.setSex(Sex.MALE);
         playerM.setBirthday(LocalDate.of(2000, 1, 1));
         players.persist(playerM);
         Player playerF = new Player();
         playerF.setFirstName("Anna");
         playerF.setLastName("Gramm");
-        playerF.setSex(SexType.FEMALE);
+        playerF.setSex(Sex.FEMALE);
         playerF.setBirthday(LocalDate.of(2000, 1, 1));
         players.persist(playerF);
 
@@ -659,10 +659,10 @@ public void addComps() {
         compSingle.setDescription("Offen für alle Herren");
         compSingle.setMode(CompetitionMode.SINGLES);
         compSingle.setType(CompetitionType.KNOCKOUT);
-        compSingle.setPlayerASex(Sex.MALE);
+        compSingle.setPlayerASex(SexFilter.MALE);
         compSingle.setcProgress(TEAMS);
         compSingle.setSignup(CompetitionSignUp.INDIVIDUAL);
-        compSingle.setPlayerASex(Sex.ANY);
+        compSingle.setPlayerASex(SexFilter.ANY);
         compSingle.setTournament(tour21);
         compSingle.setNumberSets(NumberSets.THREE);
         competitions.persist(compSingle);
@@ -671,10 +671,10 @@ public void addComps() {
         compDoubleIndSame.setDescription("Offen für alle Herren");
         compDoubleIndSame.setMode(CompetitionMode.DOUBLES);
         compDoubleIndSame.setType(CompetitionType.KNOCKOUT);
-        compDoubleIndSame.setPlayerASex(Sex.MALE);
+        compDoubleIndSame.setPlayerASex(SexFilter.MALE);
         compDoubleIndSame.setcProgress(TEAMS);
         compDoubleIndSame.setSignup(CompetitionSignUp.INDIVIDUAL);
-        compDoubleIndSame.setPlayerASex(Sex.ANY);
+        compDoubleIndSame.setPlayerASex(SexFilter.ANY);
         compDoubleIndSame.setPlayerBdifferent(false);
         compDoubleIndSame.setTournament(tour21);
         compDoubleIndSame.setNumberSets(NumberSets.FIVE);
@@ -684,12 +684,12 @@ public void addComps() {
         compDoubleIndDif.setDescription("Offen für alle Herren");
         compDoubleIndDif.setMode(CompetitionMode.DOUBLES);
         compDoubleIndDif.setType(CompetitionType.KNOCKOUT);
-        compDoubleIndDif.setPlayerASex(Sex.MALE);
+        compDoubleIndDif.setPlayerASex(SexFilter.MALE);
         compDoubleIndDif.setcProgress(TEAMS);
         compDoubleIndDif.setSignup(CompetitionSignUp.INDIVIDUAL);
-        compDoubleIndDif.setPlayerASex(Sex.MALE);
+        compDoubleIndDif.setPlayerASex(SexFilter.MALE);
         compDoubleIndDif.setPlayerBdifferent(true);
-        compDoubleIndDif.setPlayerBSex(Sex.FEMALE);
+        compDoubleIndDif.setPlayerBSex(SexFilter.FEMALE);
         compDoubleIndDif.setTournament(tour21);
         compDoubleIndDif.setNumberSets(NumberSets.THREE);
         competitions.persist(compDoubleIndDif);
@@ -698,11 +698,11 @@ public void addComps() {
         compDoubleTog.setDescription("Offen für alle Herren");
         compDoubleTog.setMode(CompetitionMode.DOUBLES);
         compDoubleTog.setType(CompetitionType.KNOCKOUT);
-        compDoubleTog.setPlayerASex(Sex.MALE);
+        compDoubleTog.setPlayerASex(SexFilter.MALE);
         compDoubleTog.setcProgress(TEAMS);
         compDoubleTog.setSignup(CompetitionSignUp.TOGETHER);
-        compDoubleTog.setPlayerASex(Sex.ANY);
-        compDoubleTog.setPlayerBSex(Sex.ANY);
+        compDoubleTog.setPlayerASex(SexFilter.ANY);
+        compDoubleTog.setPlayerBSex(SexFilter.ANY);
         compDoubleTog.setTournament(tour21);
         compDoubleTog.setNumberSets(NumberSets.THREE);
         competitions.persist(compDoubleTog);
@@ -713,10 +713,10 @@ public void addComps() {
         compSingle2.setDescription("Offen für alle Herren");
         compSingle2.setMode(CompetitionMode.SINGLES);
         compSingle2.setType(CompetitionType.KNOCKOUT);
-        compSingle2.setPlayerASex(Sex.MALE);
+        compSingle2.setPlayerASex(SexFilter.MALE);
         compSingle2.setcProgress(TEAMS);
         compSingle2.setSignup(CompetitionSignUp.INDIVIDUAL);
-        compSingle2.setPlayerASex(Sex.ANY);
+        compSingle2.setPlayerASex(SexFilter.ANY);
         compSingle2.setTournament(tour22);
         compSingle2.setNumberSets(NumberSets.THREE);
         competitions.persist(compSingle2);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
index 6cb7b962..b9814804 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
@@ -63,10 +63,10 @@ public void addCourts() {
         comp.setDescription("Offen für alle Herren");
         comp.setMode(CompetitionMode.SINGLES);
         comp.setType(CompetitionType.KNOCKOUT);
-        comp.setPlayerASex(Sex.MALE);
+        comp.setPlayerASex(SexFilter.MALE);
         comp.setcProgress(TEAMS);
         comp.setSignup(CompetitionSignUp.INDIVIDUAL);
-        comp.setPlayerASex(Sex.ANY);
+        comp.setPlayerASex(SexFilter.ANY);
         comp.setTournament(tour);
         comp.setNumberSets(NumberSets.THREE);
         competitions.persist(comp);
@@ -76,10 +76,10 @@ public void addCourts() {
         comp2.setDescription("Offen für alle Herren");
         comp2.setMode(CompetitionMode.SINGLES);
         comp2.setType(CompetitionType.KNOCKOUT);
-        comp2.setPlayerASex(Sex.MALE);
+        comp2.setPlayerASex(SexFilter.MALE);
         comp2.setcProgress(TEAMS);
         comp2.setSignup(CompetitionSignUp.INDIVIDUAL);
-        comp2.setPlayerASex(Sex.ANY);
+        comp2.setPlayerASex(SexFilter.ANY);
         comp2.setTournament(tour);
         comp2.setNumberSets(NumberSets.THREE);
         competitions.persist(comp2);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 0d02c2ad..4b3d9361 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.SexType;
+import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
@@ -39,23 +39,23 @@ public class TestPlayerResource {
     public void addPlayer() {
         for (int i = 0; i < 5; i++) {
             players.persist(
-                new Player("M" + i, "F" + i + "V", SexType.MALE, LocalDate.parse(
+                new Player("M" + i, "F" + i + "V", Sex.MALE, LocalDate.parse(
                     "2023-04-02"), "a@example.org", "+12345", true, true));
         }
         for (int i = 5; i < 10; i++) {
-            players.persist(new Player("M" + i, "F" + i, SexType.MALE, LocalDate.parse(
+            players.persist(new Player("M" + i, "F" + i, Sex.MALE, LocalDate.parse(
                 "2023-04-05"), "a@example.org", "+12345", false, true));
         }
         for (int i = 10; i < 20; i++) {
-            players.persist(new Player("M" + i, "F" + i + "V", SexType.MALE, LocalDate.parse(
+            players.persist(new Player("M" + i, "F" + i + "V", Sex.MALE, LocalDate.parse(
                 "2023-04-05"), "a@example.org", "+12345", true, true));
         }
         for (int i = 0; i < 3; i++) {
-            players.persist(new Player("F" + i, "M" + i, SexType.FEMALE, LocalDate.parse(
+            players.persist(new Player("F" + i, "M" + i, Sex.FEMALE, LocalDate.parse(
                 "2023-04-02"), "a@example.org", "+12345", true, true));
         }
 
-        players.persist(new Player("first", "last", SexType.MALE, LocalDate.parse(
+        players.persist(new Player("first", "last", Sex.MALE, LocalDate.parse(
             "2023-04-02"), "a@example.org", "+12345", true, true));
 
         mailbox.clear();
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
index 84d14fd3..5cc29297 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
@@ -74,7 +74,7 @@ public void addData() {
         comp.setMode(CompetitionMode.DOUBLES);
         comp.setType(CompetitionType.GROUPS);
         comp.setSignup(CompetitionSignUp.TOGETHER);
-        comp.setPlayerASex(Sex.MALE);
+        comp.setPlayerASex(SexFilter.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
         comp.setNumberSets(NumberSets.THREE);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
index 1b787937..bc4f115e 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
@@ -58,7 +58,7 @@ public void addData() {
         comp.setMode(CompetitionMode.DOUBLES);
         comp.setType(CompetitionType.KNOCKOUT);
         comp.setSignup(CompetitionSignUp.TOGETHER);
-        comp.setPlayerASex(Sex.MALE);
+        comp.setPlayerASex(SexFilter.MALE);
         comp.setTournament(tour);
         comp.setcProgress(CreationProgress.GAMES);
         comp.setNumberSets(NumberSets.THREE);

From 2d28e402a3f6ab4e299279d1ba7f6ff28ac33de7 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Mon, 30 Sep 2024 18:07:57 +0200
Subject: [PATCH 199/247] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Add=20pagination?=
 =?UTF-8?q?=20for=20player=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Player.java     | 12 ++++
 .../db/repositories/PlayerRepository.java     | 13 ++++
 .../resources/PlayerResource.java             | 15 +++--
 .../director/jDirectorPlayer.java             | 11 ++--
 .../resources/jsonEntities/jPage.java         | 27 ++++++++
 .../startup/testdata/TestdataGenerator.java   | 21 +++----
 .../turnierplaner/tools/TestGroupTools.java   |  4 +-
 frontend/app/src/backend/player.ts            | 12 +++-
 .../views/competitions/FormCompetition.vue    |  4 +-
 .../views/player/ViewPlayerRegistration.vue   |  4 +-
 .../views/settings/SettingsPlayer.vue         | 62 ++++++++++++++++---
 frontend/app/src/i18n/de.json                 |  6 +-
 frontend/app/src/i18n/en.json                 |  6 +-
 frontend/app/src/interfaces/general.ts        |  4 ++
 frontend/app/src/interfaces/player.ts         |  2 +
 15 files changed, 157 insertions(+), 46 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java
 create mode 100644 frontend/app/src/interfaces/general.ts

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index a1a5a66b..c83d4d34 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -25,6 +25,18 @@ WHEN lower(p.lastName) like CONCAT(lower(:search), '%') THEN 1
                                    ELSE 2
                                END, p.firstName, p.lastName"""
                ),
+               @NamedQuery(name = "countFilter",
+                           query = """
+                               SELECT p FROM Player p
+                               WHERE p.mailVerified = true
+                               AND (p.adminVerified = true OR :admin = true)
+                               AND (p.sex = :sex OR :ignoreSex = true)
+                               AND (p.birthday <= :minAge OR :ignoreMinAge = true)
+                               AND (p.birthday >= :maxAge OR :ignoreMaxAge = true)
+                               AND (lower(p.firstName) like CONCAT('%', lower(:search), '%')
+                               OR lower(p.lastName) = CONCAT('%', lower(:search), '%')
+                               OR lower(CONCAT(p.firstName, ' ', p.lastName)) like CONCAT('%', lower(:search), '%'))"""
+               ),
                @NamedQuery(name = "adminUnverified",
                            query = """
                                SELECT p FROM Player p
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index aa21bb44..3ceaec33 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -39,6 +39,19 @@ public Stream<Player> filter(String search, Sex sex, LocalDate minAge, LocalDate
                 .page(page, pageSize).stream();
     }
 
+    public Long countFilter(String search, Sex sex, LocalDate minAge, LocalDate maxAge, boolean admin) {
+        return find("#countFilter", Parameters
+            .with("search", search)
+            .and("admin", admin)
+            .and("sex", sex)
+            .and("ignoreSex", sex == null)
+            .and("minAge", minAge)
+            .and("ignoreMinAge", minAge == null)
+            .and("maxAge", maxAge)
+            .and("ignoreMaxAge", maxAge == null))
+                .count();
+    }
+
     public Stream<Player> adminUnverified() {
         return find("#adminUnverified").page(0, 10).stream();
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 5fafc7dc..ef0757bc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -9,6 +9,8 @@
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
+import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorPlayer;
+import de.secretj12.turnierplaner.resources.jsonEntities.jPage;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
 import io.quarkus.mailer.Mailer;
@@ -82,10 +84,15 @@ public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @Pat
     @Path("/find")
     @RolesAllowed("director")
     @Produces(MediaType.APPLICATION_JSON)
-    public List<jUserPlayer> listPlayer(@QueryParam("search") String search,
-                                        @DefaultValue("0") @QueryParam("page") int page,
-                                        @DefaultValue("5") @QueryParam("pageSize") int pageSize) {
-        return playerRepository.filter(search, null, null, null, true, page, pageSize).map(jUserPlayer::new).toList();
+    public jPage<List<jDirectorPlayer>> listPlayer(@QueryParam("search") String search,
+                                                   @DefaultValue("0") @QueryParam("page") int page,
+                                                   @DefaultValue("5") @QueryParam("pageSize") int pageSize) {
+        if (pageSize <= 0)
+            throw new BadRequestException("Page size has to be greater 0");
+        return new jPage<>(
+                           playerRepository.countFilter(search, null, null, null, true), playerRepository.filter(search,
+                               null, null, null, true, page, pageSize)
+                               .map(jDirectorPlayer::new).toList());
     }
 
     @GET
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
index ef63eedb..33ad6d5e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
@@ -1,22 +1,19 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSex;
 
-import java.util.UUID;
-
 public class jDirectorPlayer extends jUserPlayer {
 
     private jUserSex sex;
 
-    public jDirectorPlayer(UUID id, String firstName, String lastName, Sex sex) {
-        super(id, firstName, lastName);
-    }
-
     public jDirectorPlayer(Player p) {
         super(p);
+        this.sex = switch (p.getSex()) {
+            case MALE -> jUserSex.MALE;
+            case FEMALE -> jUserSex.FEMALE;
+        };
     }
 
     public jUserSex getSex() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java
new file mode 100644
index 00000000..c6309854
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java
@@ -0,0 +1,27 @@
+package de.secretj12.turnierplaner.resources.jsonEntities;
+
+public class jPage<T> {
+    private long total;
+    private T data;
+
+    public jPage(long total, T data) {
+        this.total = total;
+        this.data = data;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index 9d955f9c..ebcc7064 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -216,11 +216,16 @@ private void createSets(Match match) {
         matchRepository.persist(match);
     }
 
-    private Player createPlayer(AGE_RESTR ageRestr) {
+    private Player createPlayer(AGE_RESTR ageRestr, SexFilter sexFilter) {
         Player player = new Player();
         Name name = faker.name();
         player.setFirstName(name.firstName());
         player.setLastName(name.lastName());
+        player.setSex(switch (sexFilter) {
+            case MALE -> Sex.MALE;
+            case FEMALE -> Sex.FEMALE;
+            case ANY -> Math.random() > 0.5 ? Sex.MALE : Sex.FEMALE;
+        });
         player.setEmail(player.getFirstName() + "." + player.getLastName() + "@gmail.com");
         player.setPhone(faker.phoneNumber().cellPhone());
         player.setMailVerified(true);
@@ -237,12 +242,7 @@ private Player createPlayer(AGE_RESTR ageRestr) {
     private Team[] createTeams(Competition competition, CompetitionSettings competitionSettings) {
         Team[] teams = new Team[competitionSettings.getTeamNumbers()];
         for (int i = 0; i < competitionSettings.getTeamNumbers(); i++) {
-            Player player = createPlayer(competitionSettings.getAgeRestr());
-            if (competitionSettings.getSex() == SexFilter.ANY) {
-                player.setSex(Sex.MALE);
-            } else {
-                player.setSex(Sex.FEMALE);
-            }
+            Player player = createPlayer(competitionSettings.getAgeRestr(), competitionSettings.getSex());
             players.persist(player);
 
             teams[i] = new Team();
@@ -250,12 +250,7 @@ private Team[] createTeams(Competition competition, CompetitionSettings competit
             teams[i].setPlayerA(player);
 
             if (competitionSettings.getCompetitionMode() == CompetitionMode.DOUBLES) {
-                Player player2 = createPlayer(competitionSettings.getAgeRestr());
-                if (competitionSettings.getSex() == SexFilter.ANY || competitionSettings.getSex() == SexFilter.FEMALE) {
-                    player2.setSex(Sex.FEMALE);
-                } else {
-                    player2.setSex(Sex.FEMALE);
-                }
+                Player player2 = createPlayer(competitionSettings.getAgeRestr(), competitionSettings.getSex());
                 players.persist(player2);
                 teams[i].setPlayerB(player2);
             }
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
index 5cc29297..943257b3 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
@@ -260,8 +260,8 @@ public void genGroupsChange(int groupSizeFrom, int groupCountFrom, int groupSize
         List<Group> groups = competition.getGroups();
         List<Set<Match>> matches = groups.stream().map(Group::getMatches).toList();
         // necessary to preload matches
-        matches.stream().forEach(ms -> ms.forEach(Match::getTeamA));
-        matches.stream().forEach(ms -> ms.forEach(Match::getTeamB));
+        matches.forEach(ms -> ms.forEach(Match::getTeamA));
+        matches.forEach(ms -> ms.forEach(Match::getTeamB));
         Match fin = competition.getFinale();
         List<Match> firstMatches = groupCountFrom > 1 ? flatMatches(List.of(fin)) : List.of();
 
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index e30c2482..803b7372 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -9,6 +9,7 @@ import { ToastServiceMethods } from "primevue/toastservice"
 import { computed, Ref } from "vue"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query"
 import { RouteLocationNormalizedLoaded } from "vue-router"
+import { Page } from "@/interfaces/general"
 
 export function findCompPlayers(
 	search: Ref<string>,
@@ -53,13 +54,18 @@ export function findPlayers(
 	toast: ToastServiceMethods,
 ) {
 	return useQuery({
-		queryKey: ["searchPlayer", search],
+		queryKey: ["searchPlayer", search, page, pageSize],
 		queryFn: async () => {
 			return axios
-				.get<PlayerServer[]>(
+				.get<Page<PlayerServer[]>>(
 					`/player/find?search=${search.value.toLowerCase()}&page=${page.value}&pageSize=${pageSize.value}`,
 				)
-				.then<Player[]>((result) => result.data.map(playerServerToClient))
+				.then<Page<Player[]>>((result) => {
+					return {
+						total: result.data.total,
+						data: result.data.data.map(playerServerToClient),
+					}
+				})
 				.catch((error) => {
 					toast.add({
 						severity: "error",
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 1b5a83cb..4d2741a3 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -276,8 +276,8 @@
 				v-model="playerBSex"
 				:disabled="disabled"
 				:options="[
-					{ name: t('CompetitionSettings.male'), value: Sex.MALE },
-					{ name: t('CompetitionSettings.female'), value: Sex.FEMALE },
+					{ name: t('general.male'), value: Sex.MALE },
+					{ name: t('general.female'), value: Sex.FEMALE },
 					{ name: t('CompetitionSettings.any'), value: Sex.ANY },
 				]"
 				:placeholder="t(`CompetitionSettings.sex`)"
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
index 45e70762..c6d167b1 100644
--- a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
@@ -57,8 +57,8 @@
 						<Dropdown
 							v-bind="sex"
 							:options="[
-								{ name: t('CompetitionSettings.male'), value: Sex.MALE },
-								{ name: t('CompetitionSettings.female'), value: Sex.FEMALE },
+								{ name: t('general.male'), value: Sex.MALE },
+								{ name: t('general.female'), value: Sex.FEMALE },
 							]"
 							option-label="name"
 							option-value="value"
diff --git a/frontend/app/src/components/views/settings/SettingsPlayer.vue b/frontend/app/src/components/views/settings/SettingsPlayer.vue
index d602f873..cfa63b78 100644
--- a/frontend/app/src/components/views/settings/SettingsPlayer.vue
+++ b/frontend/app/src/components/views/settings/SettingsPlayer.vue
@@ -1,23 +1,71 @@
 <template>
-	<DataTable :value="player" size="small">
-		<Column field="name" :header="t('general.name')" />
-		<Column field="sex" :header="t('general.sex')" />
+	<DataTable
+		v-model:filters="filter"
+		:value="playerPage?.data"
+		lazy
+		:loading="isLoading"
+		:total-records="playerPage?.total"
+		paginator
+		:rows="pageSize"
+		size="small"
+		filter-display="row"
+		@page="(event) => (page = event.page)"
+	>
+		<Column
+			field="name"
+			:header="t('general.name')"
+			:show-filter-menu="false"
+			:show-clear-button="false"
+		>
+			<template #filter="{ filterModel, filterCallback }">
+				<InputText
+					v-model="filterModel.value"
+					size="small"
+					type="text"
+					class="p-column-filter"
+					:placeholder="t('general.filter_by_name')"
+					@input="filterCallback()"
+				/>
+			</template>
+			<template #body="{ data }">
+				<LinkPlayerName :player="data" />
+			</template>
+		</Column>
+		<Column field="sex" :header="t('general.sex')">
+			<template #body="{ data }">
+				<template v-if="(<Player>data).sex">
+					{{ t(data.sex === Sex.MALE ? "general.male" : "general.female") }}
+				</template>
+			</template>
+		</Column>
 	</DataTable>
 </template>
 
 <script setup lang="ts">
 import { findPlayers } from "@/backend/player"
-import { ref } from "vue"
+import { computed, ref } from "vue"
 import { useToast } from "primevue/usetoast"
 import { useI18n } from "vue-i18n"
+import { Player } from "@/interfaces/player"
+import { Sex } from "@/interfaces/competition"
+import LinkPlayerName from "@/components/links/LinkPlayerName.vue"
 
 const { t } = useI18n()
 const toast = useToast()
 
-const search = ref("")
+const filter = ref({
+	name: { value: "", matchMode: "contains" },
+})
+
 const page = ref(0)
-const pageSize = ref(0)
-const { data: player } = findPlayers(search, page, pageSize, t, toast)
+const pageSize = ref(5)
+const { data: playerPage, isLoading: isLoading } = findPlayers(
+	computed(() => filter.value.name.value),
+	page,
+	pageSize,
+	t,
+	toast,
+)
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index e0f8327d..d169d313 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -42,7 +42,9 @@
 		"filter_by_name": "Nach Name filtern",
 		"from": "Von",
 		"to": "Bis",
-		"sex": "Geschlecht"
+		"sex": "Geschlecht",
+		"male": "Männlich",
+		"female": "Weiblich"
 	},
 	"DialogUpdateScore": {
 		"header": "Punkte Eintragung",
@@ -140,8 +142,6 @@
 		"player": "Spielereinstellungen",
 		"differentB": "Verschiedene Einstellungen für Spieler 2",
 		"sex": "Geschlecht",
-		"male": "Männlich",
-		"female": "Weiblich",
 		"any": "Egal",
 		"minAge": "Mindestalter",
 		"maxAge": "Maximalalter",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 211ab882..6dd6de14 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -42,7 +42,9 @@
 		"filter_by_name": "Filter by name",
 		"from": "From",
 		"to": "To",
-		"sex": "Sex"
+		"sex": "Sex",
+		"male": "Male",
+		"female": "Female"
 	},
 	"DialogUpdateScore": {
 		"header": "Score Update",
@@ -143,8 +145,6 @@
 		"player": "Player settings",
 		"differentB": "Different settings for player 2",
 		"sex": "Sex",
-		"male": "Male",
-		"female": "Female",
 		"any": "Any",
 		"minAge": "Minimum age",
 		"maxAge": "Maximum age",
diff --git a/frontend/app/src/interfaces/general.ts b/frontend/app/src/interfaces/general.ts
new file mode 100644
index 00000000..e9e3e31f
--- /dev/null
+++ b/frontend/app/src/interfaces/general.ts
@@ -0,0 +1,4 @@
+export interface Page<T> {
+	total: number
+	data: T
+}
diff --git a/frontend/app/src/interfaces/player.ts b/frontend/app/src/interfaces/player.ts
index c24c6f70..b30e5f26 100644
--- a/frontend/app/src/interfaces/player.ts
+++ b/frontend/app/src/interfaces/player.ts
@@ -2,6 +2,7 @@ export interface PlayerServer {
 	id?: string
 	firstName: string
 	lastName: string
+	sex?: Sex
 }
 
 export interface Player extends PlayerServer {
@@ -13,6 +14,7 @@ export function playerServerToClient(player: PlayerServer): Player {
 		id: player.id,
 		firstName: player.firstName,
 		lastName: player.lastName,
+		sex: player.sex,
 		get name() {
 			return `${this.firstName} ${this.lastName}`
 		},

From 524bfe60a2fbfd15394dd7c9284abb04f61390e1 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 01:01:15 +0200
Subject: [PATCH 200/247] =?UTF-8?q?=E2=9C=85=20Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/entities/competition/Competition.java  |  2 +-
 .../resources/TestPlayerResource.java         | 90 ++++++++++++++-----
 2 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index f6ea75c2..f3882121 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -39,7 +39,7 @@ public class Competition {
     @JoinColumn(name = "tournament_id", nullable = false)
     private Tournament tournament;
 
-    @Column(name = "description", nullable = false)
+    @Column(name = "description")
     private String description;
     @Column(name = "type", nullable = false)
     private CompetitionType type;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 4b3d9361..8a58363b 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -2,20 +2,24 @@
 
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Sex;
+import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
+import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
+import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
 import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.mailer.MockMailbox;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
+import jakarta.inject.Inject;
+import jakarta.transaction.*;
+import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
-import jakarta.transaction.*;
-import jakarta.ws.rs.core.Response;
 import java.time.LocalDate;
 import java.util.UUID;
 
@@ -27,6 +31,10 @@
 @QuarkusTest
 public class TestPlayerResource {
 
+    @Inject
+    TournamentRepository tournamentRepository;
+    @Inject
+    CompetitionRepository competitionRepository;
     @Inject
     PlayerRepository players;
     @Inject
@@ -34,9 +42,50 @@ public class TestPlayerResource {
     @Inject
     MockMailbox mailbox;
 
+    private Competition genComp() {
+        Competition competition = new Competition();
+        competition.setcProgress(CreationProgress.TEAMS);
+        competition.setMode(CompetitionMode.SINGLES);
+        competition.setType(CompetitionType.KNOCKOUT);
+        competition.setSignup(CompetitionSignUp.INDIVIDUAL);
+        competition.setPlayerASex(SexFilter.ANY);
+        return competition;
+    }
+
     @BeforeEach
     @Transactional
     public void addPlayer() {
+        Tournament tournament = new Tournament();
+        tournament.setName("Clubmeisterschaft");
+        tournamentRepository.persist(tournament);
+
+        Competition herren = genComp();
+        herren.setTournament(tournament);
+        herren.setName("Herren");
+        herren.setPlayerASex(SexFilter.MALE);
+        competitionRepository.persist(herren);
+
+        Competition damen = genComp();
+        damen.setTournament(tournament);
+        damen.setName("Damen");
+        damen.setPlayerASex(SexFilter.FEMALE);
+        competitionRepository.persist(damen);
+
+        Competition uX = genComp();
+        uX.setTournament(tournament);
+        uX.setName("uX");
+        uX.setcProgress(CreationProgress.TEAMS);
+        uX.setPlayerAhasMaxAge(true);
+        uX.setPlayerAmaxAge(LocalDate.parse("2023-04-03"));
+        competitionRepository.persist(uX);
+
+        Competition oX = genComp();
+        oX.setTournament(tournament);
+        oX.setName("oX");
+        oX.setPlayerAhasMinAge(true);
+        oX.setPlayerAminAge(LocalDate.parse("2023-04-03"));
+        competitionRepository.persist(oX);
+
         for (int i = 0; i < 5; i++) {
             players.persist(
                 new Player("M" + i, "F" + i + "V", Sex.MALE, LocalDate.parse(
@@ -51,7 +100,7 @@ public void addPlayer() {
                 "2023-04-05"), "a@example.org", "+12345", true, true));
         }
         for (int i = 0; i < 3; i++) {
-            players.persist(new Player("F" + i, "M" + i, Sex.FEMALE, LocalDate.parse(
+            players.persist(new Player("F" + i, "M" + i + "V", Sex.FEMALE, LocalDate.parse(
                 "2023-04-02"), "a@example.org", "+12345", true, true));
         }
 
@@ -66,32 +115,25 @@ public void addPlayer() {
     public void delete() {
         verificationCodes.deleteAll();
         players.deleteAll();
+        competitionRepository.deleteAll();
+        tournamentRepository.deleteAll();
     }
 
     @Test
     public void listPlayerEmpty() {
         given()
             .param("search", "")
-            .get("/player/find")
+            .get("/player/compFind/Clubmeisterschaft/Herren")
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
             .body("size()", equalTo(0));
     }
 
-    @Test
-    public void listPlayerLessThan10() {
-        given()
-            .param("search", "M")
-            .get("/player/find")
-            .then().assertThat()
-            .statusCode(Response.Status.OK.getStatusCode()).and().body("size()", equalTo(10));
-    }
-
     @Test
     public void listPlayerMale() {
         given()
             .param("search", "M").param("sex", "MALE")
-            .get("/player/find")
+            .get("/player/compFind/Clubmeisterschaft/Herren")
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
             .body("findAll { it.firstName.startsWith('M') }.size()", equalTo(10));
@@ -101,7 +143,7 @@ public void listPlayerMale() {
     public void listPlayerFemale() {
         given()
             .param("search", "F").param("sex", "FEMALE")
-            .get("/player/find")
+            .get("/player/compFind/Clubmeisterschaft/Damen")
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
             .body("findAll { it.firstName.startsWith('F') }.size()", equalTo(3));
@@ -109,15 +151,19 @@ public void listPlayerFemale() {
 
     @Test
     public void listPlayerCheckVerified() {
-        given().param("search", "M").get("/player/find").then().assertThat().statusCode(Response.Status.OK
-            .getStatusCode()).and().body("findAll { it.lastName.endsWith('V') }.size()", equalTo(10));
+        given()
+            .param("search", "M")
+            .get("/player/compFind/Clubmeisterschaft/Herren")
+            .then().assertThat()
+            .statusCode(Response.Status.OK.getStatusCode()).and()
+            .body("findAll { it.lastName.endsWith('V') }.size()", equalTo(10));
     }
 
     @Test
     public void listPlayerMaxAge() {
         given()
-            .param("search", "M").param("maxAge", "2023-04-03")
-            .get("/player/find")
+            .param("search", "M")
+            .get("/player/compFind/Clubmeisterschaft/uX")
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
             .body("size()", equalTo(10));
@@ -126,8 +172,8 @@ public void listPlayerMaxAge() {
     @Test
     public void listPlayerMinAge() {
         given()
-            .param("search", "M").param("minAge", "2023-04-03")
-            .get("/player/find")
+            .param("search", "M")
+            .get("/player/compFind/Clubmeisterschaft/oX")
             .then().assertThat()
             .statusCode(Response.Status.OK.getStatusCode())
             .body("size()", equalTo(8));

From 2373abd4a3e1b86e5039e6fe9c56570462c39c17 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 10:51:47 +0200
Subject: [PATCH 201/247] =?UTF-8?q?=F0=9F=A6=BA=20Validate=20player=20regi?=
 =?UTF-8?q?stration=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/PlayerResource.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index ef0757bc..467a4a7a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -41,6 +41,7 @@ public class PlayerResource {
     VerificationCodeRepository verificationCodeRepository;
     @Inject
     Mailer mailer;
+    // TODO inject mail template, store in txt/html
     MailTemplates mailTemplates = new MailTemplates();
 
     @Inject
@@ -127,8 +128,17 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
                     .isBefore(Instant.now()))))
             throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
 
-        // TODO check phone number (only valid phone number)
-        // TODO check fields are not empty!
+        if (playerForm.getFirstName() == null)
+            throw new BadRequestException("First name may not be empty");
+        if (playerForm.getLastName() == null)
+            throw new BadRequestException("Last name may not be empty");
+        if (playerForm.getBirthday() == null)
+            throw new BadRequestException("Birthday may not be empty");
+        if (playerForm.getEmail() == null)
+            throw new BadRequestException("E-Mail may not be empty");
+        if (playerForm.getPhone() == null)
+            throw new BadRequestException("Phone may not be empty");
+
         Player newPlayer = new Player();
         newPlayer.setFirstName(playerForm.getFirstName());
         newPlayer.setLastName(playerForm.getLastName());
@@ -149,7 +159,6 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         verificationCode.setExpirationDate(Instant.now().plus(expire, ChronoUnit.MINUTES));
         verificationCodeRepository.persist(verificationCode);
 
-        // TODO check for valid mail
         try {
             mailer.send(mailTemplates.verificationMail(newPlayer.getEmail(), verificationCode.getId().toString()));
         } catch (Exception e) {

From 5aadbc69bacb67db0c2b5900c13c036ffadcbcbb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 12:28:23 +0200
Subject: [PATCH 202/247] =?UTF-8?q?=E2=9C=A8=20Add=20player=20update=20end?=
 =?UTF-8?q?point?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/CompetitionRepository.java   |  2 +-
 .../db/repositories/PlayerRepository.java     |  2 +-
 .../db/repositories/TournamentRepository.java |  2 +-
 .../resources/CompetitionResource.java        | 16 ++--
 .../resources/MatchResource.java              |  2 +-
 .../resources/PlayerResource.java             | 90 +++++++++++++------
 .../resources/TournamentResource.java         |  4 +-
 .../director/jDirectorPlayerUpdateForm.java   | 27 ++++++
 .../user/jUserPlayerRegistrationForm.java     | 17 ++++
 9 files changed, 123 insertions(+), 39 deletions(-)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
index c64fe1ba..d02e7502 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
@@ -11,7 +11,7 @@
 @ApplicationScoped
 public class CompetitionRepository implements PanacheRepository<Competition> {
 
-    public Competition getById(UUID uuid) {
+    public Competition findById(UUID uuid) {
         return find("id", uuid).firstResultOptional().orElse(null);
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index 3ceaec33..acee8e67 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -14,7 +14,7 @@
 public class PlayerRepository implements PanacheRepository<Player> {
 
 
-    public Player getById(UUID uuid) {
+    public Player findById(UUID uuid) {
         return find("id", uuid).firstResultOptional().orElse(null);
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
index 06425cf0..c26a3975 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
@@ -18,7 +18,7 @@ public Tournament getByName(String name) {
         return find("name", name).firstResultOptional().orElse(null);
     }
 
-    public Tournament getById(UUID uuid) {
+    public Tournament findById(UUID uuid) {
         return find("id", uuid).firstResultOptional().orElse(null);
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 970f3321..bd159550 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -141,7 +141,7 @@ public String addCompetition(@PathParam("tourName") String tourName, jDirectorCo
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
     public String updateCompetition(@PathParam("tourName") String tourName, jDirectorCompetitionUpdate competition) {
-        Competition dbCompetition = competitions.getById(competition.getId());
+        Competition dbCompetition = competitions.findById(competition.getId());
         if (dbCompetition == null) throw new BadRequestException("Competition doesn't exist");
         if (!dbCompetition.getTournament().getName().equals(tourName))
             throw new BadRequestException("Tournament of competition is not the given");
@@ -201,7 +201,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
             if (reg.getPlayerA() == null) throw new BadRequestException("Player A is null");
             if (reg.getPlayerB() != null) throw new BadRequestException("Player B is not null");
 
-            Player playerA = players.getById(reg.getPlayerA().getId());
+            Player playerA = players.findById(reg.getPlayerA().getId());
             if (playerA == null) throw new BadRequestException("Player A does not exist");
 
             if (conditionsFailA(competition, playerA))
@@ -230,7 +230,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
                     throw new BadRequestException("Player A and player B are not null");
 
                 if (reg.getPlayerA() != null) {
-                    Player playerA = players.getById(reg.getPlayerA().getId());
+                    Player playerA = players.findById(reg.getPlayerA().getId());
                     if (playerA == null) throw new BadRequestException("Player A doesn't exist");
 
                     if (conditionsFailA(competition, playerA))
@@ -249,7 +249,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
                     teams.persist(team);
                 }
                 if (reg.getPlayerB() != null) {
-                    Player playerB = players.getById(reg.getPlayerB().getId());
+                    Player playerB = players.findById(reg.getPlayerB().getId());
                     if (playerB == null) throw new BadRequestException("Player B does not exist");
 
                     if (conditionsFailB(competition, playerB))
@@ -274,9 +274,9 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
                 if (reg.getPlayerA() == null) throw new BadRequestException("Player A is null");
                 if (reg.getPlayerB() == null) throw new BadRequestException("Player B is null");
 
-                Player playerA = players.getById(reg.getPlayerA().getId());
+                Player playerA = players.findById(reg.getPlayerA().getId());
                 if (playerA == null) throw new BadRequestException("Player A does not exist");
-                Player playerB = players.getById(reg.getPlayerB().getId());
+                Player playerB = players.findById(reg.getPlayerB().getId());
                 if (playerB == null) throw new BadRequestException("Player B does not exist");
 
                 if (conditionsFailA(competition, playerA))
@@ -348,8 +348,8 @@ public String updateTeams(@PathParam("tourName") String tourName, @PathParam("co
             }
         }
         for (var team : teams) {
-            Player playerA = team.getPlayerA() == null ? null : players.getById(team.getPlayerA().getId());
-            Player playerB = team.getPlayerB() == null ? null : players.getById(team.getPlayerB().getId());
+            Player playerA = team.getPlayerA() == null ? null : players.findById(team.getPlayerA().getId());
+            Player playerB = team.getPlayerB() == null ? null : players.findById(team.getPlayerB().getId());
 
             var cTeamOp = curTeams.stream().filter(cT -> cT.getId().equals(team.getId())).findAny();
             if (cTeamOp.isEmpty()) {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index a93027f0..9c22e0d6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -40,7 +40,7 @@ public List<jUserMatchEvent> getMatches(
     ) {
         Tournament tournament = tournaments.getByName(tourName);
         Competition competition = competitions.getByName(tourName, compName);
-        Player player = playerId == null ? null : players.getById(UUID.fromString(playerId));
+        Player player = playerId == null ? null : players.findById(UUID.fromString(playerId));
         Instant fromD = from == null ? null : Instant.parse(from);
         Instant toD = to == null ? null : Instant.parse(to);
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 467a4a7a..266b0e76 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -10,6 +10,7 @@
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
 import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorPlayer;
+import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorPlayerUpdateForm;
 import de.secretj12.turnierplaner.resources.jsonEntities.jPage;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
@@ -105,15 +106,52 @@ public List<jUserPlayer> listUnverified() {
     }
 
     @GET
-    @Path("/{playerId}/details")
+    @Path("/{playerId}")
     @Produces(MediaType.APPLICATION_JSON)
     public jUserPlayer getPlayer(@PathParam("playerId") UUID playerId) {
-        Player player = playerRepository.getById(playerId);
+        Player player = playerRepository.findById(playerId);
         if (player == null)
             throw new NotFoundException("Player not found");
         return new jUserPlayer(player);
     }
 
+    @GET
+    @Path("/{playerId}/details")
+    @RolesAllowed("director")
+    @Produces(MediaType.APPLICATION_JSON)
+    public jUserPlayer getDetails(@PathParam("playerId") UUID playerId) {
+        Player player = playerRepository.findById(playerId);
+        if (player == null)
+            throw new NotFoundException("Player not found");
+        return new jDirectorPlayer(player);
+    }
+
+    private void checkPlayerForm(jUserPlayerRegistrationForm form) {
+        if (form.getFirstName() == null)
+            throw new BadRequestException("First name may not be empty");
+        if (form.getLastName() == null)
+            throw new BadRequestException("Last name may not be empty");
+        if (form.getBirthday() == null)
+            throw new BadRequestException("Birthday may not be empty");
+        if (form.getEmail() == null)
+            throw new BadRequestException("E-Mail may not be empty");
+        if (form.getPhone() == null)
+            throw new BadRequestException("Phone may not be empty");
+    }
+
+    private void updatePlayer(jUserPlayerRegistrationForm form, Player player) {
+        player.setFirstName(form.getFirstName());
+        player.setLastName(form.getLastName());
+        player.setBirthday(form.getBirthday());
+        if (form.getSex() == null) throw new BadRequestException("Sex is null");
+        switch (form.getSex()) {
+            case MALE -> player.setSex(Sex.MALE);
+            case FEMALE -> player.setSex(Sex.FEMALE);
+        }
+        player.setEmail(form.getEmail());
+        player.setPhone(form.getPhone());
+    }
+
     @POST
     @Transactional
     @Path("/registration")
@@ -125,31 +163,13 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         if (exPlayer != null &&
             (exPlayer.getVerificationCode() == null
                 || (exPlayer.getVerificationCode() != null && exPlayer.getVerificationCode().getExpirationDate()
-                    .isBefore(Instant.now()))))
+                    .isAfter(Instant.now()))))
             throw new WebApplicationException("A player already exists with this name", Response.Status.CONFLICT);
 
-        if (playerForm.getFirstName() == null)
-            throw new BadRequestException("First name may not be empty");
-        if (playerForm.getLastName() == null)
-            throw new BadRequestException("Last name may not be empty");
-        if (playerForm.getBirthday() == null)
-            throw new BadRequestException("Birthday may not be empty");
-        if (playerForm.getEmail() == null)
-            throw new BadRequestException("E-Mail may not be empty");
-        if (playerForm.getPhone() == null)
-            throw new BadRequestException("Phone may not be empty");
+        checkPlayerForm(playerForm);
 
         Player newPlayer = new Player();
-        newPlayer.setFirstName(playerForm.getFirstName());
-        newPlayer.setLastName(playerForm.getLastName());
-        newPlayer.setBirthday(playerForm.getBirthday());
-        if (playerForm.getSex() == null) throw new BadRequestException("Sex is null");
-        switch (playerForm.getSex()) {
-            case MALE -> newPlayer.setSex(Sex.MALE);
-            case FEMALE -> newPlayer.setSex(Sex.FEMALE);
-        }
-        newPlayer.setEmail(playerForm.getEmail());
-        newPlayer.setPhone(playerForm.getPhone());
+        updatePlayer(playerForm, newPlayer);
         newPlayer.setMailVerified(securityIdentity.hasRole("director"));
         newPlayer.setAdminVerified(securityIdentity.hasRole("director"));
         playerRepository.persist(newPlayer);
@@ -169,6 +189,26 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
         return "successfully added";
     }
 
+    @POST
+    @Transactional
+    @Path("/update")
+    @Blocking
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    public String playerRegistration(jDirectorPlayerUpdateForm uPlayer) {
+        Player player = playerRepository.findById(uPlayer.getId());
+        if (player == null)
+            throw new BadRequestException("Player does not exist");
+
+        checkPlayerForm(uPlayer);
+
+        updatePlayer(uPlayer, player);
+        player.setAdminVerified(true);
+        playerRepository.persist(player);
+
+        return "successfully updated";
+    }
+
     @GET
     @Transactional
     @Path("/verification")
@@ -191,7 +231,7 @@ public String verification(@QueryParam("code") String code) {
     @Path("/adminVerify")
     @Produces(MediaType.TEXT_PLAIN)
     public String adminVerify(Player player) {
-        Player dbPlayer = playerRepository.getById(player.getId());
+        Player dbPlayer = playerRepository.findById(player.getId());
         dbPlayer.setAdminVerified(true);
         playerRepository.persist(dbPlayer);
         return "Successfully verified!";
@@ -203,7 +243,7 @@ public String adminVerify(Player player) {
     @Path("/delete")
     @Produces(MediaType.TEXT_PLAIN)
     public String deletePlayer(Player player) {
-        Player dbPlayer = playerRepository.getById(player.getId());
+        Player dbPlayer = playerRepository.findById(player.getId());
         playerRepository.delete(dbPlayer);
         return "Successfully verified!";
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 518925e1..0bd9579f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -133,12 +133,12 @@ public String updateTournament(jDirectorTournamentUpdate tournament) {
         if (possibleDuplicate != null && !possibleDuplicate.getId().equals(tournament.getId()))
             throw new WebApplicationException("Tournament with this name already exist", Response.Status.CONFLICT);
 
-        Tournament dbTournament = tournaments.getById(tournament.getId());
+        Tournament dbTournament = tournaments.findById(tournament.getId());
         if (dbTournament == null)
             throw new NotFoundException("Tournament with this id does not exist");
         checkDates(tournament);
 
-        tournaments.getById(tournament.getId());
+        tournaments.findById(tournament.getId());
         dbTournament.setName(tournament.getName());
         dbTournament.setDescription(tournament.getDescription());
         dbTournament.setVisible(tournament.isVisible());
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java
new file mode 100644
index 00000000..0b5277aa
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java
@@ -0,0 +1,27 @@
+package de.secretj12.turnierplaner.resources.jsonEntities.director;
+
+import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
+
+import java.util.UUID;
+
+public class jDirectorPlayerUpdateForm extends jUserPlayerRegistrationForm {
+
+    private UUID id;
+
+    public jDirectorPlayerUpdateForm() {
+    }
+
+    public jDirectorPlayerUpdateForm(Player player) {
+        super(player);
+        this.id = player.getId();
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
index c79710c2..65d7ffca 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
@@ -1,5 +1,7 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
+import de.secretj12.turnierplaner.db.entities.Player;
+
 import java.time.LocalDate;
 
 public class jUserPlayerRegistrationForm {
@@ -11,6 +13,21 @@ public class jUserPlayerRegistrationForm {
     String email;
     String phone;
 
+    public jUserPlayerRegistrationForm() {
+    }
+
+    public jUserPlayerRegistrationForm(Player player) {
+        this.firstName = player.getFirstName();
+        this.lastName = player.getLastName();
+        this.sex = switch (player.getSex()) {
+            case MALE -> jUserSex.MALE;
+            case FEMALE -> jUserSex.FEMALE;
+        };
+        this.birthday = player.getBirthday();
+        this.email = player.getEmail();
+        this.phone = player.getPhone();
+    }
+
     public String getFirstName() {
         return firstName;
     }

From c9f446105084bbf2df6194b41bc96716d0c363d8 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 12:28:54 +0200
Subject: [PATCH 203/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20player?=
 =?UTF-8?q?=20to=20prepare=20for=20update=20use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/player.ts            |  53 +++++-
 .../views/player/ViewPlayerForm.vue           | 175 ++++++++++++++++++
 .../views/player/ViewPlayerRegistration.vue   | 170 +++--------------
 frontend/app/src/i18n/de.json                 |   3 +-
 frontend/app/src/i18n/en.json                 |   3 +-
 frontend/app/src/interfaces/player.ts         |  36 +++-
 frontend/app/src/interfaces/tournament.ts     |   8 +-
 7 files changed, 297 insertions(+), 151 deletions(-)
 create mode 100644 frontend/app/src/components/views/player/ViewPlayerForm.vue

diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 803b7372..892c7a8a 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -2,6 +2,10 @@ import axios from "axios"
 import {
 	Player,
 	playerClientToServer,
+	PlayerDetails,
+	playerDetailsClientToServer,
+	PlayerDetailsServer,
+	playerDetailsServerToClient,
 	PlayerServer,
 	playerServerToClient,
 } from "@/interfaces/player"
@@ -136,10 +140,10 @@ export function getPlayer(
 	toast: ToastServiceMethods,
 ) {
 	return useQuery({
-		queryKey: ["playerDetails", computed(() => route.params.playerId)],
+		queryKey: ["player", computed(() => route.params.playerId)],
 		queryFn: async () => {
 			return axios
-				.get<PlayerServer>(`/player/${route.params.playerId}/details`)
+				.get<PlayerServer>(`/player/${route.params.playerId}`)
 				.then<Player>((result) => playerServerToClient(result.data))
 				.catch((error) => {
 					toast.add({
@@ -154,3 +158,48 @@ export function getPlayer(
 		},
 	})
 }
+
+export function getPlayerDetails(
+	route: RouteLocationNormalizedLoaded,
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useQuery({
+		queryKey: ["playerDetails", computed(() => route.params.playerId)],
+		queryFn: async () => {
+			return axios
+				.get<PlayerDetailsServer>(`/player/${route.params.playerId}/details`)
+				.then<PlayerDetails>((result) =>
+					playerDetailsServerToClient(result.data),
+				)
+				.catch((error) => {
+					toast.add({
+						severity: "error",
+						summary: t("Player.player_not_found"),
+						detail: error,
+						life: 3000,
+					})
+					console.log(error)
+					throw error
+				})
+		},
+	})
+}
+
+export function updatePlayerDetails(
+	t: (s: string) => string,
+	toast: ToastServiceMethods,
+) {
+	return useMutation({
+		mutationFn: async (player: PlayerDetails) => {
+			return axios.post(`/player/update`, playerDetailsClientToServer(player))
+		},
+		onSuccess() {
+			toast.add({
+				severity: "success",
+				summary: t("settings.player_updated"),
+				life: 3000,
+			})
+		},
+	})
+}
diff --git a/frontend/app/src/components/views/player/ViewPlayerForm.vue b/frontend/app/src/components/views/player/ViewPlayerForm.vue
new file mode 100644
index 00000000..c5fbfe56
--- /dev/null
+++ b/frontend/app/src/components/views/player/ViewPlayerForm.vue
@@ -0,0 +1,175 @@
+<template>
+	<div class="formgrid grid">
+		<div class="field col-6">
+			<label for="first_name">{{
+				t("ViewPlayerRegistration.first_name.field")
+			}}</label>
+			<InputText
+				id="first_name"
+				:disabled="disabled"
+				type="text"
+				v-bind="firstName"
+				maxlength="40"
+				class="w-full"
+				:class="{ 'p-invalid': errors.firstName }"
+			/>
+			<InlineMessage v-if="errors.firstName" class="mt-2"
+				>{{ t(errors.firstName || "") }}
+			</InlineMessage>
+		</div>
+		<div class="field col-6">
+			<label for="name">{{
+				t("ViewPlayerRegistration.last_name.field")
+			}}</label>
+			<InputText
+				id="name"
+				:disabled="disabled"
+				type="text"
+				v-bind="lastName"
+				maxlength="40"
+				class="w-full"
+				:class="{ 'p-invalid': errors.lastName }"
+			/>
+			<InlineMessage v-if="errors.lastName" class="mt-2"
+				>{{ t(errors.lastName || "") }}
+			</InlineMessage>
+		</div>
+		<div class="field col-6">
+			<label for="birthdate">{{
+				t("ViewPlayerRegistration.birthdate.field")
+			}}</label>
+			<Calendar
+				show-icon
+				:disabled="disabled"
+				class="w-full"
+				v-bind="birthday"
+				:manual-input="false"
+				:date-format="t('date_format')"
+				:class="{ 'p-invalid': errors.birthday }"
+			/>
+			<InlineMessage v-if="errors.birthday" class="mt-2"
+				>{{ t(errors.birthday || "") }}
+			</InlineMessage>
+		</div>
+		<div class="field col-6">
+			<label for="sex">{{ t("ViewPlayerRegistration.sex.field") }}</label>
+			<Dropdown
+				v-bind="sex"
+				:disabled="disabled"
+				:options="[
+					{ name: t('general.male'), value: Sex.MALE },
+					{ name: t('general.female'), value: Sex.FEMALE },
+				]"
+				option-label="name"
+				option-value="value"
+				:placeholder="t(`CompetitionSettings.sex`)"
+				class="w-full"
+				:class="{ 'p-invalid': errors.sex }"
+			>
+				<template #option="slotProps">
+					<div>
+						{{ slotProps.option.name }}
+					</div>
+				</template>
+			</Dropdown>
+			<InlineMessage v-if="errors.sex" class="mt-2"
+				>{{ t(errors.sex || "") }}
+			</InlineMessage>
+		</div>
+		<div class="field col-12">
+			<label for="email">{{ t("ViewPlayerRegistration.email.field") }}</label>
+			<InputText
+				id="email"
+				:disabled="disabled"
+				type="text"
+				v-bind="email"
+				maxlength="100"
+				class="w-full"
+				:class="{ 'p-invalid': errors.email }"
+			/>
+			<InlineMessage v-if="errors.email" class="mt-2"
+				>{{ t(errors.email || "") }}
+			</InlineMessage>
+		</div>
+		<div class="field col-12">
+			<label for="phone">{{ t("ViewPlayerRegistration.phone.field") }}</label>
+			<InputText
+				id="phone"
+				:disabled="disabled"
+				type="text"
+				v-bind="phone"
+				maxlength="30"
+				class="w-full"
+				:class="{ 'p-invalid': errors.phone }"
+			/>
+			<InlineMessage v-if="errors.phone" class="mt-2"
+				>{{ t(errors.phone || "") }}
+			</InlineMessage>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { useI18n } from "vue-i18n"
+import { Sex } from "@/interfaces/competition"
+import { useForm } from "vee-validate"
+import { toTypedSchema } from "@vee-validate/yup"
+import { date, mixed, object, string } from "yup"
+import { PlayerRegistration, PlayerRegistrationForm } from "@/interfaces/player"
+
+const { t } = useI18n()
+
+const props = withDefaults(
+	defineProps<{
+		disabled: boolean
+		player: PlayerRegistrationForm
+	}>(),
+	{
+		disabled: false,
+	},
+)
+
+const phoneRegExp =
+	/^(\+?\d{0,4})?\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{4}\)?)$/
+
+const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
+	useForm<PlayerRegistration>({
+		validationSchema: toTypedSchema(
+			object({
+				firstName: string().min(4).max(40).required(),
+				lastName: string().min(4).max(40).required(),
+				sex: mixed().oneOf(Object.values(Sex)).required(),
+				birthday: date().required(),
+				email: string().max(100).email().required(),
+				phone: string()
+					.matches(phoneRegExp, t("ViewPlayerRegistration.phone.correct"))
+					.required(),
+			}),
+		),
+		initialValues: {
+			firstName: props.player.firstName,
+			lastName: props.player.lastName,
+			sex: props.player.sex,
+			birthday: props.player.birthday,
+			email: props.player.email,
+			phone: props.player.phone,
+		},
+	})
+
+const firstName = defineInputBinds("firstName")
+const lastName = defineInputBinds("lastName")
+const sex = defineComponentBinds("sex")
+const birthday = defineComponentBinds("birthday")
+const email = defineInputBinds("email")
+const phone = defineInputBinds("phone")
+
+const onSubmit = handleSubmit((values) => {
+	emit("submit", <PlayerRegistration>(<unknown>values))
+})
+defineExpose({ onSubmit })
+const emit = defineEmits<{
+	submit: [PlayerRegistration]
+}>()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
index c6d167b1..17369c10 100644
--- a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
@@ -1,118 +1,21 @@
 <template>
 	<div class="flex justify-content-center w-full">
-		<Card v-if="!registered" id="card">
+		<Card v-if="!isSuccess" id="card">
 			<template #title>{{ t("ViewPlayerRegistration.headline") }}</template>
 			<template #content>
-				<div class="formgrid grid">
-					<div class="field col-6">
-						<label for="first_name">{{
-							t("ViewPlayerRegistration.first_name.field")
-						}}</label>
-						<InputText
-							id="first_name"
-							type="text"
-							v-bind="firstName"
-							maxlength="40"
-							class="w-full"
-							:class="{ 'p-invalid': errors.firstName }"
-						/>
-						<InlineMessage v-if="errors.firstName" class="mt-2"
-							>{{ t(errors.firstName || "") }}
-						</InlineMessage>
-					</div>
-					<div class="field col-6">
-						<label for="name">{{
-							t("ViewPlayerRegistration.last_name.field")
-						}}</label>
-						<InputText
-							id="name"
-							type="text"
-							v-bind="lastName"
-							maxlength="40"
-							class="w-full"
-							:class="{ 'p-invalid': errors.lastName }"
-						/>
-						<InlineMessage v-if="errors.lastName" class="mt-2"
-							>{{ t(errors.lastName || "") }}
-						</InlineMessage>
-					</div>
-					<div class="field col-6">
-						<label for="birthdate">{{
-							t("ViewPlayerRegistration.birthdate.field")
-						}}</label>
-						<Calendar
-							show-icon
-							class="w-full"
-							v-bind="birthday"
-							:manual-input="false"
-							:date-format="t('date_format')"
-							:class="{ 'p-invalid': errors.birthday }"
-						/>
-						<InlineMessage v-if="errors.birthday" class="mt-2"
-							>{{ t(errors.birthday || "") }}
-						</InlineMessage>
-					</div>
-					<div class="field col-6">
-						<label for="sex">{{ t("ViewPlayerRegistration.sex.field") }}</label>
-						<Dropdown
-							v-bind="sex"
-							:options="[
-								{ name: t('general.male'), value: Sex.MALE },
-								{ name: t('general.female'), value: Sex.FEMALE },
-							]"
-							option-label="name"
-							option-value="value"
-							:placeholder="t(`CompetitionSettings.sex`)"
-							class="w-full"
-							:class="{ 'p-invalid': errors.sex }"
-						>
-							<template #option="slotProps">
-								<div>
-									{{ slotProps.option.name }}
-								</div>
-							</template>
-						</Dropdown>
-						<InlineMessage v-if="errors.sex" class="mt-2"
-							>{{ t(errors.sex || "") }}
-						</InlineMessage>
-					</div>
-					<div class="field col-12">
-						<label for="email">{{
-							t("ViewPlayerRegistration.email.field")
-						}}</label>
-						<InputText
-							id="email"
-							type="text"
-							v-bind="email"
-							maxlength="100"
-							class="w-full"
-							:class="{ 'p-invalid': errors.email }"
-						/>
-						<InlineMessage v-if="errors.email" class="mt-2"
-							>{{ t(errors.email || "") }}
-						</InlineMessage>
-					</div>
-					<div class="field col-12">
-						<label for="phone">{{
-							t("ViewPlayerRegistration.phone.field")
-						}}</label>
-						<InputText
-							id="phone"
-							type="text"
-							v-bind="phone"
-							maxlength="30"
-							class="w-full"
-							:class="{ 'p-invalid': errors.phone }"
-						/>
-						<InlineMessage v-if="errors.phone" class="mt-2"
-							>{{ t(errors.phone || "") }}
-						</InlineMessage>
-					</div>
-				</div>
+				<ViewPlayerForm
+					ref="form"
+					:disabled="disabled"
+					:player="player"
+					@submit="register"
+				/>
 			</template>
 			<template #footer>
 				<div class="justify-content-end flex">
-					<Button :label="t('general.create')" @click="onSubmit"></Button>
+					<Button
+						:label="t('general.create')"
+						@click="() => form !== null && form.onSubmit()"
+					></Button>
 				</div>
 			</template>
 		</Card>
@@ -129,47 +32,30 @@
 
 <script lang="ts" setup>
 import { useI18n } from "vue-i18n"
-import { Sex } from "@/interfaces/competition"
-import { useForm } from "vee-validate"
-import { toTypedSchema } from "@vee-validate/yup"
-import { date, mixed, object, string } from "yup"
 import { useToast } from "primevue/usetoast"
-import { PlayerRegistration } from "@/interfaces/player"
+import { PlayerRegistrationForm } from "@/interfaces/player"
+import { reactive, ref } from "vue"
 import { useRegisterPlayer } from "@/backend/registration"
+import ViewPlayerForm from "@/components/views/player/ViewPlayerForm.vue"
+import FormCompetition from "@/components/views/competitions/FormCompetition.vue"
 
 const { t } = useI18n()
 const toast = useToast()
-const { mutate: register, isSuccess: registered } = useRegisterPlayer(t, toast)
-
-const phoneRegExp =
-	/^(\+?\d{0,4})?\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{4}\)?)$/
-
-const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
-	useForm<PlayerRegistration>({
-		validationSchema: toTypedSchema(
-			object({
-				firstName: string().min(4).max(40).required(),
-				lastName: string().min(4).max(40).required(),
-				sex: mixed().oneOf(Object.values(Sex)).required(),
-				birthday: date().required(),
-				email: string().max(100).email().required(),
-				phone: string()
-					.matches(phoneRegExp, t("ViewPlayerRegistration.phone.correct"))
-					.required(),
-			}),
-		),
-		initialValues: {},
-	})
+const form = ref<InstanceType<typeof FormCompetition> | null>(null)
 
-const firstName = defineInputBinds("firstName")
-const lastName = defineInputBinds("lastName")
-const sex = defineComponentBinds("sex")
-const birthday = defineComponentBinds("birthday")
-const email = defineInputBinds("email")
-const phone = defineInputBinds("phone")
+const {
+	mutate: register,
+	isPending: disabled,
+	isSuccess,
+} = useRegisterPlayer(t, toast)
 
-const onSubmit = handleSubmit((values) => {
-	register(values)
+const player = reactive<PlayerRegistrationForm>({
+	firstName: "",
+	lastName: "",
+	sex: undefined,
+	birthday: undefined,
+	email: "",
+	phone: "",
 })
 </script>
 
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index d169d313..cc9d0edc 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -268,6 +268,7 @@
 		"admin_needed": "Verifikation durch Admin nötig",
 		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können.",
 		"user": "Benutzerverwaltung",
-		"player": "Spielerverwaltung"
+		"player": "Spielerverwaltung",
+		"player_updated": "Spieler aktualisiert"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 6dd6de14..ba874ad0 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -270,6 +270,7 @@
 		"admin_needed": "Admin verification needed",
 		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition",
 		"user": "User management",
-		"player": "Player management"
+		"player": "Player management",
+		"playerUpdated": "Player updated"
 	}
 }
diff --git a/frontend/app/src/interfaces/player.ts b/frontend/app/src/interfaces/player.ts
index b30e5f26..6c093d34 100644
--- a/frontend/app/src/interfaces/player.ts
+++ b/frontend/app/src/interfaces/player.ts
@@ -34,11 +34,45 @@ export enum Sex {
 	FEMALE = "FEMALE",
 }
 
-export interface PlayerRegistration {
+export interface PlayerRegistrationForm {
 	firstName: string
 	lastName: string
+	sex: Sex | undefined
+	birthday: Date | undefined
+	email: string
+	phone: string
+}
+
+export interface PlayerRegistration extends PlayerRegistrationForm {
 	sex: Sex
 	birthday: Date
+}
+
+export interface PlayerDetails extends PlayerRegistration {
+	id: string
+}
+
+export interface PlayerDetailsServer {
+	id: string
+	firstName: string
+	lastName: string
+	sex: Sex
+	birthday: Date | string
 	email: string
 	phone: string
 }
+
+export function playerDetailsServerToClient(
+	player: PlayerDetailsServer,
+): PlayerDetails {
+	return {
+		...player,
+		birthday: new Date(player.birthday),
+	}
+}
+
+export function playerDetailsClientToServer(
+	player: PlayerDetails,
+): PlayerDetailsServer {
+	return player
+}
diff --git a/frontend/app/src/interfaces/tournament.ts b/frontend/app/src/interfaces/tournament.ts
index c65b6296..f9d04989 100644
--- a/frontend/app/src/interfaces/tournament.ts
+++ b/frontend/app/src/interfaces/tournament.ts
@@ -27,10 +27,10 @@ export interface TournamentServer {
 	name: string
 	visible: boolean
 	description: string
-	beginRegistration: Date
-	endRegistration: Date
-	beginGamePhase: Date
-	endGamePhase: Date
+	beginRegistration: Date | string
+	endRegistration: Date | string
+	beginGamePhase: Date | string
+	endGamePhase: Date | string
 }
 
 export interface Tournament {

From 4a10e5f3adc1f8c7d58cb1e85cb4d00466ca5389 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 12:42:22 +0200
Subject: [PATCH 204/247] =?UTF-8?q?=E2=9C=A8=20Add=20view=20to=20update=20?=
 =?UTF-8?q?player?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/PlayerResource.java             |  4 +-
 frontend/app/src/backend/player.ts            | 29 +++++++-
 .../views/player/ViewPlayerRegistration.vue   |  1 +
 .../views/player/ViewPlayerUpdate.vue         | 70 +++++++++++++++++++
 .../views/settings/SettingsPlayer.vue         | 19 ++++-
 frontend/app/src/i18n/de.json                 |  3 +-
 frontend/app/src/i18n/en.json                 |  3 +-
 frontend/app/src/routes.ts                    |  5 ++
 8 files changed, 126 insertions(+), 8 deletions(-)
 create mode 100644 frontend/app/src/components/views/player/ViewPlayerUpdate.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 266b0e76..8d8fa745 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -119,11 +119,11 @@ public jUserPlayer getPlayer(@PathParam("playerId") UUID playerId) {
     @Path("/{playerId}/details")
     @RolesAllowed("director")
     @Produces(MediaType.APPLICATION_JSON)
-    public jUserPlayer getDetails(@PathParam("playerId") UUID playerId) {
+    public jDirectorPlayerUpdateForm getDetails(@PathParam("playerId") UUID playerId) {
         Player player = playerRepository.findById(playerId);
         if (player == null)
             throw new NotFoundException("Player not found");
-        return new jDirectorPlayer(player);
+        return new jDirectorPlayerUpdateForm(player);
     }
 
     private void checkPlayerForm(jUserPlayerRegistrationForm form) {
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 892c7a8a..3a447ba9 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -6,6 +6,7 @@ import {
 	playerDetailsClientToServer,
 	PlayerDetailsServer,
 	playerDetailsServerToClient,
+	PlayerRegistrationForm,
 	PlayerServer,
 	playerServerToClient,
 } from "@/interfaces/player"
@@ -24,7 +25,7 @@ export function findCompPlayers(
 ) {
 	return useQuery({
 		queryKey: [
-			"searchPlayer",
+			"searchCompPlayer",
 			search,
 			computed(() => route.params.tourId),
 			computed(() => route.params.compId),
@@ -186,20 +187,42 @@ export function getPlayerDetails(
 	})
 }
 
-export function updatePlayerDetails(
+export function useUpdatePlayerDetails(
 	t: (s: string) => string,
 	toast: ToastServiceMethods,
 ) {
+	const queryClient = useQueryClient()
 	return useMutation({
 		mutationFn: async (player: PlayerDetails) => {
 			return axios.post(`/player/update`, playerDetailsClientToServer(player))
 		},
-		onSuccess() {
+		onSuccess(_, player) {
 			toast.add({
 				severity: "success",
 				summary: t("settings.player_updated"),
 				life: 3000,
 			})
+			queryClient.invalidateQueries({
+				queryKey: ["player", player.id],
+			})
+			queryClient.invalidateQueries({
+				queryKey: ["playerDetails", player.id],
+			})
+			queryClient.invalidateQueries({
+				queryKey: ["searchCompPlayer", player.id],
+			})
+			queryClient.invalidateQueries({
+				queryKey: ["searchPlayer", player.id],
+			})
 		},
 	})
 }
+
+export const PlayerDefault: PlayerRegistrationForm = {
+	firstName: "",
+	lastName: "",
+	sex: undefined,
+	birthday: undefined,
+	email: "",
+	phone: "",
+}
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
index 17369c10..54ebaf32 100644
--- a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerRegistration.vue
@@ -14,6 +14,7 @@
 				<div class="justify-content-end flex">
 					<Button
 						:label="t('general.create')"
+						:disabled="disabled"
 						@click="() => form !== null && form.onSubmit()"
 					></Button>
 				</div>
diff --git a/frontend/app/src/components/views/player/ViewPlayerUpdate.vue b/frontend/app/src/components/views/player/ViewPlayerUpdate.vue
new file mode 100644
index 00000000..089425c0
--- /dev/null
+++ b/frontend/app/src/components/views/player/ViewPlayerUpdate.vue
@@ -0,0 +1,70 @@
+<template>
+	<div class="flex justify-content-center w-full">
+		<Card id="card">
+			<template #title>{{ t("settings.player_update_headline") }}</template>
+			<template #content>
+				<ViewPlayerForm
+					v-if="isLoading || !player"
+					:disabled="disabled"
+					:player="PlayerDefault"
+				/>
+				<ViewPlayerForm
+					v-else
+					ref="form"
+					:disabled="disabled"
+					:player="player"
+					@submit="reg"
+				/>
+			</template>
+			<template #footer>
+				<div class="justify-content-end flex">
+					<Button
+						:label="t('general.update')"
+						:disabled="disabled"
+						@click="() => form !== null && form.onSubmit()"
+					></Button>
+				</div>
+			</template>
+		</Card>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+import { PlayerRegistration } from "@/interfaces/player"
+import { ref } from "vue"
+import ViewPlayerForm from "@/components/views/player/ViewPlayerForm.vue"
+import FormCompetition from "@/components/views/competitions/FormCompetition.vue"
+import {
+	getPlayerDetails,
+	PlayerDefault,
+	useUpdatePlayerDetails,
+} from "@/backend/player"
+import { useRoute } from "vue-router"
+
+const route = useRoute()
+const { t } = useI18n()
+const toast = useToast()
+const form = ref<InstanceType<typeof FormCompetition> | null>(null)
+
+const { mutate: register, isPending: disabled } = useUpdatePlayerDetails(
+	t,
+	toast,
+)
+const { data: player, isLoading } = getPlayerDetails(route, t, toast)
+
+function reg(playerF: PlayerRegistration) {
+	if (!player.value) return
+	register({
+		...playerF,
+		id: player.value.id,
+	})
+}
+</script>
+
+<style scoped>
+#card {
+	width: min(90dvw, 50rem);
+}
+</style>
diff --git a/frontend/app/src/components/views/settings/SettingsPlayer.vue b/frontend/app/src/components/views/settings/SettingsPlayer.vue
index cfa63b78..d4699c69 100644
--- a/frontend/app/src/components/views/settings/SettingsPlayer.vue
+++ b/frontend/app/src/components/views/settings/SettingsPlayer.vue
@@ -28,7 +28,14 @@
 				/>
 			</template>
 			<template #body="{ data }">
-				<LinkPlayerName :player="data" />
+				<div class="flex flex-row align-items-center gap-2">
+					<span
+						class="material-symbols-outlined cursor-pointer"
+						@click="edit(data)"
+						>edit</span
+					>
+					<LinkPlayerName :player="data" />
+				</div>
 			</template>
 		</Column>
 		<Column field="sex" :header="t('general.sex')">
@@ -49,6 +56,7 @@ import { useI18n } from "vue-i18n"
 import { Player } from "@/interfaces/player"
 import { Sex } from "@/interfaces/competition"
 import LinkPlayerName from "@/components/links/LinkPlayerName.vue"
+import { router } from "@/main"
 
 const { t } = useI18n()
 const toast = useToast()
@@ -66,6 +74,15 @@ const { data: playerPage, isLoading: isLoading } = findPlayers(
 	t,
 	toast,
 )
+
+function edit(player: Player) {
+	router.push({
+		name: "Update player",
+		params: {
+			playerId: player.id,
+		},
+	})
+}
 </script>
 
 <style scoped></style>
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index cc9d0edc..77cdbaf2 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -269,6 +269,7 @@
 		"admin_needed_summary": "Spieler müssen von einem Admin verifiziert werden um sich zu einem Spiel anmelden zu können.",
 		"user": "Benutzerverwaltung",
 		"player": "Spielerverwaltung",
-		"player_updated": "Spieler aktualisiert"
+		"player_updated": "Spieler aktualisiert",
+		"player_update_headline": "Spieler aktualisieren"
 	}
 }
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index ba874ad0..c7c5f9ac 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -271,6 +271,7 @@
 		"admin_needed_summary": "Players need to be verified before being able to sign up to a competition",
 		"user": "User management",
 		"player": "Player management",
-		"playerUpdated": "Player updated"
+		"player_updated": "Player updated",
+		"player_update_headline": "Update player"
 	}
 }
diff --git a/frontend/app/src/routes.ts b/frontend/app/src/routes.ts
index f3a3bf8b..23a82b7f 100644
--- a/frontend/app/src/routes.ts
+++ b/frontend/app/src/routes.ts
@@ -92,6 +92,11 @@ export default [
 		component: () =>
 			import("@/components/views/player/ViewPlayerRegistration.vue"),
 	},
+	{
+		path: "/player/update/:playerId",
+		name: "Update player",
+		component: () => import("@/components/views/player/ViewPlayerUpdate.vue"),
+	},
 	{
 		path: "/player/verification",
 		name: "Player verified",

From 9386c0d9b611df8e071d7c07a69801e97c9129ac Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 17:05:49 +0200
Subject: [PATCH 205/247] =?UTF-8?q?=E2=9C=85=20Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/TestPlayerResource.java         | 6 ++----
 .../views/competition/knockoutSystem/ViewKnockoutSystem.vue | 2 +-
 .../views/competition/knockoutSystem/ViewMatch.vue          | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 8a58363b..3c8451c1 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -1,9 +1,6 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
-import de.secretj12.turnierplaner.db.entities.Tournament;
-import de.secretj12.turnierplaner.db.entities.VerificationCode;
+import de.secretj12.turnierplaner.db.entities.*;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
@@ -49,6 +46,7 @@ private Competition genComp() {
         competition.setType(CompetitionType.KNOCKOUT);
         competition.setSignup(CompetitionSignUp.INDIVIDUAL);
         competition.setPlayerASex(SexFilter.ANY);
+        competition.setNumberSets(NumberSets.THREE);
         return competition;
     }
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 9be03fa3..ca63a158 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -1,5 +1,5 @@
 <template>
-	<p>Knockout system test</p>
+	<p>Knockout system</p>
 	<template v-if="knockoutSystem">
 		<ViewKnockoutTree
 			:finale="knockoutSystem.finale ?? undefined"
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 320467a3..7b9fcb41 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -81,6 +81,7 @@ const props = withDefaults(
 	}>(),
 	{
 		allowUpdate: false,
+		numberSets: NumberSets.THREE,
 	},
 )
 

From caed4501ede49fe64db3933a7ae8e2e01639409e Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 17:51:02 +0200
Subject: [PATCH 206/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20move=20enums=20to?=
 =?UTF-8?q?=20own=20directory=20and=20deduplicate=20enums?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Court.java      |  1 +
 .../turnierplaner/db/entities/NumberSets.java |  5 --
 .../turnierplaner/db/entities/Player.java     |  1 +
 .../turnierplaner/db/entities/Sex.java        |  5 --
 .../db/entities/competition/Competition.java  |  2 +-
 .../entities/competition/CompetitionMode.java |  5 --
 .../entities/competition/CompetitionType.java |  5 --
 .../db/entities/competition/SexFilter.java    |  5 --
 .../db/repositories/PlayerRepository.java     |  2 +-
 .../turnierplaner/enums/CompetitionMode.java  |  5 ++
 .../CompetitionSignUp.java                    |  2 +-
 .../turnierplaner/enums/CompetitionType.java  |  5 ++
 .../{db/entities => enums}/CourtType.java     |  2 +-
 .../CreationProgress.java                     |  2 +-
 .../turnierplaner/enums/NumberSets.java       |  5 ++
 .../de/secretj12/turnierplaner/enums/Sex.java |  5 ++
 .../turnierplaner/enums/SexFilter.java        |  5 ++
 .../admin => enums}/jAdminRole.java           |  2 +-
 .../resources/CompetitionResource.java        |  4 +-
 .../resources/PlayerResource.java             |  2 +-
 .../turnierplaner/resources/UserResource.java |  2 +-
 .../jsonEntities/admin/jAdminUser.java        |  1 +
 .../competition/jDirectorCompetitionAdd.java  |  6 +-
 .../director/competition/jDirectorMode.java   |  5 --
 .../director/competition/jDirectorSignUp.java |  5 --
 .../competition/jDirectorValidSex.java        |  5 --
 .../director/jDirectorPlayer.java             | 13 ++--
 .../user/competition/jUserCompetition.java    | 64 ++++++-------------
 .../competition/jUserCompetitionType.java     |  5 --
 .../user/competition/jUserConfigPlayerA.java  |  8 +--
 .../jsonEntities/user/jNumberSets.java        |  5 --
 .../jsonEntities/user/jUserCourt.java         |  2 +-
 .../jsonEntities/user/jUserMatchEvent.java    | 10 +--
 .../user/jUserPlayerRegistrationForm.java     | 12 ++--
 .../resources/jsonEntities/user/jUserSex.java |  5 --
 .../startup/testdata/CompetitionSettings.java |  6 +-
 .../startup/testdata/TestdataGenerator.java   | 23 +++----
 .../model/TestDeletionBehaviour.java          |  4 +-
 .../resources/TestCompetitionResource.java    | 21 +++---
 .../resources/TestCourtResource.java          |  2 +-
 .../resources/TestMatchResource.java          |  7 +-
 .../resources/TestPlayerResource.java         |  3 +-
 .../resources/TestTournamentResource.java     |  2 +-
 .../turnierplaner/tools/TestGroupTools.java   |  4 +-
 .../tools/TestKnockoutTools.java              |  4 +-
 45 files changed, 119 insertions(+), 175 deletions(-)
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionMode.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionType.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
 rename backend/src/main/java/de/secretj12/turnierplaner/{db/entities/competition => enums}/CompetitionSignUp.java (50%)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
 rename backend/src/main/java/de/secretj12/turnierplaner/{db/entities => enums}/CourtType.java (50%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{db/entities/competition => enums}/CreationProgress.java (51%)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities/admin => enums}/jAdminRole.java (75%)
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorMode.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorSignUp.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorValidSex.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetitionType.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
 delete mode 100644 backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSex.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
index f7a3d1da..ad55fa63 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
@@ -1,5 +1,6 @@
 package de.secretj12.turnierplaner.db.entities;
 
+import de.secretj12.turnierplaner.enums.CourtType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
deleted file mode 100644
index e2ecca80..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/NumberSets.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.db.entities;
-
-public enum NumberSets {
-    THREE, FIVE
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
index c83d4d34..62a2022c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
@@ -1,5 +1,6 @@
 package de.secretj12.turnierplaner.db.entities;
 
+import de.secretj12.turnierplaner.enums.Sex;
 import jakarta.persistence.*;
 
 import java.time.LocalDate;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
deleted file mode 100644
index 96223d72..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Sex.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.db.entities;
-
-public enum Sex {
-    MALE, FEMALE
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
index f3882121..f42e6255 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.db.entities.competition;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionMode.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionMode.java
deleted file mode 100644
index 1166ef67..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionMode.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.db.entities.competition;
-
-public enum CompetitionMode {
-    SINGLES, DOUBLES
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionType.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionType.java
deleted file mode 100644
index 4052307a..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.db.entities.competition;
-
-public enum CompetitionType {
-    KNOCKOUT, GROUPS
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
deleted file mode 100644
index 6b05808f..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/SexFilter.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.db.entities.competition;
-
-public enum SexFilter {
-    MALE, FEMALE, ANY
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
index acee8e67..4dc1b822 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.db.repositories;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
+import de.secretj12.turnierplaner.enums.Sex;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.panache.common.Parameters;
 import jakarta.enterprise.context.ApplicationScoped;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
new file mode 100644
index 00000000..0acb79bf
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.enums;
+
+public enum CompetitionMode {
+    SINGLE, DOUBLE
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionSignUp.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
similarity index 50%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionSignUp.java
rename to backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
index c754ae4e..9d018166 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CompetitionSignUp.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.db.entities.competition;
+package de.secretj12.turnierplaner.enums;
 
 public enum CompetitionSignUp {
     INDIVIDUAL, TOGETHER
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
new file mode 100644
index 00000000..cceb89c3
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.enums;
+
+public enum CompetitionType {
+    KNOCKOUT, GROUPS
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/CourtType.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
similarity index 50%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/CourtType.java
rename to backend/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
index da29613f..10d06277 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/CourtType.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.db.entities;
+package de.secretj12.turnierplaner.enums;
 
 public enum CourtType {
     HARD, CLAY, GRASS
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CreationProgress.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
similarity index 51%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CreationProgress.java
rename to backend/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
index eb59a53e..557e07f2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/CreationProgress.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.db.entities.competition;
+package de.secretj12.turnierplaner.enums;
 
 public enum CreationProgress {
     TEAMS, GAMES, SCHEDULING
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
new file mode 100644
index 00000000..e0343f25
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.enums;
+
+public enum NumberSets {
+    THREE, FIVE
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java
new file mode 100644
index 00000000..2d904be3
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.enums;
+
+public enum Sex {
+    MALE, FEMALE
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
new file mode 100644
index 00000000..fb037d75
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
@@ -0,0 +1,5 @@
+package de.secretj12.turnierplaner.enums;
+
+public enum SexFilter {
+    MALE, FEMALE, ANY
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java
similarity index 75%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java
rename to backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java
index c737ec57..bdd0a844 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminRole.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.admin;
+package de.secretj12.turnierplaner.enums;
 
 public enum jAdminRole {
     USER("user"), REPORTER("reporter"), DIRECTOR("director"), ADMIN("admin");
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index bd159550..3e5b3c6e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
@@ -192,7 +192,7 @@ public String signUpPlayer(@PathParam("tourName") String tourName, @PathParam("c
                 || competition.getTournament().getEndRegistration().isBefore(Instant.now())))
             throw new NotAuthorizedException("Registration phase is not active");
 
-        if (competition.getMode() == CompetitionMode.SINGLES
+        if (competition.getMode() == CompetitionMode.SINGLE
             || (competition.getSignup() == CompetitionSignUp.INDIVIDUAL
                 && !competition.isPlayerBdifferent())) {
             // single mode or double with individual registration but same constraints
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 8d8fa745..37031b35 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.DefaultConfig;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
+import de.secretj12.turnierplaner.enums.Sex;
 import de.secretj12.turnierplaner.db.entities.VerificationCode;
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
index f04249ac..1147fdba 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
@@ -1,6 +1,6 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.resources.jsonEntities.admin.jAdminRole;
+import de.secretj12.turnierplaner.enums.jAdminRole;
 import de.secretj12.turnierplaner.resources.jsonEntities.admin.jAdminUser;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
index 028b4e3e..64c2b0b2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
@@ -1,5 +1,6 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.admin;
 
+import de.secretj12.turnierplaner.enums.jAdminRole;
 import org.keycloak.representations.idm.UserRepresentation;
 
 public class jAdminUser {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
index 09d068cc..04749796 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
@@ -1,6 +1,6 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
 
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
 
@@ -25,8 +25,8 @@ public void toDB(Competition competition) {
             case GROUPS -> competition.setType(CompetitionType.GROUPS);
         }
         switch (getMode()) {
-            case SINGLE -> competition.setMode(CompetitionMode.SINGLES);
-            case DOUBLE -> competition.setMode(CompetitionMode.DOUBLES);
+            case SINGLE -> competition.setMode(CompetitionMode.SINGLE);
+            case DOUBLE -> competition.setMode(CompetitionMode.DOUBLE);
         }
         switch (getSignUp()) {
             case INDIVIDUAL -> competition.setSignup(CompetitionSignUp.INDIVIDUAL);
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorMode.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorMode.java
deleted file mode 100644
index 56383efe..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorMode.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
-
-public enum jDirectorMode {
-    SINGLE, DOUBLE
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorSignUp.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorSignUp.java
deleted file mode 100644
index c5687d0f..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorSignUp.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
-
-public enum jDirectorSignUp {
-    INDIVIDUAL, TOGETHER
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorValidSex.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorValidSex.java
deleted file mode 100644
index b5408f65..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorValidSex.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
-
-public enum jDirectorValidSex {
-    MALE, FEMALE, ANY
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
index 33ad6d5e..e35946db 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
@@ -1,26 +1,23 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.director;
 
 import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.enums.Sex;
 import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSex;
 
 public class jDirectorPlayer extends jUserPlayer {
 
-    private jUserSex sex;
+    private Sex sex;
 
     public jDirectorPlayer(Player p) {
         super(p);
-        this.sex = switch (p.getSex()) {
-            case MALE -> jUserSex.MALE;
-            case FEMALE -> jUserSex.FEMALE;
-        };
+        this.sex = p.getSex();
     }
 
-    public jUserSex getSex() {
+    public Sex getSex() {
         return sex;
     }
 
-    public void setSex(jUserSex sex) {
+    public void setSex(Sex sex) {
         this.sex = sex;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
index b380698f..0ff8d369 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
@@ -1,20 +1,16 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
 
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
-import de.secretj12.turnierplaner.db.entities.competition.CreationProgress;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorMode;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorSignUp;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorValidSex;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jNumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import jakarta.ws.rs.NotFoundException;
 
 public class jUserCompetition {
     private String name;
     private String description;
-    private jUserCompetitionType type;
-    private jDirectorMode mode;
-    private jDirectorSignUp signUp;
-    private jNumberSets numberSets;
+    private CompetitionType type;
+    private CompetitionMode mode;
+    private CompetitionSignUp signUp;
+    private NumberSets numberSets;
     private jUserConfigPlayerA playerA;
     private jUserConfigPlayerB playerB;
     private CreationProgress cProgress;
@@ -28,41 +24,19 @@ public jUserCompetition(Competition competition) {
 
         this.name = competition.getName();
         this.description = competition.getDescription();
-        this.type = switch (competition.getType()) {
-            case GROUPS -> jUserCompetitionType.GROUPS;
-            case KNOCKOUT -> jUserCompetitionType.KNOCKOUT;
-        };
-        this.mode = switch (competition.getMode()) {
-            case SINGLES -> jDirectorMode.SINGLE;
-            case DOUBLES -> jDirectorMode.DOUBLE;
-        };
-        this.signUp = switch (competition.getSignup()) {
-            case INDIVIDUAL -> jDirectorSignUp.INDIVIDUAL;
-            case TOGETHER -> jDirectorSignUp.TOGETHER;
-        };
-        this.numberSets = switch (competition.getNumberSets()) {
-            case THREE -> jNumberSets.THREE;
-            case FIVE -> jNumberSets.FIVE;
-        };
+        this.type = competition.getType();
+        this.mode = competition.getMode();
+        this.signUp = competition.getSignup();
+        this.numberSets = competition.getNumberSets();
         this.playerA = new jUserConfigPlayerA();
-        this.playerA.setSex(switch (competition.getPlayerASex()) {
-            case MALE -> jDirectorValidSex.MALE;
-            case FEMALE -> jDirectorValidSex.FEMALE;
-            case ANY -> jDirectorValidSex.ANY;
-            case null -> null;
-        });
+        this.playerA.setSex(competition.getPlayerASex());
         this.playerA.setHasMinAge(competition.playerAhasMinAge());
         this.playerA.setMinAge(competition.getPlayerAminAge());
         this.playerA.setHasMaxAge(competition.playerAhasMaxAge());
         this.playerA.setMaxAge(competition.getPlayerAmaxAge());
         this.playerB = new jUserConfigPlayerB();
         this.playerB.setDifferent(competition.isPlayerBdifferent());
-        this.playerB.setSex(switch (competition.getPlayerBSex()) {
-            case MALE -> jDirectorValidSex.MALE;
-            case FEMALE -> jDirectorValidSex.FEMALE;
-            case ANY -> jDirectorValidSex.ANY;
-            case null -> null;
-        });
+        this.playerB.setSex(competition.getPlayerBSex());
         this.playerB.setHasMinAge(competition.playerBhasMinAge());
         this.playerB.setMinAge(competition.getPlayerBminAge());
         this.playerB.setHasMaxAge(competition.playerBhasMaxAge());
@@ -87,27 +61,27 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public jUserCompetitionType getType() {
+    public CompetitionType getType() {
         return type;
     }
 
-    public void setType(jUserCompetitionType type) {
+    public void setType(CompetitionType type) {
         this.type = type;
     }
 
-    public jDirectorMode getMode() {
+    public CompetitionMode getMode() {
         return mode;
     }
 
-    public void setMode(jDirectorMode mode) {
+    public void setMode(CompetitionMode mode) {
         this.mode = mode;
     }
 
-    public jDirectorSignUp getSignUp() {
+    public CompetitionSignUp getSignUp() {
         return signUp;
     }
 
-    public void setSignUp(jDirectorSignUp signUp) {
+    public void setSignUp(CompetitionSignUp signUp) {
         this.signUp = signUp;
     }
 
@@ -135,11 +109,11 @@ public void setcProgress(CreationProgress cProgress) {
         this.cProgress = cProgress;
     }
 
-    public jNumberSets getNumberSets() {
+    public NumberSets getNumberSets() {
         return numberSets;
     }
 
-    public void setNumberSets(jNumberSets numberSets) {
+    public void setNumberSets(NumberSets numberSets) {
         this.numberSets = numberSets;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetitionType.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetitionType.java
deleted file mode 100644
index d07a0ef0..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetitionType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
-
-public enum jUserCompetitionType {
-    KNOCKOUT, GROUPS
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java
index 1bf1d92b..17895e0d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java
@@ -1,21 +1,21 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
 
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorValidSex;
+import de.secretj12.turnierplaner.enums.SexFilter;
 
 import java.time.LocalDate;
 
 public class jUserConfigPlayerA {
-    private jDirectorValidSex sex;
+    private SexFilter sex;
     private boolean hasMinAge;
     private LocalDate minAge;
     private boolean hasMaxAge;
     private LocalDate maxAge;
 
-    public jDirectorValidSex getSex() {
+    public SexFilter getSex() {
         return sex;
     }
 
-    public void setSex(jDirectorValidSex sex) {
+    public void setSex(SexFilter sex) {
         this.sex = sex;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
deleted file mode 100644
index b3e5d644..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jNumberSets.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
-
-public enum jNumberSets {
-    THREE, FIVE
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
index dab5793f..20e1f45b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
 import de.secretj12.turnierplaner.db.entities.Court;
-import de.secretj12.turnierplaner.db.entities.CourtType;
+import de.secretj12.turnierplaner.enums.CourtType;
 
 public class jUserCourt {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
index d7172566..e0412740 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetitionType;
+import de.secretj12.turnierplaner.enums.CompetitionType;
 
 public class jUserMatchEvent extends jUserMatch {
 
@@ -17,7 +17,7 @@ public class jUserMatchEvent extends jUserMatch {
      * Type of the match in competition
      * -> also group competitions contain knockout matches
      */
-    public jUserCompetitionType type;
+    public CompetitionType type;
     /**
      * For knockout: round number
      * For group: group number
@@ -39,7 +39,7 @@ public jUserMatchEvent(Match match) {
         super(match);
         this.tourName = match.getCompetition().getTournament().getName();
         this.compName = match.getCompetition().getName();
-        this.type = match.getGroup() != null ? jUserCompetitionType.GROUPS : jUserCompetitionType.KNOCKOUT;
+        this.type = match.getGroup() != null ? CompetitionType.GROUPS : CompetitionType.KNOCKOUT;
         this.number = match.getNumber();
         this.total = match.getCompetition().getTotal();
         if (match.getDependentOn() == null) {
@@ -72,11 +72,11 @@ public void setCompName(String compName) {
         this.compName = compName;
     }
 
-    public jUserCompetitionType getType() {
+    public CompetitionType getType() {
         return type;
     }
 
-    public void setType(jUserCompetitionType type) {
+    public void setType(CompetitionType type) {
         this.type = type;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
index 65d7ffca..4a692db0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
@@ -1,6 +1,7 @@
 package de.secretj12.turnierplaner.resources.jsonEntities.user;
 
 import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.enums.Sex;
 
 import java.time.LocalDate;
 
@@ -8,7 +9,7 @@ public class jUserPlayerRegistrationForm {
 
     String firstName;
     String lastName;
-    jUserSex sex;
+    Sex sex;
     LocalDate birthday;
     String email;
     String phone;
@@ -19,10 +20,7 @@ public jUserPlayerRegistrationForm() {
     public jUserPlayerRegistrationForm(Player player) {
         this.firstName = player.getFirstName();
         this.lastName = player.getLastName();
-        this.sex = switch (player.getSex()) {
-            case MALE -> jUserSex.MALE;
-            case FEMALE -> jUserSex.FEMALE;
-        };
+        this.sex = player.getSex();
         this.birthday = player.getBirthday();
         this.email = player.getEmail();
         this.phone = player.getPhone();
@@ -44,11 +42,11 @@ public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
-    public jUserSex getSex() {
+    public Sex getSex() {
         return sex;
     }
 
-    public void setSex(jUserSex sex) {
+    public void setSex(Sex sex) {
         this.sex = sex;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSex.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSex.java
deleted file mode 100644
index 026d4fc2..00000000
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSex.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
-
-public enum jUserSex {
-    MALE, FEMALE
-}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
index f7ec345f..7686bad5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
@@ -1,8 +1,8 @@
 package de.secretj12.turnierplaner.startup.testdata;
 
-import de.secretj12.turnierplaner.db.entities.competition.CompetitionMode;
-import de.secretj12.turnierplaner.db.entities.competition.CompetitionType;
-import de.secretj12.turnierplaner.db.entities.competition.SexFilter;
+import de.secretj12.turnierplaner.enums.CompetitionMode;
+import de.secretj12.turnierplaner.enums.CompetitionType;
+import de.secretj12.turnierplaner.enums.SexFilter;
 
 class CompetitionSettings {
     private String name;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index ebcc7064..cb8960ac 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -7,6 +7,7 @@
 import de.secretj12.turnierplaner.db.entities.groups.MatchOfGroup;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.*;
+import de.secretj12.turnierplaner.enums.*;
 import io.smallrye.mutiny.tuples.Tuple2;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
@@ -67,13 +68,13 @@ public void generateData() {
 
         List<CompetitionSettings> compSetting = new ArrayList<>();
         // @formatter:off
-        compSetting.add(new CompetitionSettings("Single Groups", CompetitionType.GROUPS, CompetitionMode.SINGLES, SexFilter.MALE, 8, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Single U18", CompetitionType.GROUPS, CompetitionMode.SINGLES, SexFilter.MALE, 8, false, AGE_RESTR.U18, false, 2));
-        compSetting.add(new CompetitionSettings("Single Knockout", CompetitionType.KNOCKOUT, CompetitionMode.SINGLES, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double random", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 32, true, AGE_RESTR.NONE, false, 2));
-        compSetting.add(new CompetitionSettings("Double O50", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 8, false, AGE_RESTR.O50, true, 2));
-        compSetting.add(new CompetitionSettings("Double Mixed", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLES, SexFilter.ANY, 4, true, AGE_RESTR.O50, true, 2));
+        compSetting.add(new CompetitionSettings("Single Groups", CompetitionType.GROUPS, CompetitionMode.SINGLE, SexFilter.MALE, 8, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Single U18", CompetitionType.GROUPS, CompetitionMode.SINGLE, SexFilter.MALE, 8, false, AGE_RESTR.U18, false, 2));
+        compSetting.add(new CompetitionSettings("Single Knockout", CompetitionType.KNOCKOUT, CompetitionMode.SINGLE, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLE, SexFilter.MALE, 16, false, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double random", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLE, SexFilter.ANY, 32, true, AGE_RESTR.NONE, false, 2));
+        compSetting.add(new CompetitionSettings("Double O50", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLE, SexFilter.ANY, 8, false, AGE_RESTR.O50, true, 2));
+        compSetting.add(new CompetitionSettings("Double Mixed", CompetitionType.KNOCKOUT, CompetitionMode.DOUBLE, SexFilter.ANY, 4, true, AGE_RESTR.O50, true, 2));
         // @formatter:on
 
         createTournament(TDate.BEFORE_REGISTRATION, "Clubmeisterschaft 2026", "Anmeldung ausstehend", true,
@@ -249,7 +250,7 @@ private Team[] createTeams(Competition competition, CompetitionSettings competit
             teams[i].setCompetition(competition);
             teams[i].setPlayerA(player);
 
-            if (competitionSettings.getCompetitionMode() == CompetitionMode.DOUBLES) {
+            if (competitionSettings.getCompetitionMode() == CompetitionMode.DOUBLE) {
                 Player player2 = createPlayer(competitionSettings.getAgeRestr(), competitionSettings.getSex());
                 players.persist(player2);
                 teams[i].setPlayerB(player2);
@@ -450,8 +451,8 @@ private void addCompetition(Tournament t, TDate tDate,
             competition.setName(compSetting.getName());
 
             // Set description
-            if (compSetting.getCompetitionMode() == CompetitionMode.SINGLES) {
-                competition.setMode(CompetitionMode.SINGLES);
+            if (compSetting.getCompetitionMode() == CompetitionMode.SINGLE) {
+                competition.setMode(CompetitionMode.SINGLE);
                 competition.setSignup(CompetitionSignUp.INDIVIDUAL);
                 competition.setPlayerBdifferent(false);
                 switch (compSetting.getSex()) {
@@ -468,7 +469,7 @@ private void addCompetition(Tournament t, TDate tDate,
                     }
                 }
             } else {
-                competition.setMode(CompetitionMode.DOUBLES);
+                competition.setMode(CompetitionMode.DOUBLE);
                 if (compSetting.isDifferentConditions()) {
                     competition.setPlayerBdifferent(true);
                     if (compSetting.isRegisterIndividual()) {
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
index 04d50d8e..3b287e3c 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.model;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.FinalOfGroup;
@@ -57,7 +57,7 @@ public void addData() {
         Competition comp = new Competition();
         comp.setName("Herren");
         comp.setDescription("Empty description");
-        comp.setMode(CompetitionMode.DOUBLES);
+        comp.setMode(CompetitionMode.DOUBLE);
         comp.setType(CompetitionType.GROUPS);
         comp.setSignup(CompetitionSignUp.TOGETHER);
         comp.setPlayerASex(SexFilter.MALE);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
index 5bdbf312..f53feebd 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
@@ -1,8 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.db.entities.Sex;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
@@ -25,7 +24,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
-import static de.secretj12.turnierplaner.db.entities.competition.CreationProgress.TEAMS;
+import static de.secretj12.turnierplaner.enums.CreationProgress.TEAMS;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 
@@ -75,7 +74,7 @@ public void addData() {
         Competition comp20 = new Competition();
         comp20.setName("Herren");
         comp20.setDescription("Offen für alle Herren");
-        comp20.setMode(CompetitionMode.SINGLES);
+        comp20.setMode(CompetitionMode.SINGLE);
         comp20.setType(CompetitionType.KNOCKOUT);
         comp20.setPlayerASex(SexFilter.MALE);
         comp20.setcProgress(TEAMS);
@@ -87,7 +86,7 @@ public void addData() {
         Competition comp21 = new Competition();
         comp21.setName("Herren");
         comp21.setDescription("Offen für alle Herren");
-        comp21.setMode(CompetitionMode.SINGLES);
+        comp21.setMode(CompetitionMode.SINGLE);
         comp21.setType(CompetitionType.KNOCKOUT);
         comp21.setPlayerASex(SexFilter.MALE);
         comp21.setcProgress(TEAMS);
@@ -99,7 +98,7 @@ public void addData() {
         Competition comp22 = new Competition();
         comp22.setName("Damen");
         comp22.setDescription("Offen für alle Damen");
-        comp22.setMode(CompetitionMode.SINGLES);
+        comp22.setMode(CompetitionMode.SINGLE);
         comp22.setType(CompetitionType.KNOCKOUT);
         comp22.setPlayerASex(SexFilter.FEMALE);
         comp22.setcProgress(TEAMS);
@@ -657,7 +656,7 @@ public void addComps() {
         Competition compSingle = new Competition();
         compSingle.setName("Single");
         compSingle.setDescription("Offen für alle Herren");
-        compSingle.setMode(CompetitionMode.SINGLES);
+        compSingle.setMode(CompetitionMode.SINGLE);
         compSingle.setType(CompetitionType.KNOCKOUT);
         compSingle.setPlayerASex(SexFilter.MALE);
         compSingle.setcProgress(TEAMS);
@@ -669,7 +668,7 @@ public void addComps() {
         Competition compDoubleIndSame = new Competition();
         compDoubleIndSame.setName("DoubleIndSame");
         compDoubleIndSame.setDescription("Offen für alle Herren");
-        compDoubleIndSame.setMode(CompetitionMode.DOUBLES);
+        compDoubleIndSame.setMode(CompetitionMode.DOUBLE);
         compDoubleIndSame.setType(CompetitionType.KNOCKOUT);
         compDoubleIndSame.setPlayerASex(SexFilter.MALE);
         compDoubleIndSame.setcProgress(TEAMS);
@@ -682,7 +681,7 @@ public void addComps() {
         Competition compDoubleIndDif = new Competition();
         compDoubleIndDif.setName("DoubleIndDif");
         compDoubleIndDif.setDescription("Offen für alle Herren");
-        compDoubleIndDif.setMode(CompetitionMode.DOUBLES);
+        compDoubleIndDif.setMode(CompetitionMode.DOUBLE);
         compDoubleIndDif.setType(CompetitionType.KNOCKOUT);
         compDoubleIndDif.setPlayerASex(SexFilter.MALE);
         compDoubleIndDif.setcProgress(TEAMS);
@@ -696,7 +695,7 @@ public void addComps() {
         Competition compDoubleTog = new Competition();
         compDoubleTog.setName("DoubleTog");
         compDoubleTog.setDescription("Offen für alle Herren");
-        compDoubleTog.setMode(CompetitionMode.DOUBLES);
+        compDoubleTog.setMode(CompetitionMode.DOUBLE);
         compDoubleTog.setType(CompetitionType.KNOCKOUT);
         compDoubleTog.setPlayerASex(SexFilter.MALE);
         compDoubleTog.setcProgress(TEAMS);
@@ -711,7 +710,7 @@ public void addComps() {
         Competition compSingle2 = new Competition();
         compSingle2.setName("Single");
         compSingle2.setDescription("Offen für alle Herren");
-        compSingle2.setMode(CompetitionMode.SINGLES);
+        compSingle2.setMode(CompetitionMode.SINGLE);
         compSingle2.setType(CompetitionType.KNOCKOUT);
         compSingle2.setPlayerASex(SexFilter.MALE);
         compSingle2.setcProgress(TEAMS);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
index 6fa77ba3..262264a9 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.db.entities.Court;
-import de.secretj12.turnierplaner.db.entities.CourtType;
+import de.secretj12.turnierplaner.enums.CourtType;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
index b9814804..4061efe1 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
@@ -6,6 +6,7 @@
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.enums.*;
 import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.security.TestSecurity;
@@ -21,7 +22,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
-import static de.secretj12.turnierplaner.db.entities.competition.CreationProgress.TEAMS;
+import static de.secretj12.turnierplaner.enums.CreationProgress.TEAMS;
 import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -61,7 +62,7 @@ public void addCourts() {
         Competition comp = new Competition();
         comp.setName("Herren");
         comp.setDescription("Offen für alle Herren");
-        comp.setMode(CompetitionMode.SINGLES);
+        comp.setMode(CompetitionMode.SINGLE);
         comp.setType(CompetitionType.KNOCKOUT);
         comp.setPlayerASex(SexFilter.MALE);
         comp.setcProgress(TEAMS);
@@ -74,7 +75,7 @@ public void addCourts() {
         Competition comp2 = new Competition();
         comp2.setName("Damen");
         comp2.setDescription("Offen für alle Herren");
-        comp2.setMode(CompetitionMode.SINGLES);
+        comp2.setMode(CompetitionMode.SINGLE);
         comp2.setType(CompetitionType.KNOCKOUT);
         comp2.setPlayerASex(SexFilter.MALE);
         comp2.setcProgress(TEAMS);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 3c8451c1..9219f2f3 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -6,6 +6,7 @@
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
+import de.secretj12.turnierplaner.enums.*;
 import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.mailer.MockMailbox;
 import io.quarkus.test.junit.QuarkusTest;
@@ -42,7 +43,7 @@ public class TestPlayerResource {
     private Competition genComp() {
         Competition competition = new Competition();
         competition.setcProgress(CreationProgress.TEAMS);
-        competition.setMode(CompetitionMode.SINGLES);
+        competition.setMode(CompetitionMode.SINGLE);
         competition.setType(CompetitionType.KNOCKOUT);
         competition.setSignup(CompetitionSignUp.INDIVIDUAL);
         competition.setPlayerASex(SexFilter.ANY);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index f55c675b..0fe86a0a 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.db.entities.Court;
-import de.secretj12.turnierplaner.db.entities.CourtType;
+import de.secretj12.turnierplaner.enums.CourtType;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
index 943257b3..31be3a4d 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
@@ -71,7 +71,7 @@ public void addData() {
         Competition comp = new Competition();
         comp.setName("Herren");
         comp.setDescription("Empty description");
-        comp.setMode(CompetitionMode.DOUBLES);
+        comp.setMode(CompetitionMode.DOUBLE);
         comp.setType(CompetitionType.GROUPS);
         comp.setSignup(CompetitionSignUp.TOGETHER);
         comp.setPlayerASex(SexFilter.MALE);
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
index bc4f115e..6a86d488 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.tools;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.db.entities.NumberSets;
+import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.entities.competition.*;
@@ -55,7 +55,7 @@ public void addData() {
         Competition comp = new Competition();
         comp.setName("Herren");
         comp.setDescription("Empty description");
-        comp.setMode(CompetitionMode.DOUBLES);
+        comp.setMode(CompetitionMode.DOUBLE);
         comp.setType(CompetitionType.KNOCKOUT);
         comp.setSignup(CompetitionSignUp.TOGETHER);
         comp.setPlayerASex(SexFilter.MALE);

From 3beb2a97c5ae89ef03074aad9a0e008cbdc48b7c Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Tue, 1 Oct 2024 18:03:42 +0200
Subject: [PATCH 207/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20move=20jsonEntitie?=
 =?UTF-8?q?s=20to=20top=20level=20model=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/repositories/SetRepository.java        |  2 +-
 .../admin/jAdminUser.java                     |  2 +-
 .../competition/jDirectorCompetitionAdd.java  |  4 ++--
 .../jDirectorCompetitionUpdate.java           |  2 +-
 .../competition/jDirectorGroupsDivision.java  |  4 ++--
 .../competition/jDirectorKnockoutOrder.java   |  4 ++--
 .../director/jDirectorPlayer.java             |  4 ++--
 .../director/jDirectorPlayerUpdateForm.java   |  4 ++--
 .../director/jDirectorScheduleMatch.java      |  2 +-
 .../director/jDirectorTournamentAdd.java      |  4 ++--
 .../director/jDirectorTournamentUpdate.java   |  4 ++--
 .../jsonEntities => model}/jPage.java         |  2 +-
 .../user/competition/jUserCompetition.java    |  2 +-
 .../user/competition/jUserConfigPlayerA.java  |  2 +-
 .../user/competition/jUserConfigPlayerB.java  |  2 +-
 .../user/group/jUserGroup.java                |  4 ++--
 .../user/group/jUserGroupMatchAfterGroup.java |  4 ++--
 .../user/group/jUserGroupMatchAfterMatch.java |  4 ++--
 .../user/group/jUserGroupSystem.java          |  4 ++--
 .../user/jUserConfig.java                     |  2 +-
 .../user/jUserCourt.java                      |  2 +-
 .../user/jUserMatch.java                      |  2 +-
 .../user/jUserMatchEvent.java                 |  2 +-
 .../user/jUserPlayer.java                     |  2 +-
 .../user/jUserPlayerRegistrationForm.java     |  2 +-
 .../user/jUserPlayerSignUpForm.java           |  2 +-
 .../jsonEntities => model}/user/jUserSet.java |  2 +-
 .../user/jUserTeam.java                       |  2 +-
 .../user/jUserTournament.java                 |  2 +-
 .../user/knockout/jUserKnockoutMatch.java     |  4 ++--
 .../user/knockout/jUserKnockoutSystem.java    |  2 +-
 .../resources/CompetitionResource.java        | 20 +++++++++----------
 .../resources/ConfigResource.java             |  2 +-
 .../resources/CourtResource.java              |  2 +-
 .../resources/MatchResource.java              |  2 +-
 .../resources/PlayerResource.java             | 10 +++++-----
 .../turnierplaner/resources/SetResource.java  |  2 +-
 .../resources/TournamentResource.java         |  8 ++++----
 .../turnierplaner/resources/UserResource.java |  2 +-
 .../turnierplaner/tools/KnockoutTools.java    |  2 +-
 .../resources/TestTournamentResource.java     |  2 +-
 41 files changed, 69 insertions(+), 69 deletions(-)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/admin/jAdminUser.java (92%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/competition/jDirectorCompetitionAdd.java (93%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/competition/jDirectorCompetitionUpdate.java (86%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/competition/jDirectorGroupsDivision.java (81%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/competition/jDirectorKnockoutOrder.java (76%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/jDirectorPlayer.java (73%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/jDirectorPlayerUpdateForm.java (74%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/jDirectorScheduleMatch.java (91%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/jDirectorTournamentAdd.java (87%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/director/jDirectorTournamentUpdate.java (85%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/jPage.java (87%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/competition/jUserCompetition.java (97%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/competition/jUserConfigPlayerA.java (93%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/competition/jUserConfigPlayerB.java (77%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/group/jUserGroup.java (88%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/group/jUserGroupMatchAfterGroup.java (85%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/group/jUserGroupMatchAfterMatch.java (92%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/group/jUserGroupSystem.java (91%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserConfig.java (95%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserCourt.java (92%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserMatch.java (97%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserMatchEvent.java (97%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserPlayer.java (93%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserPlayerRegistrationForm.java (95%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserPlayerSignUpForm.java (86%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserSet.java (93%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserTeam.java (93%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/jUserTournament.java (96%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/knockout/jUserKnockoutMatch.java (89%)
 rename backend/src/main/java/de/secretj12/turnierplaner/{resources/jsonEntities => model}/user/knockout/jUserKnockoutSystem.java (93%)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
index eca23432..9d034d5d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Set;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
+import de.secretj12.turnierplaner.model.user.jUserSet;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.transaction.Transactional;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java b/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
similarity index 92%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
index 64c2b0b2..ca55f8a7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/admin/jAdminUser.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.admin;
+package de.secretj12.turnierplaner.model.admin;
 
 import de.secretj12.turnierplaner.enums.jAdminRole;
 import org.keycloak.representations.idm.UserRepresentation;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
index 04749796..24345bbc 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
@@ -1,8 +1,8 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
+package de.secretj12.turnierplaner.model.director.competition;
 
 import de.secretj12.turnierplaner.enums.*;
 import de.secretj12.turnierplaner.db.entities.competition.*;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
+import de.secretj12.turnierplaner.model.user.competition.jUserCompetition;
 
 public class jDirectorCompetitionAdd extends jUserCompetition {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionUpdate.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
similarity index 86%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionUpdate.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
index 83909342..d0f5413c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorCompetitionUpdate.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
+package de.secretj12.turnierplaner.model.director.competition;
 
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorGroupsDivision.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
similarity index 81%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorGroupsDivision.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
index e1a4976d..1a7ad5c5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorGroupsDivision.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
+package de.secretj12.turnierplaner.model.director.competition;
 
 import de.secretj12.turnierplaner.db.entities.competition.Team;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
+import de.secretj12.turnierplaner.model.user.jUserTeam;
 
 import java.util.List;
 import java.util.Set;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorKnockoutOrder.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
similarity index 76%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorKnockoutOrder.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
index bf4377b9..575d5547 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/competition/jDirectorKnockoutOrder.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director.competition;
+package de.secretj12.turnierplaner.model.director.competition;
 
 import de.secretj12.turnierplaner.db.entities.competition.Team;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
+import de.secretj12.turnierplaner.model.user.jUserTeam;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
similarity index 73%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
index e35946db..0e4101f8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayer.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
@@ -1,8 +1,8 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director;
+package de.secretj12.turnierplaner.model.director;
 
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.enums.Sex;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
+import de.secretj12.turnierplaner.model.user.jUserPlayer;
 
 public class jDirectorPlayer extends jUserPlayer {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
similarity index 74%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
index 0b5277aa..3459e243 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorPlayerUpdateForm.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director;
+package de.secretj12.turnierplaner.model.director;
 
 import de.secretj12.turnierplaner.db.entities.Player;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
+import de.secretj12.turnierplaner.model.user.jUserPlayerRegistrationForm;
 
 import java.util.UUID;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
similarity index 91%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
index fbb310f1..9b84abf0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorScheduleMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director;
+package de.secretj12.turnierplaner.model.director;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentAdd.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
similarity index 87%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentAdd.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
index 7714fd10..2d678cea 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentAdd.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director;
+package de.secretj12.turnierplaner.model.director;
 
 import de.secretj12.turnierplaner.db.entities.Tournament;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
+import de.secretj12.turnierplaner.model.user.jUserTournament;
 
 public class jDirectorTournamentAdd extends jUserTournament {
     private boolean visible;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
similarity index 85%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
index 86d7f609..113c6ea9 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/director/jDirectorTournamentUpdate.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.director;
+package de.secretj12.turnierplaner.model.director;
 
 import de.secretj12.turnierplaner.db.entities.Tournament;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
+import de.secretj12.turnierplaner.model.user.jUserCourt;
 
 import java.util.Set;
 import java.util.UUID;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java b/backend/src/main/java/de/secretj12/turnierplaner/model/jPage.java
similarity index 87%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/jPage.java
index c6309854..dd7c68a0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/jPage.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/jPage.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities;
+package de.secretj12.turnierplaner.model;
 
 public class jPage<T> {
     private long total;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
similarity index 97%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
index 0ff8d369..98fd9004 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserCompetition.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
+package de.secretj12.turnierplaner.model.user.competition;
 
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.enums.*;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
index 17895e0d..44cb85e5 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerA.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
+package de.secretj12.turnierplaner.model.user.competition;
 
 import de.secretj12.turnierplaner.enums.SexFilter;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerB.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
similarity index 77%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerB.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
index 988b6ba8..7d8f3e77 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/competition/jUserConfigPlayerB.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.competition;
+package de.secretj12.turnierplaner.model.user.competition;
 
 public class jUserConfigPlayerB extends jUserConfigPlayerA {
     private boolean different;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
similarity index 88%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
index 0c864977..62601e9d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
@@ -1,8 +1,8 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.group;
+package de.secretj12.turnierplaner.model.user.group;
 
 import de.secretj12.turnierplaner.db.entities.competition.Team;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserMatch;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
similarity index 85%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterGroup.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
index 44f25342..551b97be 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.group;
+package de.secretj12.turnierplaner.model.user.group;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserMatch;
 
 public class jUserGroupMatchAfterGroup extends jUserMatch {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
similarity index 92%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
index 69413832..322d0459 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupMatchAfterMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.group;
+package de.secretj12.turnierplaner.model.user.group;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserMatch;
 
 public class jUserGroupMatchAfterMatch extends jUserMatch {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
similarity index 91%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
index 07d32abb..b42cd51b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/group/jUserGroupSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
@@ -1,8 +1,8 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.group;
+package de.secretj12.turnierplaner.model.user.group;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserMatch;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
similarity index 95%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
index ecb93ba4..1bd784ff 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserConfig.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Config;
 import de.secretj12.turnierplaner.db.entities.DefaultConfig;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
similarity index 92%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
index 20e1f45b..7de46487 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserCourt.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Court;
 import de.secretj12.turnierplaner.enums.CourtType;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
similarity index 97%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
index 42fa44ce..117ff8ee 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import org.slf4j.Logger;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
similarity index 97%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
index e0412740..23506479 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserMatchEvent.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.enums.CompetitionType;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayer.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayer.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
index da3f6db4..b0805266 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayer.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Player;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
similarity index 95%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
index 4a692db0..64de8161 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerRegistrationForm.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Player;
 import de.secretj12.turnierplaner.enums.Sex;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerSignUpForm.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
similarity index 86%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerSignUpForm.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
index dd987724..bff8297e 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserPlayerSignUpForm.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 public class jUserPlayerSignUpForm {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
index fe1189b6..0c6267f2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserSet.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Set;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTeam.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTeam.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
index d9b9b50f..2c771cfe 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTeam.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.competition.Team;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
similarity index 96%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
index bc4f32eb..f03b5c25 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/jUserTournament.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user;
+package de.secretj12.turnierplaner.model.user;
 
 import de.secretj12.turnierplaner.db.entities.Tournament;
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
similarity index 89%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
index 14ea5d66..5ad18df6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
@@ -1,7 +1,7 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.knockout;
+package de.secretj12.turnierplaner.model.user.knockout;
 
 import de.secretj12.turnierplaner.db.entities.Match;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserMatch;
 
 public class jUserKnockoutMatch extends jUserMatch {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
similarity index 93%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
rename to backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
index cb33488e..617aa2ea 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/jsonEntities/user/knockout/jUserKnockoutSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
@@ -1,4 +1,4 @@
-package de.secretj12.turnierplaner.resources.jsonEntities.user.knockout;
+package de.secretj12.turnierplaner.model.user.knockout;
 
 import de.secretj12.turnierplaner.db.entities.Match;
 import jakarta.ws.rs.NotFoundException;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 3e5b3c6e..f04ccc23 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -7,16 +7,16 @@
 import de.secretj12.turnierplaner.db.entities.competition.*;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.db.repositories.*;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionAdd;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorCompetitionUpdate;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.competition.jDirectorGroupsDivision;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorScheduleMatch;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.competition.jUserCompetition;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.group.jUserGroupSystem;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerSignUpForm;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTeam;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutSystem;
+import de.secretj12.turnierplaner.model.director.competition.jDirectorCompetitionAdd;
+import de.secretj12.turnierplaner.model.director.competition.jDirectorCompetitionUpdate;
+import de.secretj12.turnierplaner.model.director.competition.jDirectorGroupsDivision;
+import de.secretj12.turnierplaner.model.director.jDirectorScheduleMatch;
+import de.secretj12.turnierplaner.model.user.competition.jUserCompetition;
+import de.secretj12.turnierplaner.model.user.group.jUserGroupSystem;
+import de.secretj12.turnierplaner.model.user.jUserPlayerSignUpForm;
+import de.secretj12.turnierplaner.model.user.jUserTeam;
+import de.secretj12.turnierplaner.model.user.knockout.jUserKnockoutMatch;
+import de.secretj12.turnierplaner.model.user.knockout.jUserKnockoutSystem;
 import de.secretj12.turnierplaner.tools.CommonHelpers;
 import de.secretj12.turnierplaner.tools.GroupTools;
 import de.secretj12.turnierplaner.tools.KnockoutTools;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 4fc78916..8324aedf 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -4,7 +4,7 @@
 import de.secretj12.turnierplaner.db.entities.DefaultConfig;
 import de.secretj12.turnierplaner.db.repositories.ConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserConfig;
+import de.secretj12.turnierplaner.model.user.jUserConfig;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
index e38a5743..74f43073 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
@@ -2,7 +2,7 @@
 
 import de.secretj12.turnierplaner.db.entities.Court;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
+import de.secretj12.turnierplaner.model.user.jUserCourt;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index 9c22e0d6..d1fa714d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -8,7 +8,7 @@
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserMatchEvent;
+import de.secretj12.turnierplaner.model.user.jUserMatchEvent;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 37031b35..df497c23 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -9,11 +9,11 @@
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.VerificationCodeRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorPlayer;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorPlayerUpdateForm;
-import de.secretj12.turnierplaner.resources.jsonEntities.jPage;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayer;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserPlayerRegistrationForm;
+import de.secretj12.turnierplaner.model.director.jDirectorPlayer;
+import de.secretj12.turnierplaner.model.director.jDirectorPlayerUpdateForm;
+import de.secretj12.turnierplaner.model.jPage;
+import de.secretj12.turnierplaner.model.user.jUserPlayer;
+import de.secretj12.turnierplaner.model.user.jUserPlayerRegistrationForm;
 import io.quarkus.mailer.Mailer;
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.security.identity.SecurityIdentity;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index 756b8a96..ec596d9b 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -7,7 +7,7 @@
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.SetRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserSet;
+import de.secretj12.turnierplaner.model.user.jUserSet;
 import io.quarkus.security.UnauthorizedException;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 0bd9579f..48fa3030 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -4,10 +4,10 @@
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentAdd;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserCourt;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.jUserTournament;
+import de.secretj12.turnierplaner.model.director.jDirectorTournamentAdd;
+import de.secretj12.turnierplaner.model.director.jDirectorTournamentUpdate;
+import de.secretj12.turnierplaner.model.user.jUserCourt;
+import de.secretj12.turnierplaner.model.user.jUserTournament;
 import de.secretj12.turnierplaner.tools.CommonHelpers;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
index 1147fdba..b3ce187d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
@@ -1,7 +1,7 @@
 package de.secretj12.turnierplaner.resources;
 
 import de.secretj12.turnierplaner.enums.jAdminRole;
-import de.secretj12.turnierplaner.resources.jsonEntities.admin.jAdminUser;
+import de.secretj12.turnierplaner.model.admin.jAdminUser;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
index b28a6dae..3f261dae 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
@@ -8,7 +8,7 @@
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.NextMatchRepository;
 import de.secretj12.turnierplaner.db.repositories.TeamRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.user.knockout.jUserKnockoutMatch;
+import de.secretj12.turnierplaner.model.user.knockout.jUserKnockoutMatch;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
index 0fe86a0a..70a4a62a 100644
--- a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
+++ b/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
@@ -5,7 +5,7 @@
 import de.secretj12.turnierplaner.db.entities.Tournament;
 import de.secretj12.turnierplaner.db.repositories.CourtRepositiory;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
-import de.secretj12.turnierplaner.resources.jsonEntities.director.jDirectorTournamentUpdate;
+import de.secretj12.turnierplaner.model.director.jDirectorTournamentUpdate;
 import io.quarkus.hibernate.orm.panache.Panache;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.security.TestSecurity;

From abae55d2ebf727133cb2f93cf44db3a474a9718c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 18:06:02 +0200
Subject: [PATCH 208/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Allow=20reporters?=
 =?UTF-8?q?=20to=20report=20new=20results?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/ConfigResource.java             |   9 +-
 frontend/app/src/backend/security.ts          | 111 ++++++++++--------
 .../groupSystem/ViewGroupTable.vue            |  12 +-
 .../competition/knockoutSystem/ViewMatch.vue  |  18 ++-
 4 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 8324aedf..2e59dd2a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -102,7 +102,14 @@ public boolean isAdmin() {
     @GET
     @Path("/isDirector")
     @Produces(MediaType.TEXT_PLAIN)
-    public Boolean canCreate() {
+    public Boolean isDirector() {
         return securityIdentity.hasRole("director");
     }
+
+    @GET
+    @Path("/isReporter")
+    @Produces(MediaType.TEXT_PLAIN)
+    public Boolean isReporter() {
+        return securityIdentity.hasRole("reporter");
+    }
 }
diff --git a/frontend/app/src/backend/security.ts b/frontend/app/src/backend/security.ts
index cfe46f03..6a6a053d 100644
--- a/frontend/app/src/backend/security.ts
+++ b/frontend/app/src/backend/security.ts
@@ -3,71 +3,86 @@ import { auth } from "@/security/AuthService"
 import axios from "axios"
 import { useQuery } from "@tanstack/vue-query"
 
-export function getIsDirector(isLoggedIn: Ref<boolean>) {
+export function getCanEdit(tourId: string, isLoggedIn: Ref<boolean>) {
 	return useQuery({
-		queryKey: ["can_create", isLoggedIn],
-		queryFn: fetchIsDirector,
+		queryKey: ["can_edit", tourId, isLoggedIn],
+		queryFn: async () => {
+			const user = await auth.getUser()
+			if (user === null) return false
+
+			return await axios
+				.get<boolean>(`/tournament/${tourId}/competition/canEdit`)
+				.then((response) => {
+					return response.data
+				})
+				.catch(() => {
+					return false
+				})
+		},
 		placeholderData: false,
 		staleTime: 0,
 	})
 }
 
-async function fetchIsDirector() {
-	const user = await auth.getUser()
-	if (user === null) return false
-
-	return await axios
-		.get<boolean>("/config/isDirector")
-		.then((response) => {
-			return response.data
-		})
-		.catch(() => {
-			return false
-		})
-}
-
-export function getCanEdit(tourId: string, isLoggedIn: Ref<boolean>) {
+export function getIsAdmin(isLoggedIn: Ref<boolean>) {
 	return useQuery({
-		queryKey: ["can_edit", tourId, isLoggedIn],
-		queryFn: () => fetchCanEdit(tourId),
+		queryKey: ["isAdmin", isLoggedIn],
+		queryFn: async () => {
+			const user = await auth.getUser()
+			if (user === null) return false
+
+			return await axios
+				.get<boolean>(`/config/isAdmin`)
+				.then((response) => {
+					return response.data
+				})
+				.catch(() => {
+					return false
+				})
+		},
 		placeholderData: false,
 		staleTime: 0,
 	})
 }
 
-async function fetchCanEdit(tourId: string) {
-	const user = await auth.getUser()
-	if (user === null) return false
-
-	return await axios
-		.get<boolean>(`/tournament/${tourId}/competition/canEdit`)
-		.then((response) => {
-			return response.data
-		})
-		.catch(() => {
-			return false
-		})
-}
-
-export function getIsAdmin(isLoggedIn: Ref<boolean>) {
+export function getIsDirector(isLoggedIn: Ref<boolean>) {
 	return useQuery({
-		queryKey: ["isAdmin", isLoggedIn],
-		queryFn: () => fetchIsAdmin(),
+		queryKey: ["isDirector", isLoggedIn],
+		queryFn: async () => {
+			const user = await auth.getUser()
+			if (user === null) return false
+
+			return await axios
+				.get<boolean>("/config/isDirector")
+				.then((response) => {
+					return response.data
+				})
+				.catch(() => {
+					return false
+				})
+		},
 		placeholderData: false,
 		staleTime: 0,
 	})
 }
 
-async function fetchIsAdmin() {
-	const user = await auth.getUser()
-	if (user === null) return false
+export function getIsReporter(isLoggedIn: Ref<boolean>) {
+	return useQuery({
+		queryKey: ["isReporter", isLoggedIn],
+		queryFn: async () => {
+			const user = await auth.getUser()
+			if (user === null) return false
 
-	return await axios
-		.get<boolean>(`/config/isAdmin`)
-		.then((response) => {
-			return response.data
-		})
-		.catch(() => {
-			return false
-		})
+			return await axios
+				.get<boolean>(`/config/isReporter`)
+				.then((response) => {
+					return response.data
+				})
+				.catch(() => {
+					return false
+				})
+		},
+		placeholderData: false,
+		staleTime: 0,
+	})
 }
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index 01f6cc5d..f64b5034 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -38,7 +38,7 @@
 							index + indexB < props.group.teams.length - 1
 						"
 						:class="{
-							'cursor-pointer': canEdit,
+							'cursor-pointer': isReporter,
 							highlightLow:
 								hoverIdA &&
 								hoverIdB &&
@@ -59,7 +59,7 @@
 		</template>
 	</table>
 	<UpdatePointsDialog
-		v-if="canEdit"
+		v-if="isReporter"
 		ref="dialog"
 		:number-sets="props.numberSets"
 	/>
@@ -75,8 +75,7 @@ import { Team } from "@/interfaces/team"
 import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
 import { NumberSets } from "@/interfaces/competition"
-import { getCanEdit } from "@/backend/security"
-import { useRoute } from "vue-router"
+import { getIsReporter } from "@/backend/security"
 
 const { t } = useI18n()
 
@@ -85,9 +84,8 @@ const props = defineProps<{
 	numberSets: NumberSets
 }>()
 
-const route = useRoute()
 const isLoggedIn = inject("loggedIn", ref(false))
-const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
+const { data: isReporter } = getIsReporter(isLoggedIn)
 
 function findMatch(teamA: Team, teamB: Team): Match {
 	const match: Match | undefined = props.group.matches.find((match) => {
@@ -124,7 +122,7 @@ function hoverLeave() {
 const dialog = ref()
 
 function showPopUp(match: Match) {
-	if (canEdit.value) dialog.value.showPopUp(match)
+	if (isReporter.value) dialog.value.showPopUp(match)
 }
 </script>
 
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 7b9fcb41..67628958 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -15,19 +15,19 @@
 					:key="set.index"
 					class="result"
 					:class="{
-						'cursor-pointer': canEdit,
+						'cursor-pointer': isReporter,
 					}"
 					@click="showPopUp(props.match)"
 				>
 					{{ set.scoreA }}
 				</td>
 			</template>
-			<template v-else-if="allowUpdate">
+			<template v-else-if="allowUpdate && isReporter">
 				<td
 					rowspan="2"
 					class="empty-result"
 					:class="{
-						'cursor-pointer': canEdit,
+						'cursor-pointer': isReporter,
 					}"
 					@click="showPopUp(props.match)"
 				>
@@ -46,7 +46,7 @@
 					:key="set.index"
 					class="result"
 					:class="{
-						'cursor-pointer': canEdit,
+						'cursor-pointer': isReporter,
 					}"
 					@click="showPopUp(props.match)"
 				>
@@ -56,7 +56,7 @@
 		</tr>
 	</table>
 	<UpdatePointsDialog
-		v-if="canEdit && props.numberSets !== undefined"
+		v-if="isReporter"
 		ref="dialog"
 		:number-sets="props.numberSets"
 	/>
@@ -69,8 +69,7 @@ import ViewTeamNames from "@/components/links/LinkTeamNames.vue"
 import UpdatePointsDialog from "@/components/items/UpdatePointsDialog.vue"
 import { inject, ref } from "vue"
 import { Match } from "@/interfaces/match"
-import { getCanEdit } from "@/backend/security"
-import { useRoute } from "vue-router"
+import { getIsReporter } from "@/backend/security"
 
 const props = withDefaults(
 	defineProps<{
@@ -86,12 +85,11 @@ const props = withDefaults(
 )
 
 const isLoggedIn = inject("loggedIn", ref(false))
-const route = useRoute()
-const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
+const { data: isReporter } = getIsReporter(isLoggedIn)
 const dialog = ref()
 
 const showPopUp = function (match: Match) {
-	if (canEdit.value) {
+	if (isReporter.value) {
 		dialog.value.showPopUp(match)
 	}
 }

From d510f60538f404a32f21f3bb2d46920ffa075da6 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 18:26:59 +0200
Subject: [PATCH 209/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20internalization=20?=
 =?UTF-8?q?bug,=20remove=20prints?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/calendar/ViewCalendar.vue               | 1 -
 frontend/app/src/components/items/UpdatePointsDialog.vue | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/frontend/app/src/calendar/ViewCalendar.vue
index dd4c0577..8a9490a5 100644
--- a/frontend/app/src/calendar/ViewCalendar.vue
+++ b/frontend/app/src/calendar/ViewCalendar.vue
@@ -173,7 +173,6 @@ async function onViewChange({
 	startDate: Date
 	endDate: Date
 }) {
-	console.log("view change")
 	emit("onViewChange", startDate, endDate)
 
 	await sleep(500)
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 5c51df94..8ce198ec 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -86,9 +86,8 @@ import { useUpdateSet } from "@/backend/set"
 import { useRoute } from "vue-router"
 import { useToast } from "primevue/usetoast"
 
-const { t } = useI18n({ inheritLocale: true })
+const { t } = useI18n()
 const toast = useToast()
-
 const route = useRoute()
 
 const props = defineProps<{
@@ -115,8 +114,6 @@ const showPopUp = function (match: Match) {
 		team1GamePoints.value.push(0)
 		team2GamePoints.value.push(0)
 	}
-	console.log(props.numberSets)
-	console.log(numberSets.value)
 	visible.value = true
 }
 const { mutate: updateSet } = useUpdateSet(route, t, toast)

From 499ee614e9fca4d22da6f0672f4e88a799c1ea47 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Tue, 1 Oct 2024 23:35:45 +0200
Subject: [PATCH 210/247] =?UTF-8?q?=E2=9C=A8=20Automatically=20set=20teams?=
 =?UTF-8?q?=20in=20next=20match?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/db/entities/Match.java      |   8 +-
 .../db/entities/competition/Team.java         |   2 +-
 .../db/repositories/SetRepository.java        |   7 +
 .../enums/{jAdminRole.java => AdminRole.java} |   4 +-
 .../turnierplaner/enums/NumberSets.java       |   8 +-
 .../turnierplaner/model/admin/jAdminUser.java |  10 +-
 .../model/user/jUserTeamGroupResult.java      | 107 +++++++++++
 .../turnierplaner/resources/SetResource.java  | 174 +++++++++++++++++-
 .../turnierplaner/resources/UserResource.java |  14 +-
 .../startup/testdata/TestdataGenerator.java   |  17 +-
 .../turnierplaner/tools/GroupTools.java       |  81 +++++++-
 frontend/app/src/backend/set.ts               |   2 +-
 .../components/items/UpdatePointsDialog.vue   |   1 +
 .../competition/knockoutSystem/ViewMatch.vue  |   4 +-
 14 files changed, 404 insertions(+), 35 deletions(-)
 rename backend/src/main/java/de/secretj12/turnierplaner/enums/{jAdminRole.java => AdminRole.java} (77%)
 create mode 100644 backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
index f1f69e5b..4e18086f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
@@ -14,6 +14,7 @@
 
 import java.time.Instant;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 
@@ -50,6 +51,11 @@ public class Match {
 
     @Column(name = "finished")
     private Boolean finished;
+    /**
+     * Determines who is the winner of the game
+     * true - Team A
+     * false - Team B
+     */
     @Column(name = "winner")
     private Boolean winner;
 
@@ -201,7 +207,7 @@ public void setGroup(MatchOfGroup group) {
     }
 
     public List<Set> getSets() {
-        return sets;
+        return sets.stream().sorted(Comparator.comparingInt(s -> s.getKey().getIndex())).toList();
     }
 
     public void setSets(List<Set> sets) {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
index 9514624e..8bfbd1e0 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
@@ -78,7 +78,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id);
+        return id.hashCode();
     }
 
     public static Team findById(UUID id) {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
index 9d034d5d..32aa2a40 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
@@ -15,6 +15,13 @@ public Set findById(Set.SetKey key) {
         return find("key", key).firstResult();
     }
 
+    public Set findById(Match match, byte index) {
+        Set.SetKey setKey = new Set.SetKey();
+        setKey.setMatch(match);
+        setKey.setIndex(index);
+        return findById(setKey);
+    }
+
     @Transactional
     public void updateSets(Match match, List<jUserSet> sets) {
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
similarity index 77%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java
rename to backend/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
index bdd0a844..d2b49abd 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/enums/jAdminRole.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
@@ -1,11 +1,11 @@
 package de.secretj12.turnierplaner.enums;
 
-public enum jAdminRole {
+public enum AdminRole {
     USER("user"), REPORTER("reporter"), DIRECTOR("director"), ADMIN("admin");
 
     public final String label;
 
-    jAdminRole(String label) {
+    AdminRole(String label) {
         this.label = label;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java b/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
index e0343f25..273e539c 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
@@ -1,5 +1,11 @@
 package de.secretj12.turnierplaner.enums;
 
 public enum NumberSets {
-    THREE, FIVE
+    THREE(3), FIVE(5);
+
+    public final int number;
+
+    NumberSets(int number) {
+        this.number = number;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java b/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
index ca55f8a7..09b4c5c3 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
@@ -1,6 +1,6 @@
 package de.secretj12.turnierplaner.model.admin;
 
-import de.secretj12.turnierplaner.enums.jAdminRole;
+import de.secretj12.turnierplaner.enums.AdminRole;
 import org.keycloak.representations.idm.UserRepresentation;
 
 public class jAdminUser {
@@ -8,12 +8,12 @@ public class jAdminUser {
     private String id;
     private String username;
 
-    private jAdminRole role;
+    private AdminRole role;
 
     public jAdminUser() {
     }
 
-    public jAdminUser(UserRepresentation user, jAdminRole role) {
+    public jAdminUser(UserRepresentation user, AdminRole role) {
         this.id = user.getId();
         this.username = user.getUsername();
         this.role = role;
@@ -35,11 +35,11 @@ public void setUsername(String username) {
         this.username = username;
     }
 
-    public jAdminRole getRole() {
+    public AdminRole getRole() {
         return role;
     }
 
-    public void setRole(jAdminRole role) {
+    public void setRole(AdminRole role) {
         this.role = role;
     }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
new file mode 100644
index 00000000..1436e069
--- /dev/null
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
@@ -0,0 +1,107 @@
+package de.secretj12.turnierplaner.model.user;
+
+import de.secretj12.turnierplaner.db.entities.competition.Team;
+
+public class jUserTeamGroupResult {
+
+    private Team team;
+    private int rank;
+    private int gamesWon;
+    private int gamesLost;
+    private int setsWon;
+    private int setsLost;
+    private int matchesWon;
+    private int matchesLost;
+
+    public jUserTeamGroupResult(Team team) {
+        this.team = team;
+    }
+
+    public void matchWon() {
+        this.matchesWon++;
+    }
+
+    public void matchLost() {
+        this.matchesLost++;
+    }
+
+    public void setWon() {
+        this.setsWon++;
+    }
+
+    public void setLost() {
+        this.setsLost++;
+    }
+
+    public void matchesWon(int matchesWon) {
+        this.matchesWon += matchesWon;
+    }
+
+    public void matchesLost(int matchesLost) {
+        this.matchesLost += matchesLost;
+    }
+
+    public Team getTeam() {
+        return team;
+    }
+
+    public void setTeam(Team team) {
+        this.team = team;
+    }
+
+    public int getRank() {
+        return rank;
+    }
+
+    public void setRank(int rank) {
+        this.rank = rank;
+    }
+
+    public int getGamesWon() {
+        return gamesWon;
+    }
+
+    public void setGamesWon(int gamesWon) {
+        this.gamesWon = gamesWon;
+    }
+
+    public int getGamesLost() {
+        return gamesLost;
+    }
+
+    public void setGamesLost(int gamesLost) {
+        this.gamesLost = gamesLost;
+    }
+
+    public int getSetsWon() {
+        return setsWon;
+    }
+
+    public void setSetsWon(int setsWon) {
+        this.setsWon = setsWon;
+    }
+
+    public int getSetsLost() {
+        return setsLost;
+    }
+
+    public void setSetsLost(int setsLost) {
+        this.setsLost = setsLost;
+    }
+
+    public int getMatchesWon() {
+        return matchesWon;
+    }
+
+    public void setMatchesWon(int matchesWon) {
+        this.matchesWon = matchesWon;
+    }
+
+    public int getMatchesLost() {
+        return matchesLost;
+    }
+
+    public void setMatchesLost(int matchesLost) {
+        this.matchesLost = matchesLost;
+    }
+}
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index ec596d9b..6251f525 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -4,11 +4,19 @@
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.Set;
 import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
+import de.secretj12.turnierplaner.db.entities.groups.Group;
+import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
+import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.MatchRepository;
 import de.secretj12.turnierplaner.db.repositories.SetRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.enums.NumberSets;
 import de.secretj12.turnierplaner.model.user.jUserSet;
+import de.secretj12.turnierplaner.model.user.jUserTeamGroupResult;
+import de.secretj12.turnierplaner.tools.GroupTools;
 import io.quarkus.security.UnauthorizedException;
+import io.smallrye.mutiny.tuples.Tuple2;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
@@ -20,23 +28,34 @@
 import java.util.UUID;
 
 @RolesAllowed("reporter")
-@Path("/tournament/{tourName}/competition/{matchId}/set")
+@Path("/tournament/{tourId}/competition/{compId}/set/{matchId}")
 public class SetResource {
     @Inject
     TournamentRepository tournaments;
     @Inject
+    CompetitionRepository competitions;
+    @Inject
     SetRepository setRepository;
     @Inject
     MatchRepository matchRepository;
 
+    @Inject
+    GroupTools groupTools;
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
     @Transactional
-    public String updateMatches(@PathParam("tourName") String tourName, @PathParam("matchId") UUID matchId,
+    public String updateMatches(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
+                                @PathParam("matchId") UUID matchId,
                                 List<jUserSet> sets) {
-        Tournament tournament = tournaments.getByName(tourName);
+        Tournament tournament = tournaments.getByName(tourId);
+        Competition competition = competitions.getByName(tourId, compId);
+        if (tournament == null)
+            throw new NotFoundException("Tournament was not found");
+        if (competition == null)
+            throw new NotFoundException("Competition was not found");
+
         Instant beginGamePhase = tournament.getBeginGamePhase();
         if (beginGamePhase != null && beginGamePhase.isAfter(Instant.now()))
             throw new UnauthorizedException("Cannot update matches before game phase has begun");
@@ -46,10 +65,12 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
             throw new InternalServerErrorException("Could find match");
 
         for (jUserSet jSet : sets) {
+            if (jSet.getIndex() > 4)
+                throw new BadRequestException("Invalid set index");
+
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
             setKey.setIndex(jSet.getIndex());
-
             Set set = setRepository.findById(setKey);
 
             if (set != null && jSet.getScoreA() == 0 && jSet.getScoreB() == 0) {
@@ -66,8 +87,153 @@ public String updateMatches(@PathParam("tourName") String tourName, @PathParam("
             }
         }
 
+        match.setFinished(true);
+        match.setWinner(findWinner(match, competition.getNumberSets()));
+        matchRepository.persist(match);
+
+        adjustNext(match);
         return "Updated matches";
     }
 
+    private void adjustNext(Match match) {
+        if (!match.getFinished())
+            return;
+
+        if (match.getPreviousOfA() != null) {
+            for (NextMatch nm : match.getPreviousOfA()) {
+                Match nMatch = nm.getNextMatch();
+                nMatch.setTeamA(match.getWinner() ^ nm.isWinner() ? match.getTeamB() : match.getTeamA());
+                matchRepository.persist(nMatch);
+                adjustNext(nMatch);
+            }
+        }
+        if (match.getPreviousOfB() != null) {
+            for (NextMatch nm : match.getPreviousOfB()) {
+                Match nMatch = nm.getNextMatch();
+                nMatch.setTeamB(match.getWinner() ^ nm.isWinner() ? match.getTeamB() : match.getTeamA());
+                matchRepository.persist(nMatch);
+                adjustNext(nMatch);
+            }
+        }
+        if (match.getGroup() != null && groupTools.isFinished(match.getGroup().getGroup())) {
+            Group group = match.getGroup().getGroup();
+            List<jUserTeamGroupResult> results = groupTools.determineGropuResults(group);
+
+            for (var fog : group.getFinalOfGroupA()) {
+                Match fin = fog.getNextMatch();
+                fin.setTeamA(results.get(fog.getPos()).getTeam());
+                adjustNext(fin);
+            }
+            for (var fog : group.getFinalOfGroupB()) {
+                Match fin = fog.getNextMatch();
+                fin.setTeamB(results.get(fog.getPos()).getTeam());
+                adjustNext(fin);
+            }
+        }
+    }
+
+    private boolean findWinner(Match match, NumberSets numberSets) {
+        int dif = 0;
+        for (byte i = 0; i < 2; i++) {
+            Set.SetKey setKey = new Set.SetKey();
+            setKey.setMatch(match);
+            setKey.setIndex(i);
+            Set set = setRepository.findById(setKey);
+
+            if (set == null)
+                throw new BadRequestException("Set " + i + " is null");
+            isValidSet(set);
+            dif += calcDif(set);
+        }
+
+        Set set3 = setRepository.findById(match, (byte) 2);
+        switch (numberSets) {
+            case THREE -> {
+                if (Math.abs(dif) == 2)
+                    isNull(set3);
+                else {
+                    isValidTiebreak(set3);
+                    dif += calcDif(set3);
+                }
+            }
+            case FIVE -> {
+                isValidSet(set3);
+                dif += calcDif(set3);
+            }
+        }
+        Set set4 = setRepository.findById(match, (byte) 3);
+        switch (numberSets) {
+            case THREE -> isNull(set4);
+            case FIVE -> {
+                isValidSet(set4);
+                dif += calcDif(set4);
+            }
+        }
+        Set set5 = setRepository.findById(match, (byte) 4);
+        switch (numberSets) {
+            case THREE -> isNull(set5);
+            case FIVE -> {
+                isValidTiebreak(set5);
+                dif += calcDif(set4);
+            }
+        }
+        if (dif == 0)
+            throw new InternalServerErrorException("Dif should 0");
+        return dif > 0;
+    }
+
+    private int calcDif(Set set) {
+        if (set.getScoreA() > set.getScoreB())
+            return 1;
+        else
+            return -1;
+    }
+
+    private static final java.util.Set<Tuple2<Byte, Byte>> validResults = java.util.Set.of(
+        Tuple2.of((byte) 6, (byte) 0),
+        Tuple2.of((byte) 6, (byte) 1),
+        Tuple2.of((byte) 6, (byte) 2),
+        Tuple2.of((byte) 6, (byte) 3),
+        Tuple2.of((byte) 6, (byte) 4),
+        Tuple2.of((byte) 7, (byte) 5),
+        Tuple2.of((byte) 7, (byte) 6),
+        Tuple2.of((byte) 0, (byte) 6),
+        Tuple2.of((byte) 1, (byte) 6),
+        Tuple2.of((byte) 2, (byte) 6),
+        Tuple2.of((byte) 3, (byte) 6),
+        Tuple2.of((byte) 4, (byte) 6),
+        Tuple2.of((byte) 5, (byte) 7),
+        Tuple2.of((byte) 6, (byte) 7)
+    );
+
+    private void isValidSet(Set set) {
+        notNull(set);
+        byte scoreA = set.getScoreA();
+        byte scoreB = set.getScoreB();
+        if (!validResults.contains(Tuple2.of(scoreA, scoreB)))
+            throw new BadRequestException("Invalid result");
+    }
+
+    private void isValidTiebreak(Set set) {
+        notNull(set);
+        int scoreA = set.getScoreA();
+        int scoreB = set.getScoreB();
+        boolean valid = (scoreA == 10 && scoreB <= 8)
+            || (scoreB == 10 && scoreA <= 8)
+            || (scoreA == scoreB + 2 && scoreB >= 9)
+            || (scoreB == scoreA + 2 && scoreA >= 9);
+        if (!valid)
+            throw new BadRequestException("Invalid tiebreak");
+    }
+
+    private void notNull(Set set) {
+        if (set == null)
+            throw new BadRequestException("Set is not null");
+    }
+
+    private void isNull(Set set) {
+        if (set != null)
+            throw new BadRequestException("Set is null");
+    }
 
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
index b3ce187d..6ed3c7a7 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
@@ -1,6 +1,6 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.enums.jAdminRole;
+import de.secretj12.turnierplaner.enums.AdminRole;
 import de.secretj12.turnierplaner.model.admin.jAdminUser;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -43,20 +43,20 @@ public String updateUser(jAdminUser user) {
         return "User updated";
     }
 
-    private jAdminRole getRole(UserRepresentation user) {
+    private AdminRole getRole(UserRepresentation user) {
         return getRole(keycloak.realm(realm).users().get(user.getId()));
     }
 
-    private jAdminRole getRole(org.keycloak.admin.client.resource.UserResource user) {
+    private AdminRole getRole(org.keycloak.admin.client.resource.UserResource user) {
         var groups = user.groups().stream().map(GroupRepresentation::getName).toList();
         if (groups.contains("admin"))
-            return jAdminRole.ADMIN;
+            return AdminRole.ADMIN;
         else if (groups.contains("director"))
-            return jAdminRole.DIRECTOR;
+            return AdminRole.DIRECTOR;
         else if (groups.contains("reporter"))
-            return jAdminRole.REPORTER;
+            return AdminRole.REPORTER;
         else if (groups.contains("user"))
-            return jAdminRole.USER;
+            return AdminRole.USER;
         else
             throw new InternalServerErrorException("Invalid role");
     }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
index cb8960ac..6db28240 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
@@ -143,7 +143,6 @@ private void createSets(Match match) {
             Tuple2.of((byte) 6, (byte) 2),
             Tuple2.of((byte) 6, (byte) 3),
             Tuple2.of((byte) 6, (byte) 4),
-            Tuple2.of((byte) 6, (byte) 5),
             Tuple2.of((byte) 7, (byte) 5),
             Tuple2.of((byte) 7, (byte) 6)
         );
@@ -162,8 +161,8 @@ private void createSets(Match match) {
                     winDif += winBias;
                 }
                 case 1 -> {
-                    set.setScoreA(possibleResults.get(r).getItem1());
-                    set.setScoreB(possibleResults.get(r).getItem2());
+                    set.setScoreA(possibleResults.get(r).getItem2());
+                    set.setScoreB(possibleResults.get(r).getItem1());
                     winDif -= winBias;
                 }
                 default -> {
@@ -182,7 +181,7 @@ private void createSets(Match match) {
             setArrayList.add(set);
             sets.persist(set);
         }
-        match.setWinner(winDif < 0);
+        match.setWinner(winDif > 0);
         if (winDif == 0) {
             Set.SetKey setKey = new Set.SetKey();
             setKey.setMatch(match);
@@ -202,11 +201,11 @@ private void createSets(Match match) {
             if (random.nextBoolean()) {
                 set.setScoreA(winner);
                 set.setScoreB(looser);
-                match.setWinner(false);
+                match.setWinner(true);
             } else {
                 set.setScoreA(looser);
                 set.setScoreB(winner);
-                match.setWinner(true);
+                match.setWinner(false);
             }
 
             setArrayList.add(set);
@@ -382,8 +381,7 @@ private void addTeamsAndMatchesToKnockout(Competition competition, CompetitionSe
 
     private Team getWinnerOfMatchIfExists(Match match) {
         if (match.isFinished()) {
-            if (match.getWinner()) return match.getTeamB();
-            else return match.getTeamA();
+            return match.getWinner() ? match.getTeamA() : match.getTeamB();
         } else {
             return null;
         }
@@ -391,8 +389,7 @@ private Team getWinnerOfMatchIfExists(Match match) {
 
     private Team getLooserOfMatchIfExists(Match match) {
         if (match.isFinished()) {
-            if (match.getWinner()) return match.getTeamA();
-            else return match.getTeamB();
+            return match.getWinner() ? match.getTeamB() : match.getTeamA();
         } else {
             return null;
         }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
index dcecb7ef..f6574de3 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
@@ -8,6 +8,8 @@
 import de.secretj12.turnierplaner.db.entities.groups.MatchOfGroup;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
 import de.secretj12.turnierplaner.db.repositories.*;
+import de.secretj12.turnierplaner.enums.NumberSets;
+import de.secretj12.turnierplaner.model.user.jUserTeamGroupResult;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
@@ -32,7 +34,6 @@ public class GroupTools {
     @Inject
     CompetitionRepository competitions;
 
-    // TODO please add tests for me
     public void generateMatches(Competition competition, List<Set<Team>> nGroups) {
         Match thirdP = competition.getThirdPlace();
         competition.setFinale(null);
@@ -232,4 +233,82 @@ private Match finaleOfGroups(Competition competition, Group g1, Group g2) {
     public Set<Team> teamsOfGroup(Group group) {
         return teamRepository.teamsOfGroup(group);
     }
+
+    public boolean isFinished(Group group) {
+        return group.getMatches().stream().allMatch(Match::isFinished);
+    }
+
+    public List<jUserTeamGroupResult> determineGropuResults(Group group) {
+        Map<Team, jUserTeamGroupResult> results = new HashMap<>();
+        teamsOfGroup(group).forEach(t -> results.put(t, new jUserTeamGroupResult(t)));
+        NumberSets numberSets = group.getCompetition().getNumberSets();
+        for (Match m : group.getMatches()) {
+            if (!m.isFinished())
+                continue;
+            var teamA = results.get(m.getTeamA());
+            var teamB = results.get(m.getTeamB());
+
+            if (m.getWinner()) {
+                teamA.matchWon();
+                teamB.matchLost();
+            } else {
+                teamA.matchLost();
+                teamB.matchWon();
+            }
+            for (var set : m.getSets()) {
+                if (set.getScoreA() > set.getScoreB()) {
+                    teamA.setWon();
+                    teamB.setLost();
+                } else {
+                    teamB.setWon();
+                    teamA.setLost();
+                }
+                if (set.getKey().getIndex() < numberSets.number - 1) {
+                    teamA.matchesWon(set.getScoreA());
+                    teamA.matchesLost(set.getScoreB());
+                    teamB.matchesWon(set.getScoreB());
+                    teamB.matchesLost(set.getScoreA());
+                } else {
+                    if (set.getScoreA() > set.getScoreB()) {
+                        teamA.matchesWon(1);
+                        teamB.matchesLost(1);
+                    } else {
+                        teamB.matchesWon(1);
+                        teamA.matchesLost(1);
+                    }
+                }
+            }
+        }
+
+        int rank = 1;
+        Comp comp = new Comp();
+        var sortedRes = results.values().stream()
+            .sorted(comp)
+            .toList();
+        sortedRes.getFirst().setRank(1);
+        for (int i = 1; i < sortedRes.size(); i++) {
+            if (comp.compare(sortedRes.get(i - 1), sortedRes.get(i)) == 0) {
+                sortedRes.get(i).setRank(rank);
+            } else {
+                sortedRes.get(i).setRank(++rank);
+            }
+        }
+        return sortedRes;
+    }
+
+    private static class Comp implements Comparator<jUserTeamGroupResult> {
+
+        @Override
+        public int compare(jUserTeamGroupResult t1, jUserTeamGroupResult t2) {
+            if (t1.getGamesWon() - t1.getMatchesLost() > t2.getMatchesWon() - t2.getMatchesLost())
+                return 1;
+            if (t2.getGamesWon() - t2.getMatchesLost() > t1.getMatchesWon() - t1.getMatchesLost())
+                return -1;
+            if (t1.getSetsWon() - t1.getSetsLost() > t2.getSetsWon() - t2.getSetsLost())
+                return 1;
+            if (t2.getSetsWon() - t2.getSetsLost() > t1.getSetsWon() - t1.getSetsLost())
+                return -1;
+            return Integer.compare(t1.getMatchesWon() - t1.getMatchesLost(), t2.getMatchesWon() - t2.getMatchesLost());
+        }
+    }
 }
diff --git a/frontend/app/src/backend/set.ts b/frontend/app/src/backend/set.ts
index 5e7e7a95..e8f4f29d 100644
--- a/frontend/app/src/backend/set.ts
+++ b/frontend/app/src/backend/set.ts
@@ -13,7 +13,7 @@ export function useUpdateSet(
 	return useMutation({
 		mutationFn: (data: { sets: Set[]; matchId: string }) =>
 			axios.post(
-				`/tournament/${<string>route.params.tourId}/competition/${data.matchId}/set`,
+				`/tournament/${<string>route.params.tourId}/competition/${<string>route.params.compId}/set/${data.matchId}`,
 				data.sets,
 			),
 		onSuccess() {
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/frontend/app/src/components/items/UpdatePointsDialog.vue
index 8ce198ec..89dfc2cb 100644
--- a/frontend/app/src/components/items/UpdatePointsDialog.vue
+++ b/frontend/app/src/components/items/UpdatePointsDialog.vue
@@ -106,6 +106,7 @@ const team1GamePoints = ref<number[]>([])
 const team2GamePoints = ref<number[]>([])
 
 const showPopUp = function (match: Match) {
+	selectedSet.value = 0
 	currentMatch.value = match
 	team1GamePoints.value = match.sets?.map((set) => set.scoreA) ?? []
 	team2GamePoints.value = match.sets?.map((set) => set.scoreB) ?? []
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
index 67628958..842e373c 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
@@ -5,7 +5,7 @@
 			tableDoubles: props.mode === Mode.DOUBLE,
 		}"
 	>
-		<tr :class="{ winner: props.match.finished && !props.match.winner }">
+		<tr :class="{ winner: props.match.finished && props.match.winner }">
 			<td class="name">
 				<ViewTeamNames :team="props.match.teamA" :inverted="true" />
 			</td>
@@ -35,7 +35,7 @@
 				</td>
 			</template>
 		</tr>
-		<tr :class="{ winner: props.match.finished && props.match.winner }">
+		<tr :class="{ winner: props.match.finished && !props.match.winner }">
 			<td class="name">
 				<ViewTeamNames :team="props.match.teamB" :inverted="true" />
 			</td>

From 45a69f7f541e40bdddfeeb2c44940120175ba508 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 10:46:39 +0200
Subject: [PATCH 211/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Group=20system:=20?=
 =?UTF-8?q?show=20results=20of=20finished=20games?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/groupSystem/ViewMatch.vue | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
index 083a961f..493be285 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
@@ -1,17 +1,10 @@
 <template>
-	<p v-if="props.match.begin && props.match.begin > new Date()">
+	<p v-if="!props.match.finished">
 		{{ $t("ViewGroupSystem.start") }}<br />
-		{{ props.match.begin.toLocaleString(t("lang"), dateOptions) }}
-	</p>
-	<!--  Game started already, but no results yet-->
-	<p
-		v-else-if="
-			props.match.begin &&
-			props.match.begin <= new Date() &&
-			(!props.match.sets || props.match.sets.length == 0)
-		"
-	>
-		0-0
+		<template v-if="props.match.begin">
+			{{ props.match.begin.toLocaleString(t("lang"), dateOptions) }}
+		</template>
+		<template v-else> --- </template>
 	</p>
 	<div v-else-if="props.order">
 		<div v-for="set in props.match.sets" :key="set.index">

From 539f9c3267a573216d9b34970a708bc0d4a64969 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 2 Oct 2024 14:35:11 +0200
Subject: [PATCH 212/247] =?UTF-8?q?=F0=9F=8E=A8=20remove=20duplicate=20sor?=
 =?UTF-8?q?ting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/de/secretj12/turnierplaner/model/user/jUserMatch.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
index 117ff8ee..5daa18e6 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
@@ -42,8 +42,7 @@ public jUserMatch(Match match) {
         if (match.getTeamB() != null)
             this.teamB = new jUserTeam(match.getTeamB());
 
-        this.sets = match.getSets().stream().map(jUserSet::new).sorted(Comparator.comparingInt(jUserSet::getIndex))
-            .toList();
+        this.sets = match.getSets().stream().map(jUserSet::new).toList();
     }
 
     public UUID getId() {

From a00f39a7b042376f4206f32cb5809b4da9bd0afa Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 11:16:59 +0200
Subject: [PATCH 213/247] =?UTF-8?q?=E2=9C=A8=20Send=20and=20process=20grou?=
 =?UTF-8?q?p=20results?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/user/group/jUserGroup.java          | 31 ++++++--------
 .../model/user/group/jUserGroupSystem.java    |  5 ++-
 .../resources/CompetitionResource.java        |  2 +-
 frontend/app/src/interfaces/groupSystem.ts    | 40 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
index 62601e9d..ccfe623d 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
@@ -1,27 +1,22 @@
 package de.secretj12.turnierplaner.model.user.group;
 
-import de.secretj12.turnierplaner.db.entities.competition.Team;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.model.user.jUserMatch;
+import de.secretj12.turnierplaner.model.user.jUserTeamGroupResult;
+import de.secretj12.turnierplaner.tools.GroupTools;
 
 import java.util.List;
-import java.util.UUID;
-import java.util.stream.Stream;
 
 public class jUserGroup {
 
     private byte index;
-    private List<UUID> teams;
     private List<jUserMatch> matches;
+    private List<jUserTeamGroupResult> results;
 
-    public jUserGroup(Group group) {
+    public jUserGroup(Group group, GroupTools tools) {
         this.index = group.getIndex();
-        this.teams = group.getMatches().stream()
-            .flatMap(match -> Stream.of(match.getTeamA(), match.getTeamB()))
-            .map(Team::getId)
-            .distinct()
-            .toList();
         this.matches = group.getMatches().stream().map(jUserMatch::new).toList();
+        this.results = tools.determineGropuResults(group);
     }
 
     public byte getIndex() {
@@ -32,14 +27,6 @@ public void setIndex(byte index) {
         this.index = index;
     }
 
-    public List<UUID> getTeams() {
-        return teams;
-    }
-
-    public void setTeams(List<UUID> teams) {
-        this.teams = teams;
-    }
-
     public List<jUserMatch> getMatches() {
         return matches;
     }
@@ -47,4 +34,12 @@ public List<jUserMatch> getMatches() {
     public void setMatches(List<jUserMatch> matches) {
         this.matches = matches;
     }
+
+    public List<jUserTeamGroupResult> getResults() {
+        return results;
+    }
+
+    public void setResults(List<jUserTeamGroupResult> results) {
+        this.results = results;
+    }
 }
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
index b42cd51b..e8456c45 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
@@ -3,6 +3,7 @@
 import de.secretj12.turnierplaner.db.entities.Match;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.model.user.jUserMatch;
+import de.secretj12.turnierplaner.tools.GroupTools;
 
 import java.util.List;
 
@@ -12,8 +13,8 @@ public class jUserGroupSystem {
     private jUserMatch finale;
     private jUserMatch thirdPlace;
 
-    public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace) {
-        this.groups = groups.stream().map(jUserGroup::new).toList();
+    public jUserGroupSystem(List<Group> groups, Match finale, Match thirdPlace, GroupTools tools) {
+        this.groups = groups.stream().map(g -> new jUserGroup(g, tools)).toList();
 
         if (finale != null)
             if (finale.getFinalOfGroup() != null)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index f04ccc23..5a4cf8e3 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -422,7 +422,7 @@ public jUserGroupSystem getGroupMatches(@PathParam("tourName") String tourName,
         Match thirdPlace = competition.getThirdPlace();
         if (groups.size() > 2 && (finale == null || thirdPlace == null))
             throw new InternalServerErrorException("Finale or thirdPlace is null");
-        return new jUserGroupSystem(groups, finale, thirdPlace);
+        return new jUserGroupSystem(groups, finale, thirdPlace, groupTools);
     }
 
     @POST
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index ee5ed208..f4fc7602 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -1,6 +1,6 @@
 import { Match, MatchServer, matchServerToClient } from "@/interfaces/match"
 import { KnockoutMatch } from "@/interfaces/knockoutSystem"
-import { Team } from "@/interfaces/team"
+import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 
 export interface GroupSystem {
 	groups: Group[]
@@ -11,6 +11,7 @@ export interface GroupSystem {
 export interface Group {
 	index: number
 	teams: Team[]
+	results: GroupResult[]
 	matches: Match[]
 }
 
@@ -22,9 +23,32 @@ export interface GroupSystemServer {
 
 export interface GroupServer {
 	index: number
+	results: GroupResultServer[]
 	matches: MatchServer[]
 }
 
+export interface GroupResult {
+	team: Team
+	rank: number
+	gamesWon: number
+	gamesLost: number
+	setsWon: number
+	setsLost: number
+	matchesWon: number
+	matchesLost: number
+}
+
+export interface GroupResultServer {
+	team: TeamServer
+	rank: number
+	gamesWon: number
+	gamesLost: number
+	setsWon: number
+	setsLost: number
+	matchesWon: number
+	matchesLost: number
+}
+
 export interface GroupMatchServer extends MatchServer {
 	pos?: number
 	groupA?: number
@@ -73,6 +97,7 @@ function groupServerToClient(group: GroupServer): Group {
 		index: group.index,
 		matches,
 		teams: teams,
+		results: group.results.map(groupResultServerToClient),
 	}
 }
 
@@ -110,3 +135,16 @@ function groupMatchServerToClient(matchServer: GroupMatchServer): GroupMatch {
 	}
 	return match
 }
+
+function groupResultServerToClient(result: GroupResultServer): GroupResult {
+	return {
+		team: teamServerToClient(result.team),
+		rank: result.rank,
+		gamesWon: result.gamesWon,
+		gamesLost: result.gamesLost,
+		setsWon: result.setsWon,
+		setsLost: result.setsLost,
+		matchesWon: result.matchesWon,
+		matchesLost: result.matchesLost,
+	}
+}

From e1cf891c167212f0420ffd31517ce52537746842 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 12:36:07 +0200
Subject: [PATCH 214/247] =?UTF-8?q?=E2=9C=A8=20Show=20group=20results?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/user/group/jUserGroup.java          |  2 +-
 .../model/user/jUserTeamGroupResult.java      | 24 ++++++-------
 .../turnierplaner/resources/SetResource.java  | 29 +++++++++------
 .../turnierplaner/tools/GroupTools.java       | 26 +++++++-------
 .../src/components/links/LinkPlayerName.vue   | 13 +++++--
 .../src/components/links/LinkTeamNames.vue    | 14 ++++++--
 .../groupSystem/ViewGroupResults.vue          | 36 +++++++++++++++++++
 .../groupSystem/ViewGroupSystem.vue           | 21 +++++++----
 .../groupSystem/ViewGroupTable.vue            | 26 +++++++-------
 .../competition/groupSystem/ViewMatch.vue     | 23 ++++++------
 .../knockoutSystem/ViewKnockoutSystem.vue     |  1 -
 11 files changed, 142 insertions(+), 73 deletions(-)
 create mode 100644 frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
index ccfe623d..51487c54 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
@@ -16,7 +16,7 @@ public class jUserGroup {
     public jUserGroup(Group group, GroupTools tools) {
         this.index = group.getIndex();
         this.matches = group.getMatches().stream().map(jUserMatch::new).toList();
-        this.results = tools.determineGropuResults(group);
+        this.results = tools.determineGroupResults(group);
     }
 
     public byte getIndex() {
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
index 1436e069..c5bb70a8 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
@@ -4,17 +4,17 @@
 
 public class jUserTeamGroupResult {
 
-    private Team team;
+    private jUserTeam team;
     private int rank;
-    private int gamesWon;
-    private int gamesLost;
-    private int setsWon;
-    private int setsLost;
     private int matchesWon;
     private int matchesLost;
+    private int setsWon;
+    private int setsLost;
+    private int gamesWon;
+    private int gamesLost;
 
     public jUserTeamGroupResult(Team team) {
-        this.team = team;
+        this.team = new jUserTeam(team);
     }
 
     public void matchWon() {
@@ -33,19 +33,19 @@ public void setLost() {
         this.setsLost++;
     }
 
-    public void matchesWon(int matchesWon) {
-        this.matchesWon += matchesWon;
+    public void gamesWon(int gamesWon) {
+        this.gamesWon += gamesWon;
     }
 
-    public void matchesLost(int matchesLost) {
-        this.matchesLost += matchesLost;
+    public void gamesLost(int gamesLost) {
+        this.gamesLost += gamesLost;
     }
 
-    public Team getTeam() {
+    public jUserTeam getTeam() {
         return team;
     }
 
-    public void setTeam(Team team) {
+    public void setTeam(jUserTeam team) {
         this.team = team;
     }
 
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
index 6251f525..440a5bf4 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
@@ -7,10 +7,7 @@
 import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.entities.groups.Group;
 import de.secretj12.turnierplaner.db.entities.knockout.NextMatch;
-import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
-import de.secretj12.turnierplaner.db.repositories.MatchRepository;
-import de.secretj12.turnierplaner.db.repositories.SetRepository;
-import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
+import de.secretj12.turnierplaner.db.repositories.*;
 import de.secretj12.turnierplaner.enums.NumberSets;
 import de.secretj12.turnierplaner.model.user.jUserSet;
 import de.secretj12.turnierplaner.model.user.jUserTeamGroupResult;
@@ -38,6 +35,8 @@ public class SetResource {
     SetRepository setRepository;
     @Inject
     MatchRepository matchRepository;
+    @Inject
+    TeamRepository teamRepository;
 
     @Inject
     GroupTools groupTools;
@@ -117,16 +116,16 @@ private void adjustNext(Match match) {
         }
         if (match.getGroup() != null && groupTools.isFinished(match.getGroup().getGroup())) {
             Group group = match.getGroup().getGroup();
-            List<jUserTeamGroupResult> results = groupTools.determineGropuResults(group);
+            List<jUserTeamGroupResult> results = groupTools.determineGroupResults(group);
 
             for (var fog : group.getFinalOfGroupA()) {
                 Match fin = fog.getNextMatch();
-                fin.setTeamA(results.get(fog.getPos()).getTeam());
+                fin.setTeamA(teamRepository.findById(results.get(fog.getPos()).getTeam().getId()));
                 adjustNext(fin);
             }
             for (var fog : group.getFinalOfGroupB()) {
                 Match fin = fog.getNextMatch();
-                fin.setTeamB(results.get(fog.getPos()).getTeam());
+                fin.setTeamB(teamRepository.findById(results.get(fog.getPos()).getTeam().getId()));
                 adjustNext(fin);
             }
         }
@@ -165,16 +164,24 @@ private boolean findWinner(Match match, NumberSets numberSets) {
         switch (numberSets) {
             case THREE -> isNull(set4);
             case FIVE -> {
-                isValidSet(set4);
-                dif += calcDif(set4);
+                if (Math.abs(dif) == 3)
+                    isNull(set4);
+                else {
+                    isValidSet(set4);
+                    dif += calcDif(set4);
+                }
             }
         }
         Set set5 = setRepository.findById(match, (byte) 4);
         switch (numberSets) {
             case THREE -> isNull(set5);
             case FIVE -> {
-                isValidTiebreak(set5);
-                dif += calcDif(set4);
+                if (Math.abs(dif) == 3)
+                    isNull(set4);
+                else {
+                    isValidTiebreak(set5);
+                    dif += calcDif(set5);
+                }
             }
         }
         if (dif == 0)
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
index f6574de3..67493d53 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
@@ -238,7 +238,7 @@ public boolean isFinished(Group group) {
         return group.getMatches().stream().allMatch(Match::isFinished);
     }
 
-    public List<jUserTeamGroupResult> determineGropuResults(Group group) {
+    public List<jUserTeamGroupResult> determineGroupResults(Group group) {
         Map<Team, jUserTeamGroupResult> results = new HashMap<>();
         teamsOfGroup(group).forEach(t -> results.put(t, new jUserTeamGroupResult(t)));
         NumberSets numberSets = group.getCompetition().getNumberSets();
@@ -264,17 +264,17 @@ public List<jUserTeamGroupResult> determineGropuResults(Group group) {
                     teamA.setLost();
                 }
                 if (set.getKey().getIndex() < numberSets.number - 1) {
-                    teamA.matchesWon(set.getScoreA());
-                    teamA.matchesLost(set.getScoreB());
-                    teamB.matchesWon(set.getScoreB());
-                    teamB.matchesLost(set.getScoreA());
+                    teamA.gamesWon(set.getScoreA());
+                    teamA.gamesLost(set.getScoreB());
+                    teamB.gamesWon(set.getScoreB());
+                    teamB.gamesLost(set.getScoreA());
                 } else {
                     if (set.getScoreA() > set.getScoreB()) {
-                        teamA.matchesWon(1);
-                        teamB.matchesLost(1);
+                        teamA.gamesWon(1);
+                        teamB.gamesLost(1);
                     } else {
-                        teamB.matchesWon(1);
-                        teamA.matchesLost(1);
+                        teamB.gamesWon(1);
+                        teamA.gamesLost(1);
                     }
                 }
             }
@@ -283,7 +283,7 @@ public List<jUserTeamGroupResult> determineGropuResults(Group group) {
         int rank = 1;
         Comp comp = new Comp();
         var sortedRes = results.values().stream()
-            .sorted(comp)
+            .sorted(comp.reversed())
             .toList();
         sortedRes.getFirst().setRank(1);
         for (int i = 1; i < sortedRes.size(); i++) {
@@ -300,15 +300,15 @@ private static class Comp implements Comparator<jUserTeamGroupResult> {
 
         @Override
         public int compare(jUserTeamGroupResult t1, jUserTeamGroupResult t2) {
-            if (t1.getGamesWon() - t1.getMatchesLost() > t2.getMatchesWon() - t2.getMatchesLost())
+            if (t1.getMatchesWon() - t1.getMatchesLost() > t2.getMatchesWon() - t2.getMatchesLost())
                 return 1;
-            if (t2.getGamesWon() - t2.getMatchesLost() > t1.getMatchesWon() - t1.getMatchesLost())
+            if (t2.getMatchesWon() - t2.getMatchesLost() > t1.getMatchesWon() - t1.getMatchesLost())
                 return -1;
             if (t1.getSetsWon() - t1.getSetsLost() > t2.getSetsWon() - t2.getSetsLost())
                 return 1;
             if (t2.getSetsWon() - t2.getSetsLost() > t1.getSetsWon() - t1.getSetsLost())
                 return -1;
-            return Integer.compare(t1.getMatchesWon() - t1.getMatchesLost(), t2.getMatchesWon() - t2.getMatchesLost());
+            return Integer.compare(t1.getGamesWon() - t1.getGamesLost(), t2.getGamesWon() - t2.getGamesLost());
         }
     }
 }
diff --git a/frontend/app/src/components/links/LinkPlayerName.vue b/frontend/app/src/components/links/LinkPlayerName.vue
index 6ab5c663..16c63b8e 100644
--- a/frontend/app/src/components/links/LinkPlayerName.vue
+++ b/frontend/app/src/components/links/LinkPlayerName.vue
@@ -5,27 +5,36 @@
 		@click="click"
 	>
 		<template v-if="inverted">
-			{{ props.player.lastName }}, {{ props.player.firstName }}
+			{{ props.player.lastName }}, {{ firstShort }}
 		</template>
-		<template v-else> {{ props.player.name }}</template>
+		<template v-else>{{ firstShort }} {{ props.player.lastName }}</template>
 	</span>
 </template>
 
 <script setup lang="ts">
 import { Player } from "@/interfaces/player"
 import { router } from "@/main"
+import { computed } from "vue"
 
 const props = withDefaults(
 	defineProps<{
 		player?: Player | null
 		inverted?: boolean
+		short?: boolean
 	}>(),
 	{
 		player: null,
 		inverted: false,
+		short: false,
 	},
 )
 
+const firstShort = computed(() => {
+	if (!props.player) return ""
+	if (props.short) return props.player.firstName.charAt(0) + "."
+	else return props.player.firstName
+})
+
 function click() {
 	if (props.player)
 		router.push({
diff --git a/frontend/app/src/components/links/LinkTeamNames.vue b/frontend/app/src/components/links/LinkTeamNames.vue
index 7f5f4d65..ed8910e3 100644
--- a/frontend/app/src/components/links/LinkTeamNames.vue
+++ b/frontend/app/src/components/links/LinkTeamNames.vue
@@ -1,8 +1,16 @@
 <template>
-	<ViewPlayerName :player="props.team?.playerA" :inverted="props.inverted" />
+	<ViewPlayerName
+		:player="props.team?.playerA"
+		:inverted="props.inverted"
+		:short="props.short"
+	/>
 	<template v-if="props.team?.playerB">
 		<br />
-		<ViewPlayerName :player="props.team?.playerB" :inverted="props.inverted" />
+		<ViewPlayerName
+			:player="props.team?.playerB"
+			:inverted="props.inverted"
+			:short="props.short"
+		/>
 	</template>
 </template>
 
@@ -14,10 +22,12 @@ const props = withDefaults(
 	defineProps<{
 		team?: Team | null
 		inverted?: boolean
+		short?: boolean
 	}>(),
 	{
 		team: null,
 		inverted: false,
+		short: false,
 	},
 )
 </script>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue
new file mode 100644
index 00000000..82f4556d
--- /dev/null
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue
@@ -0,0 +1,36 @@
+<template>
+	<DataTable :value="props.group.results" size="small">
+		<Column field="rank" :header="'R'" />
+		<Column field="team" :header="'Team'">
+			<template #body="{ data }">
+				<LinkTeamNames :team="data.team" inverted short />
+			</template>
+		</Column>
+		<Column :header="'M'">
+			<template #body="{ data }">
+				{{ data.matchesWon }} : {{ data.matchesLost }}
+			</template>
+		</Column>
+		<Column :header="'S'">
+			<template #body="{ data }">
+				{{ data.setsWon }} : {{ data.setsLost }}
+			</template>
+		</Column>
+		<Column :header="'G'">
+			<template #body="{ data }">
+				{{ data.gamesWon }} : {{ data.gamesLost }}
+			</template>
+		</Column>
+	</DataTable>
+</template>
+
+<script setup lang="ts">
+import { Group } from "@/interfaces/groupSystem"
+import LinkTeamNames from "@/components/links/LinkTeamNames.vue"
+
+const props = defineProps<{
+	group: Group
+}>()
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index 20266afe..c995c08c 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -1,14 +1,19 @@
 <template>
-	<!-- TODO show on card -->
 	<!-- TODO add toggle to show as list? -->
-	<template v-if="groupSystem">
-		<ViewGroupTable
+	<div v-if="groupSystem" class="lg:m-2 grid">
+		<div
 			v-for="group in groupSystem.groups"
 			:key="group.index"
-			:group="group"
-			:number-sets="props.numberSets"
-		/>
-	</template>
+			class="xl:col-6 col-12"
+		>
+			<Card>
+				<template #content>
+					<ViewGroupTable :group="group" :number-sets="props.numberSets" />
+					<ViewGroupResults :group="group" />
+				</template>
+			</Card>
+		</div>
+	</div>
 
 	<!-- TODO show finals -->
 </template>
@@ -18,8 +23,10 @@ import { useRoute } from "vue-router"
 import ViewGroupTable from "@/components/views/competition/groupSystem/ViewGroupTable.vue"
 import { getGroup } from "@/backend/group"
 import { NumberSets } from "@/interfaces/competition"
+import ViewGroupResults from "@/components/views/competition/groupSystem/ViewGroupResults.vue"
 
 const route = useRoute()
+
 const { data: groupSystem } = getGroup(route)
 const props = defineProps<{
 	numberSets: NumberSets
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
index f64b5034..9eebf19b 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
@@ -1,9 +1,9 @@
 <template>
-	<!-- TODO rework, show courts, ... -->
+	<!-- TODO mobile optimization -->
 	<table style="width: calc(100% - 1px)">
 		<tr>
 			<th id="first">
-				{{ t("ViewGroupSystem.group") }} {{ props.group.index }}
+				<span>{{ t("ViewGroupSystem.group") }} {{ props.group.index }}</span>
 			</th>
 			<template
 				v-for="(team, index) in props.group.teams.slice().reverse()"
@@ -15,18 +15,18 @@
 					@mouseover="headerHover(team.id)"
 					@mouseleave="hoverLeave()"
 				>
-					<ViewTeamNames :team="team" :inverted="true" />
+					<ViewTeamNames :team="team" :inverted="true" short />
 				</th>
 			</template>
 		</tr>
-		<template v-for="(team, index) in props.group.teams" :key="index">
+		<template v-for="(teamA, index) in props.group.teams" :key="index">
 			<tr v-if="index !== props.group.teams.length - 1">
 				<th
 					:class="hoverIdA === index ? 'highlight ' : ''"
-					@mouseover="headerHover(team.id)"
+					@mouseover="headerHover(teamA.id)"
 					@mouseleave="hoverLeave()"
 				>
-					<ViewTeamNames :team="team" :inverted="true" />
+					<ViewTeamNames :team="teamA" :inverted="true" short />
 				</th>
 				<template
 					v-for="(teamB, indexB) in props.group.teams.slice().reverse()"
@@ -44,14 +44,14 @@
 								hoverIdB &&
 								((hoverIdA === index && indexB < hoverIdB) ||
 									(hoverIdB === indexB && index < hoverIdA)),
-							highlight: hoverTeam === team.id || hoverTeam === teamB.id,
+							highlight: hoverTeam === teamA.id || hoverTeam === teamB.id,
 						}"
 						@mouseover="matchHover(index, indexB)"
 						@mouseleave="hoverLeave()"
-						@click="showPopUp(findMatch(team, teamB))"
+						@click="showPopUp(findMatch(teamA, teamB).match)"
 					>
 						<div>
-							<ViewMatch :match="findMatch(team, teamB)" />
+							<ViewMatch v-bind="findMatch(teamA, teamB)" />
 						</div>
 					</td>
 				</template>
@@ -87,7 +87,10 @@ const props = defineProps<{
 const isLoggedIn = inject("loggedIn", ref(false))
 const { data: isReporter } = getIsReporter(isLoggedIn)
 
-function findMatch(teamA: Team, teamB: Team): Match {
+function findMatch(
+	teamA: Team,
+	teamB: Team,
+): { match: Match; reversed: boolean } {
 	const match: Match | undefined = props.group.matches.find((match) => {
 		if (match.teamA === null || match.teamB === null) return false
 		if (match.teamA.id === teamA.id && match.teamB.id === teamB.id) return true
@@ -97,7 +100,7 @@ function findMatch(teamA: Team, teamB: Team): Match {
 		console.error("Match does not exist")
 		throw new Error("Match does not exist")
 	}
-	return match
+	return { match, reversed: match.teamA?.id === teamB.id }
 }
 
 const hoverIdA = ref<null | number>(null)
@@ -138,7 +141,6 @@ table {
 }
 
 #first {
-	width: 150px;
 	border-top-left-radius: 15px;
 }
 
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
index 493be285..f92ff8a1 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
@@ -5,15 +5,19 @@
 			{{ props.match.begin.toLocaleString(t("lang"), dateOptions) }}
 		</template>
 		<template v-else> --- </template>
+		<template v-if="props.match.court"
+			><br />
+			{{ props.match.court }}
+		</template>
 	</p>
-	<div v-else-if="props.order">
+	<div v-else-if="props.reversed">
 		<div v-for="set in props.match.sets" :key="set.index">
-			{{ set.scoreA }} - {{ set.scoreB }}
+			{{ set.scoreB }} - {{ set.scoreA }}
 		</div>
 	</div>
 	<div v-else>
 		<div v-for="set in props.match.sets" :key="set.index">
-			{{ set.scoreB }} - {{ set.scoreA }}
+			{{ set.scoreA }} - {{ set.scoreB }}
 		</div>
 	</div>
 </template>
@@ -24,15 +28,10 @@ import { useI18n } from "vue-i18n"
 
 const { t } = useI18n()
 
-const props = withDefaults(
-	defineProps<{
-		match: Match
-		order?: boolean
-	}>(),
-	{
-		order: true,
-	},
-)
+const props = defineProps<{
+	match: Match
+	reversed: boolean
+}>()
 
 const dateOptions: Intl.DateTimeFormatOptions = {
 	year: "2-digit",
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index ca63a158..400f14b0 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -1,5 +1,4 @@
 <template>
-	<p>Knockout system</p>
 	<template v-if="knockoutSystem">
 		<ViewKnockoutTree
 			:finale="knockoutSystem.finale ?? undefined"

From 5bd2224ed2f9535b0dbba5870293bc153757fd13 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 13:29:38 +0200
Subject: [PATCH 215/247] =?UTF-8?q?=E2=9C=A8=20Show=20knockout=20of=20grou?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupSystem/HorizontalScroller.vue        | 22 +++++++
 .../groupSystem/ViewGroupSystem.vue           | 62 +++++++++++++++++--
 frontend/app/src/interfaces/groupSystem.ts    |  8 +--
 3 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue

diff --git a/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue b/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue
new file mode 100644
index 00000000..b429fdb8
--- /dev/null
+++ b/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue
@@ -0,0 +1,22 @@
+<template>
+	<div class="horizontal-scroller">
+		<div class="scroller-content">
+			<slot></slot>
+		</div>
+	</div>
+</template>
+
+<script setup></script>
+
+<style scoped>
+.horizontal-scroller {
+	width: 100%;
+	overflow-x: auto;
+	overflow-y: hidden;
+}
+
+.scroller-content {
+	display: inline-block;
+	white-space: nowrap;
+}
+</style>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index c995c08c..3c46a016 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -1,15 +1,54 @@
 <template>
 	<!-- TODO add toggle to show as list? -->
-	<div v-if="groupSystem" class="lg:m-2 grid">
+	<div v-if="groupSystem && competition" class="w-full grid xl:w-11">
 		<div
-			v-for="group in groupSystem.groups"
-			:key="group.index"
-			class="xl:col-6 col-12"
+			class="col-12"
+			:class="{
+				'lg:col-8': groupSystem.finale,
+			}"
 		>
+			<div class="grid">
+				<div
+					v-for="group in groupSystem.groups"
+					:key="group.index"
+					class="col-12"
+				>
+					<Card class="w-full">
+						<template #content>
+							<ViewGroupTable :group="group" :number-sets="props.numberSets" />
+							<ViewGroupResults :group="group" />
+						</template>
+					</Card>
+				</div>
+			</div>
+		</div>
+		<div v-if="groupSystem.finale" class="col-12 lg:col-4">
 			<Card>
 				<template #content>
-					<ViewGroupTable :group="group" :number-sets="props.numberSets" />
-					<ViewGroupResults :group="group" />
+					<HorizontalScroller>
+						<ViewKnockoutTree
+							v-model:finale="groupSystem.finale"
+							v-model:third-place="groupSystem.thirdPlace"
+							:border-radius="0"
+							:border-thickness="2"
+							:margin-small="30"
+							:margin-big="40"
+							:titles="knockoutTitle(t)"
+						>
+							<template #match="{ match }">
+								<ViewMatch
+									v-if="match"
+									:match="match"
+									:mode="competition.mode"
+									:number-sets="props.numberSets"
+									:allow-update="true"
+								/>
+							</template>
+							<template #additional="{ match }">
+								<ViewMatchDate v-if="match" :match="match" />
+							</template>
+						</ViewKnockoutTree>
+					</HorizontalScroller>
 				</template>
 			</Card>
 		</div>
@@ -24,9 +63,20 @@ import ViewGroupTable from "@/components/views/competition/groupSystem/ViewGroup
 import { getGroup } from "@/backend/group"
 import { NumberSets } from "@/interfaces/competition"
 import ViewGroupResults from "@/components/views/competition/groupSystem/ViewGroupResults.vue"
+import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
+import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
+import { useI18n } from "vue-i18n"
+import { knockoutTitle } from "@/components/views/competition/knockoutSystem/KnockoutTitleGenerator"
+import { getCompetitionDetails } from "@/backend/competition"
+import { useToast } from "primevue/usetoast"
+import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
+import HorizontalScroller from "@/components/views/competition/groupSystem/HorizontalScroller.vue"
 
 const route = useRoute()
+const { t } = useI18n()
+const toast = useToast()
 
+const { data: competition } = getCompetitionDetails(route, t, toast)
 const { data: groupSystem } = getGroup(route)
 const props = defineProps<{
 	numberSets: NumberSets
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index f4fc7602..20dcbe36 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -4,8 +4,8 @@ import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 
 export interface GroupSystem {
 	groups: Group[]
-	finale: GroupMatch | null
-	thirdPlace: GroupMatch | null
+	finale: GroupMatch | undefined
+	thirdPlace: GroupMatch | undefined
 }
 
 export interface Group {
@@ -73,10 +73,10 @@ export function groupSystemServerToClient(
 		groups: groupSystem.groups.map((group) => groupServerToClient(group)),
 		finale: groupSystem.finale
 			? groupMatchServerToClient(groupSystem.finale)
-			: null,
+			: undefined,
 		thirdPlace: groupSystem.thirdPlace
 			? groupMatchServerToClient(groupSystem.thirdPlace)
-			: null,
+			: undefined,
 	}
 }
 

From d88f5147ff90c26a7920f26731e375d137995260 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 14:35:16 +0200
Subject: [PATCH 216/247] =?UTF-8?q?=E2=9C=A8=20Adjust=20scrolling=20in=20g?=
 =?UTF-8?q?roup=20and=20knockout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/items/HorizontalScroller.vue   | 11 ++++
 .../views/competition/ViewCompetition.vue     |  5 +-
 .../groupSystem/HorizontalScroller.vue        | 22 --------
 .../groupSystem/ViewGroupSystem.vue           |  6 +-
 .../knockoutSystem/ViewKnockoutSystem.vue     | 55 +++++++++++--------
 frontend/app/src/interfaces/groupSystem.ts    |  8 +--
 6 files changed, 53 insertions(+), 54 deletions(-)
 create mode 100644 frontend/app/src/components/items/HorizontalScroller.vue
 delete mode 100644 frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue

diff --git a/frontend/app/src/components/items/HorizontalScroller.vue b/frontend/app/src/components/items/HorizontalScroller.vue
new file mode 100644
index 00000000..07c23127
--- /dev/null
+++ b/frontend/app/src/components/items/HorizontalScroller.vue
@@ -0,0 +1,11 @@
+<template>
+	<div class="max-w-full w-fit overflow-x-auto">
+		<div class="inline-block flex-wrap">
+			<slot></slot>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup></script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index a88b074a..733a73de 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -7,8 +7,9 @@
 				class="material-symbols-outlined cursor-pointer"
 				style="font-size: 1.7rem"
 				@click="settings"
-				>settings</span
 			>
+				settings
+			</span>
 			<div id="tourName">
 				{{ route.params.tourId }}
 			</div>
@@ -95,7 +96,7 @@ const dateOptions: Intl.DateTimeFormatOptions = {
 <style scoped>
 #container {
 	width: 100%;
-	margin: 0 10px 0 10px;
+	padding: 0 10px 0 10px;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
diff --git a/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue b/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue
deleted file mode 100644
index b429fdb8..00000000
--- a/frontend/app/src/components/views/competition/groupSystem/HorizontalScroller.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-	<div class="horizontal-scroller">
-		<div class="scroller-content">
-			<slot></slot>
-		</div>
-	</div>
-</template>
-
-<script setup></script>
-
-<style scoped>
-.horizontal-scroller {
-	width: 100%;
-	overflow-x: auto;
-	overflow-y: hidden;
-}
-
-.scroller-content {
-	display: inline-block;
-	white-space: nowrap;
-}
-</style>
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
index 3c46a016..7e34609a 100644
--- a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
+++ b/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
@@ -27,8 +27,8 @@
 				<template #content>
 					<HorizontalScroller>
 						<ViewKnockoutTree
-							v-model:finale="groupSystem.finale"
-							v-model:third-place="groupSystem.thirdPlace"
+							:finale="groupSystem.finale"
+							:third-place="groupSystem.thirdPlace ?? undefined"
 							:border-radius="0"
 							:border-thickness="2"
 							:margin-small="30"
@@ -60,6 +60,7 @@
 <script lang="ts" setup>
 import { useRoute } from "vue-router"
 import ViewGroupTable from "@/components/views/competition/groupSystem/ViewGroupTable.vue"
+import HorizontalScroller from "@/components/items/HorizontalScroller.vue"
 import { getGroup } from "@/backend/group"
 import { NumberSets } from "@/interfaces/competition"
 import ViewGroupResults from "@/components/views/competition/groupSystem/ViewGroupResults.vue"
@@ -70,7 +71,6 @@ import { knockoutTitle } from "@/components/views/competition/knockoutSystem/Kno
 import { getCompetitionDetails } from "@/backend/competition"
 import { useToast } from "primevue/usetoast"
 import ViewMatchDate from "@/components/views/competition/knockoutSystem/ViewMatchDate.vue"
-import HorizontalScroller from "@/components/views/competition/groupSystem/HorizontalScroller.vue"
 
 const route = useRoute()
 const { t } = useI18n()
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
index 400f14b0..f000d457 100644
--- a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
+++ b/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
@@ -1,33 +1,42 @@
 <template>
-	<template v-if="knockoutSystem">
-		<ViewKnockoutTree
-			:finale="knockoutSystem.finale ?? undefined"
-			:third-place="knockoutSystem.thirdPlace ?? undefined"
-			:border-radius="0"
-			:border-thickness="2"
-			:margin-small="30"
-			:margin-big="40"
-			:titles="knockoutTitle(t)"
-		>
-			<template #match="{ match }">
-				<ViewMatch
-					v-if="match"
-					:match="match"
-					:mode="props.mode"
-					:number-sets="props.numberSets"
-					:allow-update="true"
-				/>
+	<div class="w-full xl:w-11">
+		<Card v-if="knockoutSystem">
+			<template #content>
+				<div class="w-full flex flex-column align-items-center">
+					<HorizontalScroller>
+						<ViewKnockoutTree
+							:finale="knockoutSystem.finale ?? undefined"
+							:third-place="knockoutSystem.thirdPlace ?? undefined"
+							:border-radius="0"
+							:border-thickness="2"
+							:margin-small="30"
+							:margin-big="40"
+							:titles="knockoutTitle(t)"
+						>
+							<template #match="{ match }">
+								<ViewMatch
+									v-if="match"
+									:match="match"
+									:mode="props.mode"
+									:number-sets="props.numberSets"
+									:allow-update="true"
+								/>
+							</template>
+							<template #additional="{ match }">
+								<ViewMatchDate v-if="match" :match="match" />
+							</template>
+						</ViewKnockoutTree>
+					</HorizontalScroller>
+				</div>
 			</template>
-			<template #additional="{ match }">
-				<ViewMatchDate v-if="match" :match="match" />
-			</template>
-		</ViewKnockoutTree>
-	</template>
+		</Card>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { useRoute } from "vue-router"
 import ViewKnockoutTree from "@/components/views/competition/knockoutSystem/ViewKnockoutTree.vue"
+import HorizontalScroller from "@/components/items/HorizontalScroller.vue"
 import { Mode, NumberSets } from "@/interfaces/competition"
 import { getKnockout } from "@/backend/knockout"
 import ViewMatch from "@/components/views/competition/knockoutSystem/ViewMatch.vue"
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/frontend/app/src/interfaces/groupSystem.ts
index 20dcbe36..f4fc7602 100644
--- a/frontend/app/src/interfaces/groupSystem.ts
+++ b/frontend/app/src/interfaces/groupSystem.ts
@@ -4,8 +4,8 @@ import { Team, TeamServer, teamServerToClient } from "@/interfaces/team"
 
 export interface GroupSystem {
 	groups: Group[]
-	finale: GroupMatch | undefined
-	thirdPlace: GroupMatch | undefined
+	finale: GroupMatch | null
+	thirdPlace: GroupMatch | null
 }
 
 export interface Group {
@@ -73,10 +73,10 @@ export function groupSystemServerToClient(
 		groups: groupSystem.groups.map((group) => groupServerToClient(group)),
 		finale: groupSystem.finale
 			? groupMatchServerToClient(groupSystem.finale)
-			: undefined,
+			: null,
 		thirdPlace: groupSystem.thirdPlace
 			? groupMatchServerToClient(groupSystem.thirdPlace)
-			: undefined,
+			: null,
 	}
 }
 

From f80459818ce66cfa91c16ca6be73a0c6cb406239 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 15:23:08 +0200
Subject: [PATCH 217/247] =?UTF-8?q?=F0=9F=94=A5=20Only=20show=20title=20in?=
 =?UTF-8?q?=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/competition/ViewCompetition.vue       | 17 -----------------
 .../views/competitions/ViewCompetitions.vue     |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index 733a73de..454fd41d 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -1,22 +1,5 @@
 <template>
 	<div id="container">
-		<div style="margin-bottom: 20px">
-			<span
-				v-if="canEdit"
-				id="settings"
-				class="material-symbols-outlined cursor-pointer"
-				style="font-size: 1.7rem"
-				@click="settings"
-			>
-				settings
-			</span>
-			<div id="tourName">
-				{{ route.params.tourId }}
-			</div>
-			<h2>
-				{{ route.params.compId }}
-			</h2>
-		</div>
 		<template v-if="tournamentSuc && tournament">
 			<template v-if="new Date() < tournament.registration_phase.begin">
 				{{ t("ViewCompetition.registration_not_started") }}
diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
index e465d277..46a34281 100644
--- a/frontend/app/src/components/views/competitions/ViewCompetitions.vue
+++ b/frontend/app/src/components/views/competitions/ViewCompetitions.vue
@@ -1,8 +1,5 @@
 <template>
 	<div id="container">
-		<h2>
-			{{ route.params.tourId }}
-		</h2>
 		<div id="content">
 			<div id="competitions">
 				<template v-if="competitions === null">

From e65505cbb3170aa1d36a866ce464f311e383b90e Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 15:23:37 +0200
Subject: [PATCH 218/247] =?UTF-8?q?=F0=9F=93=B1=20Optimize=20Header=20for?=
 =?UTF-8?q?=20small=20devices?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/header/HeaderLeft.vue  | 62 +++++++++++-------
 .../app/src/components/header/HeaderRight.vue | 65 +++++--------------
 .../views/competition/ViewCompetition.vue     | 12 ----
 3 files changed, 52 insertions(+), 87 deletions(-)

diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index b09d5d35..e2db3807 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -1,32 +1,34 @@
 <template>
-	<div id="header" class="flex flex-row pl-3 align-items-center gap-3">
-		<span
-			class="material-symbols-outlined cursor-pointer"
-			style="font-size: 3rem"
-			@click="toHome"
+	<div
+		id="header"
+		class="flex flex-row pl-1 lg:pl-3 align-items-center gap-1 lg:gap-3"
+	>
+		<span class="material-symbols-outlined cursor-pointer icon" @click="toHome"
 			>sports_tennis</span
 		>
-		<div class="flex flex-row align-items-baseline gap-3">
+		<div class="flex flex-column lg:flex-row align-items-center lg:gap-3">
 			<h1 id="colorHeadLine" class="m-0 cursor-pointer title" @click="toHome">
 				{{ config?.title ? t(config.title) : t("title") }}
 			</h1>
-			<h2
-				v-if="route.params.tourId"
-				class="m-0 cursor-pointer"
-				@click="toTournament"
-			>
-				{{ route.params.tourId }}
-			</h2>
-			<h2 v-if="route.name === 'Settings'" class="cursor-pointer">
-				{{ t("general.settings") }}
-			</h2>
-			<h3
-				v-if="route.params.compId"
-				class="m-0 cursor-pointer"
-				@click="toCompetition"
-			>
-				{{ route.params.compId }}
-			</h3>
+			<div class="flex flex-column xl:flex-row align-items-center xl:gap-3">
+				<h2
+					v-if="route.params.tourId"
+					class="m-0 cursor-pointer"
+					@click="toTournament"
+				>
+					{{ route.params.tourId }}
+				</h2>
+				<h2 v-if="route.name === 'Settings'" class="cursor-pointer">
+					{{ t("general.settings") }}
+				</h2>
+				<h3
+					v-if="route.params.compId"
+					class="m-0 cursor-pointer"
+					@click="toCompetition"
+				>
+					{{ route.params.compId }}
+				</h3>
+			</div>
 		</div>
 	</div>
 </template>
@@ -74,12 +76,22 @@ h1,
 h2,
 h3 {
 	line-height: 1;
+	padding: 0;
 }
 
-@media only screen and (max-width: 750px) {
-	h1 {
+.icon {
+	font-size: 3rem;
+}
+
+@media only screen and (max-width: 991px) {
+	h1,
+	h2,
+	h3 {
 		font-size: 1em;
 	}
+	.icon {
+		font-size: 2rem;
+	}
 }
 
 span:hover,
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index e1090059..696b5a6f 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -1,5 +1,5 @@
 <template>
-	<div id="headerRight">
+	<div class="pr-3 flex flex-row align-items-center gap-2 lg:gap-3">
 		<Button v-if="isLoggedIn" rounded outlined size="small" @click="settings">
 			<template #icon>
 				<span class="material-symbols-outlined">settings</span>
@@ -13,16 +13,23 @@
 
 		<span
 			v-if="!isLoggedIn"
-			class="material-symbols-outlined clickable bigger"
+			class="material-symbols-outlined cursor-pointer bigger"
 			@click="login"
-			>login</span
 		>
-		<template v-else>
-			<span v-if="windowWidth > 600">{{ currentUser }}</span>
-			<span class="material-symbols-outlined clickable bigger" @click="logout"
-				>logout</span
+			login
+		</span>
+		<div
+			v-else
+			class="flex flex-column-reverse lg:flex-row align-items-center lg:gap-3"
+		>
+			<span>{{ currentUser }}</span>
+			<span
+				class="material-symbols-outlined cursor-pointer bigger"
+				@click="logout"
 			>
-		</template>
+				logout
+			</span>
+		</div>
 	</div>
 </template>
 
@@ -45,11 +52,6 @@ function settings() {
 	})
 }
 
-let windowWidth = ref(window.innerWidth)
-window.addEventListener("resize", () => {
-	windowWidth.value = window.innerWidth
-})
-
 watch(isLoggedIn, async () => {
 	auth.getUser().then((user) => {
 		if (user !== null && user.profile.preferred_username) {
@@ -77,43 +79,6 @@ export default {
 </script>
 
 <style>
-#headerRight {
-	width: fit-content;
-	padding-right: 10px;
-	display: flex;
-	align-items: center;
-	align-content: flex-end;
-	flex-direction: row;
-	justify-content: flex-end;
-}
-
-#login > span {
-	text-align: center;
-	margin-right: 20px;
-	display: flex;
-	justify-content: center;
-}
-
-@media only screen and (max-width: 500px) {
-	#headerRight {
-		padding-right: 0;
-	}
-
-	#headerRight > * {
-		margin-right: 10px;
-	}
-}
-
-#headerRight > * {
-	margin-right: 20px;
-	flex-grow: 0;
-	flex-shrink: 1;
-}
-
-.clickable {
-	cursor: pointer;
-}
-
 .bigger {
 	font-size: 2.5rem !important;
 	font-weight: bold !important;
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/frontend/app/src/components/views/competition/ViewCompetition.vue
index 454fd41d..3f7b9930 100644
--- a/frontend/app/src/components/views/competition/ViewCompetition.vue
+++ b/frontend/app/src/components/views/competition/ViewCompetition.vue
@@ -35,12 +35,9 @@
 
 <script lang="ts" setup>
 import { useRoute } from "vue-router"
-import { inject, ref } from "vue"
-import { router } from "@/main"
 import ViewSignUp from "@/components/views/competition/signup/ViewSignUp.vue"
 import ViewGame from "@/components/views/competition/ViewGame.vue"
 import { useI18n } from "vue-i18n"
-import { getCanEdit } from "@/backend/security"
 import { getTournamentDetails } from "@/backend/tournament"
 import { useToast } from "primevue/usetoast"
 import { getCompetitionDetails } from "@/backend/competition"
@@ -49,8 +46,6 @@ const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
-const isLoggedIn = inject("loggedIn", ref(false))
-const { data: canEdit } = getCanEdit(<string>route.params.tourId, isLoggedIn)
 
 const { data: tournament, isSuccess: tournamentSuc } = getTournamentDetails(
 	route,
@@ -59,13 +54,6 @@ const { data: tournament, isSuccess: tournamentSuc } = getTournamentDetails(
 )
 const { data: competition } = getCompetitionDetails(route, t, toast)
 
-function settings() {
-	router.push({
-		name: "Edit competition",
-		params: { tourId: route.params.tourId, compId: route.params.compId },
-	})
-}
-
 const dateOptions: Intl.DateTimeFormatOptions = {
 	weekday: "long",
 	year: "numeric",

From 91ed0f5dfdfdac8fb31eeaad77b0adc7c311b014 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Wed, 2 Oct 2024 15:55:35 +0200
Subject: [PATCH 219/247] =?UTF-8?q?=F0=9F=93=B1=20Add=20sidebar=20for=20mo?=
 =?UTF-8?q?bile=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/components/header/HeaderLeft.vue  |  11 +-
 .../app/src/components/header/HeaderRight.vue | 104 ++++++++----------
 .../components/header/HeaderRightContent.vue  |  76 +++++++++++++
 .../src/components/header/SidebarContent.vue  |  86 +++++++++++++++
 4 files changed, 210 insertions(+), 67 deletions(-)
 create mode 100644 frontend/app/src/components/header/HeaderRightContent.vue
 create mode 100644 frontend/app/src/components/header/SidebarContent.vue

diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index e2db3807..f375e68b 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -1,11 +1,11 @@
 <template>
 	<div
 		id="header"
-		class="flex flex-row pl-1 lg:pl-3 align-items-center gap-1 lg:gap-3"
+		class="flex flex-row pl-2 lg:pl-3 align-items-center gap-2 lg:gap-3"
 	>
-		<span class="material-symbols-outlined cursor-pointer icon" @click="toHome"
-			>sports_tennis</span
-		>
+		<span class="material-symbols-outlined cursor-pointer icon" @click="toHome">
+			sports_tennis
+		</span>
 		<div class="flex flex-column lg:flex-row align-items-center lg:gap-3">
 			<h1 id="colorHeadLine" class="m-0 cursor-pointer title" @click="toHome">
 				{{ config?.title ? t(config.title) : t("title") }}
@@ -89,9 +89,6 @@ h3 {
 	h3 {
 		font-size: 1em;
 	}
-	.icon {
-		font-size: 2rem;
-	}
 }
 
 span:hover,
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/frontend/app/src/components/header/HeaderRight.vue
index 696b5a6f..080e3f42 100644
--- a/frontend/app/src/components/header/HeaderRight.vue
+++ b/frontend/app/src/components/header/HeaderRight.vue
@@ -1,86 +1,70 @@
 <template>
-	<div class="pr-3 flex flex-row align-items-center gap-2 lg:gap-3">
-		<Button v-if="isLoggedIn" rounded outlined size="small" @click="settings">
-			<template #icon>
-				<span class="material-symbols-outlined">settings</span>
-			</template>
-		</Button>
-		<Dropdown
-			v-model="locale"
-			:options="availableLocales"
-			@change="(event) => saveLanguage(event.value)"
-		/>
-
+	<div v-if="windowWidth < 600">
 		<span
-			v-if="!isLoggedIn"
-			class="material-symbols-outlined cursor-pointer bigger"
-			@click="login"
+			class="material-symbols-outlined cursor-pointer bigger pr-2"
+			@click="sidebar = true"
 		>
-			login
+			menu
 		</span>
-		<div
-			v-else
-			class="flex flex-column-reverse lg:flex-row align-items-center lg:gap-3"
-		>
-			<span>{{ currentUser }}</span>
-			<span
-				class="material-symbols-outlined cursor-pointer bigger"
-				@click="logout"
-			>
-				logout
-			</span>
-		</div>
+		<Sidebar v-model:visible="sidebar" position="right">
+			<template #header>
+				<div class="flex flex-row align-items-center gap-2">
+					<span
+						class="material-symbols-outlined cursor-pointer icon"
+						style="font-size: 3rem"
+						@click="toHome"
+					>
+						sports_tennis
+					</span>
+					<h1 class="m-0 cursor-pointer title" @click="toHome">
+						{{ config?.title ? t(config.title) : t("title") }}
+					</h1>
+				</div>
+			</template>
+			<SidebarContent />
+		</Sidebar>
+	</div>
+	<div v-else class="pr-3 flex flex-row align-items-center gap-2 lg:gap-3">
+		<HeaderRightContent />
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { auth } from "@/security/AuthService"
-import { inject, ref, watch } from "vue"
+import HeaderRightContent from "./HeaderRightContent.vue"
+import SidebarContent from "./SidebarContent.vue"
+import { inject, ref } from "vue"
 import { router } from "@/main"
+import { getConfig } from "@/backend/config"
 import { useI18n } from "vue-i18n"
-import { useSaveLanguage } from "@/backend/config"
 
-const currentUser = ref<string>("")
-const isLoggedIn = inject("loggedIn", ref(false))
-const { locale, availableLocales } = useI18n()
+const { t } = useI18n()
 
-const { mutate: saveLanguage } = useSaveLanguage(isLoggedIn)
+const sidebar = ref(false)
 
-function settings() {
-	router.push({
-		name: "Settings",
-	})
-}
+const isLoggedIn = inject("loggedIn", ref(false))
+const { data: config } = getConfig(isLoggedIn)
 
-watch(isLoggedIn, async () => {
-	auth.getUser().then((user) => {
-		if (user !== null && user.profile.preferred_username) {
-			currentUser.value = user.profile.preferred_username
-		}
-	})
+let windowWidth = ref(window.innerWidth)
+window.addEventListener("resize", () => {
+	windowWidth.value = window.innerWidth
 })
 
-function login() {
-	auth.login()
-}
-
-function logout() {
-	auth.logout()
+function toHome() {
+	router.push({ name: "Tournaments" })
 }
 </script>
 
-<script lang="ts">
-export default {
-	name: "LocaleChanger",
-	data() {
-		return { langs: ["en", "en"] }
-	},
-}
-</script>
+<script lang="ts"></script>
 
 <style>
 .bigger {
 	font-size: 2.5rem !important;
 	font-weight: bold !important;
 }
+
+h1 {
+	font-weight: 900;
+	font-size: 1.2rem;
+	color: #044154;
+}
 </style>
diff --git a/frontend/app/src/components/header/HeaderRightContent.vue b/frontend/app/src/components/header/HeaderRightContent.vue
new file mode 100644
index 00000000..52b202c8
--- /dev/null
+++ b/frontend/app/src/components/header/HeaderRightContent.vue
@@ -0,0 +1,76 @@
+<template>
+	<Button v-if="isLoggedIn" rounded outlined size="small" @click="settings">
+		<template #icon>
+			<span class="material-symbols-outlined">settings</span>
+		</template>
+	</Button>
+	<Dropdown
+		v-model="locale"
+		:options="availableLocales"
+		@change="(event) => saveLanguage(event.value)"
+	/>
+
+	<span
+		v-if="!isLoggedIn"
+		class="material-symbols-outlined cursor-pointer bigger"
+		@click="login"
+	>
+		login
+	</span>
+	<template v-else>
+		<span>{{ currentUser }}</span>
+		<span
+			class="material-symbols-outlined cursor-pointer bigger"
+			@click="logout"
+		>
+			logout
+		</span>
+	</template>
+</template>
+
+<script setup lang="ts">
+import { auth } from "@/security/AuthService"
+import { inject, ref, watch } from "vue"
+import { router } from "@/main"
+import { useI18n } from "vue-i18n"
+import { useSaveLanguage } from "@/backend/config"
+
+const currentUser = ref<string>("")
+const isLoggedIn = inject("loggedIn", ref(false))
+const { locale, availableLocales } = useI18n()
+
+const { mutate: saveLanguage } = useSaveLanguage(isLoggedIn)
+
+function settings() {
+	router.push({
+		name: "Settings",
+	})
+}
+
+watch(isLoggedIn, async () => {
+	auth.getUser().then((user) => {
+		if (user !== null && user.profile.preferred_username) {
+			currentUser.value = user.profile.preferred_username
+		}
+	})
+})
+
+function login() {
+	auth.login()
+}
+
+function logout() {
+	auth.logout()
+}
+</script>
+
+<script lang="ts">
+export default {
+	name: "LocaleChanger",
+	data() {
+		return { langs: ["en", "en"] }
+	},
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/header/SidebarContent.vue b/frontend/app/src/components/header/SidebarContent.vue
new file mode 100644
index 00000000..0101b6ef
--- /dev/null
+++ b/frontend/app/src/components/header/SidebarContent.vue
@@ -0,0 +1,86 @@
+<template>
+	<div class="flex flex-column-reverse align-items-end gap-3">
+		<div class="flex flex-row align-items-center gap-3">
+			<Dropdown
+				v-model="locale"
+				:options="availableLocales"
+				@change="(event) => saveLanguage(event.value)"
+			/>
+			<Button v-if="isLoggedIn" rounded outlined size="small" @click="settings">
+				<template #icon>
+					<span class="material-symbols-outlined">settings</span>
+				</template>
+			</Button>
+		</div>
+
+		<span
+			v-if="!isLoggedIn"
+			class="material-symbols-outlined cursor-pointer bigger"
+			@click="login"
+		>
+			login
+		</span>
+		<template v-else>
+			<div class="flex flex-row align-items-center gap-3">
+				<span>{{ currentUser }}</span>
+				<span
+					class="material-symbols-outlined cursor-pointer bigger"
+					@click="logout"
+				>
+					logout
+				</span>
+			</div>
+		</template>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { auth } from "@/security/AuthService"
+import { inject, ref, watch } from "vue"
+import { router } from "@/main"
+import { useI18n } from "vue-i18n"
+import { useSaveLanguage } from "@/backend/config"
+
+const currentUser = ref<string>("")
+const isLoggedIn = inject("loggedIn", ref(false))
+const { locale, availableLocales } = useI18n()
+
+const { mutate: saveLanguage } = useSaveLanguage(isLoggedIn)
+
+function settings() {
+	router.push({
+		name: "Settings",
+	})
+}
+
+watch(
+	isLoggedIn,
+	async () => {
+		auth.getUser().then((user) => {
+			if (user !== null && user.profile.preferred_username) {
+				currentUser.value = user.profile.preferred_username
+			}
+		})
+	},
+	{ immediate: true },
+)
+
+function login() {
+	auth.login()
+}
+
+function logout() {
+	auth.logout()
+}
+</script>
+
+<script lang="ts">
+export default {
+	name: "LocaleChanger",
+	data() {
+		return { langs: ["en", "en"] }
+	},
+}
+</script>
+
+<style scoped></style>

From 26576d77ba30f95a28763f618041c4bf975b695b Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 00:10:39 +0200
Subject: [PATCH 220/247] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20use=20new=20define?=
 =?UTF-8?q?Field=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/player/ViewPlayerForm.vue           |  75 ++++++-----
 .../views/tournaments/FormTournament.vue      | 123 +++++++++---------
 2 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/frontend/app/src/components/views/player/ViewPlayerForm.vue b/frontend/app/src/components/views/player/ViewPlayerForm.vue
index c5fbfe56..f354272c 100644
--- a/frontend/app/src/components/views/player/ViewPlayerForm.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerForm.vue
@@ -8,7 +8,8 @@
 				id="first_name"
 				:disabled="disabled"
 				type="text"
-				v-bind="firstName"
+				v-model="firstName"
+				v-bind="firstNameAttrs"
 				maxlength="40"
 				class="w-full"
 				:class="{ 'p-invalid': errors.firstName }"
@@ -25,7 +26,8 @@
 				id="name"
 				:disabled="disabled"
 				type="text"
-				v-bind="lastName"
+				v-model="lastName"
+				v-bind="lastNameAttrs"
 				maxlength="40"
 				class="w-full"
 				:class="{ 'p-invalid': errors.lastName }"
@@ -42,7 +44,8 @@
 				show-icon
 				:disabled="disabled"
 				class="w-full"
-				v-bind="birthday"
+				v-model="birthday"
+				v-bind="birthdayAttrs"
 				:manual-input="false"
 				:date-format="t('date_format')"
 				:class="{ 'p-invalid': errors.birthday }"
@@ -54,7 +57,8 @@
 		<div class="field col-6">
 			<label for="sex">{{ t("ViewPlayerRegistration.sex.field") }}</label>
 			<Dropdown
-				v-bind="sex"
+				v-model="sex"
+				v-bind="sexAttrs"
 				:disabled="disabled"
 				:options="[
 					{ name: t('general.male'), value: Sex.MALE },
@@ -82,7 +86,8 @@
 				id="email"
 				:disabled="disabled"
 				type="text"
-				v-bind="email"
+				v-model="email"
+				v-bind="emailAttrs"
 				maxlength="100"
 				class="w-full"
 				:class="{ 'p-invalid': errors.email }"
@@ -97,7 +102,8 @@
 				id="phone"
 				:disabled="disabled"
 				type="text"
-				v-bind="phone"
+				v-model="phone"
+				v-bind="phoneAttrs"
 				maxlength="30"
 				class="w-full"
 				:class="{ 'p-invalid': errors.phone }"
@@ -132,36 +138,35 @@ const props = withDefaults(
 const phoneRegExp =
 	/^(\+?\d{0,4})?\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{3}\)?)\s?-?\s?(\(?\d{4}\)?)$/
 
-const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
-	useForm<PlayerRegistration>({
-		validationSchema: toTypedSchema(
-			object({
-				firstName: string().min(4).max(40).required(),
-				lastName: string().min(4).max(40).required(),
-				sex: mixed().oneOf(Object.values(Sex)).required(),
-				birthday: date().required(),
-				email: string().max(100).email().required(),
-				phone: string()
-					.matches(phoneRegExp, t("ViewPlayerRegistration.phone.correct"))
-					.required(),
-			}),
-		),
-		initialValues: {
-			firstName: props.player.firstName,
-			lastName: props.player.lastName,
-			sex: props.player.sex,
-			birthday: props.player.birthday,
-			email: props.player.email,
-			phone: props.player.phone,
-		},
-	})
+const { defineField, errors, handleSubmit } = useForm<PlayerRegistration>({
+	validationSchema: toTypedSchema(
+		object({
+			firstName: string().min(4).max(40).required(),
+			lastName: string().min(4).max(40).required(),
+			sex: mixed().oneOf(Object.values(Sex)).required(),
+			birthday: date().required(),
+			email: string().max(100).email().required(),
+			phone: string()
+				.matches(phoneRegExp, t("ViewPlayerRegistration.phone.correct"))
+				.required(),
+		}),
+	),
+	initialValues: {
+		firstName: props.player.firstName,
+		lastName: props.player.lastName,
+		sex: props.player.sex,
+		birthday: props.player.birthday,
+		email: props.player.email,
+		phone: props.player.phone,
+	},
+})
 
-const firstName = defineInputBinds("firstName")
-const lastName = defineInputBinds("lastName")
-const sex = defineComponentBinds("sex")
-const birthday = defineComponentBinds("birthday")
-const email = defineInputBinds("email")
-const phone = defineInputBinds("phone")
+const [firstName, firstNameAttrs] = defineField("firstName")
+const [lastName, lastNameAttrs] = defineField("lastName")
+const [sex, sexAttrs] = defineField("sex")
+const [birthday, birthdayAttrs] = defineField("birthday")
+const [email, emailAttrs] = defineField("email")
+const [phone, phoneAttrs] = defineField("phone")
 
 const onSubmit = handleSubmit((values) => {
 	emit("submit", <PlayerRegistration>(<unknown>values))
diff --git a/frontend/app/src/components/views/tournaments/FormTournament.vue b/frontend/app/src/components/views/tournaments/FormTournament.vue
index 7957c020..461cf065 100644
--- a/frontend/app/src/components/views/tournaments/FormTournament.vue
+++ b/frontend/app/src/components/views/tournaments/FormTournament.vue
@@ -10,7 +10,8 @@
 							<InputText
 								id="name"
 								type="text"
-								v-bind="name"
+								v-model="name"
+								v-bind="nameAttrs"
 								maxlength="30"
 								class="w-full"
 								:class="{ 'p-invalid': errors.name }"
@@ -25,7 +26,8 @@
 								t("TournamentSettings.visible")
 							}}</label>
 							<SelectButton
-								v-bind="visible"
+								v-model="visible"
+								v-bind="visibleAttrs"
 								:unselectable="false"
 								:options="[
 									{ name: t('no'), value: false },
@@ -45,7 +47,8 @@
 							rows="4"
 							maxlength="255"
 							class="w-full"
-							v-bind="description"
+							v-model="description"
+							v-bind="descriptionAttrs"
 							:disabled="disabled"
 						></Textarea>
 					</div>
@@ -55,7 +58,8 @@
 						}}</label>
 						<Calendar
 							id="registration"
-							v-bind="registration_phase"
+							v-model="registrationPhase"
+							v-bind="registrationPhaseAttrs"
 							selection-mode="range"
 							:manual-input="false"
 							class="w-full"
@@ -75,7 +79,8 @@
 						}}</label>
 						<Calendar
 							id="game_phase"
-							v-bind="game_phase"
+							v-model="gamePhase"
+							v-bind="gamePhaseAttrs"
 							selection-mode="range"
 							:manual-input="false"
 							class="w-full"
@@ -150,62 +155,62 @@ setLocale({
 	},
 })
 
-const { defineInputBinds, errors, defineComponentBinds, handleSubmit } =
-	useForm<TournamentForm>({
-		validationSchema: toTypedSchema(
-			object({
-				name: string().required().min(4),
-				visible: boolean(),
-				description: string().max(255),
-				registration_phase: array()
-					.length(2, "validation.date_missing")
-					.of(mixed().nonNullable())
-					.of(date())
-					.test(
-						"correctDates",
-						"TournamentSettings.wrong_dates",
-						(arr, context) => {
-							if (!context.parent.game_phase?.[0]) return true
-							return (
-								context.parent.registration_phase[1] <
-								context.parent.game_phase[0]
-							)
-						},
-					)
-					.required("validation.date_missing"),
-				game_phase: array()
-					.length(2, "validation.date_missing")
-					.of(mixed().nonNullable())
-					.of(date())
-					.test(
-						"correctDates",
-						"TournamentSettings.wrong_dates",
-						(arr, context) => {
-							if (!context.parent.registration_phase?.[1]) return true
-							return (
-								context.parent.registration_phase[1] <
-								context.parent.game_phase[0]
-							)
-						},
-					)
-					.required("validation.date_missing"),
-			}),
-		),
-		initialValues: {
-			name: data.name,
-			visible: data.visible,
-			description: data.description,
-			registration_phase: data.registration_phase,
-			game_phase: data.game_phase,
-		},
-	})
+const { defineField, errors, handleSubmit } = useForm<TournamentForm>({
+	validationSchema: toTypedSchema(
+		object({
+			name: string().required().min(4),
+			visible: boolean(),
+			description: string().max(255),
+			registration_phase: array()
+				.length(2, "validation.date_missing")
+				.of(mixed().nonNullable())
+				.of(date())
+				.test(
+					"correctDates",
+					"TournamentSettings.wrong_dates",
+					(arr, context) => {
+						if (!context.parent.game_phase?.[0]) return true
+						return (
+							context.parent.registration_phase[1] <
+							context.parent.game_phase[0]
+						)
+					},
+				)
+				.required("validation.date_missing"),
+			game_phase: array()
+				.length(2, "validation.date_missing")
+				.of(mixed().nonNullable())
+				.of(date())
+				.test(
+					"correctDates",
+					"TournamentSettings.wrong_dates",
+					(arr, context) => {
+						if (!context.parent.registration_phase?.[1]) return true
+						return (
+							context.parent.registration_phase[1] <
+							context.parent.game_phase[0]
+						)
+					},
+				)
+				.required("validation.date_missing"),
+		}),
+	),
+	initialValues: {
+		name: data.name,
+		visible: data.visible,
+		description: data.description,
+		registration_phase: data.registration_phase,
+		game_phase: data.game_phase,
+	},
+})
 
-const name = defineInputBinds("name")
-const visible = defineComponentBinds("visible")
-const description = defineInputBinds("description")
+const [name, nameAttrs] = defineField("name")
+const [visible, visibleAttrs] = defineField("visible")
+const [description, descriptionAttrs] = defineField("description")
 
-const registration_phase = defineComponentBinds("registration_phase")
-const game_phase = defineComponentBinds("game_phase")
+const [registrationPhase, registrationPhaseAttrs] =
+	defineField("registration_phase")
+const [gamePhase, gamePhaseAttrs] = defineField("game_phase")
 
 const emit = defineEmits(["submit"])
 

From fe6f3316217f3d3f1fa2d3ab50cce61b18bc45bb Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Wed, 2 Oct 2024 16:03:58 +0200
Subject: [PATCH 221/247] =?UTF-8?q?=E2=9C=A8=20use=20spotless=20for=20back?=
 =?UTF-8?q?end=20formatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml |  2 +-
 backend/pom.xml             | 45 +++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef1ff3f3..d40b148c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Validate backend format
-        run: mvn formatter:validate
+        run: cd backend && mvn spotless:check
   buildBackend:
     name: Build backend
     runs-on: ubuntu-latest
diff --git a/backend/pom.xml b/backend/pom.xml
index 1a47581b..d43dd4d5 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -126,13 +126,50 @@
     </dependencies>
     <build>
         <plugins>
+            <!-- spotless formatting -->
             <plugin>
-                <groupId>net.revelc.code.formatter</groupId>
-                <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.22.0</version>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
                 <configuration>
-                    <configFile>formatJava.xml</configFile>
+                    <formats>
+                        <!-- you can define as many formats as you want, each is independent -->
+                        <format>
+                            <!-- define the files to apply to -->
+                            <includes>
+                                <include>.gitattributes</include>
+                                <include>.gitignore</include>
+                            </includes>
+                            <!-- define the steps to apply to those files -->
+                            <trimTrailingWhitespace/>
+                            <endWithNewline/>
+                            <indent>
+                                <tabs>true</tabs>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                    <!-- define a language-specific format -->
+                    <java>
+                        <!-- no need to specify files, inferred automatically, but you can if you want -->
+
+                        <!-- apply a specific flavor of google-java-format and reflow long strings -->
+                        <googleJavaFormat>
+                            <version>1.23.0</version>
+                            <style>GOOGLE</style>
+                            <reflowLongStrings>true</reflowLongStrings>
+                            <formatJavadoc>true</formatJavadoc>
+                        </googleJavaFormat>
+                    </java>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>apply</goal> <!-- Applies formatting rules -->
+                        </goals>
+                        <phase>validate</phase> <!-- Run Spotless during the 'validate' phase -->
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>${quarkus.platform.group-id}</groupId>

From 1fd6409893da74f1e83f374747ae365f66c29d97 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 17:10:12 +0200
Subject: [PATCH 222/247] =?UTF-8?q?=F0=9F=8E=A8=20Change=20spotless=20styl?=
 =?UTF-8?q?e=20to=20old=20formatter=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index d43dd4d5..b791210e 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -133,14 +133,11 @@
                 <version>2.43.0</version>
                 <configuration>
                     <formats>
-                        <!-- you can define as many formats as you want, each is independent -->
                         <format>
-                            <!-- define the files to apply to -->
                             <includes>
                                 <include>.gitattributes</include>
                                 <include>.gitignore</include>
                             </includes>
-                            <!-- define the steps to apply to those files -->
                             <trimTrailingWhitespace/>
                             <endWithNewline/>
                             <indent>
@@ -149,17 +146,10 @@
                             </indent>
                         </format>
                     </formats>
-                    <!-- define a language-specific format -->
                     <java>
-                        <!-- no need to specify files, inferred automatically, but you can if you want -->
-
-                        <!-- apply a specific flavor of google-java-format and reflow long strings -->
-                        <googleJavaFormat>
-                            <version>1.23.0</version>
-                            <style>GOOGLE</style>
-                            <reflowLongStrings>true</reflowLongStrings>
-                            <formatJavadoc>true</formatJavadoc>
-                        </googleJavaFormat>
+                        <eclipse>
+                            <file>formatJava.xml</file>
+                        </eclipse>
                     </java>
                 </configuration>
                 <executions>

From 4296ac20cc5a28769326c0df617dc757d9f55d11 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 20:13:13 +0200
Subject: [PATCH 223/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20title=20size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/components/header/HeaderLeft.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/frontend/app/src/components/header/HeaderLeft.vue
index f375e68b..36b56f36 100644
--- a/frontend/app/src/components/header/HeaderLeft.vue
+++ b/frontend/app/src/components/header/HeaderLeft.vue
@@ -70,6 +70,7 @@ function toCompetition() {
 
 h1 {
 	font-weight: 900;
+	font-size: 3rem;
 }
 
 h1,

From f9fbda08bec2fa39604c5cfdf26d873a128c03db Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 00:38:06 +0200
Subject: [PATCH 224/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20success=20toast=20?=
 =?UTF-8?q?being=20shown=20for=20no=20players=20selected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/competition.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index a60ea1bf..5b09e6ff 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -202,7 +202,7 @@ export function useSignUpSingle(
 					detail: t("ViewSignUp.selectPlayerFirst"),
 					life: 3000,
 				})
-				return
+				throw new Error("No player selected")
 			}
 
 			const form: TeamServer = {
@@ -239,7 +239,7 @@ export function useSignUpDoubleTog(
 					detail: t("ViewSignUp.selectPlayerFirst"),
 					life: 3000,
 				})
-				return
+				throw new Error("No player selected")
 			}
 
 			const form = {

From 759f78663676588f7ba85ab411150a65eb0c766f Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 00:38:35 +0200
Subject: [PATCH 225/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20wrong=20key=20for?=
 =?UTF-8?q?=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/competition/signup/ViewConditions.vue    | 2 +-
 .../app/src/components/views/competitions/FormCompetition.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/app/src/components/views/competition/signup/ViewConditions.vue b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
index 6cdf3629..a96cd42f 100644
--- a/frontend/app/src/components/views/competition/signup/ViewConditions.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewConditions.vue
@@ -4,7 +4,7 @@
 			v-if="player.sex !== Sex.ANY"
 			class="w-min font-medium"
 			rounded
-			:value="t('CompetitionSettings.' + player.sex.toLowerCase())"
+			:value="t('general.' + player.sex.toLowerCase())"
 		/>
 		<Tag
 			v-if="player.hasMinAge"
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index 4d2741a3..e8ddae30 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -252,8 +252,8 @@
 				v-bind="playerASexAttrs"
 				:disabled="disabled"
 				:options="[
-					{ name: t('CompetitionSettings.male'), value: Sex.MALE },
-					{ name: t('CompetitionSettings.female'), value: Sex.FEMALE },
+					{ name: t('general.male'), value: Sex.MALE },
+					{ name: t('general.female'), value: Sex.FEMALE },
 					{ name: t('CompetitionSettings.any'), value: Sex.ANY },
 				]"
 				:placeholder="t(`CompetitionSettings.sex`)"

From 76e77088156f72d4b99a9b933990c7e5166c8d46 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 12:44:45 +0200
Subject: [PATCH 226/247] =?UTF-8?q?=F0=9F=90=9B=20fix=20registration=20not?=
 =?UTF-8?q?=20returning=20any=20results?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/PlayerResource.java          | 1 +
 frontend/app/src/backend/competition.ts                  | 6 +++---
 frontend/app/src/backend/player.ts                       | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index df497c23..d7e0fec2 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -53,6 +53,7 @@ public class PlayerResource {
     @ConfigProperty(name = "turnierplaner.registration.expire")
     public int expire;
 
+    // expects search string as lower case!
     @GET
     @Path("/compFind/{tourId}/{compId}/")
     @Produces(MediaType.APPLICATION_JSON)
diff --git a/frontend/app/src/backend/competition.ts b/frontend/app/src/backend/competition.ts
index 5b09e6ff..a49b2b09 100644
--- a/frontend/app/src/backend/competition.ts
+++ b/frontend/app/src/backend/competition.ts
@@ -192,7 +192,7 @@ export function useSignUpSingle(
 ) {
 	return useMutation({
 		mutationFn: async (data: {
-			player: Ref<Player | null>
+			player: Ref<Player | undefined>
 			playerB: boolean
 		}) => {
 			if (!data.player.value) {
@@ -229,8 +229,8 @@ export function useSignUpDoubleTog(
 ) {
 	return useMutation({
 		mutationFn: async (data: {
-			playerA: Ref<Player | null>
-			playerB: Ref<Player | null>
+			playerA: Ref<Player | undefined>
+			playerB: Ref<Player | undefined>
 		}) => {
 			if (!data.playerA.value || !data.playerB.value) {
 				toast.add({
diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index 3a447ba9..c10c9e15 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -33,10 +33,13 @@ export function findCompPlayers(
 		queryFn: async () => {
 			return axios
 				.get<PlayerServer[]>(
-					`/player/compFind/${route.params.tourId}/${route.params.compId}?search=${search.value.toLowerCase()}` +
-						`playerB=${playerB}`,
+					`/player/compFind/${route.params.tourId}/${route.params.compId}`,
+					{ params: { search: search.value.toLowerCase(), playerB: playerB } },
 				)
-				.then<Player[]>((result) => result.data.map(playerServerToClient))
+				.then<Player[]>((result) => {
+					console.log(result.data.map(playerServerToClient))
+					return result.data.map(playerServerToClient)
+				})
 				.catch((error) => {
 					toast.add({
 						severity: "error",

From de61f8ec3ccd8c1d15347f3d99ec2379eaee88f2 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 17:09:39 +0200
Subject: [PATCH 227/247] =?UTF-8?q?=F0=9F=90=9B=20refactor=20SignUpForm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/PlayerResource.java             |  11 +-
 .../components/items/SignUpDoubleDropdown.vue | 110 ++++++++
 .../src/components/items/SignUpDropdown.vue   |  79 ++++++
 .../competition/signup/ViewSignUpForm.vue     | 239 +-----------------
 4 files changed, 206 insertions(+), 233 deletions(-)
 create mode 100644 frontend/app/src/components/items/SignUpDoubleDropdown.vue
 create mode 100644 frontend/app/src/components/items/SignUpDropdown.vue

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index d7e0fec2..0f985db3 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -32,6 +32,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import static java.lang.Thread.sleep;
+
 @Path("/player")
 public class PlayerResource {
     @Inject
@@ -59,7 +61,8 @@ public class PlayerResource {
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
                                             @QueryParam("search") String search,
-                                            @DefaultValue("false") @QueryParam("playerB") boolean playerB) {
+                                            @DefaultValue("false") @QueryParam("playerB") boolean playerB) throws InterruptedException {
+        System.out.println("tourId: " + tourId + " compId: " + compId + " search: " + search + " playerB: " + playerB);
         Competition competition = competitionRepository.getByName(tourId, compId);
         if (competition == null)
             throw new BadRequestException("Invalid competition");
@@ -80,7 +83,11 @@ public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @Pat
 
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         boolean admin = securityIdentity.hasRole("director") || !defConfig.isAdminVerificationNeeded();
-        return playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).map(jUserPlayer::new).toList();
+        System.out.println("print all filters:");
+        System.out.println("search: " + search + " dbSex: " + dbSex + " minAge: " + minAge + " maxAge: " + maxAge + " admin: " + admin);
+        var res = playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).toList();
+        System.out.println(res.size());
+        return res.stream().map(jUserPlayer::new).toList();
     }
 
     @GET
diff --git a/frontend/app/src/components/items/SignUpDoubleDropdown.vue b/frontend/app/src/components/items/SignUpDoubleDropdown.vue
new file mode 100644
index 00000000..4226f76e
--- /dev/null
+++ b/frontend/app/src/components/items/SignUpDoubleDropdown.vue
@@ -0,0 +1,110 @@
+<template>
+	<div class="flex flex-column">
+		<div class="grid">
+			<div class="col-6">
+				<Dropdown
+					v-model="selectedPlayerA"
+					class="w-full"
+					:options="suggestionsPlayerA"
+					:auto-filter-focus="true"
+					:filter-placeholder="t('ViewCompetition.searchPlayer')"
+					:placeholder="t('ViewCompetition.selectPlayer')"
+					:loading="loadingA"
+					option-label="name"
+					data-key="id"
+					filter
+					:disabled="mutDoubleLoading"
+					@filter="(ev) => queryPlayer(true, ev)"
+				>
+					<template #empty>
+						{{ t("ViewSignUp.atLeastOneLetter") }}
+					</template>
+					<template #emptyfilter>
+						{{ t("ViewSignUp.noPlayerFound") }}
+					</template>
+				</Dropdown>
+			</div>
+			<div clasS="col-6">
+				<Dropdown
+					v-model="selectedPlayerB"
+					class="w-full"
+					:options="suggestionsPlayerB"
+					:auto-filter-focus="true"
+					:filter-placeholder="t('ViewCompetition.searchPlayer')"
+					:placeholder="t('ViewCompetition.selectPlayer')"
+					:loading="loadingB"
+					option-label="name"
+					data-key="id"
+					filter
+					:disabled="mutDoubleLoading"
+					@filter="(ev) => queryPlayer(false, ev)"
+				>
+					<template #empty>
+						{{ t("ViewSignUp.atLeastOneLetter") }}
+					</template>
+					<template #emptyfilter>
+						{{ t("ViewSignUp.noPlayerFound") }}
+					</template>
+				</Dropdown>
+			</div>
+		</div>
+		<Button
+			class="w-full"
+			:disabled="mutDoubleLoading"
+			@click="signUpDoubleTog"
+		>
+			{{ t("general.signUp") }}
+		</Button>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from "vue-router"
+import { useI18n } from "vue-i18n"
+import { useToast } from "primevue/usetoast"
+import { useSignUpDoubleTog } from "@/backend/competition"
+import { useQueryClient } from "@tanstack/vue-query"
+import { ref } from "vue"
+import { Player } from "@/interfaces/player"
+import { findCompPlayers } from "@/backend/player"
+import { DropdownFilterEvent } from "primevue/dropdown"
+
+const { t } = useI18n()
+const toast = useToast()
+
+const route = useRoute()
+const queryClient = useQueryClient()
+
+const selectedPlayerA = ref<Player | undefined>(undefined)
+const searchA = ref<string>("")
+const { data: suggestionsPlayerA, isFetching: loadingA } = findCompPlayers(
+	searchA,
+	route,
+	false,
+	t,
+	toast,
+)
+const selectedPlayerB = ref<Player | undefined>(undefined)
+const searchB = ref<string>("")
+const { data: suggestionsPlayerB, isFetching: loadingB } = findCompPlayers(
+	searchB,
+	route,
+	true,
+	t,
+	toast,
+)
+
+function queryPlayer(playerA: boolean, event: DropdownFilterEvent) {
+	console.log("event.value " + event.value)
+	if (playerA) searchA.value = event.value
+	else searchB.value = event.value
+}
+
+const { mutate: mutateSignUpDoubleTog, isPending: mutDoubleLoading } =
+	useSignUpDoubleTog(route, t, toast, queryClient)
+
+function signUpDoubleTog() {
+	mutateSignUpDoubleTog({ playerA: selectedPlayerA, playerB: selectedPlayerB })
+}
+</script>
+<style scoped></style>
diff --git a/frontend/app/src/components/items/SignUpDropdown.vue b/frontend/app/src/components/items/SignUpDropdown.vue
new file mode 100644
index 00000000..608e244a
--- /dev/null
+++ b/frontend/app/src/components/items/SignUpDropdown.vue
@@ -0,0 +1,79 @@
+<template>
+	<div class="p-inputgroup">
+		<Dropdown
+			v-model="selectedPlayer"
+			:options="suggestionsPlayer"
+			:auto-filter-focus="true"
+			:filter-placeholder="t('ViewCompetition.searchPlayer')"
+			:placeholder="t('ViewCompetition.selectPlayer')"
+			:loading="loading"
+			option-label="name"
+			data-key="id"
+			filter
+			:disabled="loading"
+			@filter="queryPlayer"
+		>
+			<template #empty>
+				{{ t("ViewSignUp.atLeastOneLetter") }}
+			</template>
+			<template #emptyfilter>
+				{{ t("ViewSignUp.noPlayerFound") }}
+			</template>
+		</Dropdown>
+		<Button :disabled="mutSingleLoading" @click="signUpPlayer">
+			{{ t("general.signUp") }}
+		</Button>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n"
+import { DropdownFilterEvent } from "primevue/dropdown"
+import { Player } from "@/interfaces/player"
+import { ref } from "vue"
+import { useSignUpSingle } from "@/backend/competition"
+import { useToast } from "primevue/usetoast"
+import { useRoute } from "vue-router"
+import { useQueryClient } from "@tanstack/vue-query"
+import { findCompPlayers } from "@/backend/player"
+
+const { t } = useI18n()
+const toast = useToast()
+const route = useRoute()
+const queryClient = useQueryClient()
+
+const props = withDefaults(
+	defineProps<{
+		isPlayerB?: boolean
+	}>(),
+	{
+		isPlayerB: false,
+	},
+)
+
+const selectedPlayer = ref<Player | undefined>(undefined)
+const { mutate: mutateSignUpSingle, isPending: mutSingleLoading } =
+	useSignUpSingle(route, t, toast, queryClient)
+
+const search = ref<string>("")
+const { data: suggestionsPlayer, isFetching: loading } = findCompPlayers(
+	search,
+	route,
+	props.isPlayerB,
+	t,
+	toast,
+)
+
+function queryPlayer(event: DropdownFilterEvent) {
+	console.log("event.value " + event.value)
+	search.value = event.value
+}
+
+function signUpPlayer() {
+	console.log(selectedPlayer.value)
+	console.log(props.isPlayerB)
+	mutateSignUpSingle({ player: selectedPlayer, playerB: props.isPlayerB })
+}
+</script>
+
+<style scoped></style>
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
index 3521ec5c..73a3a7dd 100644
--- a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
+++ b/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
@@ -5,34 +5,7 @@
 			<!-- Registration player A -->
 			<div class="flex flex-column gap-2">
 				<ViewConditions />
-				<div class="p-inputgroup">
-					<Dropdown
-						v-model="selectedPlayerA"
-						:options="suggestionsPlayerA"
-						:loading="loadingA"
-						:auto-filter-focus="true"
-						:filter-placeholder="t('ViewCompetition.searchPlayer')"
-						:placeholder="t('ViewCompetition.selectPlayer')"
-						option-label="name"
-						data-key="id"
-						filter
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@filter="queryPlayerA"
-					>
-						<template #empty>
-							{{ t("ViewSignUp.atLeastOneLetter") }}
-						</template>
-						<template #emptyfilter>
-							{{ t("ViewSignUp.noPlayerFound") }}
-						</template>
-					</Dropdown>
-					<Button
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@click="signUpSingle"
-					>
-						{{ t("general.signUp") }}
-					</Button>
-				</div>
+				<SignUpDropDown />
 			</div>
 		</template>
 		<!-- DOUBLE TOGETHER -->
@@ -46,61 +19,7 @@
 						<ViewConditions :second="true" />
 					</div>
 				</div>
-				<div class="grid">
-					<div class="col-6">
-						<Dropdown
-							v-model="selectedPlayerA"
-							class="w-full"
-							:options="suggestionsPlayerA"
-							:auto-filter-focus="true"
-							:filter-placeholder="t('ViewCompetition.searchPlayer')"
-							:placeholder="t('ViewCompetition.selectPlayer')"
-							:loading="loadingA"
-							option-label="name"
-							data-key="id"
-							filter
-							:disabled="mutSingleLoading || mutDoubleLoading"
-							@filter="queryPlayerA"
-						>
-							<template #empty>
-								{{ t("ViewSignUp.atLeastOneLetter") }}
-							</template>
-							<template #emptyfilter>
-								{{ t("ViewSignUp.noPlayerFound") }}
-							</template>
-						</Dropdown>
-					</div>
-					<div clasS="col-6">
-						<Dropdown
-							v-model="selectedPlayerB"
-							class="w-full"
-							:options="suggestionsPlayerB"
-							:auto-filter-focus="true"
-							:filter-placeholder="t('ViewCompetition.searchPlayer')"
-							:placeholder="t('ViewCompetition.selectPlayer')"
-							:loading="loadingB"
-							option-label="name"
-							data-key="id"
-							filter
-							:disabled="mutSingleLoading || mutDoubleLoading"
-							@filter="queryPlayerB"
-						>
-							<template #empty>
-								{{ t("ViewSignUp.atLeastOneLetter") }}
-							</template>
-							<template #emptyfilter>
-								{{ t("ViewSignUp.noPlayerFound") }}
-							</template>
-						</Dropdown>
-					</div>
-				</div>
-				<Button
-					class="w-full"
-					:disabled="mutSingleLoading || mutDoubleLoading"
-					@click="signUpDoubleTog"
-				>
-					{{ t("general.signUp") }}
-				</Button>
+				<SignUpDoubleDropdown />
 			</div>
 		</template>
 		<!-- DOUBLE INDIVIDUAL SAME -->
@@ -108,179 +27,37 @@
 			<div class="flex flex-column gutter gap-2">
 				<!-- Registration player A -->
 				<ViewConditions />
-				<div class="p-inputgroup">
-					<Dropdown
-						v-model="selectedPlayerA"
-						:options="suggestionsPlayerA"
-						:auto-filter-focus="true"
-						:filter-placeholder="t('ViewCompetition.searchPlayer')"
-						:placeholder="t('ViewCompetition.selectPlayer')"
-						:loading="loadingA"
-						option-label="name"
-						data-key="id"
-						filter
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@filter="queryPlayerA"
-					>
-						<template #empty>
-							{{ t("ViewSignUp.atLeastOneLetter") }}
-						</template>
-						<template #emptyfilter>
-							{{ t("ViewSignUp.noPlayerFound") }}
-						</template>
-					</Dropdown>
-					<Button
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@click="signUpDoubleIndSame"
-					>
-						{{ t("general.signUp") }}
-					</Button>
-				</div>
+				<SignUpDropDown />
 			</div>
 		</template>
 		<!-- DOUBLE INDIVIDUAL DIFFERENT -->
 		<template v-else>
 			<div id="regDoubIndDif">
 				<ViewConditions id="regDoubIndDifCondA" />
-				<div id="regDoubIndDifRegA" class="p-inputgroup">
-					<Dropdown
-						v-model="selectedPlayerA"
-						:options="suggestionsPlayerA"
-						:auto-filter-focus="true"
-						:filter-placeholder="t('ViewCompetition.selectPlayer')"
-						:placeholder="t('ViewCompetition.selectPlayer')"
-						:loading="loadingA"
-						option-label="name"
-						data-key="id"
-						filter
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@filter="queryPlayerA"
-					>
-						<template #empty>
-							{{ t("ViewSignUp.atLeastOneLetter") }}
-						</template>
-						<template #emptyfilter>
-							{{ t("ViewSignUp.noPlayerFound") }}
-						</template>
-					</Dropdown>
-					<Button
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@click="signUpDoubleIndDifA"
-					>
-						{{ t("general.signUp") }}
-					</Button>
-				</div>
-
+				<SignUpDropDown id="regDoubIndDifRegA" />
 				<ViewConditions id="regDoubIndDifCondB" :second="true" />
-				<div id="regDoubIndDifRegB" class="p-inputgroup">
-					<Dropdown
-						v-model="selectedPlayerB"
-						:options="suggestionsPlayerB"
-						:auto-filter-focus="true"
-						:filter-placeholder="t('ViewCompetition.searchPlayer')"
-						:placeholder="t('ViewCompetition.selectPlayer')"
-						:loading="loadingB"
-						option-label="name"
-						data-key="id"
-						filter
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@filter="queryPlayerB"
-					>
-						<template #empty>
-							{{ t("ViewSignUp.atLeastOneLetter") }}
-						</template>
-						<template #emptyfilter>
-							{{ t("ViewSignUp.noPlayerFound") }}
-						</template>
-					</Dropdown>
-					<Button
-						:disabled="mutSingleLoading || mutDoubleLoading"
-						@click="signUpDoubleIndDifB"
-					>
-						{{ t("general.signUp") }}
-					</Button>
-				</div>
+				<SignUpDropDown id="regDoubIndDifRegB" :is-player-b="true" />
 			</div>
 		</template>
 	</template>
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue"
 import ViewConditions from "@/components/views/competition/signup/ViewConditions.vue"
 import { useRoute } from "vue-router"
 import { Mode, SignUp } from "@/interfaces/competition"
-import { Player } from "@/interfaces/player"
 import { useI18n } from "vue-i18n"
-import { DropdownFilterEvent } from "primevue/dropdown"
 import { useToast } from "primevue/usetoast"
-import {
-	getCompetitionDetails,
-	useSignUpDoubleTog,
-	useSignUpSingle,
-} from "@/backend/competition"
-import { useQueryClient } from "@tanstack/vue-query"
-import { findCompPlayers } from "@/backend/player"
+import { getCompetitionDetails } from "@/backend/competition"
+import SignUpDropDown from "@/components/items/SignUpDropdown.vue"
+import SignUpDoubleDropdown from "@/components/items/SignUpDoubleDropdown.vue"
 
 const { t } = useI18n()
 const toast = useToast()
 
 const route = useRoute()
-const queryClient = useQueryClient()
 
 const { data: competition } = getCompetitionDetails(route, t, toast)
-
-const selectedPlayerA = ref<Player | null>(null)
-const searchA = ref<string>("")
-const { data: suggestionsPlayerA, isFetching: loadingA } = findCompPlayers(
-	searchA,
-	route,
-	false,
-	t,
-	toast,
-)
-const selectedPlayerB = ref<Player | null>(null)
-const searchB = ref<string>("")
-const { data: suggestionsPlayerB, isFetching: loadingB } = findCompPlayers(
-	searchB,
-	route,
-	true,
-	t,
-	toast,
-)
-
-const { mutate: mutateSignUpSingle, isPending: mutSingleLoading } =
-	useSignUpSingle(route, t, toast, queryClient)
-const { mutate: mutateSignUpDoubleTog, isPending: mutDoubleLoading } =
-	useSignUpDoubleTog(route, t, toast, queryClient)
-
-function queryPlayerA(event: DropdownFilterEvent) {
-	searchA.value = event.value
-}
-
-function queryPlayerB(event: DropdownFilterEvent) {
-	searchB.value = event.value
-}
-
-function signUpSingle() {
-	mutateSignUpSingle({ player: selectedPlayerA, playerB: false })
-}
-
-function signUpDoubleIndSame() {
-	mutateSignUpSingle({ player: selectedPlayerA, playerB: false })
-}
-
-function signUpDoubleIndDifA() {
-	mutateSignUpSingle({ player: selectedPlayerA, playerB: false })
-}
-
-function signUpDoubleIndDifB() {
-	mutateSignUpSingle({ player: selectedPlayerB, playerB: true })
-}
-
-function signUpDoubleTog() {
-	mutateSignUpDoubleTog({ playerA: selectedPlayerA, playerB: selectedPlayerB })
-}
 </script>
 
 <style scoped>

From cd57ce28d374cc28b84f282d294d5bfef3a73b4e Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 17:23:26 +0200
Subject: [PATCH 228/247] =?UTF-8?q?=E2=99=BB=20format=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/PlayerResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 0f985db3..25442307 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -84,7 +84,8 @@ public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @Pat
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         boolean admin = securityIdentity.hasRole("director") || !defConfig.isAdminVerificationNeeded();
         System.out.println("print all filters:");
-        System.out.println("search: " + search + " dbSex: " + dbSex + " minAge: " + minAge + " maxAge: " + maxAge + " admin: " + admin);
+        System.out.println(
+            "search: " + search + " dbSex: " + dbSex + " minAge: " + minAge + " maxAge: " + maxAge + " admin: " + admin);
         var res = playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).toList();
         System.out.println(res.size());
         return res.stream().map(jUserPlayer::new).toList();

From 2a1dd1699625202f82f9465206295b782376cf39 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 17:38:55 +0200
Subject: [PATCH 229/247] =?UTF-8?q?=F0=9F=90=9B=20don't=20show=20playerB?=
 =?UTF-8?q?=20different=20if=20mode=20is=20single?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/views/competitions/FormCompetition.vue    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index e8ddae30..b056934d 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -212,7 +212,10 @@
 		<Divider align="left">
 			<b>{{ t("CompetitionSettings.player") }}</b>
 		</Divider>
-		<div class="field col-12 flex flex-row align-items-center mb-4">
+		<div
+			v-if="values.mode === Mode.DOUBLE"
+			class="field col-12 flex flex-row align-items-center mb-4"
+		>
 			<Checkbox
 				id="playerB_different"
 				v-model="playerB_different"

From 087c7766f6f1a91538411166cd39653e33637b36 Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 20:06:30 +0200
Subject: [PATCH 230/247] =?UTF-8?q?=F0=9F=8E=A8=20clean=20up=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secretj12/turnierplaner/resources/PlayerResource.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 25442307..6969572f 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -62,7 +62,6 @@ public class PlayerResource {
     public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
                                             @QueryParam("search") String search,
                                             @DefaultValue("false") @QueryParam("playerB") boolean playerB) throws InterruptedException {
-        System.out.println("tourId: " + tourId + " compId: " + compId + " search: " + search + " playerB: " + playerB);
         Competition competition = competitionRepository.getByName(tourId, compId);
         if (competition == null)
             throw new BadRequestException("Invalid competition");
@@ -83,12 +82,7 @@ public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @Pat
 
         DefaultConfig defConfig = defaultConfigRepository.findById(0L);
         boolean admin = securityIdentity.hasRole("director") || !defConfig.isAdminVerificationNeeded();
-        System.out.println("print all filters:");
-        System.out.println(
-            "search: " + search + " dbSex: " + dbSex + " minAge: " + minAge + " maxAge: " + maxAge + " admin: " + admin);
-        var res = playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).toList();
-        System.out.println(res.size());
-        return res.stream().map(jUserPlayer::new).toList();
+        return playerRepository.filter(search, dbSex, minAge, maxAge, admin, 0, 10).map(jUserPlayer::new).toList();
     }
 
     @GET

From 118abe2738c7a2f326cab848d29b1c8d76f8df06 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 20:22:44 +0200
Subject: [PATCH 231/247] =?UTF-8?q?=F0=9F=94=A5=20Remove=20some=20console?=
 =?UTF-8?q?=20logs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/app/src/backend/player.ts                     |  5 +----
 .../app/src/components/items/SignUpDoubleDropdown.vue  |  1 -
 frontend/app/src/components/items/SignUpDropdown.vue   |  3 ---
 .../components/views/competitions/FormCompetition.vue  |  1 -
 .../app/src/components/views/player/ViewPlayerForm.vue | 10 +++++-----
 .../components/views/tournaments/FormTournament.vue    |  4 ++--
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/frontend/app/src/backend/player.ts b/frontend/app/src/backend/player.ts
index c10c9e15..d0a7a2ad 100644
--- a/frontend/app/src/backend/player.ts
+++ b/frontend/app/src/backend/player.ts
@@ -36,10 +36,7 @@ export function findCompPlayers(
 					`/player/compFind/${route.params.tourId}/${route.params.compId}`,
 					{ params: { search: search.value.toLowerCase(), playerB: playerB } },
 				)
-				.then<Player[]>((result) => {
-					console.log(result.data.map(playerServerToClient))
-					return result.data.map(playerServerToClient)
-				})
+				.then<Player[]>((result) => result.data.map(playerServerToClient))
 				.catch((error) => {
 					toast.add({
 						severity: "error",
diff --git a/frontend/app/src/components/items/SignUpDoubleDropdown.vue b/frontend/app/src/components/items/SignUpDoubleDropdown.vue
index 4226f76e..6d9fb440 100644
--- a/frontend/app/src/components/items/SignUpDoubleDropdown.vue
+++ b/frontend/app/src/components/items/SignUpDoubleDropdown.vue
@@ -95,7 +95,6 @@ const { data: suggestionsPlayerB, isFetching: loadingB } = findCompPlayers(
 )
 
 function queryPlayer(playerA: boolean, event: DropdownFilterEvent) {
-	console.log("event.value " + event.value)
 	if (playerA) searchA.value = event.value
 	else searchB.value = event.value
 }
diff --git a/frontend/app/src/components/items/SignUpDropdown.vue b/frontend/app/src/components/items/SignUpDropdown.vue
index 608e244a..5ab7ddc7 100644
--- a/frontend/app/src/components/items/SignUpDropdown.vue
+++ b/frontend/app/src/components/items/SignUpDropdown.vue
@@ -65,13 +65,10 @@ const { data: suggestionsPlayer, isFetching: loading } = findCompPlayers(
 )
 
 function queryPlayer(event: DropdownFilterEvent) {
-	console.log("event.value " + event.value)
 	search.value = event.value
 }
 
 function signUpPlayer() {
-	console.log(selectedPlayer.value)
-	console.log(props.isPlayerB)
 	mutateSignUpSingle({ player: selectedPlayer, playerB: props.isPlayerB })
 }
 </script>
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/frontend/app/src/components/views/competitions/FormCompetition.vue
index b056934d..45f79eb2 100644
--- a/frontend/app/src/components/views/competitions/FormCompetition.vue
+++ b/frontend/app/src/components/views/competitions/FormCompetition.vue
@@ -494,7 +494,6 @@ const { values, defineField, errors, handleSubmit } = useForm<CompetitionForm>({
 			: new Date(),
 	},
 })
-console.log(values)
 
 const [name, nameAttrs] = defineField("name")
 const [description, descriptionAttrs] = defineField("description")
diff --git a/frontend/app/src/components/views/player/ViewPlayerForm.vue b/frontend/app/src/components/views/player/ViewPlayerForm.vue
index f354272c..9353d82c 100644
--- a/frontend/app/src/components/views/player/ViewPlayerForm.vue
+++ b/frontend/app/src/components/views/player/ViewPlayerForm.vue
@@ -6,9 +6,9 @@
 			}}</label>
 			<InputText
 				id="first_name"
+				v-model="firstName"
 				:disabled="disabled"
 				type="text"
-				v-model="firstName"
 				v-bind="firstNameAttrs"
 				maxlength="40"
 				class="w-full"
@@ -24,9 +24,9 @@
 			}}</label>
 			<InputText
 				id="name"
+				v-model="lastName"
 				:disabled="disabled"
 				type="text"
-				v-model="lastName"
 				v-bind="lastNameAttrs"
 				maxlength="40"
 				class="w-full"
@@ -41,10 +41,10 @@
 				t("ViewPlayerRegistration.birthdate.field")
 			}}</label>
 			<Calendar
+				v-model="birthday"
 				show-icon
 				:disabled="disabled"
 				class="w-full"
-				v-model="birthday"
 				v-bind="birthdayAttrs"
 				:manual-input="false"
 				:date-format="t('date_format')"
@@ -84,9 +84,9 @@
 			<label for="email">{{ t("ViewPlayerRegistration.email.field") }}</label>
 			<InputText
 				id="email"
+				v-model="email"
 				:disabled="disabled"
 				type="text"
-				v-model="email"
 				v-bind="emailAttrs"
 				maxlength="100"
 				class="w-full"
@@ -100,9 +100,9 @@
 			<label for="phone">{{ t("ViewPlayerRegistration.phone.field") }}</label>
 			<InputText
 				id="phone"
+				v-model="phone"
 				:disabled="disabled"
 				type="text"
-				v-model="phone"
 				v-bind="phoneAttrs"
 				maxlength="30"
 				class="w-full"
diff --git a/frontend/app/src/components/views/tournaments/FormTournament.vue b/frontend/app/src/components/views/tournaments/FormTournament.vue
index 461cf065..cdc79f17 100644
--- a/frontend/app/src/components/views/tournaments/FormTournament.vue
+++ b/frontend/app/src/components/views/tournaments/FormTournament.vue
@@ -9,8 +9,8 @@
 							<label for="name">{{ t("general.name") }}</label>
 							<InputText
 								id="name"
-								type="text"
 								v-model="name"
+								type="text"
 								v-bind="nameAttrs"
 								maxlength="30"
 								class="w-full"
@@ -43,11 +43,11 @@
 						<label for="description">{{ t("general.description") }}</label>
 						<Textarea
 							id="description"
+							v-model="description"
 							type="text"
 							rows="4"
 							maxlength="255"
 							class="w-full"
-							v-model="description"
 							v-bind="descriptionAttrs"
 							:disabled="disabled"
 						></Textarea>

From bdb71ab18ae6a99de57430598243c8bfc78c33ba Mon Sep 17 00:00:00 2001
From: oliver <ge96xey@mytum.de>
Date: Thu, 3 Oct 2024 20:44:12 +0200
Subject: [PATCH 232/247] =?UTF-8?q?=F0=9F=8E=A8=20remove=20exception=20sig?=
 =?UTF-8?q?nature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/PlayerResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 6969572f..8d72b96a 100644
--- a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -61,7 +61,7 @@ public class PlayerResource {
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
                                             @QueryParam("search") String search,
-                                            @DefaultValue("false") @QueryParam("playerB") boolean playerB) throws InterruptedException {
+                                            @DefaultValue("false") @QueryParam("playerB") boolean playerB) {
         Competition competition = competitionRepository.getByName(tourId, compId);
         if (competition == null)
             throw new BadRequestException("Invalid competition");

From a7d4d7243f7d9991920156e4a87b3f6fecac525e Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 21:18:55 +0200
Subject: [PATCH 233/247] =?UTF-8?q?=F0=9F=9A=9A=20Move=20files=20for=20qui?=
 =?UTF-8?q?noa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.dockerignore => .dockerignore        |   2 +-
 .../wrapper/MavenWrapperDownloader.java       |   0
 .../wrapper/maven-wrapper.properties          |   0
 backend/README.md                             |  60 -----
 backend/pom.xml                               | 245 ------------------
 distribution/pom.xml                          |  52 ----
 backend/formatJava.xml => formatJava.xml      |   0
 frontend/pom.xml                              | 172 ------------
 backend/mvnw => mvnw                          |   0
 backend/mvnw.cmd => mvnw.cmd                  |   0
 pom.xml                                       | 223 ++++++++++++++--
 .../src => src}/main/docker/Dockerfile.jvm    |   0
 .../main/docker/Dockerfile.legacy-jar         |   0
 .../src => src}/main/docker/Dockerfile.native |   0
 .../main/docker/Dockerfile.native-micro       |   0
 .../turnierplaner/ApiInformation.java         |   0
 .../turnierplaner/db/entities/Config.java     |   0
 .../turnierplaner/db/entities/Court.java      |   0
 .../db/entities/DefaultConfig.java            |   0
 .../turnierplaner/db/entities/Match.java      |   0
 .../turnierplaner/db/entities/Player.java     |   0
 .../turnierplaner/db/entities/Set.java        |   0
 .../turnierplaner/db/entities/Timeslot.java   |   0
 .../turnierplaner/db/entities/Tournament.java |   0
 .../db/entities/VerificationCode.java         |   0
 .../db/entities/competition/Competition.java  |   0
 .../db/entities/competition/Team.java         |   0
 .../db/entities/groups/FinalOfGroup.java      |   0
 .../db/entities/groups/Group.java             |   0
 .../db/entities/groups/MatchOfGroup.java      |   0
 .../db/entities/knockout/NextMatch.java       |   0
 .../repositories/CompetitionRepository.java   |   0
 .../db/repositories/ConfigRepository.java     |   0
 .../db/repositories/CourtRepositiory.java     |   0
 .../repositories/DefaultConfigRepository.java |   0
 .../repositories/FinalOfGroupRepository.java  |   0
 .../db/repositories/GroupRepository.java      |   0
 .../repositories/MatchOfGroupRepository.java  |   0
 .../db/repositories/MatchRepository.java      |   0
 .../db/repositories/NextMatchRepository.java  |   0
 .../db/repositories/PlayerRepository.java     |   0
 .../db/repositories/SetRepository.java        |   0
 .../db/repositories/TeamRepository.java       |   0
 .../db/repositories/TournamentRepository.java |   0
 .../VerificationCodeRepository.java           |   0
 .../turnierplaner/enums/AdminRole.java        |   0
 .../turnierplaner/enums/CompetitionMode.java  |   0
 .../enums/CompetitionSignUp.java              |   0
 .../turnierplaner/enums/CompetitionType.java  |   0
 .../turnierplaner/enums/CourtType.java        |   0
 .../turnierplaner/enums/CreationProgress.java |   0
 .../turnierplaner/enums/NumberSets.java       |   0
 .../de/secretj12/turnierplaner/enums/Sex.java |   0
 .../turnierplaner/enums/SexFilter.java        |   0
 .../turnierplaner/model/admin/jAdminUser.java |   0
 .../competition/jDirectorCompetitionAdd.java  |   0
 .../jDirectorCompetitionUpdate.java           |   0
 .../competition/jDirectorGroupsDivision.java  |   0
 .../competition/jDirectorKnockoutOrder.java   |   0
 .../model/director/jDirectorPlayer.java       |   0
 .../director/jDirectorPlayerUpdateForm.java   |   0
 .../director/jDirectorScheduleMatch.java      |   0
 .../director/jDirectorTournamentAdd.java      |   0
 .../director/jDirectorTournamentUpdate.java   |   0
 .../secretj12/turnierplaner/model/jPage.java  |   0
 .../user/competition/jUserCompetition.java    |   0
 .../user/competition/jUserConfigPlayerA.java  |   0
 .../user/competition/jUserConfigPlayerB.java  |   0
 .../model/user/group/jUserGroup.java          |   0
 .../user/group/jUserGroupMatchAfterGroup.java |   0
 .../user/group/jUserGroupMatchAfterMatch.java |   0
 .../model/user/group/jUserGroupSystem.java    |   0
 .../turnierplaner/model/user/jUserConfig.java |   0
 .../turnierplaner/model/user/jUserCourt.java  |   0
 .../turnierplaner/model/user/jUserMatch.java  |   0
 .../model/user/jUserMatchEvent.java           |   0
 .../turnierplaner/model/user/jUserPlayer.java |   0
 .../user/jUserPlayerRegistrationForm.java     |   0
 .../model/user/jUserPlayerSignUpForm.java     |   0
 .../turnierplaner/model/user/jUserSet.java    |   0
 .../turnierplaner/model/user/jUserTeam.java   |   0
 .../model/user/jUserTeamGroupResult.java      |   0
 .../model/user/jUserTournament.java           |   0
 .../user/knockout/jUserKnockoutMatch.java     |   0
 .../user/knockout/jUserKnockoutSystem.java    |   0
 .../resources/CompetitionResource.java        |   0
 .../resources/ConfigResource.java             |   0
 .../resources/CourtResource.java              |   0
 .../resources/MailTemplates.java              |   0
 .../resources/MatchResource.java              |   0
 .../resources/PlayerResource.java             |   0
 .../turnierplaner/resources/SetResource.java  |   0
 .../resources/TournamentResource.java         |   0
 .../turnierplaner/resources/UserResource.java |   0
 .../turnierplaner/startup/Defaults.java       |   0
 .../turnierplaner/startup/Startup.java        |   0
 .../startup/testdata/AGE_RESTR.java           |   0
 .../startup/testdata/CompetitionSettings.java |   0
 .../startup/testdata/TestdataGenerator.java   |   0
 .../turnierplaner/tools/CommonHelpers.java    |   0
 .../turnierplaner/tools/GroupTools.java       |   0
 .../turnierplaner/tools/KnockoutTools.java    |   0
 .../main/java/template/Example.java           |   0
 .../main/resources/application.properties     |   0
 .../src => src}/main/resources/banner.txt     |   0
 .../main/resources/keycloak_realm.json        |  16 +-
 .../main/resources/tennis-ball.png            | Bin
 .../app => src/main/webui}/.eslintrc.json     |   0
 {frontend/app => src/main/webui}/.gitignore   |   0
 .../app => src/main/webui}/.prettierignore    |   0
 .../app => src/main/webui}/.prettierrc.json   |   0
 {frontend/app => src/main/webui}/README.md    |   0
 .../main/webui}/callbackSignIn.html           |   0
 .../main/webui}/callbackSignOut.html          |   0
 .../main/webui}/callbackSilent.html           |   0
 .../app => src/main/webui}/eslint.config.js   |   0
 {frontend/app => src/main/webui}/index.html   |   0
 {frontend/app => src/main/webui}/package.json |   0
 .../app => src/main/webui}/public/favicon.ico | Bin
 {frontend/app => src/main/webui}/src/App.vue  |   0
 .../main/webui}/src/backend/Tracker.ts        |   0
 .../main/webui}/src/backend/competition.ts    |   0
 .../main/webui}/src/backend/config.ts         |   0
 .../main/webui}/src/backend/court.ts          |   0
 .../main/webui}/src/backend/group.ts          |   0
 .../main/webui}/src/backend/knockout.ts       |   0
 .../main/webui}/src/backend/match.ts          |   0
 .../main/webui}/src/backend/player.ts         |   0
 .../main/webui}/src/backend/registration.ts   |   0
 .../main/webui}/src/backend/security.ts       |   0
 .../app => src/main/webui}/src/backend/set.ts |   0
 .../main/webui}/src/backend/signup.ts         |   0
 .../main/webui}/src/backend/tournament.ts     |   0
 .../main/webui}/src/backend/user.ts           |   0
 .../webui}/src/calendar/CalendarInterfaces.ts |   0
 .../main/webui}/src/calendar/ViewCalendar.vue |   0
 .../src/components/header/HeadContent.vue     |   0
 .../src/components/header/HeaderLeft.vue      |   0
 .../src/components/header/HeaderRight.vue     |   0
 .../components/header/HeaderRightContent.vue  |   0
 .../src/components/header/LoadingBar.vue      |   0
 .../src/components/header/SidebarContent.vue  |   0
 .../components/items/HorizontalScroller.vue   |   0
 .../webui}/src/components/items/ItemAdd.vue   |   0
 .../src/components/items/ItemCompetition.vue  |   0
 .../src/components/items/ItemTournament.vue   |   0
 .../src/components/items/PlayerPointRow.vue   |   0
 .../components/items/SignUpDoubleDropdown.vue |   0
 .../src/components/items/SignUpDropdown.vue   |   0
 .../components/items/UpdatePointsDialog.vue   |   0
 .../src/components/links/LinkCompetition.vue  |   0
 .../src/components/links/LinkPlayerName.vue   |   0
 .../src/components/links/LinkTeamNames.vue    |   0
 .../src/components/links/LinkTournament.vue   |   0
 .../src/components/views/ViewTemplates.vue    |   0
 .../views/competition/ViewCompetition.vue     |   0
 .../components/views/competition/ViewGame.vue |   0
 .../competition/groupSystem/ViewGroupList.vue |   0
 .../groupSystem/ViewGroupResults.vue          |   0
 .../groupSystem/ViewGroupSystem.vue           |   0
 .../groupSystem/ViewGroupTable.vue            |   0
 .../competition/groupSystem/ViewMatch.vue     |   0
 .../knockoutSystem/KnockoutTitleGenerator.ts  |   0
 .../knockoutSystem/ViewKnockoutSystem.vue     |   0
 .../knockoutSystem/ViewKnockoutTree.vue       |   0
 .../competition/knockoutSystem/ViewMatch.vue  |   0
 .../knockoutSystem/ViewMatchDate.vue          |   0
 .../competition/signup/ViewConditions.vue     |   0
 .../views/competition/signup/ViewSignUp.vue   |   0
 .../competition/signup/ViewSignUpForm.vue     |   0
 .../views/competition/signup/ViewTable.vue    |   0
 .../views/competitions/FormCompetition.vue    |   0
 .../views/competitions/ViewCompetitions.vue   |   0
 .../competitions/ViewCreateCompetition.vue    |   0
 .../views/court/ViewCreateCourtSmall.vue      |   0
 .../views/overview/OverviewCalendar.vue       |   0
 .../views/overview/OverviewList.vue           |   0
 .../views/overview/ViewTournamentOverview.vue |   0
 .../views/player/ViewPlayerForm.vue           |   0
 .../views/player/ViewPlayerOverview.vue       |   0
 .../views/player/ViewPlayerRegistration.vue   |   0
 .../views/player/ViewPlayerUpdate.vue         |   0
 .../views/player/ViewVerification.vue         |   0
 .../views/prepare/ViewEditCompetition.vue     |   0
 .../views/prepare/ViewEditPlayer.vue          |   0
 .../views/prepare/ViewPrepareMatches.vue      |   0
 .../assignMatches/AssginMatchesHelper.ts      |   0
 .../assignMatches/AssignMatchesGroups.vue     |   0
 .../assignMatches/AssignMatchesKnockout.vue   |   0
 .../assignMatches/ViewAssignMatches.vue       |   0
 .../prepare/assignMatches/ViewMatchEdit.vue   |   0
 .../views/prepare/components/MatchBox.vue     |   0
 .../views/prepare/components/PlayerCard.vue   |   0
 .../components/PlayerContainerDraggable.vue   |   0
 .../views/prepare/components/TeamBox.vue      |   0
 .../views/prepare/components/TeamCard.vue     |   0
 .../components/TeamContainerDraggable.vue     |   0
 .../views/prepare/editTeams/AddPlayer.vue     |   0
 .../views/prepare/editTeams/DeleteBox.vue     |   0
 .../views/prepare/editTeams/PlayerList.vue    |   0
 .../views/prepare/editTeams/TeamList.vue      |   0
 .../views/prepare/editTeams/ViewEditTeams.vue |   0
 .../prepare/scheduleMatches/CourtChooser.vue  |   0
 .../prepare/scheduleMatches/MatchEvent.vue    |   0
 .../MatchesContainerDraggable.vue             |   0
 .../scheduleMatches/ScheduleMatchesHelper.ts  |   0
 .../scheduleMatches/SchedulingCalendar.vue    |   0
 .../scheduleMatches/ViewScheduleMatches.vue   |   0
 .../views/settings/SettingsCourts.vue         |   0
 .../views/settings/SettingsGeneral.vue        |   0
 .../views/settings/SettingsItem.vue           |   0
 .../views/settings/SettingsPlayer.vue         |   0
 .../views/settings/SettingsPlayerVerify.vue   |   0
 .../views/settings/SettingsUser.vue           |   0
 .../views/settings/ViewSettings.vue           |   0
 .../views/tournaments/FormTournament.vue      |   0
 .../tournaments/ViewCreateTournament.vue      |   0
 .../views/tournaments/ViewEditTournament.vue  |   0
 .../views/tournaments/ViewTournaments.vue     |   0
 .../webui}/src/draggable/DraggableList.vue    |   0
 .../webui}/src/draggable/DraggablePanel.vue   |   0
 .../app => src/main/webui}/src/i18n/de.json   |   0
 .../app => src/main/webui}/src/i18n/en.json   |   0
 .../app => src/main/webui}/src/i18n/index.ts  |   0
 .../main/webui}/src/interfaces/competition.ts |   0
 .../main/webui}/src/interfaces/config.ts      |   0
 .../main/webui}/src/interfaces/court.ts       |   0
 .../main/webui}/src/interfaces/general.ts     |   0
 .../main/webui}/src/interfaces/groupSystem.ts |   0
 .../webui}/src/interfaces/knockoutSystem.ts   |   0
 .../main/webui}/src/interfaces/match.ts       |   0
 .../main/webui}/src/interfaces/player.ts      |   0
 .../main/webui}/src/interfaces/team.ts        |   0
 .../main/webui}/src/interfaces/tournament.ts  |   0
 .../main/webui}/src/interfaces/user.ts        |   0
 {frontend/app => src/main/webui}/src/main.ts  |   0
 .../app => src/main/webui}/src/routes.ts      |   0
 .../main/webui}/src/security/AuthService.ts   |   0
 .../webui}/src/security/callbackSignIn.ts     |   0
 .../webui}/src/security/callbackSignOut.ts    |   0
 .../webui}/src/security/callbackSilent.ts     |   0
 .../main/webui}/src/security/settings.ts      |   0
 .../app => src/main/webui}/src/settings.ts    |   2 +-
 .../app => src/main/webui}/src/style.css      |   0
 .../app => src/main/webui}/tsconfig.json      |   0
 .../app => src/main/webui}/vite.config.ts     |   1 -
 .../model/TestDeletionBehaviour.java          |   0
 .../resources/TestCompetitionResource.java    |   0
 .../resources/TestCourtResource.java          |   0
 .../resources/TestMatchResource.java          |   0
 .../resources/TestPlayerResource.java         |   0
 .../resources/TestTournamentResource.java     |   0
 .../turnierplaner/startup/TestStartup.java    |   0
 .../turnierplaner/tools/TestGroupTools.java   |   0
 .../tools/TestKnockoutTools.java              |   0
 .../test/java/template/TestExample.java       |   0
 256 files changed, 212 insertions(+), 561 deletions(-)
 rename backend/.dockerignore => .dockerignore (85%)
 rename {backend/.mvn => .mvn}/wrapper/MavenWrapperDownloader.java (100%)
 rename {backend/.mvn => .mvn}/wrapper/maven-wrapper.properties (100%)
 delete mode 100644 backend/README.md
 delete mode 100644 backend/pom.xml
 delete mode 100644 distribution/pom.xml
 rename backend/formatJava.xml => formatJava.xml (100%)
 delete mode 100644 frontend/pom.xml
 rename backend/mvnw => mvnw (100%)
 mode change 100755 => 100644
 rename backend/mvnw.cmd => mvnw.cmd (100%)
 rename {backend/src => src}/main/docker/Dockerfile.jvm (100%)
 rename {backend/src => src}/main/docker/Dockerfile.legacy-jar (100%)
 rename {backend/src => src}/main/docker/Dockerfile.native (100%)
 rename {backend/src => src}/main/docker/Dockerfile.native-micro (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/ApiInformation.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Config.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Court.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Match.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Player.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Set.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/FinalOfGroupRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/GroupRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/MatchOfGroupRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/NextMatchRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/db/repositories/VerificationCodeRepository.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/AdminRole.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/CourtType.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/NumberSets.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/Sex.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/enums/SexFilter.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/jPage.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/CourtResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/MatchResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/SetResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/resources/UserResource.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/startup/Defaults.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/startup/Startup.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/startup/testdata/AGE_RESTR.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/tools/GroupTools.java (100%)
 rename {backend/src => src}/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java (100%)
 rename {backend/src => src}/main/java/template/Example.java (100%)
 rename {backend/src => src}/main/resources/application.properties (100%)
 rename {backend/src => src}/main/resources/banner.txt (100%)
 rename {backend/src => src}/main/resources/keycloak_realm.json (99%)
 rename {backend/src => src}/main/resources/tennis-ball.png (100%)
 rename {frontend/app => src/main/webui}/.eslintrc.json (100%)
 rename {frontend/app => src/main/webui}/.gitignore (100%)
 rename {frontend/app => src/main/webui}/.prettierignore (100%)
 rename {frontend/app => src/main/webui}/.prettierrc.json (100%)
 rename {frontend/app => src/main/webui}/README.md (100%)
 rename {frontend/app => src/main/webui}/callbackSignIn.html (100%)
 rename {frontend/app => src/main/webui}/callbackSignOut.html (100%)
 rename {frontend/app => src/main/webui}/callbackSilent.html (100%)
 rename {frontend/app => src/main/webui}/eslint.config.js (100%)
 rename {frontend/app => src/main/webui}/index.html (100%)
 rename {frontend/app => src/main/webui}/package.json (100%)
 rename {frontend/app => src/main/webui}/public/favicon.ico (100%)
 rename {frontend/app => src/main/webui}/src/App.vue (100%)
 rename {frontend/app => src/main/webui}/src/backend/Tracker.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/competition.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/config.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/court.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/group.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/knockout.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/match.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/player.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/registration.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/security.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/set.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/signup.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/tournament.ts (100%)
 rename {frontend/app => src/main/webui}/src/backend/user.ts (100%)
 rename {frontend/app => src/main/webui}/src/calendar/CalendarInterfaces.ts (100%)
 rename {frontend/app => src/main/webui}/src/calendar/ViewCalendar.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/HeadContent.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/HeaderLeft.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/HeaderRight.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/HeaderRightContent.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/LoadingBar.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/header/SidebarContent.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/HorizontalScroller.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/ItemAdd.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/ItemCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/ItemTournament.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/PlayerPointRow.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/SignUpDoubleDropdown.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/SignUpDropdown.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/items/UpdatePointsDialog.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/links/LinkCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/links/LinkPlayerName.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/links/LinkTeamNames.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/links/LinkTournament.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/ViewTemplates.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/ViewCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/ViewGame.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/groupSystem/ViewGroupList.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/groupSystem/ViewGroupResults.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/groupSystem/ViewGroupSystem.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/groupSystem/ViewGroupTable.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/groupSystem/ViewMatch.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/knockoutSystem/ViewMatch.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/knockoutSystem/ViewMatchDate.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/signup/ViewConditions.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/signup/ViewSignUp.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/signup/ViewSignUpForm.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competition/signup/ViewTable.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competitions/FormCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competitions/ViewCompetitions.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/competitions/ViewCreateCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/court/ViewCreateCourtSmall.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/overview/OverviewCalendar.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/overview/OverviewList.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/overview/ViewTournamentOverview.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/player/ViewPlayerForm.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/player/ViewPlayerOverview.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/player/ViewPlayerRegistration.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/player/ViewPlayerUpdate.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/player/ViewVerification.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/ViewEditCompetition.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/ViewEditPlayer.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/ViewPrepareMatches.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/assignMatches/ViewAssignMatches.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/assignMatches/ViewMatchEdit.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/MatchBox.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/PlayerCard.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/PlayerContainerDraggable.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/TeamBox.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/TeamCard.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/components/TeamContainerDraggable.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/editTeams/AddPlayer.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/editTeams/DeleteBox.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/editTeams/PlayerList.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/editTeams/TeamList.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/editTeams/ViewEditTeams.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/CourtChooser.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/MatchEvent.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsCourts.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsGeneral.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsItem.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsPlayer.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsPlayerVerify.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/SettingsUser.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/settings/ViewSettings.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/tournaments/FormTournament.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/tournaments/ViewCreateTournament.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/tournaments/ViewEditTournament.vue (100%)
 rename {frontend/app => src/main/webui}/src/components/views/tournaments/ViewTournaments.vue (100%)
 rename {frontend/app => src/main/webui}/src/draggable/DraggableList.vue (100%)
 rename {frontend/app => src/main/webui}/src/draggable/DraggablePanel.vue (100%)
 rename {frontend/app => src/main/webui}/src/i18n/de.json (100%)
 rename {frontend/app => src/main/webui}/src/i18n/en.json (100%)
 rename {frontend/app => src/main/webui}/src/i18n/index.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/competition.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/config.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/court.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/general.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/groupSystem.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/knockoutSystem.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/match.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/player.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/team.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/tournament.ts (100%)
 rename {frontend/app => src/main/webui}/src/interfaces/user.ts (100%)
 rename {frontend/app => src/main/webui}/src/main.ts (100%)
 rename {frontend/app => src/main/webui}/src/routes.ts (100%)
 rename {frontend/app => src/main/webui}/src/security/AuthService.ts (100%)
 rename {frontend/app => src/main/webui}/src/security/callbackSignIn.ts (100%)
 rename {frontend/app => src/main/webui}/src/security/callbackSignOut.ts (100%)
 rename {frontend/app => src/main/webui}/src/security/callbackSilent.ts (100%)
 rename {frontend/app => src/main/webui}/src/security/settings.ts (100%)
 rename {frontend/app => src/main/webui}/src/settings.ts (76%)
 rename {frontend/app => src/main/webui}/src/style.css (100%)
 rename {frontend/app => src/main/webui}/tsconfig.json (100%)
 rename {frontend/app => src/main/webui}/vite.config.ts (97%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/startup/TestStartup.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java (100%)
 rename {backend/src => src}/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java (100%)
 rename {backend/src => src}/test/java/template/TestExample.java (100%)

diff --git a/backend/.dockerignore b/.dockerignore
similarity index 85%
rename from backend/.dockerignore
rename to .dockerignore
index 94810d00..5e28baef 100644
--- a/backend/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
-*
+backend/src
 !target/*-runner
 !target/*-runner.jar
 !target/lib/*
diff --git a/backend/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from backend/.mvn/wrapper/MavenWrapperDownloader.java
rename to .mvn/wrapper/MavenWrapperDownloader.java
diff --git a/backend/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from backend/.mvn/wrapper/maven-wrapper.properties
rename to .mvn/wrapper/maven-wrapper.properties
diff --git a/backend/README.md b/backend/README.md
deleted file mode 100644
index 0b28c27e..00000000
--- a/backend/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# backend Project
-
-This project uses Quarkus, the Supersonic Subatomic Java Framework.
-
-If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
-
-## Running the application in dev mode
-
-You can run your application in dev mode that enables live coding using:
-```shell script
-./mvnw compile quarkus:dev
-```
-
-> **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
-
-## Packaging and running the application
-
-The application can be packaged using:
-```shell script
-./mvnw package
-```
-It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
-Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory.
-
-The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`.
-
-If you want to build an _über-jar_, execute the following command:
-```shell script
-./mvnw package -Dquarkus.package.type=uber-jar
-```
-
-The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
-
-## Creating a native executable
-
-You can create a native executable using: 
-```shell script
-./mvnw package -Pnative
-```
-
-Or, if you don't have GraalVM installed, you can run the native executable build in a container using: 
-```shell script
-./mvnw package -Pnative -Dquarkus.native.container-build=true
-```
-
-You can then execute your native executable with: `./target/backend-1.0.0-SNAPSHOT-runner`
-
-If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.
-
-## Related Guides
-
-- RESTEasy JAX-RS ([guide](https://quarkus.io/guides/rest-json)): REST endpoint framework implementing JAX-RS and more
-
-## Provided Code
-
-### RESTEasy JAX-RS
-
-Easily start your RESTful Web Services
-
-[Related guide section...](https://quarkus.io/guides/getting-started#the-jax-rs-resources)
diff --git a/backend/pom.xml b/backend/pom.xml
deleted file mode 100644
index b791210e..00000000
--- a/backend/pom.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>de.secretj12.turnierplaner</groupId>
-        <artifactId>main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>backend</artifactId>
-
-    <properties>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-jackson</artifactId>
-        </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-security</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Hibernate ORM specific dependencies -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-panache</artifactId>
-        </dependency>
-
-        <!-- JPA Metamodel classes used for criteria api -->
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>6.1.7.Final</version>
-        </dependency>
-
-        <!-- JDBC driver dependencies -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- oidc -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-jwt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-keycloak-admin-rest-client</artifactId>
-        </dependency>
-
-        <!-- mail -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-mailer</artifactId>
-        </dependency>
-
-        <!-- scheduled tasks -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-quartz</artifactId>
-        </dependency>
-
-        <!-- openapi and swagger ui -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-openapi</artifactId>
-        </dependency>
-        <!-- Faker for name random name generation   -->
-        <dependency>
-            <groupId>net.datafaker</groupId>
-            <artifactId>datafaker</artifactId>
-            <version>2.4.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <!-- spotless formatting -->
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
-                <configuration>
-                    <formats>
-                        <format>
-                            <includes>
-                                <include>.gitattributes</include>
-                                <include>.gitignore</include>
-                            </includes>
-                            <trimTrailingWhitespace/>
-                            <endWithNewline/>
-                            <indent>
-                                <tabs>true</tabs>
-                                <spacesPerTab>4</spacesPerTab>
-                            </indent>
-                        </format>
-                    </formats>
-                    <java>
-                        <eclipse>
-                            <file>formatJava.xml</file>
-                        </eclipse>
-                    </java>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>apply</goal> <!-- Applies formatting rules -->
-                        </goals>
-                        <phase>validate</phase> <!-- Run Spotless during the 'validate' phase -->
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>generate-code</goal>
-                            <goal>generate-code-tests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-                <configuration>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <!--suppress UnresolvedMavenProperty -->
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>backend-dev</id>
-            <activation>
-                <property>
-                    <name>backendDev</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
-                                        </java.util.logging.manager>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <maven.home>${maven.home}</maven.home>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
-</project>
diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644
index a5b3b745..00000000
--- a/distribution/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>de.secretj12.turnierplaner</groupId>
-        <artifactId>main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>distribution</artifactId>
-
-    <properties>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>de.secretj12.turnierplaner</groupId>
-            <artifactId>backend</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>de.secretj12.turnierplaner</groupId>
-            <artifactId>frontend</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus.platform</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>generate-code</goal>
-                            <goal>generate-code-tests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/backend/formatJava.xml b/formatJava.xml
similarity index 100%
rename from backend/formatJava.xml
rename to formatJava.xml
diff --git a/frontend/pom.xml b/frontend/pom.xml
deleted file mode 100644
index 605c82a1..00000000
--- a/frontend/pom.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>de.secretj12.turnierplaner</groupId>
-        <artifactId>main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>frontend</artifactId>
-
-    <properties>
-        <working.dir>app</working.dir>
-        <node.version>v20.12.0</node.version>
-        <npm.version>10.5.0</npm.version>
-        <production.build.dir>${working.dir}/dist</production.build.dir>
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>frontend</id>
-            <activation>
-                <property>
-                    <name>!noFrontendComp</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <version>1.12.0</version>
-                        <configuration>
-                            <workingDirectory>${working.dir}</workingDirectory>
-                            <nodeVersion>${node.version}</nodeVersion>
-                            <npmVersion>${npm.version}</npmVersion>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>Install Node.js and npm</id>
-                                <goals>
-                                    <goal>install-node-and-npm</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>install</arguments>
-                                </configuration>
-                                <phase>generate-resources</phase>
-                            </execution>
-                            <execution>
-                                <id>npm run build</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>run build</arguments>
-                                </configuration>
-                                <phase>generate-resources</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>2.5</version>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>app/node_modules</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>app/node</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>app/dist</directory>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>clean-node-module</id>
-                                <phase>clean</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.2.0</version>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${basedir}/target/classes/META-INF/resources/</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${production.build.dir}</directory>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>frontend-dev</id>
-            <activation>
-                <property>
-                    <name>frontendDev</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <version>1.12.0</version>
-                        <configuration>
-                            <workingDirectory>${working.dir}</workingDirectory>
-                            <nodeVersion>${node.version}</nodeVersion>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>Install Node.js and npm</id>
-                                <goals>
-                                    <goal>install-node-and-npm</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>install</arguments>
-                                </configuration>
-                                <phase>generate-resources</phase>
-                            </execution>
-                            <execution>
-                                <id>npm run dev</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>run dev</arguments>
-                                </configuration>
-                                <phase>generate-resources</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/backend/mvnw b/mvnw
old mode 100755
new mode 100644
similarity index 100%
rename from backend/mvnw
rename to mvnw
diff --git a/backend/mvnw.cmd b/mvnw.cmd
similarity index 100%
rename from backend/mvnw.cmd
rename to mvnw.cmd
diff --git a/pom.xml b/pom.xml
index 8664c7b6..6669bbe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,15 +8,19 @@
     <groupId>de.secretj12.turnierplaner</groupId>
     <artifactId>main</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
 
     <properties>
         <java.version>21</java.version>
-        <quarkus.platform.version>3.14.3</quarkus.platform.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+        <quarkus.platform.version>3.13.3</quarkus.platform.version>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <surefire-plugin.version>3.2.5</surefire-plugin.version>
+        <failsafe.useModulePath>false</failsafe.useModulePath>
     </properties>
 
     <dependencyManagement>
@@ -31,37 +35,214 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>frontend</module>
-        <module>backend</module>
-        <module>distribution</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-jackson</artifactId>
+        </dependency>
 
+        <!-- Frontend -->
+        <dependency>
+            <groupId>io.quarkiverse.quinoa</groupId>
+            <artifactId>quarkus-quinoa</artifactId>
+            <version>2.4.5</version>
+        </dependency>
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-security</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Hibernate ORM specific dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache</artifactId>
+        </dependency>
+
+        <!-- JPA Metamodel classes used for criteria api -->
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>6.1.7.Final</version>
+        </dependency>
+
+        <!-- JDBC driver dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- oidc -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-admin-rest-client</artifactId>
+        </dependency>
+
+        <!-- mail -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mailer</artifactId>
+        </dependency>
+
+        <!-- scheduled tasks -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-quartz</artifactId>
+        </dependency>
+
+        <!-- openapi and swagger ui -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi</artifactId>
+        </dependency>
+        <!-- Faker for name random name generation   -->
+        <dependency>
+            <groupId>net.datafaker</groupId>
+            <artifactId>datafaker</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+    </dependencies>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>net.revelc.code.formatter</groupId>
-                    <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.22.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
+            <!-- spotless formatting -->
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <formats>
+                        <format>
+                            <includes>
+                                <include>.gitattributes</include>
+                                <include>.gitignore</include>
+                            </includes>
+                            <trimTrailingWhitespace/>
+                            <endWithNewline/>
+                            <indent>
+                                <tabs>true</tabs>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                    <java>
+                        <eclipse>
+                            <file>formatJava.xml</file>
+                        </eclipse>
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>apply</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
+                            <goal>native-image-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler-plugin.version}</version>
+                <configuration>
+                    <parameters>true</parameters>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <!--suppress UnresolvedMavenProperty -->
+                        <maven.home>${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <version>1.2.3</version>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${surefire-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>make-index</id>
                         <goals>
-                            <goal>jandex</goal>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <systemPropertyVariables>
+                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <!--suppress UnresolvedMavenProperty -->
+                        <maven.home>${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <skipITs>false</skipITs>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/backend/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
similarity index 100%
rename from backend/src/main/docker/Dockerfile.jvm
rename to src/main/docker/Dockerfile.jvm
diff --git a/backend/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar
similarity index 100%
rename from backend/src/main/docker/Dockerfile.legacy-jar
rename to src/main/docker/Dockerfile.legacy-jar
diff --git a/backend/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native
similarity index 100%
rename from backend/src/main/docker/Dockerfile.native
rename to src/main/docker/Dockerfile.native
diff --git a/backend/src/main/docker/Dockerfile.native-micro b/src/main/docker/Dockerfile.native-micro
similarity index 100%
rename from backend/src/main/docker/Dockerfile.native-micro
rename to src/main/docker/Dockerfile.native-micro
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java b/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/ApiInformation.java
rename to src/main/java/de/secretj12/turnierplaner/ApiInformation.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Config.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Court.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java b/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/DefaultConfig.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Match.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Player.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Set.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Timeslot.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java b/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/Tournament.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java b/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/VerificationCode.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java b/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/competition/Competition.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java b/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/competition/Team.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java b/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/groups/FinalOfGroup.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java b/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/groups/Group.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java b/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/groups/MatchOfGroup.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java b/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
rename to src/main/java/de/secretj12/turnierplaner/db/entities/knockout/NextMatch.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/CompetitionRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/ConfigRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/CourtRepositiory.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/DefaultConfigRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/FinalOfGroupRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/FinalOfGroupRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/FinalOfGroupRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/FinalOfGroupRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/GroupRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/GroupRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/GroupRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/GroupRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchOfGroupRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchOfGroupRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchOfGroupRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/MatchOfGroupRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/MatchRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/NextMatchRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/NextMatchRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/NextMatchRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/NextMatchRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/PlayerRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/SetRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/TeamRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/TournamentRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/db/repositories/VerificationCodeRepository.java b/src/main/java/de/secretj12/turnierplaner/db/repositories/VerificationCodeRepository.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/db/repositories/VerificationCodeRepository.java
rename to src/main/java/de/secretj12/turnierplaner/db/repositories/VerificationCodeRepository.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java b/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
rename to src/main/java/de/secretj12/turnierplaner/enums/AdminRole.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java b/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
rename to src/main/java/de/secretj12/turnierplaner/enums/CompetitionMode.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java b/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
rename to src/main/java/de/secretj12/turnierplaner/enums/CompetitionSignUp.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java b/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
rename to src/main/java/de/secretj12/turnierplaner/enums/CompetitionType.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java b/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
rename to src/main/java/de/secretj12/turnierplaner/enums/CourtType.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java b/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
rename to src/main/java/de/secretj12/turnierplaner/enums/CreationProgress.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java b/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
rename to src/main/java/de/secretj12/turnierplaner/enums/NumberSets.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java b/src/main/java/de/secretj12/turnierplaner/enums/Sex.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/Sex.java
rename to src/main/java/de/secretj12/turnierplaner/enums/Sex.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java b/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
rename to src/main/java/de/secretj12/turnierplaner/enums/SexFilter.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java b/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
rename to src/main/java/de/secretj12/turnierplaner/model/admin/jAdminUser.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java b/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionAdd.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java b/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorCompetitionUpdate.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java b/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorGroupsDivision.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java b/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/competition/jDirectorKnockoutOrder.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java b/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayer.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java b/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/jDirectorPlayerUpdateForm.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java b/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/jDirectorScheduleMatch.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java b/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentAdd.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java b/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
rename to src/main/java/de/secretj12/turnierplaner/model/director/jDirectorTournamentUpdate.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/jPage.java b/src/main/java/de/secretj12/turnierplaner/model/jPage.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/jPage.java
rename to src/main/java/de/secretj12/turnierplaner/model/jPage.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java b/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserCompetition.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java b/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerA.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java b/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/competition/jUserConfigPlayerB.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java b/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroup.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java b/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterGroup.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java b/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupMatchAfterMatch.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java b/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/group/jUserGroupSystem.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserCourt.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserMatch.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserMatchEvent.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayer.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerRegistrationForm.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserPlayerSignUpForm.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserSet.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserTeam.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserTeamGroupResult.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/jUserTournament.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java b/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutMatch.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java b/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
rename to src/main/java/de/secretj12/turnierplaner/model/user/knockout/jUserKnockoutSystem.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java b/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/CourtResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java b/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
rename to src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java b/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/SetResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
rename to src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java b/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
rename to src/main/java/de/secretj12/turnierplaner/startup/Defaults.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java b/src/main/java/de/secretj12/turnierplaner/startup/Startup.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/startup/Startup.java
rename to src/main/java/de/secretj12/turnierplaner/startup/Startup.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/AGE_RESTR.java b/src/main/java/de/secretj12/turnierplaner/startup/testdata/AGE_RESTR.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/AGE_RESTR.java
rename to src/main/java/de/secretj12/turnierplaner/startup/testdata/AGE_RESTR.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java b/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
rename to src/main/java/de/secretj12/turnierplaner/startup/testdata/CompetitionSettings.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java b/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
rename to src/main/java/de/secretj12/turnierplaner/startup/testdata/TestdataGenerator.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java b/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
rename to src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java b/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
rename to src/main/java/de/secretj12/turnierplaner/tools/GroupTools.java
diff --git a/backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java b/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
similarity index 100%
rename from backend/src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
rename to src/main/java/de/secretj12/turnierplaner/tools/KnockoutTools.java
diff --git a/backend/src/main/java/template/Example.java b/src/main/java/template/Example.java
similarity index 100%
rename from backend/src/main/java/template/Example.java
rename to src/main/java/template/Example.java
diff --git a/backend/src/main/resources/application.properties b/src/main/resources/application.properties
similarity index 100%
rename from backend/src/main/resources/application.properties
rename to src/main/resources/application.properties
diff --git a/backend/src/main/resources/banner.txt b/src/main/resources/banner.txt
similarity index 100%
rename from backend/src/main/resources/banner.txt
rename to src/main/resources/banner.txt
diff --git a/backend/src/main/resources/keycloak_realm.json b/src/main/resources/keycloak_realm.json
similarity index 99%
rename from backend/src/main/resources/keycloak_realm.json
rename to src/main/resources/keycloak_realm.json
index 8471fd38..c27acd23 100644
--- a/backend/src/main/resources/keycloak_realm.json
+++ b/src/main/resources/keycloak_realm.json
@@ -689,14 +689,14 @@
     {
       "id": "b2d33df3-d90c-4674-ad81-060b801ddb7e",
       "clientId": "backend-quarkus",
-      "rootUrl": "http://localhost:2000",
+      "rootUrl": "http://localhost:8080",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,
       "clientAuthenticatorType": "client-secret",
       "secret": "**********",
       "redirectUris": [
-        "http://localhost:2000/*"
+        "http://localhost:8080/*"
       ],
       "webOrigins": [],
       "notBefore": 0,
@@ -796,18 +796,18 @@
     {
       "id": "1e8a4f16-0566-482b-b408-334e30656203",
       "clientId": "frontend-vue",
-      "rootUrl": "http://localhost:3000/*",
-      "adminUrl": "http://localhost:3000/*",
-      "baseUrl": "http://localhost:3000/*",
+      "rootUrl": "http://localhost:2000/*",
+      "adminUrl": "http://localhost:2000/*",
+      "baseUrl": "http://localhost:2000/*",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,
       "clientAuthenticatorType": "client-secret",
       "redirectUris": [
-        "http://localhost:3000/*"
+        "http://localhost:2000/*"
       ],
       "webOrigins": [
-        "http://localhost:3000"
+        "http://localhost:2000"
       ],
       "notBefore": 0,
       "bearerOnly": false,
@@ -879,7 +879,7 @@
         "http://localhost:2000/q/swagger-ui/oauth2-redirect.html"
       ],
       "webOrigins": [
-        "http://localhost:3000"
+        "http://localhost:2000"
       ],
       "notBefore": 0,
       "bearerOnly": false,
diff --git a/backend/src/main/resources/tennis-ball.png b/src/main/resources/tennis-ball.png
similarity index 100%
rename from backend/src/main/resources/tennis-ball.png
rename to src/main/resources/tennis-ball.png
diff --git a/frontend/app/.eslintrc.json b/src/main/webui/.eslintrc.json
similarity index 100%
rename from frontend/app/.eslintrc.json
rename to src/main/webui/.eslintrc.json
diff --git a/frontend/app/.gitignore b/src/main/webui/.gitignore
similarity index 100%
rename from frontend/app/.gitignore
rename to src/main/webui/.gitignore
diff --git a/frontend/app/.prettierignore b/src/main/webui/.prettierignore
similarity index 100%
rename from frontend/app/.prettierignore
rename to src/main/webui/.prettierignore
diff --git a/frontend/app/.prettierrc.json b/src/main/webui/.prettierrc.json
similarity index 100%
rename from frontend/app/.prettierrc.json
rename to src/main/webui/.prettierrc.json
diff --git a/frontend/app/README.md b/src/main/webui/README.md
similarity index 100%
rename from frontend/app/README.md
rename to src/main/webui/README.md
diff --git a/frontend/app/callbackSignIn.html b/src/main/webui/callbackSignIn.html
similarity index 100%
rename from frontend/app/callbackSignIn.html
rename to src/main/webui/callbackSignIn.html
diff --git a/frontend/app/callbackSignOut.html b/src/main/webui/callbackSignOut.html
similarity index 100%
rename from frontend/app/callbackSignOut.html
rename to src/main/webui/callbackSignOut.html
diff --git a/frontend/app/callbackSilent.html b/src/main/webui/callbackSilent.html
similarity index 100%
rename from frontend/app/callbackSilent.html
rename to src/main/webui/callbackSilent.html
diff --git a/frontend/app/eslint.config.js b/src/main/webui/eslint.config.js
similarity index 100%
rename from frontend/app/eslint.config.js
rename to src/main/webui/eslint.config.js
diff --git a/frontend/app/index.html b/src/main/webui/index.html
similarity index 100%
rename from frontend/app/index.html
rename to src/main/webui/index.html
diff --git a/frontend/app/package.json b/src/main/webui/package.json
similarity index 100%
rename from frontend/app/package.json
rename to src/main/webui/package.json
diff --git a/frontend/app/public/favicon.ico b/src/main/webui/public/favicon.ico
similarity index 100%
rename from frontend/app/public/favicon.ico
rename to src/main/webui/public/favicon.ico
diff --git a/frontend/app/src/App.vue b/src/main/webui/src/App.vue
similarity index 100%
rename from frontend/app/src/App.vue
rename to src/main/webui/src/App.vue
diff --git a/frontend/app/src/backend/Tracker.ts b/src/main/webui/src/backend/Tracker.ts
similarity index 100%
rename from frontend/app/src/backend/Tracker.ts
rename to src/main/webui/src/backend/Tracker.ts
diff --git a/frontend/app/src/backend/competition.ts b/src/main/webui/src/backend/competition.ts
similarity index 100%
rename from frontend/app/src/backend/competition.ts
rename to src/main/webui/src/backend/competition.ts
diff --git a/frontend/app/src/backend/config.ts b/src/main/webui/src/backend/config.ts
similarity index 100%
rename from frontend/app/src/backend/config.ts
rename to src/main/webui/src/backend/config.ts
diff --git a/frontend/app/src/backend/court.ts b/src/main/webui/src/backend/court.ts
similarity index 100%
rename from frontend/app/src/backend/court.ts
rename to src/main/webui/src/backend/court.ts
diff --git a/frontend/app/src/backend/group.ts b/src/main/webui/src/backend/group.ts
similarity index 100%
rename from frontend/app/src/backend/group.ts
rename to src/main/webui/src/backend/group.ts
diff --git a/frontend/app/src/backend/knockout.ts b/src/main/webui/src/backend/knockout.ts
similarity index 100%
rename from frontend/app/src/backend/knockout.ts
rename to src/main/webui/src/backend/knockout.ts
diff --git a/frontend/app/src/backend/match.ts b/src/main/webui/src/backend/match.ts
similarity index 100%
rename from frontend/app/src/backend/match.ts
rename to src/main/webui/src/backend/match.ts
diff --git a/frontend/app/src/backend/player.ts b/src/main/webui/src/backend/player.ts
similarity index 100%
rename from frontend/app/src/backend/player.ts
rename to src/main/webui/src/backend/player.ts
diff --git a/frontend/app/src/backend/registration.ts b/src/main/webui/src/backend/registration.ts
similarity index 100%
rename from frontend/app/src/backend/registration.ts
rename to src/main/webui/src/backend/registration.ts
diff --git a/frontend/app/src/backend/security.ts b/src/main/webui/src/backend/security.ts
similarity index 100%
rename from frontend/app/src/backend/security.ts
rename to src/main/webui/src/backend/security.ts
diff --git a/frontend/app/src/backend/set.ts b/src/main/webui/src/backend/set.ts
similarity index 100%
rename from frontend/app/src/backend/set.ts
rename to src/main/webui/src/backend/set.ts
diff --git a/frontend/app/src/backend/signup.ts b/src/main/webui/src/backend/signup.ts
similarity index 100%
rename from frontend/app/src/backend/signup.ts
rename to src/main/webui/src/backend/signup.ts
diff --git a/frontend/app/src/backend/tournament.ts b/src/main/webui/src/backend/tournament.ts
similarity index 100%
rename from frontend/app/src/backend/tournament.ts
rename to src/main/webui/src/backend/tournament.ts
diff --git a/frontend/app/src/backend/user.ts b/src/main/webui/src/backend/user.ts
similarity index 100%
rename from frontend/app/src/backend/user.ts
rename to src/main/webui/src/backend/user.ts
diff --git a/frontend/app/src/calendar/CalendarInterfaces.ts b/src/main/webui/src/calendar/CalendarInterfaces.ts
similarity index 100%
rename from frontend/app/src/calendar/CalendarInterfaces.ts
rename to src/main/webui/src/calendar/CalendarInterfaces.ts
diff --git a/frontend/app/src/calendar/ViewCalendar.vue b/src/main/webui/src/calendar/ViewCalendar.vue
similarity index 100%
rename from frontend/app/src/calendar/ViewCalendar.vue
rename to src/main/webui/src/calendar/ViewCalendar.vue
diff --git a/frontend/app/src/components/header/HeadContent.vue b/src/main/webui/src/components/header/HeadContent.vue
similarity index 100%
rename from frontend/app/src/components/header/HeadContent.vue
rename to src/main/webui/src/components/header/HeadContent.vue
diff --git a/frontend/app/src/components/header/HeaderLeft.vue b/src/main/webui/src/components/header/HeaderLeft.vue
similarity index 100%
rename from frontend/app/src/components/header/HeaderLeft.vue
rename to src/main/webui/src/components/header/HeaderLeft.vue
diff --git a/frontend/app/src/components/header/HeaderRight.vue b/src/main/webui/src/components/header/HeaderRight.vue
similarity index 100%
rename from frontend/app/src/components/header/HeaderRight.vue
rename to src/main/webui/src/components/header/HeaderRight.vue
diff --git a/frontend/app/src/components/header/HeaderRightContent.vue b/src/main/webui/src/components/header/HeaderRightContent.vue
similarity index 100%
rename from frontend/app/src/components/header/HeaderRightContent.vue
rename to src/main/webui/src/components/header/HeaderRightContent.vue
diff --git a/frontend/app/src/components/header/LoadingBar.vue b/src/main/webui/src/components/header/LoadingBar.vue
similarity index 100%
rename from frontend/app/src/components/header/LoadingBar.vue
rename to src/main/webui/src/components/header/LoadingBar.vue
diff --git a/frontend/app/src/components/header/SidebarContent.vue b/src/main/webui/src/components/header/SidebarContent.vue
similarity index 100%
rename from frontend/app/src/components/header/SidebarContent.vue
rename to src/main/webui/src/components/header/SidebarContent.vue
diff --git a/frontend/app/src/components/items/HorizontalScroller.vue b/src/main/webui/src/components/items/HorizontalScroller.vue
similarity index 100%
rename from frontend/app/src/components/items/HorizontalScroller.vue
rename to src/main/webui/src/components/items/HorizontalScroller.vue
diff --git a/frontend/app/src/components/items/ItemAdd.vue b/src/main/webui/src/components/items/ItemAdd.vue
similarity index 100%
rename from frontend/app/src/components/items/ItemAdd.vue
rename to src/main/webui/src/components/items/ItemAdd.vue
diff --git a/frontend/app/src/components/items/ItemCompetition.vue b/src/main/webui/src/components/items/ItemCompetition.vue
similarity index 100%
rename from frontend/app/src/components/items/ItemCompetition.vue
rename to src/main/webui/src/components/items/ItemCompetition.vue
diff --git a/frontend/app/src/components/items/ItemTournament.vue b/src/main/webui/src/components/items/ItemTournament.vue
similarity index 100%
rename from frontend/app/src/components/items/ItemTournament.vue
rename to src/main/webui/src/components/items/ItemTournament.vue
diff --git a/frontend/app/src/components/items/PlayerPointRow.vue b/src/main/webui/src/components/items/PlayerPointRow.vue
similarity index 100%
rename from frontend/app/src/components/items/PlayerPointRow.vue
rename to src/main/webui/src/components/items/PlayerPointRow.vue
diff --git a/frontend/app/src/components/items/SignUpDoubleDropdown.vue b/src/main/webui/src/components/items/SignUpDoubleDropdown.vue
similarity index 100%
rename from frontend/app/src/components/items/SignUpDoubleDropdown.vue
rename to src/main/webui/src/components/items/SignUpDoubleDropdown.vue
diff --git a/frontend/app/src/components/items/SignUpDropdown.vue b/src/main/webui/src/components/items/SignUpDropdown.vue
similarity index 100%
rename from frontend/app/src/components/items/SignUpDropdown.vue
rename to src/main/webui/src/components/items/SignUpDropdown.vue
diff --git a/frontend/app/src/components/items/UpdatePointsDialog.vue b/src/main/webui/src/components/items/UpdatePointsDialog.vue
similarity index 100%
rename from frontend/app/src/components/items/UpdatePointsDialog.vue
rename to src/main/webui/src/components/items/UpdatePointsDialog.vue
diff --git a/frontend/app/src/components/links/LinkCompetition.vue b/src/main/webui/src/components/links/LinkCompetition.vue
similarity index 100%
rename from frontend/app/src/components/links/LinkCompetition.vue
rename to src/main/webui/src/components/links/LinkCompetition.vue
diff --git a/frontend/app/src/components/links/LinkPlayerName.vue b/src/main/webui/src/components/links/LinkPlayerName.vue
similarity index 100%
rename from frontend/app/src/components/links/LinkPlayerName.vue
rename to src/main/webui/src/components/links/LinkPlayerName.vue
diff --git a/frontend/app/src/components/links/LinkTeamNames.vue b/src/main/webui/src/components/links/LinkTeamNames.vue
similarity index 100%
rename from frontend/app/src/components/links/LinkTeamNames.vue
rename to src/main/webui/src/components/links/LinkTeamNames.vue
diff --git a/frontend/app/src/components/links/LinkTournament.vue b/src/main/webui/src/components/links/LinkTournament.vue
similarity index 100%
rename from frontend/app/src/components/links/LinkTournament.vue
rename to src/main/webui/src/components/links/LinkTournament.vue
diff --git a/frontend/app/src/components/views/ViewTemplates.vue b/src/main/webui/src/components/views/ViewTemplates.vue
similarity index 100%
rename from frontend/app/src/components/views/ViewTemplates.vue
rename to src/main/webui/src/components/views/ViewTemplates.vue
diff --git a/frontend/app/src/components/views/competition/ViewCompetition.vue b/src/main/webui/src/components/views/competition/ViewCompetition.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/ViewCompetition.vue
rename to src/main/webui/src/components/views/competition/ViewCompetition.vue
diff --git a/frontend/app/src/components/views/competition/ViewGame.vue b/src/main/webui/src/components/views/competition/ViewGame.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/ViewGame.vue
rename to src/main/webui/src/components/views/competition/ViewGame.vue
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue b/src/main/webui/src/components/views/competition/groupSystem/ViewGroupList.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/groupSystem/ViewGroupList.vue
rename to src/main/webui/src/components/views/competition/groupSystem/ViewGroupList.vue
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue b/src/main/webui/src/components/views/competition/groupSystem/ViewGroupResults.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/groupSystem/ViewGroupResults.vue
rename to src/main/webui/src/components/views/competition/groupSystem/ViewGroupResults.vue
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue b/src/main/webui/src/components/views/competition/groupSystem/ViewGroupSystem.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/groupSystem/ViewGroupSystem.vue
rename to src/main/webui/src/components/views/competition/groupSystem/ViewGroupSystem.vue
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue b/src/main/webui/src/components/views/competition/groupSystem/ViewGroupTable.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/groupSystem/ViewGroupTable.vue
rename to src/main/webui/src/components/views/competition/groupSystem/ViewGroupTable.vue
diff --git a/frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue b/src/main/webui/src/components/views/competition/groupSystem/ViewMatch.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/groupSystem/ViewMatch.vue
rename to src/main/webui/src/components/views/competition/groupSystem/ViewMatch.vue
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts b/src/main/webui/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts
similarity index 100%
rename from frontend/app/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts
rename to src/main/webui/src/components/views/competition/knockoutSystem/KnockoutTitleGenerator.ts
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue b/src/main/webui/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
rename to src/main/webui/src/components/views/competition/knockoutSystem/ViewKnockoutSystem.vue
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue b/src/main/webui/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
rename to src/main/webui/src/components/views/competition/knockoutSystem/ViewKnockoutTree.vue
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue b/src/main/webui/src/components/views/competition/knockoutSystem/ViewMatch.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/knockoutSystem/ViewMatch.vue
rename to src/main/webui/src/components/views/competition/knockoutSystem/ViewMatch.vue
diff --git a/frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue b/src/main/webui/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
rename to src/main/webui/src/components/views/competition/knockoutSystem/ViewMatchDate.vue
diff --git a/frontend/app/src/components/views/competition/signup/ViewConditions.vue b/src/main/webui/src/components/views/competition/signup/ViewConditions.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/signup/ViewConditions.vue
rename to src/main/webui/src/components/views/competition/signup/ViewConditions.vue
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUp.vue b/src/main/webui/src/components/views/competition/signup/ViewSignUp.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/signup/ViewSignUp.vue
rename to src/main/webui/src/components/views/competition/signup/ViewSignUp.vue
diff --git a/frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue b/src/main/webui/src/components/views/competition/signup/ViewSignUpForm.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/signup/ViewSignUpForm.vue
rename to src/main/webui/src/components/views/competition/signup/ViewSignUpForm.vue
diff --git a/frontend/app/src/components/views/competition/signup/ViewTable.vue b/src/main/webui/src/components/views/competition/signup/ViewTable.vue
similarity index 100%
rename from frontend/app/src/components/views/competition/signup/ViewTable.vue
rename to src/main/webui/src/components/views/competition/signup/ViewTable.vue
diff --git a/frontend/app/src/components/views/competitions/FormCompetition.vue b/src/main/webui/src/components/views/competitions/FormCompetition.vue
similarity index 100%
rename from frontend/app/src/components/views/competitions/FormCompetition.vue
rename to src/main/webui/src/components/views/competitions/FormCompetition.vue
diff --git a/frontend/app/src/components/views/competitions/ViewCompetitions.vue b/src/main/webui/src/components/views/competitions/ViewCompetitions.vue
similarity index 100%
rename from frontend/app/src/components/views/competitions/ViewCompetitions.vue
rename to src/main/webui/src/components/views/competitions/ViewCompetitions.vue
diff --git a/frontend/app/src/components/views/competitions/ViewCreateCompetition.vue b/src/main/webui/src/components/views/competitions/ViewCreateCompetition.vue
similarity index 100%
rename from frontend/app/src/components/views/competitions/ViewCreateCompetition.vue
rename to src/main/webui/src/components/views/competitions/ViewCreateCompetition.vue
diff --git a/frontend/app/src/components/views/court/ViewCreateCourtSmall.vue b/src/main/webui/src/components/views/court/ViewCreateCourtSmall.vue
similarity index 100%
rename from frontend/app/src/components/views/court/ViewCreateCourtSmall.vue
rename to src/main/webui/src/components/views/court/ViewCreateCourtSmall.vue
diff --git a/frontend/app/src/components/views/overview/OverviewCalendar.vue b/src/main/webui/src/components/views/overview/OverviewCalendar.vue
similarity index 100%
rename from frontend/app/src/components/views/overview/OverviewCalendar.vue
rename to src/main/webui/src/components/views/overview/OverviewCalendar.vue
diff --git a/frontend/app/src/components/views/overview/OverviewList.vue b/src/main/webui/src/components/views/overview/OverviewList.vue
similarity index 100%
rename from frontend/app/src/components/views/overview/OverviewList.vue
rename to src/main/webui/src/components/views/overview/OverviewList.vue
diff --git a/frontend/app/src/components/views/overview/ViewTournamentOverview.vue b/src/main/webui/src/components/views/overview/ViewTournamentOverview.vue
similarity index 100%
rename from frontend/app/src/components/views/overview/ViewTournamentOverview.vue
rename to src/main/webui/src/components/views/overview/ViewTournamentOverview.vue
diff --git a/frontend/app/src/components/views/player/ViewPlayerForm.vue b/src/main/webui/src/components/views/player/ViewPlayerForm.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewPlayerForm.vue
rename to src/main/webui/src/components/views/player/ViewPlayerForm.vue
diff --git a/frontend/app/src/components/views/player/ViewPlayerOverview.vue b/src/main/webui/src/components/views/player/ViewPlayerOverview.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewPlayerOverview.vue
rename to src/main/webui/src/components/views/player/ViewPlayerOverview.vue
diff --git a/frontend/app/src/components/views/player/ViewPlayerRegistration.vue b/src/main/webui/src/components/views/player/ViewPlayerRegistration.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewPlayerRegistration.vue
rename to src/main/webui/src/components/views/player/ViewPlayerRegistration.vue
diff --git a/frontend/app/src/components/views/player/ViewPlayerUpdate.vue b/src/main/webui/src/components/views/player/ViewPlayerUpdate.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewPlayerUpdate.vue
rename to src/main/webui/src/components/views/player/ViewPlayerUpdate.vue
diff --git a/frontend/app/src/components/views/player/ViewVerification.vue b/src/main/webui/src/components/views/player/ViewVerification.vue
similarity index 100%
rename from frontend/app/src/components/views/player/ViewVerification.vue
rename to src/main/webui/src/components/views/player/ViewVerification.vue
diff --git a/frontend/app/src/components/views/prepare/ViewEditCompetition.vue b/src/main/webui/src/components/views/prepare/ViewEditCompetition.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/ViewEditCompetition.vue
rename to src/main/webui/src/components/views/prepare/ViewEditCompetition.vue
diff --git a/frontend/app/src/components/views/prepare/ViewEditPlayer.vue b/src/main/webui/src/components/views/prepare/ViewEditPlayer.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/ViewEditPlayer.vue
rename to src/main/webui/src/components/views/prepare/ViewEditPlayer.vue
diff --git a/frontend/app/src/components/views/prepare/ViewPrepareMatches.vue b/src/main/webui/src/components/views/prepare/ViewPrepareMatches.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/ViewPrepareMatches.vue
rename to src/main/webui/src/components/views/prepare/ViewPrepareMatches.vue
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts b/src/main/webui/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
rename to src/main/webui/src/components/views/prepare/assignMatches/AssginMatchesHelper.ts
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue b/src/main/webui/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
rename to src/main/webui/src/components/views/prepare/assignMatches/AssignMatchesGroups.vue
diff --git a/frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue b/src/main/webui/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
rename to src/main/webui/src/components/views/prepare/assignMatches/AssignMatchesKnockout.vue
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue b/src/main/webui/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
rename to src/main/webui/src/components/views/prepare/assignMatches/ViewAssignMatches.vue
diff --git a/frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue b/src/main/webui/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
rename to src/main/webui/src/components/views/prepare/assignMatches/ViewMatchEdit.vue
diff --git a/frontend/app/src/components/views/prepare/components/MatchBox.vue b/src/main/webui/src/components/views/prepare/components/MatchBox.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/MatchBox.vue
rename to src/main/webui/src/components/views/prepare/components/MatchBox.vue
diff --git a/frontend/app/src/components/views/prepare/components/PlayerCard.vue b/src/main/webui/src/components/views/prepare/components/PlayerCard.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/PlayerCard.vue
rename to src/main/webui/src/components/views/prepare/components/PlayerCard.vue
diff --git a/frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue b/src/main/webui/src/components/views/prepare/components/PlayerContainerDraggable.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/PlayerContainerDraggable.vue
rename to src/main/webui/src/components/views/prepare/components/PlayerContainerDraggable.vue
diff --git a/frontend/app/src/components/views/prepare/components/TeamBox.vue b/src/main/webui/src/components/views/prepare/components/TeamBox.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/TeamBox.vue
rename to src/main/webui/src/components/views/prepare/components/TeamBox.vue
diff --git a/frontend/app/src/components/views/prepare/components/TeamCard.vue b/src/main/webui/src/components/views/prepare/components/TeamCard.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/TeamCard.vue
rename to src/main/webui/src/components/views/prepare/components/TeamCard.vue
diff --git a/frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue b/src/main/webui/src/components/views/prepare/components/TeamContainerDraggable.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/components/TeamContainerDraggable.vue
rename to src/main/webui/src/components/views/prepare/components/TeamContainerDraggable.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue b/src/main/webui/src/components/views/prepare/editTeams/AddPlayer.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/editTeams/AddPlayer.vue
rename to src/main/webui/src/components/views/prepare/editTeams/AddPlayer.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue b/src/main/webui/src/components/views/prepare/editTeams/DeleteBox.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/editTeams/DeleteBox.vue
rename to src/main/webui/src/components/views/prepare/editTeams/DeleteBox.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/PlayerList.vue b/src/main/webui/src/components/views/prepare/editTeams/PlayerList.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/editTeams/PlayerList.vue
rename to src/main/webui/src/components/views/prepare/editTeams/PlayerList.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/TeamList.vue b/src/main/webui/src/components/views/prepare/editTeams/TeamList.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/editTeams/TeamList.vue
rename to src/main/webui/src/components/views/prepare/editTeams/TeamList.vue
diff --git a/frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue b/src/main/webui/src/components/views/prepare/editTeams/ViewEditTeams.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/editTeams/ViewEditTeams.vue
rename to src/main/webui/src/components/views/prepare/editTeams/ViewEditTeams.vue
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue b/src/main/webui/src/components/views/prepare/scheduleMatches/CourtChooser.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/CourtChooser.vue
rename to src/main/webui/src/components/views/prepare/scheduleMatches/CourtChooser.vue
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue b/src/main/webui/src/components/views/prepare/scheduleMatches/MatchEvent.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/MatchEvent.vue
rename to src/main/webui/src/components/views/prepare/scheduleMatches/MatchEvent.vue
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue b/src/main/webui/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
rename to src/main/webui/src/components/views/prepare/scheduleMatches/MatchesContainerDraggable.vue
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts b/src/main/webui/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
rename to src/main/webui/src/components/views/prepare/scheduleMatches/ScheduleMatchesHelper.ts
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue b/src/main/webui/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
rename to src/main/webui/src/components/views/prepare/scheduleMatches/SchedulingCalendar.vue
diff --git a/frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue b/src/main/webui/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
similarity index 100%
rename from frontend/app/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
rename to src/main/webui/src/components/views/prepare/scheduleMatches/ViewScheduleMatches.vue
diff --git a/frontend/app/src/components/views/settings/SettingsCourts.vue b/src/main/webui/src/components/views/settings/SettingsCourts.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsCourts.vue
rename to src/main/webui/src/components/views/settings/SettingsCourts.vue
diff --git a/frontend/app/src/components/views/settings/SettingsGeneral.vue b/src/main/webui/src/components/views/settings/SettingsGeneral.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsGeneral.vue
rename to src/main/webui/src/components/views/settings/SettingsGeneral.vue
diff --git a/frontend/app/src/components/views/settings/SettingsItem.vue b/src/main/webui/src/components/views/settings/SettingsItem.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsItem.vue
rename to src/main/webui/src/components/views/settings/SettingsItem.vue
diff --git a/frontend/app/src/components/views/settings/SettingsPlayer.vue b/src/main/webui/src/components/views/settings/SettingsPlayer.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsPlayer.vue
rename to src/main/webui/src/components/views/settings/SettingsPlayer.vue
diff --git a/frontend/app/src/components/views/settings/SettingsPlayerVerify.vue b/src/main/webui/src/components/views/settings/SettingsPlayerVerify.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsPlayerVerify.vue
rename to src/main/webui/src/components/views/settings/SettingsPlayerVerify.vue
diff --git a/frontend/app/src/components/views/settings/SettingsUser.vue b/src/main/webui/src/components/views/settings/SettingsUser.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/SettingsUser.vue
rename to src/main/webui/src/components/views/settings/SettingsUser.vue
diff --git a/frontend/app/src/components/views/settings/ViewSettings.vue b/src/main/webui/src/components/views/settings/ViewSettings.vue
similarity index 100%
rename from frontend/app/src/components/views/settings/ViewSettings.vue
rename to src/main/webui/src/components/views/settings/ViewSettings.vue
diff --git a/frontend/app/src/components/views/tournaments/FormTournament.vue b/src/main/webui/src/components/views/tournaments/FormTournament.vue
similarity index 100%
rename from frontend/app/src/components/views/tournaments/FormTournament.vue
rename to src/main/webui/src/components/views/tournaments/FormTournament.vue
diff --git a/frontend/app/src/components/views/tournaments/ViewCreateTournament.vue b/src/main/webui/src/components/views/tournaments/ViewCreateTournament.vue
similarity index 100%
rename from frontend/app/src/components/views/tournaments/ViewCreateTournament.vue
rename to src/main/webui/src/components/views/tournaments/ViewCreateTournament.vue
diff --git a/frontend/app/src/components/views/tournaments/ViewEditTournament.vue b/src/main/webui/src/components/views/tournaments/ViewEditTournament.vue
similarity index 100%
rename from frontend/app/src/components/views/tournaments/ViewEditTournament.vue
rename to src/main/webui/src/components/views/tournaments/ViewEditTournament.vue
diff --git a/frontend/app/src/components/views/tournaments/ViewTournaments.vue b/src/main/webui/src/components/views/tournaments/ViewTournaments.vue
similarity index 100%
rename from frontend/app/src/components/views/tournaments/ViewTournaments.vue
rename to src/main/webui/src/components/views/tournaments/ViewTournaments.vue
diff --git a/frontend/app/src/draggable/DraggableList.vue b/src/main/webui/src/draggable/DraggableList.vue
similarity index 100%
rename from frontend/app/src/draggable/DraggableList.vue
rename to src/main/webui/src/draggable/DraggableList.vue
diff --git a/frontend/app/src/draggable/DraggablePanel.vue b/src/main/webui/src/draggable/DraggablePanel.vue
similarity index 100%
rename from frontend/app/src/draggable/DraggablePanel.vue
rename to src/main/webui/src/draggable/DraggablePanel.vue
diff --git a/frontend/app/src/i18n/de.json b/src/main/webui/src/i18n/de.json
similarity index 100%
rename from frontend/app/src/i18n/de.json
rename to src/main/webui/src/i18n/de.json
diff --git a/frontend/app/src/i18n/en.json b/src/main/webui/src/i18n/en.json
similarity index 100%
rename from frontend/app/src/i18n/en.json
rename to src/main/webui/src/i18n/en.json
diff --git a/frontend/app/src/i18n/index.ts b/src/main/webui/src/i18n/index.ts
similarity index 100%
rename from frontend/app/src/i18n/index.ts
rename to src/main/webui/src/i18n/index.ts
diff --git a/frontend/app/src/interfaces/competition.ts b/src/main/webui/src/interfaces/competition.ts
similarity index 100%
rename from frontend/app/src/interfaces/competition.ts
rename to src/main/webui/src/interfaces/competition.ts
diff --git a/frontend/app/src/interfaces/config.ts b/src/main/webui/src/interfaces/config.ts
similarity index 100%
rename from frontend/app/src/interfaces/config.ts
rename to src/main/webui/src/interfaces/config.ts
diff --git a/frontend/app/src/interfaces/court.ts b/src/main/webui/src/interfaces/court.ts
similarity index 100%
rename from frontend/app/src/interfaces/court.ts
rename to src/main/webui/src/interfaces/court.ts
diff --git a/frontend/app/src/interfaces/general.ts b/src/main/webui/src/interfaces/general.ts
similarity index 100%
rename from frontend/app/src/interfaces/general.ts
rename to src/main/webui/src/interfaces/general.ts
diff --git a/frontend/app/src/interfaces/groupSystem.ts b/src/main/webui/src/interfaces/groupSystem.ts
similarity index 100%
rename from frontend/app/src/interfaces/groupSystem.ts
rename to src/main/webui/src/interfaces/groupSystem.ts
diff --git a/frontend/app/src/interfaces/knockoutSystem.ts b/src/main/webui/src/interfaces/knockoutSystem.ts
similarity index 100%
rename from frontend/app/src/interfaces/knockoutSystem.ts
rename to src/main/webui/src/interfaces/knockoutSystem.ts
diff --git a/frontend/app/src/interfaces/match.ts b/src/main/webui/src/interfaces/match.ts
similarity index 100%
rename from frontend/app/src/interfaces/match.ts
rename to src/main/webui/src/interfaces/match.ts
diff --git a/frontend/app/src/interfaces/player.ts b/src/main/webui/src/interfaces/player.ts
similarity index 100%
rename from frontend/app/src/interfaces/player.ts
rename to src/main/webui/src/interfaces/player.ts
diff --git a/frontend/app/src/interfaces/team.ts b/src/main/webui/src/interfaces/team.ts
similarity index 100%
rename from frontend/app/src/interfaces/team.ts
rename to src/main/webui/src/interfaces/team.ts
diff --git a/frontend/app/src/interfaces/tournament.ts b/src/main/webui/src/interfaces/tournament.ts
similarity index 100%
rename from frontend/app/src/interfaces/tournament.ts
rename to src/main/webui/src/interfaces/tournament.ts
diff --git a/frontend/app/src/interfaces/user.ts b/src/main/webui/src/interfaces/user.ts
similarity index 100%
rename from frontend/app/src/interfaces/user.ts
rename to src/main/webui/src/interfaces/user.ts
diff --git a/frontend/app/src/main.ts b/src/main/webui/src/main.ts
similarity index 100%
rename from frontend/app/src/main.ts
rename to src/main/webui/src/main.ts
diff --git a/frontend/app/src/routes.ts b/src/main/webui/src/routes.ts
similarity index 100%
rename from frontend/app/src/routes.ts
rename to src/main/webui/src/routes.ts
diff --git a/frontend/app/src/security/AuthService.ts b/src/main/webui/src/security/AuthService.ts
similarity index 100%
rename from frontend/app/src/security/AuthService.ts
rename to src/main/webui/src/security/AuthService.ts
diff --git a/frontend/app/src/security/callbackSignIn.ts b/src/main/webui/src/security/callbackSignIn.ts
similarity index 100%
rename from frontend/app/src/security/callbackSignIn.ts
rename to src/main/webui/src/security/callbackSignIn.ts
diff --git a/frontend/app/src/security/callbackSignOut.ts b/src/main/webui/src/security/callbackSignOut.ts
similarity index 100%
rename from frontend/app/src/security/callbackSignOut.ts
rename to src/main/webui/src/security/callbackSignOut.ts
diff --git a/frontend/app/src/security/callbackSilent.ts b/src/main/webui/src/security/callbackSilent.ts
similarity index 100%
rename from frontend/app/src/security/callbackSilent.ts
rename to src/main/webui/src/security/callbackSilent.ts
diff --git a/frontend/app/src/security/settings.ts b/src/main/webui/src/security/settings.ts
similarity index 100%
rename from frontend/app/src/security/settings.ts
rename to src/main/webui/src/security/settings.ts
diff --git a/frontend/app/src/settings.ts b/src/main/webui/src/settings.ts
similarity index 76%
rename from frontend/app/src/settings.ts
rename to src/main/webui/src/settings.ts
index f24d5a0c..2583e269 100644
--- a/frontend/app/src/settings.ts
+++ b/src/main/webui/src/settings.ts
@@ -1,5 +1,5 @@
 export const settings = {
 	AUTH_DOMAIN: "http://localhost:7777/realms/Quarkus",
-	FRONTEND: "http://localhost:3000",
+	FRONTEND: "http://localhost:2000",
 	BACKEND: "http://localhost:2000",
 }
diff --git a/frontend/app/src/style.css b/src/main/webui/src/style.css
similarity index 100%
rename from frontend/app/src/style.css
rename to src/main/webui/src/style.css
diff --git a/frontend/app/tsconfig.json b/src/main/webui/tsconfig.json
similarity index 100%
rename from frontend/app/tsconfig.json
rename to src/main/webui/tsconfig.json
diff --git a/frontend/app/vite.config.ts b/src/main/webui/vite.config.ts
similarity index 97%
rename from frontend/app/vite.config.ts
rename to src/main/webui/vite.config.ts
index 370db76e..8ae87cf8 100644
--- a/frontend/app/vite.config.ts
+++ b/src/main/webui/vite.config.ts
@@ -8,7 +8,6 @@ import { PrimeVueResolver } from "unplugin-vue-components/resolvers"
 export default defineConfig({
 	server: {
 		host: true,
-		port: 3000,
 	},
 	plugins: [
 		vue(),
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java b/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
rename to src/test/java/de/secretj12/turnierplaner/model/TestDeletionBehaviour.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
rename to src/test/java/de/secretj12/turnierplaner/resources/TestCompetitionResource.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
rename to src/test/java/de/secretj12/turnierplaner/resources/TestCourtResource.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
rename to src/test/java/de/secretj12/turnierplaner/resources/TestMatchResource.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
rename to src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
rename to src/test/java/de/secretj12/turnierplaner/resources/TestTournamentResource.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java b/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
rename to src/test/java/de/secretj12/turnierplaner/startup/TestStartup.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java b/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
rename to src/test/java/de/secretj12/turnierplaner/tools/TestGroupTools.java
diff --git a/backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java b/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
similarity index 100%
rename from backend/src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
rename to src/test/java/de/secretj12/turnierplaner/tools/TestKnockoutTools.java
diff --git a/backend/src/test/java/template/TestExample.java b/src/test/java/template/TestExample.java
similarity index 100%
rename from backend/src/test/java/template/TestExample.java
rename to src/test/java/template/TestExample.java

From ea9e0d89144be8824ac2cecce236cf691c9e4565 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 22:33:52 +0200
Subject: [PATCH 234/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/secretj12/turnierplaner/resources/MailTemplates.java     | 2 +-
 src/main/webui/package.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java b/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
index dbccbfb9..8143a531 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/MailTemplates.java
@@ -7,7 +7,7 @@
 
 public class MailTemplates {
     //    TODO internationalization
-    String url = "http://localhost:3000";
+    String url = "http://localhost:2000";
 
     public Mail verificationMail(String recipient, String verificationcode) {
         return Mail
diff --git a/src/main/webui/package.json b/src/main/webui/package.json
index 53e3437d..92592e46 100644
--- a/src/main/webui/package.json
+++ b/src/main/webui/package.json
@@ -21,7 +21,7 @@
 		"axios": "^1.7.7",
 		"keycloak-js": "^23.0.3",
 		"material-symbols": "^0.23.0",
-		"oidc-client-ts": "^2.4.0",
+		"oidc-client-ts": "^3.0.1",
 		"primeflex": "^3.3.1",
 		"primeicons": "^6.0.1",
 		"primevue": "^3.44.0",

From 7abbfdf91618ad39a826ef9c13c0dc1a395d6f38 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 22:49:50 +0200
Subject: [PATCH 235/247] =?UTF-8?q?=F0=9F=91=B7=20Update=20GitHub=20action?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml  | 49 +++++++----------------------
 .github/workflows/docker.yml | 61 ++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 37 deletions(-)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d40b148c..22ab391a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,63 +12,38 @@ jobs:
     name: Validate format of backend
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 22
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '22'
           distribution: 'temurin'
           cache: maven
       - name: Validate backend format
-        run: cd backend && mvn spotless:check
-  buildBackend:
-    name: Build backend
-    runs-on: ubuntu-latest
-    needs: formatBackend
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 22
-        uses: actions/setup-java@v3
-        with:
-          java-version: '22'
-          distribution: 'temurin'
-          cache: maven
-      - name: Build backend
-        run: cd backend && mvn package
+        run: mvn spotless:check
 
   formatFrontend:
     name: Validate format of frontend
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install frontend dependencies
-        run: cd frontend/app && npm install
+        run: cd src/main/webui && npm install
       - name: Validate frontend linter
-        run: cd frontend/app && npm run lint:validate
+        run: cd src/main/webui && npm run lint:validate
       - name: Validate frontend prettier
-        run: cd frontend/app && npm run prettier:validate
-  buildFrontend:
-    name: Build frontend
-    runs-on: ubuntu-latest
-    needs: formatFrontend
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 22
-        uses: actions/setup-java@v3
-        with:
-          java-version: '22'
-          distribution: 'temurin'
-          cache: maven
-      - name: Build frontend
-        run: cd frontend && mvn package
+        run: cd src/main/webui && npm run prettier:validate
 
   buildAll:
     name: Build whole application
     runs-on: ubuntu-latest
+    needs:
+      - formatBackend
+      - formatFrontend
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 22
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '22'
           distribution: 'temurin'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 00000000..dabcef12
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,61 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GH_PAT }}
+
+      - name: Debug metadata outputs
+        run: |
+          echo "Tags: ${{ steps.meta.outputs.tags }}"
+          echo "Labels: ${{ steps.meta.outputs.labels }}"
+
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn package
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          file: ./src/main/docker/Dockerfile.jvm
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file

From 0094991f8817ea4eee4658bc26d3491cae8e30d5 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Thu, 3 Oct 2024 22:50:59 +0200
Subject: [PATCH 236/247] =?UTF-8?q?=F0=9F=99=88=20Include=20package-lock.j?=
 =?UTF-8?q?son?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       |     6 +-
 src/main/webui/.gitignore        |    35 -
 src/main/webui/package-lock.json | 17081 +++++++++++++++++++++++++++++
 3 files changed, 17085 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/webui/.gitignore
 create mode 100644 src/main/webui/package-lock.json

diff --git a/.gitignore b/.gitignore
index 6b07b77a..e8a12858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ nb-configuration.xml
 .env
 
 # Frontend
-node_modules/**
-package-lock.json
+**/node_modules/**
+auto-imports.d.ts
+components.d.ts
+src/main/webui/dist/**
 
 keycloak-19.0.1/**
 backend/.mvn
diff --git a/src/main/webui/.gitignore b/src/main/webui/.gitignore
deleted file mode 100644
index 6d510db0..00000000
--- a/src/main/webui/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-.DS_Store
-dist
-dist-ssr
-coverage
-*.local
-
-/cypress/videos/
-/cypress/screenshots/
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-package-lock.json
-node/**
-/auto-imports.d.ts
-/components.d.ts
-
-bun.lockb
\ No newline at end of file
diff --git a/src/main/webui/package-lock.json b/src/main/webui/package-lock.json
new file mode 100644
index 00000000..12a5a73e
--- /dev/null
+++ b/src/main/webui/package-lock.json
@@ -0,0 +1,17081 @@
+{
+	"name": "turnierplaner",
+	"version": "0.0.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "turnierplaner",
+			"version": "0.0.0",
+			"dependencies": {
+				"@tanstack/vue-query": "^5.52.0",
+				"@tanstack/vue-query-devtools": "^5.52.0",
+				"@vee-validate/yup": "^4.13.2",
+				"@vue/cli": "^5.0.8",
+				"axios": "^1.7.7",
+				"keycloak-js": "^23.0.3",
+				"material-symbols": "^0.23.0",
+				"oidc-client-ts": "^3.0.1",
+				"primeflex": "^3.3.1",
+				"primeicons": "^6.0.1",
+				"primevue": "^3.44.0",
+				"sass": "^1.69.5",
+				"sortablejs": "^1.15.1",
+				"uuid": "^9.0.1",
+				"vee-validate": "^4.12.3",
+				"vue": "^3.5.8",
+				"vue-axios": "^3.5.2",
+				"vue-cal": "^4.9.0",
+				"vue-i18n": "^10.0.3",
+				"vue-password": "^3.1.0",
+				"vue-router": "^4.2.5"
+			},
+			"devDependencies": {
+				"@types/sortablejs": "^1.15.7",
+				"@types/uuid": "^9.0.7",
+				"@typescript-eslint/eslint-plugin": "^8.8.0",
+				"@typescript-eslint/parser": "^8.8.0",
+				"@vitejs/plugin-vue": "^4.5.2",
+				"@vue/cli-plugin-typescript": "~5.0.8",
+				"@vue/cli-service": "^5.0.8",
+				"eslint": "^8.56.0",
+				"eslint-config-prettier": "^9.1.0",
+				"eslint-plugin-vue": "^9.19.2",
+				"prettier": "^3.1.1",
+				"typescript": "~5.6.2",
+				"unplugin-auto-import": "^0.17.2",
+				"unplugin-vue-components": "^0.26.0",
+				"vite": "^5.0.10",
+				"vue-component-type-helpers": "^2.1.6",
+				"vue-loader": "^17.4.2",
+				"vue-tsc": "^2.1.6"
+			}
+		},
+		"node_modules/@achrinza/node-ipc": {
+			"version": "9.2.9",
+			"resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz",
+			"integrity": "sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ==",
+			"dependencies": {
+				"@node-ipc/js-queue": "2.0.3",
+				"event-pubsub": "4.3.0",
+				"js-message": "1.0.7"
+			},
+			"engines": {
+				"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 21 || 22"
+			}
+		},
+		"node_modules/@akryum/winattr": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@akryum/winattr/-/winattr-3.0.0.tgz",
+			"integrity": "sha512-t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==",
+			"dependencies": {
+				"fswin": "^2.17.1227"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@ampproject/remapping": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@antfu/utils": {
+			"version": "0.7.10",
+			"resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.10.tgz",
+			"integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@apollo/protobufjs": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz",
+			"integrity": "sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg==",
+			"hasInstallScript": true,
+			"dependencies": {
+				"@protobufjs/aspromise": "^1.1.2",
+				"@protobufjs/base64": "^1.1.2",
+				"@protobufjs/codegen": "^2.0.4",
+				"@protobufjs/eventemitter": "^1.1.0",
+				"@protobufjs/fetch": "^1.1.0",
+				"@protobufjs/float": "^1.0.2",
+				"@protobufjs/inquire": "^1.1.0",
+				"@protobufjs/path": "^1.1.2",
+				"@protobufjs/pool": "^1.1.0",
+				"@protobufjs/utf8": "^1.1.0",
+				"@types/long": "^4.0.0",
+				"long": "^4.0.0"
+			},
+			"bin": {
+				"apollo-pbjs": "bin/pbjs",
+				"apollo-pbts": "bin/pbts"
+			}
+		},
+		"node_modules/@apollo/usage-reporting-protobuf": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz",
+			"integrity": "sha512-u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA==",
+			"dependencies": {
+				"@apollo/protobufjs": "1.2.7"
+			}
+		},
+		"node_modules/@apollo/utils.dropunuseddefinitions": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz",
+			"integrity": "sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg==",
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollo/utils.keyvaluecache": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz",
+			"integrity": "sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg==",
+			"dependencies": {
+				"@apollo/utils.logger": "^1.0.0",
+				"lru-cache": "7.10.1 - 7.13.1"
+			}
+		},
+		"node_modules/@apollo/utils.keyvaluecache/node_modules/lru-cache": {
+			"version": "7.13.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz",
+			"integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@apollo/utils.logger": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-1.0.1.tgz",
+			"integrity": "sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA=="
+		},
+		"node_modules/@apollo/utils.printwithreducedwhitespace": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz",
+			"integrity": "sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q==",
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollo/utils.removealiases": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz",
+			"integrity": "sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A==",
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollo/utils.sortast": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz",
+			"integrity": "sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA==",
+			"dependencies": {
+				"lodash.sortby": "^4.7.0"
+			},
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollo/utils.stripsensitiveliterals": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz",
+			"integrity": "sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w==",
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollo/utils.usagereporting": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz",
+			"integrity": "sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ==",
+			"dependencies": {
+				"@apollo/usage-reporting-protobuf": "^4.0.0",
+				"@apollo/utils.dropunuseddefinitions": "^1.1.0",
+				"@apollo/utils.printwithreducedwhitespace": "^1.1.0",
+				"@apollo/utils.removealiases": "1.0.0",
+				"@apollo/utils.sortast": "^1.1.0",
+				"@apollo/utils.stripsensitiveliterals": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=12.13.0"
+			},
+			"peerDependencies": {
+				"graphql": "14.x || 15.x || 16.x"
+			}
+		},
+		"node_modules/@apollographql/apollo-tools": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz",
+			"integrity": "sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==",
+			"engines": {
+				"node": ">=8",
+				"npm": ">=6"
+			},
+			"peerDependencies": {
+				"graphql": "^14.2.1 || ^15.0.0 || ^16.0.0"
+			}
+		},
+		"node_modules/@apollographql/graphql-playground-html": {
+			"version": "1.6.29",
+			"resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz",
+			"integrity": "sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA==",
+			"dependencies": {
+				"xss": "^1.0.8"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+			"integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+			"dependencies": {
+				"@babel/highlight": "^7.24.7",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+			"integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+			"integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.0",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-module-transforms": "^7.25.2",
+				"@babel/helpers": "^7.25.0",
+				"@babel/parser": "^7.25.0",
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.2",
+				"@babel/types": "^7.25.2",
+				"convert-source-map": "^2.0.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+			"integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+			"dependencies": {
+				"@babel/types": "^7.25.6",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^2.5.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-annotate-as-pure": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+			"integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+			"dependencies": {
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+			"integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+			"integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+			"dependencies": {
+				"@babel/compat-data": "^7.25.2",
+				"@babel/helper-validator-option": "^7.24.8",
+				"browserslist": "^4.23.1",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+			"dependencies": {
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+		},
+		"node_modules/@babel/helper-create-class-features-plugin": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz",
+			"integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/traverse": "^7.25.4",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-create-regexp-features-plugin": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
+			"integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"regexpu-core": "^5.3.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-define-polyfill-provider": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+			"integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
+				"debug": "^4.1.1",
+				"lodash.debounce": "^4.0.8",
+				"resolve": "^1.14.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/@babel/helper-member-expression-to-functions": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
+			"integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==",
+			"dependencies": {
+				"@babel/traverse": "^7.24.8",
+				"@babel/types": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+			"integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+			"integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-simple-access": "^7.24.7",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-optimise-call-expression": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+			"integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+			"dependencies": {
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+			"integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-remap-async-to-generator": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
+			"integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-wrap-function": "^7.25.0",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-replace-supers": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
+			"integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
+			"dependencies": {
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+			"integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+			"integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+			"integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+			"integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+			"integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-wrap-function": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
+			"integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
+			"dependencies": {
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.0",
+				"@babel/types": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+			"integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+			"dependencies": {
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+			"integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"chalk": "^2.4.2",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+			"integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+			"dependencies": {
+				"@babel/types": "^7.25.6"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
+			"integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
+			"integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
+			"integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+			"integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/plugin-transform-optional-chaining": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.13.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
+			"integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-proposal-class-properties": {
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.18.6",
+				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+			"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-proposal-optional-chaining": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+			"integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-proposal-private-property-in-object": {
+			"version": "7.21.0-placeholder-for-preset-env.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+			"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-static-block": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-dynamic-import": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-export-namespace-from": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-flow": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz",
+			"integrity": "sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-assertions": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz",
+			"integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-attributes": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz",
+			"integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-jsx": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+			"integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-private-property-in-object": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz",
+			"integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+			"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
+				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-arrow-functions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+			"integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-async-generator-functions": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz",
+			"integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-remap-async-to-generator": "^7.25.0",
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/traverse": "^7.25.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-async-to-generator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+			"integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-remap-async-to-generator": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-block-scoped-functions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+			"integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-block-scoping": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
+			"integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-class-properties": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz",
+			"integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.25.4",
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-class-static-block": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+			"integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.12.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-classes": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz",
+			"integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/traverse": "^7.25.4",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-computed-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+			"integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/template": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-destructuring": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
+			"integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-dotall-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+			"integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-duplicate-keys": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+			"integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
+			"integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-dynamic-import": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+			"integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-exponentiation-operator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+			"integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+			"dependencies": {
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-export-namespace-from": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+			"integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-flow-strip-types": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.2.tgz",
+			"integrity": "sha512-InBZ0O8tew5V0K6cHcQ+wgxlrjOw1W4wDXLkOTjLRD8GYhTSkxTVBtdy3MMtvYBrbAWa1Qm3hNoTc1620Yj+Mg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/plugin-syntax-flow": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-for-of": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+			"integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-function-name": {
+			"version": "7.25.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
+			"integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-json-strings": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+			"integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-json-strings": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-literals": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
+			"integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-logical-assignment-operators": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+			"integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-member-expression-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+			"integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-modules-amd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+			"integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-modules-commonjs": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
+			"integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-simple-access": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-modules-systemjs": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
+			"integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-modules-umd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+			"integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+			"integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-new-target": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+			"integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+			"integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-numeric-separator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+			"integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-object-rest-spread": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+			"integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-transform-parameters": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-object-super": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+			"integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-optional-catch-binding": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+			"integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-optional-chaining": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz",
+			"integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-parameters": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+			"integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-private-methods": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz",
+			"integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.25.4",
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-private-property-in-object": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+			"integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-property-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+			"integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-regenerator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+			"integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"regenerator-transform": "^0.15.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-reserved-words": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+			"integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-shorthand-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+			"integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-spread": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+			"integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-sticky-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+			"integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-template-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+			"integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-typeof-symbol": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
+			"integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-typescript": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz",
+			"integrity": "sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-create-class-features-plugin": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/plugin-syntax-typescript": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-unicode-escapes": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+			"integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-unicode-property-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+			"integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-unicode-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+			"integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-unicode-sets-regex": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz",
+			"integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.25.2",
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/preset-env": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz",
+			"integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==",
+			"dependencies": {
+				"@babel/compat-data": "^7.25.4",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-validator-option": "^7.24.8",
+				"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+				"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
+				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-class-properties": "^7.12.13",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+				"@babel/plugin-syntax-import-assertions": "^7.24.7",
+				"@babel/plugin-syntax-import-attributes": "^7.24.7",
+				"@babel/plugin-syntax-import-meta": "^7.10.4",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+				"@babel/plugin-syntax-top-level-await": "^7.14.5",
+				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+				"@babel/plugin-transform-arrow-functions": "^7.24.7",
+				"@babel/plugin-transform-async-generator-functions": "^7.25.4",
+				"@babel/plugin-transform-async-to-generator": "^7.24.7",
+				"@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+				"@babel/plugin-transform-block-scoping": "^7.25.0",
+				"@babel/plugin-transform-class-properties": "^7.25.4",
+				"@babel/plugin-transform-class-static-block": "^7.24.7",
+				"@babel/plugin-transform-classes": "^7.25.4",
+				"@babel/plugin-transform-computed-properties": "^7.24.7",
+				"@babel/plugin-transform-destructuring": "^7.24.8",
+				"@babel/plugin-transform-dotall-regex": "^7.24.7",
+				"@babel/plugin-transform-duplicate-keys": "^7.24.7",
+				"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
+				"@babel/plugin-transform-dynamic-import": "^7.24.7",
+				"@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+				"@babel/plugin-transform-export-namespace-from": "^7.24.7",
+				"@babel/plugin-transform-for-of": "^7.24.7",
+				"@babel/plugin-transform-function-name": "^7.25.1",
+				"@babel/plugin-transform-json-strings": "^7.24.7",
+				"@babel/plugin-transform-literals": "^7.25.2",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+				"@babel/plugin-transform-member-expression-literals": "^7.24.7",
+				"@babel/plugin-transform-modules-amd": "^7.24.7",
+				"@babel/plugin-transform-modules-commonjs": "^7.24.8",
+				"@babel/plugin-transform-modules-systemjs": "^7.25.0",
+				"@babel/plugin-transform-modules-umd": "^7.24.7",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+				"@babel/plugin-transform-new-target": "^7.24.7",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+				"@babel/plugin-transform-numeric-separator": "^7.24.7",
+				"@babel/plugin-transform-object-rest-spread": "^7.24.7",
+				"@babel/plugin-transform-object-super": "^7.24.7",
+				"@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+				"@babel/plugin-transform-optional-chaining": "^7.24.8",
+				"@babel/plugin-transform-parameters": "^7.24.7",
+				"@babel/plugin-transform-private-methods": "^7.25.4",
+				"@babel/plugin-transform-private-property-in-object": "^7.24.7",
+				"@babel/plugin-transform-property-literals": "^7.24.7",
+				"@babel/plugin-transform-regenerator": "^7.24.7",
+				"@babel/plugin-transform-reserved-words": "^7.24.7",
+				"@babel/plugin-transform-shorthand-properties": "^7.24.7",
+				"@babel/plugin-transform-spread": "^7.24.7",
+				"@babel/plugin-transform-sticky-regex": "^7.24.7",
+				"@babel/plugin-transform-template-literals": "^7.24.7",
+				"@babel/plugin-transform-typeof-symbol": "^7.24.8",
+				"@babel/plugin-transform-unicode-escapes": "^7.24.7",
+				"@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+				"@babel/plugin-transform-unicode-regex": "^7.24.7",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.25.4",
+				"@babel/preset-modules": "0.1.6-no-external-plugins",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"core-js-compat": "^3.37.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/preset-env/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/preset-flow": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.7.tgz",
+			"integrity": "sha512-NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-validator-option": "^7.24.7",
+				"@babel/plugin-transform-flow-strip-types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/preset-modules": {
+			"version": "0.1.6-no-external-plugins",
+			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+			"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@babel/types": "^7.4.4",
+				"esutils": "^2.0.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/@babel/preset-typescript": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz",
+			"integrity": "sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-validator-option": "^7.24.7",
+				"@babel/plugin-syntax-jsx": "^7.24.7",
+				"@babel/plugin-transform-modules-commonjs": "^7.24.7",
+				"@babel/plugin-transform-typescript": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/register": {
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/register/-/register-7.24.6.tgz",
+			"integrity": "sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==",
+			"dependencies": {
+				"clone-deep": "^4.0.1",
+				"find-cache-dir": "^2.0.0",
+				"make-dir": "^2.1.0",
+				"pirates": "^4.0.6",
+				"source-map-support": "^0.5.16"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/register/node_modules/find-cache-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+			"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"make-dir": "^2.0.0",
+				"pkg-dir": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"dependencies": {
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"dependencies": {
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/make-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+			"dependencies": {
+				"pify": "^4.0.1",
+				"semver": "^5.6.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@babel/register/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+			"dependencies": {
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/path-exists": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/register/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/pkg-dir": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+			"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+			"dependencies": {
+				"find-up": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@babel/register/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/@babel/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+		},
+		"node_modules/@babel/runtime": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+			"integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+			"dependencies": {
+				"regenerator-runtime": "^0.14.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+			"integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+			"dependencies": {
+				"@babel/code-frame": "^7.24.7",
+				"@babel/parser": "^7.25.0",
+				"@babel/types": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+			"integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+			"dependencies": {
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.6",
+				"@babel/parser": "^7.25.6",
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.6",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+			"integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@discoveryjs/json-ext": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/@esbuild/aix-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-loong64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"cpu": [
+				"loong64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-mips64el": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"cpu": [
+				"mips64el"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-riscv64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-s390x": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/netbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/openbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/sunos-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+			}
+		},
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.11.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+			"integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+			"dev": true,
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+			"integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.6.0",
+				"globals": "^13.19.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@eslint/js": {
+			"version": "8.57.1",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+			"integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/merge": {
+			"version": "8.3.1",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz",
+			"integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==",
+			"dependencies": {
+				"@graphql-tools/utils": "8.9.0",
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/mock": {
+			"version": "8.7.20",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.20.tgz",
+			"integrity": "sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ==",
+			"dependencies": {
+				"@graphql-tools/schema": "^9.0.18",
+				"@graphql-tools/utils": "^9.2.1",
+				"fast-json-stable-stringify": "^2.1.0",
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/mock/node_modules/@graphql-tools/merge": {
+			"version": "8.4.2",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.4.2.tgz",
+			"integrity": "sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw==",
+			"dependencies": {
+				"@graphql-tools/utils": "^9.2.1",
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/mock/node_modules/@graphql-tools/schema": {
+			"version": "9.0.19",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.19.tgz",
+			"integrity": "sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w==",
+			"dependencies": {
+				"@graphql-tools/merge": "^8.4.1",
+				"@graphql-tools/utils": "^9.2.1",
+				"tslib": "^2.4.0",
+				"value-or-promise": "^1.0.12"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/mock/node_modules/@graphql-tools/utils": {
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.2.1.tgz",
+			"integrity": "sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==",
+			"dependencies": {
+				"@graphql-typed-document-node/core": "^3.1.1",
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/mock/node_modules/value-or-promise": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz",
+			"integrity": "sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@graphql-tools/schema": {
+			"version": "8.5.1",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz",
+			"integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==",
+			"dependencies": {
+				"@graphql-tools/merge": "8.3.1",
+				"@graphql-tools/utils": "8.9.0",
+				"tslib": "^2.4.0",
+				"value-or-promise": "1.0.11"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-tools/utils": {
+			"version": "8.9.0",
+			"resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz",
+			"integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@graphql-typed-document-node/core": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz",
+			"integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==",
+			"peerDependencies": {
+				"graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+			}
+		},
+		"node_modules/@hapi/hoek": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+			"integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+		},
+		"node_modules/@hapi/topo": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+			"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+			"dependencies": {
+				"@hapi/hoek": "^9.0.0"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.13.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+			"integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+			"deprecated": "Use @eslint/config-array instead",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^2.0.3",
+				"debug": "^4.3.1",
+				"minimatch": "^3.0.5"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.22"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+			"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+			"deprecated": "Use @eslint/object-schema instead",
+			"dev": true
+		},
+		"node_modules/@intlify/core-base": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.3.tgz",
+			"integrity": "sha512-ysJnTGDtuXPa6R2Ii4JIvfMVvDahUUny3aY8+P4r6/0TYHkblgzIMjV6cAn60em67AB0M7OWNAdcAVfWWeN8Qg==",
+			"dependencies": {
+				"@intlify/message-compiler": "10.0.3",
+				"@intlify/shared": "10.0.3"
+			},
+			"engines": {
+				"node": ">= 16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/kazupon"
+			}
+		},
+		"node_modules/@intlify/message-compiler": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.3.tgz",
+			"integrity": "sha512-KC2fG8nCzSYmXjHptEt6i/xM3k6S2szsPaHDCRgWKEYAbeHe6JFm6X4KRw3Csy112A8CxpavMi1dh3h7khwV5w==",
+			"dependencies": {
+				"@intlify/shared": "10.0.3",
+				"source-map-js": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/kazupon"
+			}
+		},
+		"node_modules/@intlify/shared": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.3.tgz",
+			"integrity": "sha512-PWxrCb6fDlnoGLnXLlWu6d7o/HdWACB9TjRnpLro+9uyfqgWA9hvqg5vekcPRyraTieV5srCbTk/ldYw9V3LHw==",
+			"engines": {
+				"node": ">= 16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/kazupon"
+			}
+		},
+		"node_modules/@josephg/resolvable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz",
+			"integrity": "sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+			"dependencies": {
+				"@jridgewell/set-array": "^1.2.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/source-map": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
+			}
+		},
+		"node_modules/@leichtgewicht/ip-codec": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+			"integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+			"dev": true
+		},
+		"node_modules/@node-ipc/js-queue": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
+			"integrity": "sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==",
+			"dependencies": {
+				"easy-stack": "1.0.1"
+			},
+			"engines": {
+				"node": ">=1.0.0"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@polka/url": {
+			"version": "1.0.0-next.25",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+			"integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+			"dev": true
+		},
+		"node_modules/@protobufjs/aspromise": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+			"integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+		},
+		"node_modules/@protobufjs/base64": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+			"integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+		},
+		"node_modules/@protobufjs/codegen": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+			"integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+		},
+		"node_modules/@protobufjs/eventemitter": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+			"integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+		},
+		"node_modules/@protobufjs/fetch": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+			"integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+			"dependencies": {
+				"@protobufjs/aspromise": "^1.1.1",
+				"@protobufjs/inquire": "^1.1.0"
+			}
+		},
+		"node_modules/@protobufjs/float": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+			"integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+		},
+		"node_modules/@protobufjs/inquire": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+			"integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+		},
+		"node_modules/@protobufjs/path": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+			"integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+		},
+		"node_modules/@protobufjs/pool": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+			"integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+		},
+		"node_modules/@protobufjs/utf8": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+			"integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+		},
+		"node_modules/@rollup/pluginutils": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+			"integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "^1.0.0",
+				"estree-walker": "^2.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			},
+			"peerDependencies": {
+				"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+			},
+			"peerDependenciesMeta": {
+				"rollup": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@rollup/rollup-android-arm-eabi": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+			"integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@rollup/rollup-android-arm64": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+			"integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@rollup/rollup-darwin-arm64": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+			"integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@rollup/rollup-darwin-x64": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+			"integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+			"integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+			"integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm64-gnu": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+			"integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm64-musl": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+			"integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+			"integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+			"integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-s390x-gnu": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+			"integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-x64-gnu": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+			"integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-x64-musl": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+			"integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-win32-arm64-msvc": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+			"integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@rollup/rollup-win32-ia32-msvc": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+			"integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@rollup/rollup-win32-x64-msvc": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+			"integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@sideway/address": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+			"integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
+			"dependencies": {
+				"@hapi/hoek": "^9.0.0"
+			}
+		},
+		"node_modules/@sideway/formula": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
+		},
+		"node_modules/@sideway/pinpoint": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+		},
+		"node_modules/@sindresorhus/is": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+			"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
+			"integrity": "sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^3.0.0",
+				"error-stack-parser": "^2.0.6",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/chalk": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/get-current-script": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz",
+			"integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==",
+			"dev": true
+		},
+		"node_modules/@tanstack/match-sorter-utils": {
+			"version": "8.19.4",
+			"resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.19.4.tgz",
+			"integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
+			"dependencies": {
+				"remove-accents": "0.5.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			}
+		},
+		"node_modules/@tanstack/query-core": {
+			"version": "5.56.2",
+			"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.56.2.tgz",
+			"integrity": "sha512-gor0RI3/R5rVV3gXfddh1MM+hgl0Z4G7tj6Xxpq6p2I03NGPaJ8dITY9Gz05zYYb/EJq9vPas/T4wn9EaDPd4Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			}
+		},
+		"node_modules/@tanstack/query-devtools": {
+			"version": "5.58.0",
+			"resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.58.0.tgz",
+			"integrity": "sha512-iFdQEFXaYYxqgrv63ots+65FGI+tNp5ZS5PdMU1DWisxk3fez5HG3FyVlbUva+RdYS5hSLbxZ9aw3yEs97GNTw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			}
+		},
+		"node_modules/@tanstack/vue-query": {
+			"version": "5.56.2",
+			"resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.56.2.tgz",
+			"integrity": "sha512-VW7qS8JXwC3SZpawJHxQ+mWwWa5WVIQUUOh/OD6WI85eLcbJPg83ezjGupPXGKF9h31gl7CIRrnJDi4g5pK3Jg==",
+			"dependencies": {
+				"@tanstack/match-sorter-utils": "^8.15.1",
+				"@tanstack/query-core": "5.56.2",
+				"@vue/devtools-api": "^6.6.3",
+				"vue-demi": "^0.14.10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.1.2",
+				"vue": "^2.6.0 || ^3.3.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@tanstack/vue-query-devtools": {
+			"version": "5.58.0",
+			"resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.58.0.tgz",
+			"integrity": "sha512-OdCXA7cTt0qkgw87JhLeLdGLmGIXsldXHERZ+Wm2up52H6TqZbWGCs4jvBF3AafiUHl5ibCRoynQ5r114+YPXw==",
+			"dependencies": {
+				"@tanstack/query-devtools": "5.58.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			},
+			"peerDependencies": {
+				"@tanstack/vue-query": "^5.56.2",
+				"vue": "^3.3.0"
+			}
+		},
+		"node_modules/@tanstack/vue-query/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@trysound/sax": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/@types/accepts": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz",
+			"integrity": "sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/body-parser": {
+			"version": "1.19.2",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+			"dependencies": {
+				"@types/connect": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/bonjour": {
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+			"integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/connect": {
+			"version": "3.4.38",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+			"integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/connect-history-api-fallback": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+			"integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+			"dev": true,
+			"dependencies": {
+				"@types/express-serve-static-core": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/cors": {
+			"version": "2.8.12",
+			"resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+			"integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+		},
+		"node_modules/@types/ejs": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
+			"integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="
+		},
+		"node_modules/@types/estree": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+			"dev": true
+		},
+		"node_modules/@types/express": {
+			"version": "4.17.14",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
+			"integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+			"dependencies": {
+				"@types/body-parser": "*",
+				"@types/express-serve-static-core": "^4.17.18",
+				"@types/qs": "*",
+				"@types/serve-static": "*"
+			}
+		},
+		"node_modules/@types/express-serve-static-core": {
+			"version": "4.17.31",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+			"integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+			"dependencies": {
+				"@types/node": "*",
+				"@types/qs": "*",
+				"@types/range-parser": "*"
+			}
+		},
+		"node_modules/@types/html-minifier-terser": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+			"integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+			"dev": true
+		},
+		"node_modules/@types/http-errors": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+			"integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
+		},
+		"node_modules/@types/http-proxy": {
+			"version": "1.17.15",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+			"integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/inquirer": {
+			"version": "8.2.10",
+			"resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz",
+			"integrity": "sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==",
+			"dependencies": {
+				"@types/through": "*",
+				"rxjs": "^7.2.0"
+			}
+		},
+		"node_modules/@types/jscodeshift": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.2.tgz",
+			"integrity": "sha512-k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw==",
+			"dependencies": {
+				"ast-types": "0.12.1",
+				"recast": "0.17.2"
+			}
+		},
+		"node_modules/@types/jscodeshift/node_modules/ast-types": {
+			"version": "0.12.1",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz",
+			"integrity": "sha512-H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@types/jscodeshift/node_modules/recast": {
+			"version": "0.17.2",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.17.2.tgz",
+			"integrity": "sha512-YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg==",
+			"dependencies": {
+				"ast-types": "0.12.1",
+				"esprima": "~4.0.0",
+				"private": "~0.1.5",
+				"source-map": "~0.6.1"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+			"dev": true
+		},
+		"node_modules/@types/long": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+			"integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
+		},
+		"node_modules/@types/mime": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+			"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+		},
+		"node_modules/@types/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+			"dev": true
+		},
+		"node_modules/@types/node": {
+			"version": "22.5.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
+			"integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
+		},
+		"node_modules/@types/node-forge": {
+			"version": "1.3.11",
+			"resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+			"integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+			"integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="
+		},
+		"node_modules/@types/parse-json": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+			"dev": true
+		},
+		"node_modules/@types/qs": {
+			"version": "6.9.15",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
+			"integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg=="
+		},
+		"node_modules/@types/range-parser": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+			"integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
+		},
+		"node_modules/@types/retry": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+			"dev": true
+		},
+		"node_modules/@types/send": {
+			"version": "0.17.4",
+			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+			"integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+			"dependencies": {
+				"@types/mime": "^1",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/serve-index": {
+			"version": "1.9.4",
+			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+			"integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+			"dev": true,
+			"dependencies": {
+				"@types/express": "*"
+			}
+		},
+		"node_modules/@types/serve-static": {
+			"version": "1.15.7",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+			"integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+			"dependencies": {
+				"@types/http-errors": "*",
+				"@types/node": "*",
+				"@types/send": "*"
+			}
+		},
+		"node_modules/@types/sockjs": {
+			"version": "0.3.36",
+			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+			"integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/sortablejs": {
+			"version": "1.15.8",
+			"resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+			"integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+			"dev": true
+		},
+		"node_modules/@types/through": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
+			"integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/uuid": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+			"integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+			"dev": true
+		},
+		"node_modules/@types/webpack-env": {
+			"version": "1.18.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.5.tgz",
+			"integrity": "sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA==",
+			"dev": true
+		},
+		"node_modules/@types/ws": {
+			"version": "8.5.12",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
+			"integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.0.tgz",
+			"integrity": "sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/regexpp": "^4.10.0",
+				"@typescript-eslint/scope-manager": "8.8.0",
+				"@typescript-eslint/type-utils": "8.8.0",
+				"@typescript-eslint/utils": "8.8.0",
+				"@typescript-eslint/visitor-keys": "8.8.0",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.3.1",
+				"natural-compare": "^1.4.0",
+				"ts-api-utils": "^1.3.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+				"eslint": "^8.57.0 || ^9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.0.tgz",
+			"integrity": "sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "8.8.0",
+				"@typescript-eslint/types": "8.8.0",
+				"@typescript-eslint/typescript-estree": "8.8.0",
+				"@typescript-eslint/visitor-keys": "8.8.0",
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz",
+			"integrity": "sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "8.8.0",
+				"@typescript-eslint/visitor-keys": "8.8.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/type-utils": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.0.tgz",
+			"integrity": "sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/typescript-estree": "8.8.0",
+				"@typescript-eslint/utils": "8.8.0",
+				"debug": "^4.3.4",
+				"ts-api-utils": "^1.3.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz",
+			"integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==",
+			"dev": true,
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz",
+			"integrity": "sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "8.8.0",
+				"@typescript-eslint/visitor-keys": "8.8.0",
+				"debug": "^4.3.4",
+				"fast-glob": "^3.3.2",
+				"is-glob": "^4.0.3",
+				"minimatch": "^9.0.4",
+				"semver": "^7.6.0",
+				"ts-api-utils": "^1.3.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/utils": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz",
+			"integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.4.0",
+				"@typescript-eslint/scope-manager": "8.8.0",
+				"@typescript-eslint/types": "8.8.0",
+				"@typescript-eslint/typescript-estree": "8.8.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz",
+			"integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "8.8.0",
+				"eslint-visitor-keys": "^3.4.3"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@ungap/structured-clone": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+			"integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+			"dev": true
+		},
+		"node_modules/@vee-validate/yup": {
+			"version": "4.13.2",
+			"resolved": "https://registry.npmjs.org/@vee-validate/yup/-/yup-4.13.2.tgz",
+			"integrity": "sha512-ai0UL46S3GKO8wxnjTN6ksbxmpRrgOxKZlVO0GVqMAF52ZXW92wcADk5qUtuuW+kWe3cePuK6MH305J+kT9scw==",
+			"dependencies": {
+				"type-fest": "^4.8.3",
+				"vee-validate": "4.13.2",
+				"yup": "^1.3.2"
+			}
+		},
+		"node_modules/@vitejs/plugin-vue": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz",
+			"integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==",
+			"dev": true,
+			"engines": {
+				"node": "^14.18.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"vite": "^4.0.0 || ^5.0.0",
+				"vue": "^3.2.25"
+			}
+		},
+		"node_modules/@volar/language-core": {
+			"version": "2.4.5",
+			"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.5.tgz",
+			"integrity": "sha512-F4tA0DCO5Q1F5mScHmca0umsi2ufKULAnMOVBfMsZdT4myhVl4WdKRwCaKcfOkIEuyrAVvtq1ESBdZ+rSyLVww==",
+			"dev": true,
+			"dependencies": {
+				"@volar/source-map": "2.4.5"
+			}
+		},
+		"node_modules/@volar/source-map": {
+			"version": "2.4.5",
+			"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.5.tgz",
+			"integrity": "sha512-varwD7RaKE2J/Z+Zu6j3mNNJbNT394qIxXwdvz/4ao/vxOfyClZpSDtLKkwWmecinkOVos5+PWkWraelfMLfpw==",
+			"dev": true
+		},
+		"node_modules/@volar/typescript": {
+			"version": "2.4.5",
+			"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.5.tgz",
+			"integrity": "sha512-mcT1mHvLljAEtHviVcBuOyAwwMKz1ibXTi5uYtP/pf4XxoAzpdkQ+Br2IC0NPCvLCbjPZmbf3I0udndkfB1CDg==",
+			"dev": true,
+			"dependencies": {
+				"@volar/language-core": "2.4.5",
+				"path-browserify": "^1.0.1",
+				"vscode-uri": "^3.0.8"
+			}
+		},
+		"node_modules/@vue/cli": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli/-/cli-5.0.8.tgz",
+			"integrity": "sha512-c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA==",
+			"dependencies": {
+				"@types/ejs": "^3.0.6",
+				"@types/inquirer": "^8.1.3",
+				"@vue/cli-shared-utils": "^5.0.8",
+				"@vue/cli-ui": "^5.0.8",
+				"@vue/cli-ui-addon-webpack": "^5.0.8",
+				"@vue/cli-ui-addon-widgets": "^5.0.8",
+				"boxen": "^5.0.0",
+				"commander": "^7.1.0",
+				"debug": "^4.1.0",
+				"deepmerge": "^4.2.2",
+				"download-git-repo": "^3.0.2",
+				"ejs": "^3.1.6",
+				"envinfo": "^7.7.4",
+				"fs-extra": "^9.1.0",
+				"globby": "^11.0.2",
+				"import-global": "^0.1.0",
+				"ini": "^2.0.0",
+				"inquirer": "^8.0.0",
+				"isbinaryfile": "^4.0.6",
+				"javascript-stringify": "^2.0.1",
+				"js-yaml": "^4.0.0",
+				"leven": "^3.1.0",
+				"lodash.clonedeep": "^4.5.0",
+				"lru-cache": "^6.0.0",
+				"minimist": "^1.2.5",
+				"pkg-dir": "^5.0.0",
+				"recast": "^0.20.3",
+				"resolve": "^1.20.0",
+				"shortid": "^2.2.15",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0",
+				"validate-npm-package-name": "^3.0.0",
+				"vue": "^2.6.14",
+				"vue-codemod": "^0.0.5",
+				"yaml-front-matter": "^4.1.0"
+			},
+			"bin": {
+				"vue": "bin/vue.js"
+			},
+			"engines": {
+				"node": "^12.0.0 || >= 14.0.0"
+			}
+		},
+		"node_modules/@vue/cli-overlay": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz",
+			"integrity": "sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ==",
+			"dev": true
+		},
+		"node_modules/@vue/cli-plugin-router": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
+			"integrity": "sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg==",
+			"dev": true,
+			"dependencies": {
+				"@vue/cli-shared-utils": "^5.0.8"
+			},
+			"peerDependencies": {
+				"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
+			}
+		},
+		"node_modules/@vue/cli-plugin-typescript": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.8.tgz",
+			"integrity": "sha512-JKJOwzJshBqsmp4yLBexwVMebOZ4VGJgbnYvmHVxasJOStF2RxwyW28ZF+zIvASGdat4sAUuo/3mAQyVhm7JHg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.12.16",
+				"@types/webpack-env": "^1.15.2",
+				"@vue/cli-shared-utils": "^5.0.8",
+				"babel-loader": "^8.2.2",
+				"fork-ts-checker-webpack-plugin": "^6.4.0",
+				"globby": "^11.0.2",
+				"thread-loader": "^3.0.0",
+				"ts-loader": "^9.2.5",
+				"webpack": "^5.54.0"
+			},
+			"peerDependencies": {
+				"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",
+				"cache-loader": "^4.1.0",
+				"typescript": ">=2",
+				"vue": "^2 || ^3.2.13",
+				"vue-template-compiler": "^2.0.0"
+			},
+			"peerDependenciesMeta": {
+				"cache-loader": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vue/cli-plugin-vuex": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
+			"integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==",
+			"dev": true,
+			"peerDependencies": {
+				"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
+			}
+		},
+		"node_modules/@vue/cli-service": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz",
+			"integrity": "sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.12.16",
+				"@soda/friendly-errors-webpack-plugin": "^1.8.0",
+				"@soda/get-current-script": "^1.0.2",
+				"@types/minimist": "^1.2.0",
+				"@vue/cli-overlay": "^5.0.8",
+				"@vue/cli-plugin-router": "^5.0.8",
+				"@vue/cli-plugin-vuex": "^5.0.8",
+				"@vue/cli-shared-utils": "^5.0.8",
+				"@vue/component-compiler-utils": "^3.3.0",
+				"@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
+				"@vue/web-component-wrapper": "^1.3.0",
+				"acorn": "^8.0.5",
+				"acorn-walk": "^8.0.2",
+				"address": "^1.1.2",
+				"autoprefixer": "^10.2.4",
+				"browserslist": "^4.16.3",
+				"case-sensitive-paths-webpack-plugin": "^2.3.0",
+				"cli-highlight": "^2.1.10",
+				"clipboardy": "^2.3.0",
+				"cliui": "^7.0.4",
+				"copy-webpack-plugin": "^9.0.1",
+				"css-loader": "^6.5.0",
+				"css-minimizer-webpack-plugin": "^3.0.2",
+				"cssnano": "^5.0.0",
+				"debug": "^4.1.1",
+				"default-gateway": "^6.0.3",
+				"dotenv": "^10.0.0",
+				"dotenv-expand": "^5.1.0",
+				"fs-extra": "^9.1.0",
+				"globby": "^11.0.2",
+				"hash-sum": "^2.0.0",
+				"html-webpack-plugin": "^5.1.0",
+				"is-file-esm": "^1.0.0",
+				"launch-editor-middleware": "^2.2.1",
+				"lodash.defaultsdeep": "^4.6.1",
+				"lodash.mapvalues": "^4.6.0",
+				"mini-css-extract-plugin": "^2.5.3",
+				"minimist": "^1.2.5",
+				"module-alias": "^2.2.2",
+				"portfinder": "^1.0.26",
+				"postcss": "^8.2.6",
+				"postcss-loader": "^6.1.1",
+				"progress-webpack-plugin": "^1.0.12",
+				"ssri": "^8.0.1",
+				"terser-webpack-plugin": "^5.1.1",
+				"thread-loader": "^3.0.0",
+				"vue-loader": "^17.0.0",
+				"vue-style-loader": "^4.1.3",
+				"webpack": "^5.54.0",
+				"webpack-bundle-analyzer": "^4.4.0",
+				"webpack-chain": "^6.5.1",
+				"webpack-dev-server": "^4.7.3",
+				"webpack-merge": "^5.7.3",
+				"webpack-virtual-modules": "^0.4.2",
+				"whatwg-fetch": "^3.6.2"
+			},
+			"bin": {
+				"vue-cli-service": "bin/vue-cli-service.js"
+			},
+			"engines": {
+				"node": "^12.0.0 || >= 14.0.0"
+			},
+			"peerDependencies": {
+				"vue-template-compiler": "^2.0.0",
+				"webpack-sources": "*"
+			},
+			"peerDependenciesMeta": {
+				"cache-loader": {
+					"optional": true
+				},
+				"less-loader": {
+					"optional": true
+				},
+				"pug-plain-loader": {
+					"optional": true
+				},
+				"raw-loader": {
+					"optional": true
+				},
+				"sass-loader": {
+					"optional": true
+				},
+				"stylus-loader": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
+				},
+				"webpack-sources": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vue/cli-shared-utils": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
+			"integrity": "sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ==",
+			"dependencies": {
+				"@achrinza/node-ipc": "^9.2.5",
+				"chalk": "^4.1.2",
+				"execa": "^1.0.0",
+				"joi": "^17.4.0",
+				"launch-editor": "^2.2.1",
+				"lru-cache": "^6.0.0",
+				"node-fetch": "^2.6.7",
+				"open": "^8.0.2",
+				"ora": "^5.3.0",
+				"read-pkg": "^5.1.1",
+				"semver": "^7.3.4",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@vue/cli-shared-utils/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@vue/cli-ui": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.8.tgz",
+			"integrity": "sha512-1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA==",
+			"dependencies": {
+				"@achrinza/node-ipc": "^9.2.5",
+				"@akryum/winattr": "^3.0.0",
+				"@graphql-tools/schema": "^8.5.0",
+				"@vue/cli-shared-utils": "^5.0.8",
+				"apollo-server-express": "^3.9.0",
+				"clone": "^2.1.1",
+				"deepmerge": "^4.2.2",
+				"express": "^4.17.1",
+				"express-history-api-fallback": "^2.2.1",
+				"fkill": "^7.1.0",
+				"fs-extra": "^9.1.0",
+				"globby": "^11.0.2",
+				"graphql": "^15.5.0",
+				"graphql-subscriptions": "^1.2.0",
+				"graphql-tag": "^2.10.3",
+				"graphql-type-json": "^0.3.1",
+				"javascript-stringify": "^2.0.1",
+				"js-yaml": "^4.0.0",
+				"lodash.merge": "^4.6.1",
+				"lowdb": "^1.0.0",
+				"lru-cache": "^6.0.0",
+				"node-notifier": "^10.0.0",
+				"parse-git-config": "^3.0.0",
+				"portfinder": "^1.0.26",
+				"prismjs": "^1.23.0",
+				"rss-parser": "^3.11.0",
+				"shortid": "^2.2.15",
+				"subscriptions-transport-ws": "^0.11.0",
+				"typescript": "~4.5.5"
+			},
+			"engines": {
+				"node": "^12.0.0 || >= 14.0.0"
+			}
+		},
+		"node_modules/@vue/cli-ui-addon-webpack": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz",
+			"integrity": "sha512-sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow=="
+		},
+		"node_modules/@vue/cli-ui-addon-widgets": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz",
+			"integrity": "sha512-jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="
+		},
+		"node_modules/@vue/cli-ui/node_modules/typescript": {
+			"version": "4.5.5",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
+			"integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/@vue/cli/node_modules/@vue/compiler-sfc": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+			"integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+			"dependencies": {
+				"@babel/parser": "^7.23.5",
+				"postcss": "^8.4.14",
+				"source-map": "^0.6.1"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
+			}
+		},
+		"node_modules/@vue/cli/node_modules/prettier": {
+			"version": "2.8.8",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+			"optional": true,
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/@vue/cli/node_modules/vue": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+			"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+			"dependencies": {
+				"@vue/compiler-sfc": "2.7.16",
+				"csstype": "^3.1.0"
+			}
+		},
+		"node_modules/@vue/compiler-core": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz",
+			"integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==",
+			"dependencies": {
+				"@babel/parser": "^7.25.3",
+				"@vue/shared": "3.5.8",
+				"entities": "^4.5.0",
+				"estree-walker": "^2.0.2",
+				"source-map-js": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/compiler-core/node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/@vue/compiler-dom": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz",
+			"integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==",
+			"dependencies": {
+				"@vue/compiler-core": "3.5.8",
+				"@vue/shared": "3.5.8"
+			}
+		},
+		"node_modules/@vue/compiler-sfc": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.8.tgz",
+			"integrity": "sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==",
+			"dependencies": {
+				"@babel/parser": "^7.25.3",
+				"@vue/compiler-core": "3.5.8",
+				"@vue/compiler-dom": "3.5.8",
+				"@vue/compiler-ssr": "3.5.8",
+				"@vue/shared": "3.5.8",
+				"estree-walker": "^2.0.2",
+				"magic-string": "^0.30.11",
+				"postcss": "^8.4.47",
+				"source-map-js": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/compiler-ssr": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.8.tgz",
+			"integrity": "sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==",
+			"dependencies": {
+				"@vue/compiler-dom": "3.5.8",
+				"@vue/shared": "3.5.8"
+			}
+		},
+		"node_modules/@vue/compiler-vue2": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz",
+			"integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==",
+			"dev": true,
+			"dependencies": {
+				"de-indent": "^1.0.2",
+				"he": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/component-compiler-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+			"dev": true,
+			"dependencies": {
+				"consolidate": "^0.15.1",
+				"hash-sum": "^1.0.2",
+				"lru-cache": "^4.1.2",
+				"merge-source-map": "^1.1.0",
+				"postcss": "^7.0.36",
+				"postcss-selector-parser": "^6.0.2",
+				"source-map": "~0.6.1",
+				"vue-template-es2015-compiler": "^1.9.0"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
+			}
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"dev": true
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"dev": true,
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+			"dev": true
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/postcss": {
+			"version": "7.0.39",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+			"dev": true,
+			"dependencies": {
+				"picocolors": "^0.2.1",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			}
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/prettier": {
+			"version": "2.8.8",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+			"dev": true,
+			"optional": true,
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+			"dev": true
+		},
+		"node_modules/@vue/devtools-api": {
+			"version": "6.6.3",
+			"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz",
+			"integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw=="
+		},
+		"node_modules/@vue/language-core": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.6.tgz",
+			"integrity": "sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==",
+			"dev": true,
+			"dependencies": {
+				"@volar/language-core": "~2.4.1",
+				"@vue/compiler-dom": "^3.4.0",
+				"@vue/compiler-vue2": "^2.7.16",
+				"@vue/shared": "^3.4.0",
+				"computeds": "^0.0.1",
+				"minimatch": "^9.0.3",
+				"muggle-string": "^0.4.1",
+				"path-browserify": "^1.0.1"
+			},
+			"peerDependencies": {
+				"typescript": "*"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vue/reactivity": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.8.tgz",
+			"integrity": "sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==",
+			"dependencies": {
+				"@vue/shared": "3.5.8"
+			}
+		},
+		"node_modules/@vue/runtime-core": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.8.tgz",
+			"integrity": "sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==",
+			"dependencies": {
+				"@vue/reactivity": "3.5.8",
+				"@vue/shared": "3.5.8"
+			}
+		},
+		"node_modules/@vue/runtime-dom": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.8.tgz",
+			"integrity": "sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==",
+			"dependencies": {
+				"@vue/reactivity": "3.5.8",
+				"@vue/runtime-core": "3.5.8",
+				"@vue/shared": "3.5.8",
+				"csstype": "^3.1.3"
+			}
+		},
+		"node_modules/@vue/server-renderer": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.8.tgz",
+			"integrity": "sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==",
+			"dependencies": {
+				"@vue/compiler-ssr": "3.5.8",
+				"@vue/shared": "3.5.8"
+			},
+			"peerDependencies": {
+				"vue": "3.5.8"
+			}
+		},
+		"node_modules/@vue/shared": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz",
+			"integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A=="
+		},
+		"node_modules/@vue/vue-loader-v15": {
+			"name": "vue-loader",
+			"version": "15.11.1",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+			"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+			"dev": true,
+			"dependencies": {
+				"@vue/component-compiler-utils": "^3.1.0",
+				"hash-sum": "^1.0.2",
+				"loader-utils": "^1.1.0",
+				"vue-hot-reload-api": "^2.3.0",
+				"vue-style-loader": "^4.1.0"
+			},
+			"peerDependencies": {
+				"css-loader": "*",
+				"webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
+			},
+			"peerDependenciesMeta": {
+				"cache-loader": {
+					"optional": true
+				},
+				"prettier": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vue/vue-loader-v15/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"dev": true
+		},
+		"node_modules/@vue/web-component-wrapper": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
+			"integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+			"integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/helper-numbers": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+			"integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-numbers": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+			"integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/wasm-gen": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+			"dev": true,
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
+		},
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+			"dev": true,
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+			"integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/helper-wasm-section": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-opt": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1",
+				"@webassemblyjs/wast-printer": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+			"integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+			"integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+			"integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+			"integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@xtuc/ieee754": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+			"dev": true
+		},
+		"node_modules/@xtuc/long": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+			"dev": true
+		},
+		"node_modules/accepts": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+			"dependencies": {
+				"mime-types": "~2.1.34",
+				"negotiator": "0.6.3"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/acorn": {
+			"version": "8.12.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+			"integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-import-attributes": {
+			"version": "1.9.5",
+			"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+			"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^8"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "8.3.3",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
+			"integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.11.0"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/address": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+			"integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/aggregate-error": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+			"dependencies": {
+				"clean-stack": "^2.0.0",
+				"indent-string": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ajv-formats/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"dev": true,
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/ansi-align": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+			"integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
+			"dependencies": {
+				"string-width": "^4.1.0"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-escapes/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-html-community": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+			"dev": true,
+			"engines": [
+				"node >= 0.8.0"
+			],
+			"bin": {
+				"ansi-html": "bin/ansi-html"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/any-promise": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+			"integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+			"dev": true
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/apollo-datasource": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.3.2.tgz",
+			"integrity": "sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg==",
+			"deprecated": "The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"dependencies": {
+				"@apollo/utils.keyvaluecache": "^1.0.1",
+				"apollo-server-env": "^4.2.1"
+			},
+			"engines": {
+				"node": ">=12.0"
+			}
+		},
+		"node_modules/apollo-reporting-protobuf": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz",
+			"integrity": "sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog==",
+			"deprecated": "The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"dependencies": {
+				"@apollo/protobufjs": "1.2.6"
+			}
+		},
+		"node_modules/apollo-reporting-protobuf/node_modules/@apollo/protobufjs": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.6.tgz",
+			"integrity": "sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw==",
+			"hasInstallScript": true,
+			"dependencies": {
+				"@protobufjs/aspromise": "^1.1.2",
+				"@protobufjs/base64": "^1.1.2",
+				"@protobufjs/codegen": "^2.0.4",
+				"@protobufjs/eventemitter": "^1.1.0",
+				"@protobufjs/fetch": "^1.1.0",
+				"@protobufjs/float": "^1.0.2",
+				"@protobufjs/inquire": "^1.1.0",
+				"@protobufjs/path": "^1.1.2",
+				"@protobufjs/pool": "^1.1.0",
+				"@protobufjs/utf8": "^1.1.0",
+				"@types/long": "^4.0.0",
+				"@types/node": "^10.1.0",
+				"long": "^4.0.0"
+			},
+			"bin": {
+				"apollo-pbjs": "bin/pbjs",
+				"apollo-pbts": "bin/pbts"
+			}
+		},
+		"node_modules/apollo-reporting-protobuf/node_modules/@types/node": {
+			"version": "10.17.60",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+			"integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="
+		},
+		"node_modules/apollo-server-core": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.13.0.tgz",
+			"integrity": "sha512-v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg==",
+			"dependencies": {
+				"@apollo/utils.keyvaluecache": "^1.0.1",
+				"@apollo/utils.logger": "^1.0.0",
+				"@apollo/utils.usagereporting": "^1.0.0",
+				"@apollographql/apollo-tools": "^0.5.3",
+				"@apollographql/graphql-playground-html": "1.6.29",
+				"@graphql-tools/mock": "^8.1.2",
+				"@graphql-tools/schema": "^8.0.0",
+				"@josephg/resolvable": "^1.0.0",
+				"apollo-datasource": "^3.3.2",
+				"apollo-reporting-protobuf": "^3.4.0",
+				"apollo-server-env": "^4.2.1",
+				"apollo-server-errors": "^3.3.1",
+				"apollo-server-plugin-base": "^3.7.2",
+				"apollo-server-types": "^3.8.0",
+				"async-retry": "^1.2.1",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graphql-tag": "^2.11.0",
+				"loglevel": "^1.6.8",
+				"lru-cache": "^6.0.0",
+				"node-abort-controller": "^3.0.1",
+				"sha.js": "^2.4.11",
+				"uuid": "^9.0.0",
+				"whatwg-mimetype": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"graphql": "^15.3.0 || ^16.0.0"
+			}
+		},
+		"node_modules/apollo-server-env": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz",
+			"integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==",
+			"deprecated": "The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"dependencies": {
+				"node-fetch": "^2.6.7"
+			},
+			"engines": {
+				"node": ">=12.0"
+			}
+		},
+		"node_modules/apollo-server-errors": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz",
+			"integrity": "sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==",
+			"deprecated": "The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"graphql": "^15.3.0 || ^16.0.0"
+			}
+		},
+		"node_modules/apollo-server-express": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.13.0.tgz",
+			"integrity": "sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g==",
+			"dependencies": {
+				"@types/accepts": "^1.3.5",
+				"@types/body-parser": "1.19.2",
+				"@types/cors": "2.8.12",
+				"@types/express": "4.17.14",
+				"@types/express-serve-static-core": "4.17.31",
+				"accepts": "^1.3.5",
+				"apollo-server-core": "^3.13.0",
+				"apollo-server-types": "^3.8.0",
+				"body-parser": "^1.19.0",
+				"cors": "^2.8.5",
+				"parseurl": "^1.3.3"
+			},
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"express": "^4.17.1",
+				"graphql": "^15.3.0 || ^16.0.0"
+			}
+		},
+		"node_modules/apollo-server-plugin-base": {
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz",
+			"integrity": "sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw==",
+			"deprecated": "The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"dependencies": {
+				"apollo-server-types": "^3.8.0"
+			},
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"graphql": "^15.3.0 || ^16.0.0"
+			}
+		},
+		"node_modules/apollo-server-types": {
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.8.0.tgz",
+			"integrity": "sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A==",
+			"deprecated": "The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+			"dependencies": {
+				"@apollo/utils.keyvaluecache": "^1.0.1",
+				"@apollo/utils.logger": "^1.0.0",
+				"apollo-reporting-protobuf": "^3.4.0",
+				"apollo-server-env": "^4.2.1"
+			},
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"graphql": "^15.3.0 || ^16.0.0"
+			}
+		},
+		"node_modules/arch": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+			"integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/archive-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
+			"integrity": "sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==",
+			"dependencies": {
+				"file-type": "^4.2.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/archive-type/node_modules/file-type": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+			"integrity": "sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+		},
+		"node_modules/arr-diff": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+			"integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/arr-flatten": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/arr-union": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+			"integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-flatten": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+		},
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/array-unique": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+			"integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/arrify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+			"integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/assign-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+			"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ast-types": {
+			"version": "0.14.2",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
+			"integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+			"dependencies": {
+				"tslib": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/async": {
+			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
+		},
+		"node_modules/async-retry": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
+			"integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
+			"dependencies": {
+				"retry": "0.13.1"
+			}
+		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+		},
+		"node_modules/at-least-node": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/atob": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+			"bin": {
+				"atob": "bin/atob.js"
+			},
+			"engines": {
+				"node": ">= 4.5.0"
+			}
+		},
+		"node_modules/autoprefixer": {
+			"version": "10.4.20",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+			"integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/autoprefixer"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"browserslist": "^4.23.3",
+				"caniuse-lite": "^1.0.30001646",
+				"fraction.js": "^4.3.7",
+				"normalize-range": "^0.1.2",
+				"picocolors": "^1.0.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"bin": {
+				"autoprefixer": "bin/autoprefixer"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/axios": {
+			"version": "1.7.7",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+			"integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+			"dependencies": {
+				"follow-redirects": "^1.15.6",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
+			}
+		},
+		"node_modules/babel-core": {
+			"version": "7.0.0-bridge.0",
+			"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
+			"integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/babel-loader": {
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+			"dev": true,
+			"dependencies": {
+				"find-cache-dir": "^3.3.1",
+				"loader-utils": "^2.0.0",
+				"make-dir": "^3.1.0",
+				"schema-utils": "^2.6.5"
+			},
+			"engines": {
+				"node": ">= 8.9"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0",
+				"webpack": ">=2"
+			}
+		},
+		"node_modules/babel-loader/node_modules/loader-utils": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+			"dev": true,
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs2": {
+			"version": "0.4.11",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+			"integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+			"dependencies": {
+				"@babel/compat-data": "^7.22.6",
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"semver": "^6.3.1"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs3": {
+			"version": "0.10.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+			"integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"core-js-compat": "^3.38.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-regenerator": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+			"integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.6.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/backo2": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+			"integrity": "sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+		},
+		"node_modules/base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"dependencies": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/batch": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+			"dev": true
+		},
+		"node_modules/big.js": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/binary-extensions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bluebird": {
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+			"dev": true
+		},
+		"node_modules/body-parser": {
+			"version": "1.20.2",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+			"dependencies": {
+				"bytes": "3.1.2",
+				"content-type": "~1.0.5",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"on-finished": "2.4.1",
+				"qs": "6.11.0",
+				"raw-body": "2.5.2",
+				"type-is": "~1.6.18",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
+		},
+		"node_modules/body-parser/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/body-parser/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/bonjour-service": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+			"integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"multicast-dns": "^7.2.5"
+			}
+		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+			"dev": true
+		},
+		"node_modules/boxen": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
+			"integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
+			"dependencies": {
+				"ansi-align": "^3.0.0",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.1.0",
+				"cli-boxes": "^2.2.1",
+				"string-width": "^4.2.2",
+				"type-fest": "^0.20.2",
+				"widest-line": "^3.1.0",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/boxen/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/boxen/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/boxen/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/boxen/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/boxen/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/boxen/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/boxen/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"dependencies": {
+				"fill-range": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browserslist": {
+			"version": "4.23.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+			"integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001646",
+				"electron-to-chromium": "^1.5.4",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.0"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			}
+		},
+		"node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"node_modules/buffer-alloc": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+			"dependencies": {
+				"buffer-alloc-unsafe": "^1.1.0",
+				"buffer-fill": "^1.0.0"
+			}
+		},
+		"node_modules/buffer-alloc-unsafe": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+		},
+		"node_modules/buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/buffer-fill": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+			"integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+		},
+		"node_modules/builtins": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+			"integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="
+		},
+		"node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/cache-base": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"dependencies": {
+				"collection-visit": "^1.0.0",
+				"component-emitter": "^1.2.1",
+				"get-value": "^2.0.6",
+				"has-value": "^1.0.0",
+				"isobject": "^3.0.1",
+				"set-value": "^2.0.0",
+				"to-object-path": "^0.3.0",
+				"union-value": "^1.0.0",
+				"unset-value": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cacheable-request": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+			"integrity": "sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==",
+			"dependencies": {
+				"clone-response": "1.0.2",
+				"get-stream": "3.0.0",
+				"http-cache-semantics": "3.8.1",
+				"keyv": "3.0.0",
+				"lowercase-keys": "1.0.0",
+				"normalize-url": "2.0.1",
+				"responselike": "1.0.2"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/json-buffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+			"integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
+		},
+		"node_modules/cacheable-request/node_modules/keyv": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+			"integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+			"dependencies": {
+				"json-buffer": "3.0.0"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/lowercase-keys": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+			"integrity": "sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/call-bind": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camel-case": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+			"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+			"dev": true,
+			"dependencies": {
+				"pascal-case": "^3.1.2",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/caniuse-api": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"caniuse-lite": "^1.0.0",
+				"lodash.memoize": "^4.1.2",
+				"lodash.uniq": "^4.5.0"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001655",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
+			"integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			]
+		},
+		"node_modules/case-sensitive-paths-webpack-plugin": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
+			"integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/caw": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+			"integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+			"dependencies": {
+				"get-proxy": "^2.0.0",
+				"isurl": "^1.0.0-alpha5",
+				"tunnel-agent": "^0.6.0",
+				"url-to-options": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/chardet": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+		},
+		"node_modules/chokidar": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+			"dependencies": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			},
+			"engines": {
+				"node": ">= 8.10.0"
+			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/chokidar/node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/chrome-trace-event": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
+		"node_modules/class-utils": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+			"dependencies": {
+				"arr-union": "^3.1.0",
+				"define-property": "^0.2.5",
+				"isobject": "^3.0.0",
+				"static-extend": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/class-utils/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/class-utils/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/clean-css": {
+			"version": "5.3.3",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+			"integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+			"dev": true,
+			"dependencies": {
+				"source-map": "~0.6.0"
+			},
+			"engines": {
+				"node": ">= 10.0"
+			}
+		},
+		"node_modules/clean-stack": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/cli-boxes": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+			"integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/cli-cursor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+			"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+			"dependencies": {
+				"restore-cursor": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cli-highlight": {
+			"version": "2.1.11",
+			"resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
+			"integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"highlight.js": "^10.7.1",
+				"mz": "^2.4.0",
+				"parse5": "^5.1.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.0",
+				"yargs": "^16.0.0"
+			},
+			"bin": {
+				"highlight": "bin/highlight"
+			},
+			"engines": {
+				"node": ">=8.0.0",
+				"npm": ">=5.0.0"
+			}
+		},
+		"node_modules/cli-highlight/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/cli-highlight/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/cli-highlight/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/cli-highlight/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/cli-highlight/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cli-highlight/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cli-spinners": {
+			"version": "2.9.2",
+			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+			"integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/cli-width": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+			"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/clipboardy": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
+			"integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
+			"dev": true,
+			"dependencies": {
+				"arch": "^2.1.1",
+				"execa": "^1.0.0",
+				"is-wsl": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/clone-deep": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+			"dependencies": {
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/clone-response": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+			"integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
+			"dependencies": {
+				"mimic-response": "^1.0.0"
+			}
+		},
+		"node_modules/collection-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+			"integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+			"dependencies": {
+				"map-visit": "^1.0.0",
+				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+		},
+		"node_modules/colord": {
+			"version": "2.9.3",
+			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+			"dev": true
+		},
+		"node_modules/colorette": {
+			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+			"dev": true
+		},
+		"node_modules/colors": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+			"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+		},
+		"node_modules/component-emitter": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+			"integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/compressible": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": ">= 1.43.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/compression": {
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+			"dev": true,
+			"dependencies": {
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.16",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.2",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/compression/node_modules/bytes": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/compression/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/compression/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/compression/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/computeds": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz",
+			"integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
+			"dev": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+		},
+		"node_modules/confbox": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+			"integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+			"dev": true
+		},
+		"node_modules/config-chain": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+			"integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+			"dependencies": {
+				"ini": "^1.3.4",
+				"proto-list": "~1.2.1"
+			}
+		},
+		"node_modules/config-chain/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+		},
+		"node_modules/connect-history-api-fallback": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/consolidate": {
+			"version": "0.15.1",
+			"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+			"integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+			"deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
+			"dev": true,
+			"dependencies": {
+				"bluebird": "^3.1.1"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/content-disposition": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+			"dependencies": {
+				"safe-buffer": "5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/content-type": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+		},
+		"node_modules/cookie": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+		},
+		"node_modules/copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/copy-webpack-plugin": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
+			"integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
+			"dev": true,
+			"dependencies": {
+				"fast-glob": "^3.2.7",
+				"glob-parent": "^6.0.1",
+				"globby": "^11.0.3",
+				"normalize-path": "^3.0.0",
+				"schema-utils": "^3.1.1",
+				"serialize-javascript": "^6.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/core-js-compat": {
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+			"integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+			"dependencies": {
+				"browserslist": "^4.23.3"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+		},
+		"node_modules/cors": {
+			"version": "2.8.5",
+			"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+			"integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+			"dependencies": {
+				"object-assign": "^4",
+				"vary": "^1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/cosmiconfig": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+			"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+			"dev": true,
+			"dependencies": {
+				"@types/parse-json": "^4.0.0",
+				"import-fresh": "^3.1.0",
+				"parse-json": "^5.0.0",
+				"path-type": "^4.0.0",
+				"yaml": "^1.7.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/css-declaration-sorter": {
+			"version": "6.4.1",
+			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+			"integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.9"
+			}
+		},
+		"node_modules/css-loader": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+			"integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+			"dev": true,
+			"dependencies": {
+				"icss-utils": "^5.1.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
+				"postcss-modules-values": "^4.0.0",
+				"postcss-value-parser": "^4.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/css-minimizer-webpack-plugin": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+			"integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
+			"dev": true,
+			"dependencies": {
+				"cssnano": "^5.0.6",
+				"jest-worker": "^27.0.2",
+				"postcss": "^8.3.5",
+				"schema-utils": "^4.0.0",
+				"serialize-javascript": "^6.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@parcel/css": {
+					"optional": true
+				},
+				"clean-css": {
+					"optional": true
+				},
+				"csso": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/css-tree": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.14",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"dev": true,
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cssfilter": {
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+			"integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
+		},
+		"node_modules/cssnano": {
+			"version": "5.1.15",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+			"integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+			"dev": true,
+			"dependencies": {
+				"cssnano-preset-default": "^5.2.14",
+				"lilconfig": "^2.0.3",
+				"yaml": "^1.10.2"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/cssnano"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/cssnano-preset-default": {
+			"version": "5.2.14",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+			"integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+			"dev": true,
+			"dependencies": {
+				"css-declaration-sorter": "^6.3.1",
+				"cssnano-utils": "^3.1.0",
+				"postcss-calc": "^8.2.3",
+				"postcss-colormin": "^5.3.1",
+				"postcss-convert-values": "^5.1.3",
+				"postcss-discard-comments": "^5.1.2",
+				"postcss-discard-duplicates": "^5.1.0",
+				"postcss-discard-empty": "^5.1.1",
+				"postcss-discard-overridden": "^5.1.0",
+				"postcss-merge-longhand": "^5.1.7",
+				"postcss-merge-rules": "^5.1.4",
+				"postcss-minify-font-values": "^5.1.0",
+				"postcss-minify-gradients": "^5.1.1",
+				"postcss-minify-params": "^5.1.4",
+				"postcss-minify-selectors": "^5.2.1",
+				"postcss-normalize-charset": "^5.1.0",
+				"postcss-normalize-display-values": "^5.1.0",
+				"postcss-normalize-positions": "^5.1.1",
+				"postcss-normalize-repeat-style": "^5.1.1",
+				"postcss-normalize-string": "^5.1.0",
+				"postcss-normalize-timing-functions": "^5.1.0",
+				"postcss-normalize-unicode": "^5.1.1",
+				"postcss-normalize-url": "^5.1.0",
+				"postcss-normalize-whitespace": "^5.1.1",
+				"postcss-ordered-values": "^5.1.3",
+				"postcss-reduce-initial": "^5.1.2",
+				"postcss-reduce-transforms": "^5.1.0",
+				"postcss-svgo": "^5.1.0",
+				"postcss-unique-selectors": "^5.1.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/cssnano-utils": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/csso": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+			"dev": true,
+			"dependencies": {
+				"css-tree": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/csstype": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+		},
+		"node_modules/de-indent": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+			"dev": true
+		},
+		"node_modules/debounce": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+			"integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+			"dev": true
+		},
+		"node_modules/debug": {
+			"version": "4.3.6",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+			"integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decode-uri-component": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/decompress": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
+			"integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+			"dependencies": {
+				"decompress-tar": "^4.0.0",
+				"decompress-tarbz2": "^4.0.0",
+				"decompress-targz": "^4.0.0",
+				"decompress-unzip": "^4.0.1",
+				"graceful-fs": "^4.1.10",
+				"make-dir": "^1.0.0",
+				"pify": "^2.3.0",
+				"strip-dirs": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-response": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+			"integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
+			"dependencies": {
+				"mimic-response": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tar": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+			"integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+			"dependencies": {
+				"file-type": "^5.2.0",
+				"is-stream": "^1.1.0",
+				"tar-stream": "^1.5.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tar/node_modules/file-type": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+			"integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tarbz2": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+			"integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+			"dependencies": {
+				"decompress-tar": "^4.1.0",
+				"file-type": "^6.1.0",
+				"is-stream": "^1.1.0",
+				"seek-bzip": "^1.0.5",
+				"unbzip2-stream": "^1.0.9"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tarbz2/node_modules/file-type": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+			"integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-targz": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+			"integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+			"dependencies": {
+				"decompress-tar": "^4.1.1",
+				"file-type": "^5.2.0",
+				"is-stream": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-targz/node_modules/file-type": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+			"integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-unzip": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+			"integrity": "sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==",
+			"dependencies": {
+				"file-type": "^3.8.0",
+				"get-stream": "^2.2.0",
+				"pify": "^2.3.0",
+				"yauzl": "^2.4.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/file-type": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+			"integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/get-stream": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+			"integrity": "sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==",
+			"dependencies": {
+				"object-assign": "^4.0.1",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress/node_modules/make-dir/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/deepmerge": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/default-gateway": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+			"dev": true,
+			"dependencies": {
+				"execa": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/default-gateway/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/default-gateway/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/default-gateway/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/default-gateway/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/defaults": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+			"integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+			"dependencies": {
+				"clone": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/defaults/node_modules/clone": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+			"integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/define-lazy-prop": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/define-property": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+			"dependencies": {
+				"is-descriptor": "^1.0.2",
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/depd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/destroy": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
+		},
+		"node_modules/detect-node": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+			"dev": true
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/dns-packet": {
+			"version": "5.6.1",
+			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+			"integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+			"dev": true,
+			"dependencies": {
+				"@leichtgewicht/ip-codec": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/dom-converter": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+			"dev": true,
+			"dependencies": {
+				"utila": "~0.4"
+			}
+		},
+		"node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domhandler": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/dot-case": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+			"integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+			"dev": true,
+			"dependencies": {
+				"no-case": "^3.0.4",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/dotenv": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+			"integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/dotenv-expand": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+			"dev": true
+		},
+		"node_modules/download": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
+			"integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+			"dependencies": {
+				"archive-type": "^4.0.0",
+				"caw": "^2.0.1",
+				"content-disposition": "^0.5.2",
+				"decompress": "^4.2.0",
+				"ext-name": "^5.0.0",
+				"file-type": "^8.1.0",
+				"filenamify": "^2.0.0",
+				"get-stream": "^3.0.0",
+				"got": "^8.3.1",
+				"make-dir": "^1.2.0",
+				"p-event": "^2.1.0",
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/download-git-repo": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/download-git-repo/-/download-git-repo-3.0.2.tgz",
+			"integrity": "sha512-N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg==",
+			"dependencies": {
+				"download": "^7.1.0",
+				"git-clone": "^0.1.0",
+				"rimraf": "^3.0.0"
+			}
+		},
+		"node_modules/download/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/duplexer": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+			"dev": true
+		},
+		"node_modules/duplexer3": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
+			"integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="
+		},
+		"node_modules/easy-stack": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz",
+			"integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/ee-first": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+		},
+		"node_modules/ejs": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+			"dependencies": {
+				"jake": "^10.8.5"
+			},
+			"bin": {
+				"ejs": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.5.13",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
+			"integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q=="
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+		},
+		"node_modules/emojis-list": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dependencies": {
+				"once": "^1.4.0"
+			}
+		},
+		"node_modules/enhanced-resolve": {
+			"version": "5.17.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.4",
+				"tapable": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/enhanced-resolve/node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/envinfo": {
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
+			"integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
+			"bin": {
+				"envinfo": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/error-stack-parser": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+			"integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+			"dev": true,
+			"dependencies": {
+				"stackframe": "^1.3.4"
+			}
+		},
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-module-lexer": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+			"dev": true
+		},
+		"node_modules/esbuild": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.21.5",
+				"@esbuild/android-arm": "0.21.5",
+				"@esbuild/android-arm64": "0.21.5",
+				"@esbuild/android-x64": "0.21.5",
+				"@esbuild/darwin-arm64": "0.21.5",
+				"@esbuild/darwin-x64": "0.21.5",
+				"@esbuild/freebsd-arm64": "0.21.5",
+				"@esbuild/freebsd-x64": "0.21.5",
+				"@esbuild/linux-arm": "0.21.5",
+				"@esbuild/linux-arm64": "0.21.5",
+				"@esbuild/linux-ia32": "0.21.5",
+				"@esbuild/linux-loong64": "0.21.5",
+				"@esbuild/linux-mips64el": "0.21.5",
+				"@esbuild/linux-ppc64": "0.21.5",
+				"@esbuild/linux-riscv64": "0.21.5",
+				"@esbuild/linux-s390x": "0.21.5",
+				"@esbuild/linux-x64": "0.21.5",
+				"@esbuild/netbsd-x64": "0.21.5",
+				"@esbuild/openbsd-x64": "0.21.5",
+				"@esbuild/sunos-x64": "0.21.5",
+				"@esbuild/win32-arm64": "0.21.5",
+				"@esbuild/win32-ia32": "0.21.5",
+				"@esbuild/win32-x64": "0.21.5"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "8.57.1",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+			"integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.6.1",
+				"@eslint/eslintrc": "^2.1.4",
+				"@eslint/js": "8.57.1",
+				"@humanwhocodes/config-array": "^0.13.0",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
+				"@ungap/structured-clone": "^1.2.0",
+				"ajv": "^6.12.4",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.2.2",
+				"eslint-visitor-keys": "^3.4.3",
+				"espree": "^9.6.1",
+				"esquery": "^1.4.2",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.2.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.1.2",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.3",
+				"strip-ansi": "^6.0.1",
+				"text-table": "^0.2.0"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-config-prettier": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+			"integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+			"dev": true,
+			"bin": {
+				"eslint-config-prettier": "bin/cli.js"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-vue": {
+			"version": "9.28.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz",
+			"integrity": "sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.4.0",
+				"globals": "^13.24.0",
+				"natural-compare": "^1.4.0",
+				"nth-check": "^2.1.1",
+				"postcss-selector-parser": "^6.0.15",
+				"semver": "^7.6.3",
+				"vue-eslint-parser": "^9.4.3",
+				"xml-name-validator": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-vue/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-plugin-vue/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/eslint/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/eslint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/eslint/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/eslint/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/eslint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/espree": {
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.9.0",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^3.4.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/etag": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/event-pubsub": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+			"integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/eventemitter3": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+			"integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+		},
+		"node_modules/events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.x"
+			}
+		},
+		"node_modules/execa": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"dependencies": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^4.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/execa/node_modules/cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"dependencies": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			},
+			"engines": {
+				"node": ">=4.8"
+			}
+		},
+		"node_modules/execa/node_modules/get-stream": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+			"dependencies": {
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/execa/node_modules/path-key": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/execa/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/execa/node_modules/shebang-command": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+			"integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+			"dependencies": {
+				"shebang-regex": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/execa/node_modules/shebang-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+			"integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/execa/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+			"dependencies": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/express": {
+			"version": "4.19.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+			"dependencies": {
+				"accepts": "~1.3.8",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.20.2",
+				"content-disposition": "0.5.4",
+				"content-type": "~1.0.4",
+				"cookie": "0.6.0",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.2.0",
+				"fresh": "0.5.2",
+				"http-errors": "2.0.0",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.7",
+				"qs": "6.11.0",
+				"range-parser": "~1.2.1",
+				"safe-buffer": "5.2.1",
+				"send": "0.18.0",
+				"serve-static": "1.15.0",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"type-is": "~1.6.18",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/express-history-api-fallback": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz",
+			"integrity": "sha512-swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg=="
+		},
+		"node_modules/express/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/express/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/ext-list": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+			"integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+			"dependencies": {
+				"mime-db": "^1.28.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ext-name": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+			"integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+			"dependencies": {
+				"ext-list": "^2.0.0",
+				"sort-keys-length": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+			"dependencies": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/external-editor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+			"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+			"dependencies": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dependencies": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extglob/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extglob/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extglob/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-glob": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			},
+			"engines": {
+				"node": ">=8.6.0"
+			}
+		},
+		"node_modules/fast-glob/node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+			"dev": true
+		},
+		"node_modules/fast-uri": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+			"integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+			"dev": true
+		},
+		"node_modules/fastq": {
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/faye-websocket": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+			"dev": true,
+			"dependencies": {
+				"websocket-driver": ">=0.5.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+			"dependencies": {
+				"pend": "~1.2.0"
+			}
+		},
+		"node_modules/figures": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+			"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/file-type": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
+			"integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/filelist": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+			"dependencies": {
+				"minimatch": "^5.0.1"
+			}
+		},
+		"node_modules/filelist/node_modules/minimatch": {
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/filename-reserved-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+			"integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/filenamify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+			"integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+			"dependencies": {
+				"filename-reserved-regex": "^2.0.0",
+				"strip-outer": "^1.0.0",
+				"trim-repeated": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/finalhandler": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"dependencies": {
+				"debug": "2.6.9",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"statuses": "2.0.1",
+				"unpipe": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/finalhandler/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/finalhandler/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"dev": true,
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+			}
+		},
+		"node_modules/find-cache-dir/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-cache-dir/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-cache-dir/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/find-cache-dir/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-cache-dir/node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/fkill": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz",
+			"integrity": "sha512-eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ==",
+			"dependencies": {
+				"aggregate-error": "^3.1.0",
+				"arrify": "^2.0.1",
+				"execa": "^5.0.0",
+				"pid-port": "^0.1.0",
+				"process-exists": "^4.0.0",
+				"ps-list": "^7.2.0",
+				"taskkill": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/fkill/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/fkill/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/fkill/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/fkill/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.3",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+			"integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+			"dev": true
+		},
+		"node_modules/flow-parser": {
+			"version": "0.245.0",
+			"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.245.0.tgz",
+			"integrity": "sha512-xUBkkpIDfDZHAebnDEX65FCVitJUctab82KFmtP5SY4cGly1vbuYNe6Muyp0NLXrgmBChVdoC2T+3/RUHi4Mww==",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/follow-redirects": {
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/RubenVerborgh"
+				}
+			],
+			"engines": {
+				"node": ">=4.0"
+			},
+			"peerDependenciesMeta": {
+				"debug": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin": {
+			"version": "6.5.3",
+			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
+			"integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.8.3",
+				"@types/json-schema": "^7.0.5",
+				"chalk": "^4.1.0",
+				"chokidar": "^3.4.2",
+				"cosmiconfig": "^6.0.0",
+				"deepmerge": "^4.2.2",
+				"fs-extra": "^9.0.0",
+				"glob": "^7.1.6",
+				"memfs": "^3.1.2",
+				"minimatch": "^3.0.4",
+				"schema-utils": "2.7.0",
+				"semver": "^7.3.2",
+				"tapable": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=10",
+				"yarn": ">=1.0.0"
+			},
+			"peerDependencies": {
+				"eslint": ">= 6",
+				"typescript": ">= 2.7",
+				"vue-template-compiler": "*",
+				"webpack": ">= 4"
+			},
+			"peerDependenciesMeta": {
+				"eslint": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+			"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.4",
+				"ajv": "^6.12.2",
+				"ajv-keywords": "^3.4.1"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/forwarded": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/fraction.js": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+			"integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"type": "patreon",
+				"url": "https://github.com/sponsors/rawify"
+			}
+		},
+		"node_modules/fragment-cache": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+			"integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+			"dependencies": {
+				"map-cache": "^0.2.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fresh": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/from2": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0"
+			}
+		},
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+		},
+		"node_modules/fs-extra": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+			"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+			"dependencies": {
+				"at-least-node": "^1.0.0",
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/fs-monkey": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+			"integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
+			"dev": true
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/fswin": {
+			"version": "2.17.1227",
+			"resolved": "https://registry.npmjs.org/fswin/-/fswin-2.17.1227.tgz",
+			"integrity": "sha512-xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/get-proxy": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+			"integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+			"dependencies": {
+				"npm-conf": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/git-clone": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz",
+			"integrity": "sha512-zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="
+		},
+		"node_modules/git-config-path": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/git-config-path/-/git-config-path-2.0.0.tgz",
+			"integrity": "sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/glob-to-regexp": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+			"dev": true
+		},
+		"node_modules/glob/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/glob/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
+			"dependencies": {
+				"ini": "^1.3.4"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/global-dirs/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+		},
+		"node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/globby": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.2.9",
+				"ignore": "^5.2.0",
+				"merge2": "^1.4.1",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/got": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+			"integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+			"dependencies": {
+				"@sindresorhus/is": "^0.7.0",
+				"cacheable-request": "^2.1.1",
+				"decompress-response": "^3.3.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"into-stream": "^3.1.0",
+				"is-retry-allowed": "^1.1.0",
+				"isurl": "^1.0.0-alpha5",
+				"lowercase-keys": "^1.0.0",
+				"mimic-response": "^1.0.0",
+				"p-cancelable": "^0.4.0",
+				"p-timeout": "^2.0.1",
+				"pify": "^3.0.0",
+				"safe-buffer": "^5.1.1",
+				"timed-out": "^4.0.1",
+				"url-parse-lax": "^3.0.0",
+				"url-to-options": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+		},
+		"node_modules/graphemer": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+			"dev": true
+		},
+		"node_modules/graphql": {
+			"version": "15.9.0",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-15.9.0.tgz",
+			"integrity": "sha512-GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA==",
+			"engines": {
+				"node": ">= 10.x"
+			}
+		},
+		"node_modules/graphql-subscriptions": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz",
+			"integrity": "sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==",
+			"dependencies": {
+				"iterall": "^1.3.0"
+			},
+			"peerDependencies": {
+				"graphql": "^0.10.5 || ^0.11.3 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+			}
+		},
+		"node_modules/graphql-tag": {
+			"version": "2.12.6",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
+			"integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
+			"dependencies": {
+				"tslib": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+			}
+		},
+		"node_modules/graphql-type-json": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz",
+			"integrity": "sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==",
+			"peerDependencies": {
+				"graphql": ">=0.8.0"
+			}
+		},
+		"node_modules/growly": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+			"integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
+		},
+		"node_modules/gzip-size": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+			"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+			"dev": true,
+			"dependencies": {
+				"duplexer": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/handle-thing": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+			"dev": true
+		},
+		"node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/has-property-descriptors": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+			"dependencies": {
+				"es-define-property": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-proto": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-symbol-support-x": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+			"integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-to-string-tag-x": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+			"integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+			"dependencies": {
+				"has-symbol-support-x": "^1.4.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+			"dependencies": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+			"dependencies": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/has-values/node_modules/is-number": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/has-values/node_modules/kind-of": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+			"integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/hash-sum": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+			"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+			"dev": true
+		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true,
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/highlight.js": {
+			"version": "10.7.3",
+			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+			"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+		},
+		"node_modules/hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"node_modules/html-entities": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+			"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/mdevils"
+				},
+				{
+					"type": "patreon",
+					"url": "https://patreon.com/mdevils"
+				}
+			]
+		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"node_modules/html-minifier-terser": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+			"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+			"dev": true,
+			"dependencies": {
+				"camel-case": "^4.1.2",
+				"clean-css": "^5.2.2",
+				"commander": "^8.3.0",
+				"he": "^1.2.0",
+				"param-case": "^3.0.4",
+				"relateurl": "^0.2.7",
+				"terser": "^5.10.0"
+			},
+			"bin": {
+				"html-minifier-terser": "cli.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/html-minifier-terser/node_modules/commander": {
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+			"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+			"dev": true,
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/html-webpack-plugin": {
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
+			"integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
+			"dev": true,
+			"dependencies": {
+				"@types/html-minifier-terser": "^6.0.0",
+				"html-minifier-terser": "^6.0.2",
+				"lodash": "^4.17.21",
+				"pretty-error": "^4.0.0",
+				"tapable": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/html-webpack-plugin"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"webpack": "^5.20.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/html-webpack-plugin/node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"funding": [
+				"https://github.com/fb55/htmlparser2?sponsor=1",
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			],
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/http-cache-semantics": {
+			"version": "3.8.1",
+			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+			"integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
+		},
+		"node_modules/http-deceiver": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+			"dev": true
+		},
+		"node_modules/http-errors": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+			"dependencies": {
+				"depd": "2.0.0",
+				"inherits": "2.0.4",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"toidentifier": "1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/http-parser-js": {
+			"version": "0.5.8",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+			"integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+			"dev": true
+		},
+		"node_modules/http-proxy": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+			"dev": true,
+			"dependencies": {
+				"eventemitter3": "^4.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/http-proxy-middleware": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+			"dev": true,
+			"dependencies": {
+				"@types/http-proxy": "^1.17.8",
+				"http-proxy": "^1.18.1",
+				"is-glob": "^4.0.1",
+				"is-plain-obj": "^3.0.0",
+				"micromatch": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"@types/express": "^4.17.13"
+			},
+			"peerDependenciesMeta": {
+				"@types/express": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+			"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/http-proxy/node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+			"dev": true
+		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/icss-utils": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/ignore": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/immutable": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+			"integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/import-global": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/import-global/-/import-global-0.1.0.tgz",
+			"integrity": "sha512-8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg==",
+			"dependencies": {
+				"global-dirs": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+		},
+		"node_modules/ini": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+			"integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/inquirer": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
+			"integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
+			"dependencies": {
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.1",
+				"cli-cursor": "^3.1.0",
+				"cli-width": "^3.0.0",
+				"external-editor": "^3.0.3",
+				"figures": "^3.0.0",
+				"lodash": "^4.17.21",
+				"mute-stream": "0.0.8",
+				"ora": "^5.4.1",
+				"run-async": "^2.4.0",
+				"rxjs": "^7.5.5",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0",
+				"through": "^2.3.6",
+				"wrap-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/inquirer/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/inquirer/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/inquirer/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/inquirer/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/inquirer/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inquirer/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inquirer/node_modules/wrap-ansi": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/into-stream": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+			"integrity": "sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==",
+			"dependencies": {
+				"from2": "^2.1.1",
+				"p-is-promise": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/is-accessor-descriptor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+			"integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+			"dependencies": {
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+		},
+		"node_modules/is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dependencies": {
+				"binary-extensions": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+		},
+		"node_modules/is-core-module": {
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+			"integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+			"dependencies": {
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-data-descriptor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+			"integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+			"dependencies": {
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/is-descriptor": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/is-docker": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+			"bin": {
+				"is-docker": "cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/is-extendable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"dependencies": {
+				"is-plain-object": "^2.0.4"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-file-esm": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-file-esm/-/is-file-esm-1.0.0.tgz",
+			"integrity": "sha512-rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA==",
+			"dev": true,
+			"dependencies": {
+				"read-pkg-up": "^7.0.1"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-interactive": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+			"integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-natural-number": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+			"integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ=="
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-object": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+			"integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-promise": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
+		},
+		"node_modules/is-retry-allowed": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+			"integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+			"dependencies": {
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/isbinaryfile": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+			"integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+			"engines": {
+				"node": ">= 8.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/gjtorikian/"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/isurl": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+			"integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+			"dependencies": {
+				"has-to-string-tag-x": "^1.2.0",
+				"is-object": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/iterall": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
+			"integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="
+		},
+		"node_modules/jake": {
+			"version": "10.9.2",
+			"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+			"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+			"dependencies": {
+				"async": "^3.2.3",
+				"chalk": "^4.0.2",
+				"filelist": "^1.0.4",
+				"minimatch": "^3.1.2"
+			},
+			"bin": {
+				"jake": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jake/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jake/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/jake/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/jake/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/jake/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/jake/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jake/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/jake/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/javascript-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
+			"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="
+		},
+		"node_modules/jest-worker": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/joi": {
+			"version": "17.13.3",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
+			"integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
+			"dependencies": {
+				"@hapi/hoek": "^9.3.0",
+				"@hapi/topo": "^5.1.0",
+				"@sideway/address": "^4.1.5",
+				"@sideway/formula": "^3.0.1",
+				"@sideway/pinpoint": "^2.0.0"
+			}
+		},
+		"node_modules/js-message": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
+			"integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
+			"engines": {
+				"node": ">=0.6.0"
+			}
+		},
+		"node_modules/js-sha256": {
+			"version": "0.10.1",
+			"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+			"integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+		},
+		"node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/jscodeshift": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.11.0.tgz",
+			"integrity": "sha512-SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g==",
+			"dependencies": {
+				"@babel/core": "^7.1.6",
+				"@babel/parser": "^7.1.6",
+				"@babel/plugin-proposal-class-properties": "^7.1.0",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.1.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.1.0",
+				"@babel/plugin-transform-modules-commonjs": "^7.1.0",
+				"@babel/preset-flow": "^7.0.0",
+				"@babel/preset-typescript": "^7.1.0",
+				"@babel/register": "^7.0.0",
+				"babel-core": "^7.0.0-bridge.0",
+				"colors": "^1.1.2",
+				"flow-parser": "0.*",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^3.1.10",
+				"neo-async": "^2.5.0",
+				"node-dir": "^0.1.17",
+				"recast": "^0.20.3",
+				"temp": "^0.8.1",
+				"write-file-atomic": "^2.3.0"
+			},
+			"bin": {
+				"jscodeshift": "bin/jscodeshift.js"
+			},
+			"peerDependencies": {
+				"@babel/preset-env": "^7.1.6"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"dependencies": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/braces/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/fill-range": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1",
+				"to-regex-range": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/fill-range/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/is-number": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/is-number/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dependencies": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jscodeshift/node_modules/to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+			"dependencies": {
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/json-buffer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+			"dev": true
+		},
+		"node_modules/json-parse-better-errors": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+			"dev": true
+		},
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/jwt-decode": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+			"integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/keycloak-js": {
+			"version": "23.0.7",
+			"resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-23.0.7.tgz",
+			"integrity": "sha512-OmszsKzBhhm5yP4W1q/tMd+nNnKpOAdeVYcoGhphlv8Fj1bNk4wRTYzp7pn5BkvueLz7fhvKHz7uOc33524YrA==",
+			"dependencies": {
+				"base64-js": "^1.5.1",
+				"js-sha256": "^0.10.1",
+				"jwt-decode": "^4.0.0"
+			}
+		},
+		"node_modules/keyv": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+			"dev": true,
+			"dependencies": {
+				"json-buffer": "3.0.1"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/klona": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+			"integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/launch-editor": {
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.1.tgz",
+			"integrity": "sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA==",
+			"dependencies": {
+				"picocolors": "^1.0.0",
+				"shell-quote": "^1.8.1"
+			}
+		},
+		"node_modules/launch-editor-middleware": {
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.8.1.tgz",
+			"integrity": "sha512-GWhcsTuzgRQguiiei0BrbLX7rS5Pcj+6VyynZlS7zlnmUvVAUUBnJjILIhuIgWJXn1WSMtkfHAkXFSoQeJvwdQ==",
+			"dev": true,
+			"dependencies": {
+				"launch-editor": "^2.8.1"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/lilconfig": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+			"integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+		},
+		"node_modules/loader-runner": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.11.5"
+			}
+		},
+		"node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/loader-utils/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/local-pkg": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
+			"integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
+			"dev": true,
+			"dependencies": {
+				"mlly": "^1.4.2",
+				"pkg-types": "^1.0.3"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+		},
+		"node_modules/lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+		},
+		"node_modules/lodash.debounce": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+		},
+		"node_modules/lodash.defaultsdeep": {
+			"version": "4.6.1",
+			"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
+			"integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
+			"dev": true
+		},
+		"node_modules/lodash.mapvalues": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
+			"integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==",
+			"dev": true
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+		},
+		"node_modules/lodash.sortby": {
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+			"integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
+		},
+		"node_modules/lodash.uniq": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+			"dev": true
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/log-symbols/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/log-symbols/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-symbols/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-update": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+			"integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-escapes": "^3.0.0",
+				"cli-cursor": "^2.0.0",
+				"wrap-ansi": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/ansi-escapes": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+			"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/cli-cursor": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
+			"dev": true,
+			"dependencies": {
+				"restore-cursor": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/mimic-fn": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
+			"dev": true,
+			"dependencies": {
+				"mimic-fn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/restore-cursor": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
+			"dev": true,
+			"dependencies": {
+				"onetime": "^2.0.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+			"dev": true,
+			"dependencies": {
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/log-update/node_modules/wrap-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+			"integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/loglevel": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz",
+			"integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==",
+			"engines": {
+				"node": ">= 0.6.0"
+			},
+			"funding": {
+				"type": "tidelift",
+				"url": "https://tidelift.com/funding/github/npm/loglevel"
+			}
+		},
+		"node_modules/long": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+			"integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+		},
+		"node_modules/lowdb": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz",
+			"integrity": "sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ==",
+			"dependencies": {
+				"graceful-fs": "^4.1.3",
+				"is-promise": "^2.1.0",
+				"lodash": "4",
+				"pify": "^3.0.0",
+				"steno": "^0.4.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/lower-case": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+			"integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+			"dev": true,
+			"dependencies": {
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/lowercase-keys": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+			"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/magic-string": {
+			"version": "0.30.11",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+			"integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+			"dependencies": {
+				"@jridgewell/sourcemap-codec": "^1.5.0"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-dir/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/map-cache": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+			"integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/map-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+			"integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+			"dependencies": {
+				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/material-symbols": {
+			"version": "0.23.0",
+			"resolved": "https://registry.npmjs.org/material-symbols/-/material-symbols-0.23.0.tgz",
+			"integrity": "sha512-ciq9bPgw5bFGC807lT3KgbvU97bC7w6DeUQmqLXdIHD28L/FD9ajvX11swtQXcMV/nEjQ/fI6u5NVtli18qUqQ=="
+		},
+		"node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+			"dev": true
+		},
+		"node_modules/media-typer": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/memfs": {
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+			"dev": true,
+			"dependencies": {
+				"fs-monkey": "^1.0.4"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/merge-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+		},
+		"node_modules/merge-source-map": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+			"dev": true,
+			"dependencies": {
+				"source-map": "^0.6.1"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/methods": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+			"dependencies": {
+				"braces": "^3.0.3",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.53.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+			"integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/mimic-response": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mini-css-extract-plugin": {
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz",
+			"integrity": "sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==",
+			"dev": true,
+			"dependencies": {
+				"schema-utils": "^4.0.0",
+				"tapable": "^2.2.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/minimalistic-assert": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+			"dev": true
+		},
+		"node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/minipass": {
+			"version": "3.3.6",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+			"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/mixin-deep": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+			"dependencies": {
+				"for-in": "^1.0.2",
+				"is-extendable": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+			"dependencies": {
+				"minimist": "^1.2.6"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
+		"node_modules/mlly": {
+			"version": "1.7.1",
+			"resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
+			"integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.11.3",
+				"pathe": "^1.1.2",
+				"pkg-types": "^1.1.1",
+				"ufo": "^1.5.3"
+			}
+		},
+		"node_modules/module-alias": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz",
+			"integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
+			"dev": true
+		},
+		"node_modules/mrmime": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+			"integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+		},
+		"node_modules/muggle-string": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+			"integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+			"dev": true
+		},
+		"node_modules/multicast-dns": {
+			"version": "7.2.5",
+			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+			"dev": true,
+			"dependencies": {
+				"dns-packet": "^5.2.2",
+				"thunky": "^1.0.2"
+			},
+			"bin": {
+				"multicast-dns": "cli.js"
+			}
+		},
+		"node_modules/mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+		},
+		"node_modules/mz": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+			"integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+			"dev": true,
+			"dependencies": {
+				"any-promise": "^1.0.0",
+				"object-assign": "^4.0.1",
+				"thenify-all": "^1.0.0"
+			}
+		},
+		"node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dependencies": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+			"dev": true
+		},
+		"node_modules/negotiator": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/neo-async": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+		},
+		"node_modules/nice-try": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+		},
+		"node_modules/no-case": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+			"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+			"dev": true,
+			"dependencies": {
+				"lower-case": "^2.0.2",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/node-abort-controller": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+			"integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="
+		},
+		"node_modules/node-dir": {
+			"version": "0.1.17",
+			"resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+			"integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
+			"dependencies": {
+				"minimatch": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10.5"
+			}
+		},
+		"node_modules/node-dir/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/node-dir/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/node-fetch": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+			"dependencies": {
+				"whatwg-url": "^5.0.0"
+			},
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			},
+			"peerDependencies": {
+				"encoding": "^0.1.0"
+			},
+			"peerDependenciesMeta": {
+				"encoding": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/node-forge": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6.13.0"
+			}
+		},
+		"node_modules/node-notifier": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-10.0.1.tgz",
+			"integrity": "sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==",
+			"dependencies": {
+				"growly": "^1.3.0",
+				"is-wsl": "^2.2.0",
+				"semver": "^7.3.5",
+				"shellwords": "^0.1.1",
+				"uuid": "^8.3.2",
+				"which": "^2.0.2"
+			}
+		},
+		"node_modules/node-notifier/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+		},
+		"node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/normalize-package-data/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-range": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-url": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+			"integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+			"dependencies": {
+				"prepend-http": "^2.0.0",
+				"query-string": "^5.0.1",
+				"sort-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-conf": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+			"integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+			"dependencies": {
+				"config-chain": "^1.1.11",
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+			"integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+			"dependencies": {
+				"path-key": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-run-path/node_modules/path-key": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+			"integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+			"dependencies": {
+				"copy-descriptor": "^0.1.0",
+				"define-property": "^0.2.5",
+				"kind-of": "^3.0.3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/object-copy/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+			"integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-visit": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+			"integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+			"dependencies": {
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.pick": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+			"integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/obuf": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+			"dev": true
+		},
+		"node_modules/oidc-client-ts": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-3.0.1.tgz",
+			"integrity": "sha512-xX8unZNtmtw3sOz4FPSqDhkLFnxCDsdo2qhFEH2opgWnF/iXMFoYdBQzkwCxAZVgt3FT3DnuBY3k80EZHT0RYg==",
+			"dependencies": {
+				"jwt-decode": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/on-finished": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+			"dependencies": {
+				"ee-first": "1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/on-headers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/open": {
+			"version": "8.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+			"dependencies": {
+				"define-lazy-prop": "^2.0.0",
+				"is-docker": "^2.1.1",
+				"is-wsl": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/opener": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+			"dev": true,
+			"bin": {
+				"opener": "bin/opener-bin.js"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/ora": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+			"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+			"dependencies": {
+				"bl": "^4.1.0",
+				"chalk": "^4.1.0",
+				"cli-cursor": "^3.1.0",
+				"cli-spinners": "^2.5.0",
+				"is-interactive": "^1.0.0",
+				"is-unicode-supported": "^0.1.0",
+				"log-symbols": "^4.1.0",
+				"strip-ansi": "^6.0.0",
+				"wcwidth": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ora/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/ora/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/ora/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/ora/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/ora/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ora/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/os-tmpdir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/p-cancelable": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+			"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-event": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
+			"integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+			"dependencies": {
+				"p-timeout": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/p-finally": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+			"integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-is-promise": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+			"integrity": "sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-retry": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/retry": "0.12.0",
+				"retry": "^0.13.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/p-timeout": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+			"integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+			"dependencies": {
+				"p-finally": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/param-case": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+			"integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+			"dev": true,
+			"dependencies": {
+				"dot-case": "^3.0.4",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-git-config": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/parse-git-config/-/parse-git-config-3.0.0.tgz",
+			"integrity": "sha512-wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA==",
+			"dependencies": {
+				"git-config-path": "^2.0.0",
+				"ini": "^1.3.5"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/parse-git-config/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+			"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+			"dev": true
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"dependencies": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"node_modules/parseurl": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/pascal-case": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+			"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+			"dev": true,
+			"dependencies": {
+				"no-case": "^3.0.4",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/pascalcase": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-browserify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+			"dev": true
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+		},
+		"node_modules/path-to-regexp": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pathe": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+			"integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+			"dev": true
+		},
+		"node_modules/pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+		},
+		"node_modules/picocolors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+			"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pid-port": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz",
+			"integrity": "sha512-boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg==",
+			"dependencies": {
+				"execa": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pid-port/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/pid-port/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pid-port/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pid-port/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pinkie": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+			"integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pinkie-promise": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+			"integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+			"dependencies": {
+				"pinkie": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pirates": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
+			"integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
+			"dependencies": {
+				"find-up": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/pkg-types": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz",
+			"integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==",
+			"dev": true,
+			"dependencies": {
+				"confbox": "^0.1.7",
+				"mlly": "^1.7.1",
+				"pathe": "^1.1.2"
+			}
+		},
+		"node_modules/portfinder": {
+			"version": "1.0.32",
+			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+			"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+			"dependencies": {
+				"async": "^2.6.4",
+				"debug": "^3.2.7",
+				"mkdirp": "^0.5.6"
+			},
+			"engines": {
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/portfinder/node_modules/async": {
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"dependencies": {
+				"lodash": "^4.17.14"
+			}
+		},
+		"node_modules/portfinder/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/posix-character-classes": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+			"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/postcss": {
+			"version": "8.4.47",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+			"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.0",
+				"source-map-js": "^1.2.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			}
+		},
+		"node_modules/postcss-calc": {
+			"version": "8.2.4",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.9",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.2"
+			}
+		},
+		"node_modules/postcss-colormin": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+			"integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0",
+				"colord": "^2.9.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-convert-values": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+			"integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-discard-comments": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+			"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-discard-duplicates": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-discard-empty": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-discard-overridden": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-loader": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+			"integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+			"dev": true,
+			"dependencies": {
+				"cosmiconfig": "^7.0.0",
+				"klona": "^2.0.5",
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"postcss": "^7.0.0 || ^8.0.1",
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/postcss-loader/node_modules/cosmiconfig": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+			"dev": true,
+			"dependencies": {
+				"@types/parse-json": "^4.0.0",
+				"import-fresh": "^3.2.1",
+				"parse-json": "^5.0.0",
+				"path-type": "^4.0.0",
+				"yaml": "^1.10.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/postcss-merge-longhand": {
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+			"integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"stylehacks": "^5.1.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-merge-rules": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+			"integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0",
+				"cssnano-utils": "^3.1.0",
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-minify-font-values": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-minify-gradients": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+			"dev": true,
+			"dependencies": {
+				"colord": "^2.9.1",
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-minify-params": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+			"integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-minify-selectors": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+			"integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-modules-extract-imports": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+			"integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+			"dev": true,
+			"dependencies": {
+				"icss-utils": "^5.0.0",
+				"postcss-selector-parser": "^6.0.2",
+				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-scope": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+			"integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-values": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+			"dev": true,
+			"dependencies": {
+				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-normalize-charset": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-display-values": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-positions": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+			"integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-repeat-style": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+			"integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-string": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-timing-functions": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-unicode": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+			"integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-url": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+			"dev": true,
+			"dependencies": {
+				"normalize-url": "^6.0.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-normalize-url/node_modules/normalize-url": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/postcss-normalize-whitespace": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-ordered-values": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+			"integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+			"dev": true,
+			"dependencies": {
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-reduce-initial": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+			"integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-reduce-transforms": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-selector-parser": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+			"dev": true,
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss-svgo": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"svgo": "^2.7.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-unique-selectors": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"dev": true
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/prepend-http": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+			"integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/prettier": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+			"integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+			"dev": true,
+			"bin": {
+				"prettier": "bin/prettier.cjs"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/pretty-error": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+			"integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+			"dev": true,
+			"dependencies": {
+				"lodash": "^4.17.20",
+				"renderkid": "^3.0.0"
+			}
+		},
+		"node_modules/primeflex": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/primeflex/-/primeflex-3.3.1.tgz",
+			"integrity": "sha512-zaOq3YvcOYytbAmKv3zYc+0VNS9Wg5d37dfxZnveKBFPr7vEIwfV5ydrpiouTft8MVW6qNjfkaQphHSnvgQbpQ=="
+		},
+		"node_modules/primeicons": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/primeicons/-/primeicons-6.0.1.tgz",
+			"integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA=="
+		},
+		"node_modules/primevue": {
+			"version": "3.53.0",
+			"resolved": "https://registry.npmjs.org/primevue/-/primevue-3.53.0.tgz",
+			"integrity": "sha512-mRqTPGGZX+3AQokaCCjxLVSNEjGEA7LaPdBT4qSpGEdMstK6vhUBCxgLH7IPjHudbaSi4Xo3CIO62pXQxbz8dQ==",
+			"peerDependencies": {
+				"vue": "^3.0.0"
+			}
+		},
+		"node_modules/prismjs": {
+			"version": "1.29.0",
+			"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/private": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+			"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/process-exists": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/process-exists/-/process-exists-4.1.0.tgz",
+			"integrity": "sha512-BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA==",
+			"dependencies": {
+				"ps-list": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/process-exists/node_modules/ps-list": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz",
+			"integrity": "sha512-qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+		},
+		"node_modules/progress-webpack-plugin": {
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz",
+			"integrity": "sha512-sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^2.1.0",
+				"figures": "^2.0.0",
+				"log-update": "^2.3.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"peerDependencies": {
+				"webpack": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/progress-webpack-plugin/node_modules/figures": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+			"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/property-expr": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz",
+			"integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA=="
+		},
+		"node_modules/proto-list": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+			"integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="
+		},
+		"node_modules/proxy-addr": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+			"dependencies": {
+				"forwarded": "0.2.0",
+				"ipaddr.js": "1.9.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/proxy-from-env": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+		},
+		"node_modules/ps-list": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz",
+			"integrity": "sha512-v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+			"dev": true
+		},
+		"node_modules/pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/qs": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/query-string": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+			"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+			"dependencies": {
+				"decode-uri-component": "^0.2.0",
+				"object-assign": "^4.1.0",
+				"strict-uri-encode": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/raw-body": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+			"dependencies": {
+				"bytes": "3.1.2",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dependencies": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readable-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"dependencies": {
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/recast": {
+			"version": "0.20.5",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz",
+			"integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==",
+			"dependencies": {
+				"ast-types": "0.14.2",
+				"esprima": "~4.0.0",
+				"source-map": "~0.6.1",
+				"tslib": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/regenerate": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+		},
+		"node_modules/regenerate-unicode-properties": {
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+			"integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+			"dependencies": {
+				"regenerate": "^1.4.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+		},
+		"node_modules/regenerator-transform": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+			"dependencies": {
+				"@babel/runtime": "^7.8.4"
+			}
+		},
+		"node_modules/regex-not": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+			"dependencies": {
+				"extend-shallow": "^3.0.2",
+				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/regexpu-core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+			"dependencies": {
+				"@babel/regjsgen": "^0.8.0",
+				"regenerate": "^1.4.2",
+				"regenerate-unicode-properties": "^10.1.0",
+				"regjsparser": "^0.9.1",
+				"unicode-match-property-ecmascript": "^2.0.0",
+				"unicode-match-property-value-ecmascript": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regjsparser": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"dependencies": {
+				"jsesc": "~0.5.0"
+			},
+			"bin": {
+				"regjsparser": "bin/parser"
+			}
+		},
+		"node_modules/regjsparser/node_modules/jsesc": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			}
+		},
+		"node_modules/relateurl": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/remove-accents": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
+			"integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A=="
+		},
+		"node_modules/renderkid": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+			"integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+			"dev": true,
+			"dependencies": {
+				"css-select": "^4.1.3",
+				"dom-converter": "^0.2.0",
+				"htmlparser2": "^6.1.0",
+				"lodash": "^4.17.21",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"node_modules/repeat-element": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+			"integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/repeat-string": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+			"dev": true
+		},
+		"node_modules/resolve": {
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"dependencies": {
+				"is-core-module": "^2.13.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve-url": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+			"integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+			"deprecated": "https://github.com/lydell/resolve-url#deprecated"
+		},
+		"node_modules/responselike": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+			"integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
+			"dependencies": {
+				"lowercase-keys": "^1.0.0"
+			}
+		},
+		"node_modules/restore-cursor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+			"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+			"dependencies": {
+				"onetime": "^5.1.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ret": {
+			"version": "0.1.15",
+			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
+		"node_modules/retry": {
+			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/rollup": {
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+			"integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "1.0.5"
+			},
+			"bin": {
+				"rollup": "dist/bin/rollup"
+			},
+			"engines": {
+				"node": ">=18.0.0",
+				"npm": ">=8.0.0"
+			},
+			"optionalDependencies": {
+				"@rollup/rollup-android-arm-eabi": "4.21.2",
+				"@rollup/rollup-android-arm64": "4.21.2",
+				"@rollup/rollup-darwin-arm64": "4.21.2",
+				"@rollup/rollup-darwin-x64": "4.21.2",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+				"@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+				"@rollup/rollup-linux-arm64-gnu": "4.21.2",
+				"@rollup/rollup-linux-arm64-musl": "4.21.2",
+				"@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+				"@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+				"@rollup/rollup-linux-s390x-gnu": "4.21.2",
+				"@rollup/rollup-linux-x64-gnu": "4.21.2",
+				"@rollup/rollup-linux-x64-musl": "4.21.2",
+				"@rollup/rollup-win32-arm64-msvc": "4.21.2",
+				"@rollup/rollup-win32-ia32-msvc": "4.21.2",
+				"@rollup/rollup-win32-x64-msvc": "4.21.2",
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/rss-parser": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/rss-parser/-/rss-parser-3.13.0.tgz",
+			"integrity": "sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==",
+			"dependencies": {
+				"entities": "^2.0.3",
+				"xml2js": "^0.5.0"
+			}
+		},
+		"node_modules/run-async": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/rxjs": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+			"dependencies": {
+				"tslib": "^2.1.0"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/safe-regex": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+			"integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+			"dependencies": {
+				"ret": "~0.1.10"
+			}
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		},
+		"node_modules/sass": {
+			"version": "1.77.8",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
+			"integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
+			"dependencies": {
+				"chokidar": ">=3.0.0 <4.0.0",
+				"immutable": "^4.0.0",
+				"source-map-js": ">=0.6.2 <2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sax": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+			"integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
+		},
+		"node_modules/schema-utils": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.5",
+				"ajv": "^6.12.4",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/scule": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+			"integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+			"dev": true
+		},
+		"node_modules/seek-bzip": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
+			"integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
+			"dependencies": {
+				"commander": "^2.8.1"
+			},
+			"bin": {
+				"seek-bunzip": "bin/seek-bunzip",
+				"seek-table": "bin/seek-bzip-table"
+			}
+		},
+		"node_modules/seek-bzip/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+		},
+		"node_modules/select-hose": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+			"dev": true
+		},
+		"node_modules/selfsigned": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+			"integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+			"dev": true,
+			"dependencies": {
+				"@types/node-forge": "^1.3.0",
+				"node-forge": "^1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/send": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+			"dependencies": {
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"fresh": "0.5.2",
+				"http-errors": "2.0.0",
+				"mime": "1.6.0",
+				"ms": "2.1.3",
+				"on-finished": "2.4.1",
+				"range-parser": "~1.2.1",
+				"statuses": "2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/send/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+			"dev": true,
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/serve-index": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+			"dev": true,
+			"dependencies": {
+				"accepts": "~1.3.4",
+				"batch": "0.6.1",
+				"debug": "2.6.9",
+				"escape-html": "~1.0.3",
+				"http-errors": "~1.6.2",
+				"mime-types": "~2.1.17",
+				"parseurl": "~1.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+			"dev": true,
+			"dependencies": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-static": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+			"dependencies": {
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"parseurl": "~1.3.3",
+				"send": "0.18.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/set-value": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-extendable": "^0.1.1",
+				"is-plain-object": "^2.0.3",
+				"split-string": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/setprototypeof": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+		},
+		"node_modules/sha.js": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			},
+			"bin": {
+				"sha.js": "bin.js"
+			}
+		},
+		"node_modules/shallow-clone": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shell-quote": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/shellwords": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
+		},
+		"node_modules/shortid": {
+			"version": "2.2.16",
+			"resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz",
+			"integrity": "sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==",
+			"deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+			"dependencies": {
+				"nanoid": "^2.1.0"
+			}
+		},
+		"node_modules/shortid/node_modules/nanoid": {
+			"version": "2.1.11",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
+			"integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
+		},
+		"node_modules/side-channel": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4",
+				"object-inspect": "^1.13.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+		},
+		"node_modules/sirv": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+			"integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+			"dev": true,
+			"dependencies": {
+				"@polka/url": "^1.0.0-next.24",
+				"mrmime": "^2.0.0",
+				"totalist": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"dependencies": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+			"dependencies": {
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.0",
+				"snapdragon-util": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-util": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+			"dependencies": {
+				"kind-of": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-util/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/snapdragon/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/snapdragon/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sockjs": {
+			"version": "0.3.24",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+			"dev": true,
+			"dependencies": {
+				"faye-websocket": "^0.11.3",
+				"uuid": "^8.3.2",
+				"websocket-driver": "^0.7.4"
+			}
+		},
+		"node_modules/sockjs/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"dev": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/sort-keys": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+			"integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
+			"dependencies": {
+				"is-plain-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/sort-keys-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+			"integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+			"dependencies": {
+				"sort-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sort-keys-length/node_modules/sort-keys": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+			"integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+			"dependencies": {
+				"is-plain-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sortablejs": {
+			"version": "1.15.2",
+			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
+			"integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-resolve": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+			"deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+			"dependencies": {
+				"atob": "^2.1.2",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/source-map-url": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+			"deprecated": "See https://github.com/lydell/source-map-url#deprecated"
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+			"dependencies": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.20",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+			"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="
+		},
+		"node_modules/spdy": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/spdy-transport": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			}
+		},
+		"node_modules/spdy-transport/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/split-string": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+			"dependencies": {
+				"extend-shallow": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+		},
+		"node_modules/ssri": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+			"integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+			"dev": true,
+			"dependencies": {
+				"minipass": "^3.1.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/stable": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+			"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+			"dev": true
+		},
+		"node_modules/stackframe": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+			"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+			"dev": true
+		},
+		"node_modules/static-extend": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+			"integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+			"dependencies": {
+				"define-property": "^0.2.5",
+				"object-copy": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/static-extend/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/static-extend/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/statuses": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/steno": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz",
+			"integrity": "sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==",
+			"dependencies": {
+				"graceful-fs": "^4.1.3"
+			}
+		},
+		"node_modules/strict-uri-encode": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+			"integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"node_modules/string_decoder/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-dirs": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+			"integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+			"dependencies": {
+				"is-natural-number": "^4.0.1"
+			}
+		},
+		"node_modules/strip-eof": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+			"integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/strip-literal": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
+			"integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
+			"dev": true,
+			"dependencies": {
+				"js-tokens": "^9.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/strip-literal/node_modules/js-tokens": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
+			"integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
+			"dev": true
+		},
+		"node_modules/strip-outer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+			"integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/stylehacks": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+			"integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/subscriptions-transport-ws": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz",
+			"integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==",
+			"deprecated": "The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws    For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md",
+			"dependencies": {
+				"backo2": "^1.0.2",
+				"eventemitter3": "^3.1.0",
+				"iterall": "^1.2.1",
+				"symbol-observable": "^1.0.4",
+				"ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
+			},
+			"peerDependencies": {
+				"graphql": "^15.7.2 || ^16.0.0"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/svgo": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+			"dev": true,
+			"dependencies": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^4.1.3",
+				"css-tree": "^1.1.3",
+				"csso": "^4.2.0",
+				"picocolors": "^1.0.0",
+				"stable": "^0.1.8"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/symbol-observable": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/tapable": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+			"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+			"dependencies": {
+				"bl": "^1.0.0",
+				"buffer-alloc": "^1.2.0",
+				"end-of-stream": "^1.0.0",
+				"fs-constants": "^1.0.0",
+				"readable-stream": "^2.3.0",
+				"to-buffer": "^1.1.1",
+				"xtend": "^4.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/tar-stream/node_modules/bl": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+			"integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+			"dependencies": {
+				"readable-stream": "^2.3.5",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"node_modules/taskkill": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/taskkill/-/taskkill-3.1.0.tgz",
+			"integrity": "sha512-5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w==",
+			"dependencies": {
+				"arrify": "^2.0.1",
+				"execa": "^3.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/taskkill/node_modules/execa": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+			"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+			"dependencies": {
+				"cross-spawn": "^7.0.0",
+				"get-stream": "^5.0.0",
+				"human-signals": "^1.1.1",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.0",
+				"onetime": "^5.1.0",
+				"p-finally": "^2.0.0",
+				"signal-exit": "^3.0.2",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": "^8.12.0 || >=9.7.0"
+			}
+		},
+		"node_modules/taskkill/node_modules/get-stream": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+			"dependencies": {
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/taskkill/node_modules/human-signals": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+			"engines": {
+				"node": ">=8.12.0"
+			}
+		},
+		"node_modules/taskkill/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/taskkill/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/taskkill/node_modules/p-finally": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+			"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/temp": {
+			"version": "0.8.4",
+			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
+			"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
+			"dependencies": {
+				"rimraf": "~2.6.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/temp/node_modules/rimraf": {
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			}
+		},
+		"node_modules/terser": {
+			"version": "5.31.6",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+			"integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/source-map": "^0.3.3",
+				"acorn": "^8.8.2",
+				"commander": "^2.20.0",
+				"source-map-support": "~0.5.20"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.10",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.20",
+				"jest-worker": "^27.4.5",
+				"schema-utils": "^3.1.1",
+				"serialize-javascript": "^6.0.1",
+				"terser": "^5.26.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				},
+				"uglify-js": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/terser/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+			"dev": true
+		},
+		"node_modules/thenify": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+			"integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+			"dev": true,
+			"dependencies": {
+				"any-promise": "^1.0.0"
+			}
+		},
+		"node_modules/thenify-all": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+			"integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+			"dev": true,
+			"dependencies": {
+				"thenify": ">= 3.1.0 < 4"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/thread-loader": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz",
+			"integrity": "sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA==",
+			"dev": true,
+			"dependencies": {
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^4.1.0",
+				"loader-utils": "^2.0.0",
+				"neo-async": "^2.6.2",
+				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.27.0 || ^5.0.0"
+			}
+		},
+		"node_modules/thread-loader/node_modules/loader-utils": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+			"dev": true,
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			}
+		},
+		"node_modules/thread-loader/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+		},
+		"node_modules/thunky": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+			"dev": true
+		},
+		"node_modules/timed-out": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+			"integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/tiny-case": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+			"integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q=="
+		},
+		"node_modules/tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+			"dependencies": {
+				"os-tmpdir": "~1.0.2"
+			},
+			"engines": {
+				"node": ">=0.6.0"
+			}
+		},
+		"node_modules/to-buffer": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+			"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-object-path/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+			"dependencies": {
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/toidentifier": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/toposort": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+			"integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
+		},
+		"node_modules/totalist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+		},
+		"node_modules/trim-repeated": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+			"integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ts-api-utils": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+			"integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=16"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.2.0"
+			}
+		},
+		"node_modules/ts-loader": {
+			"version": "9.5.1",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
+			"integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^5.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4",
+				"source-map": "^0.7.4"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"typescript": "*",
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/ts-loader/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/ts-loader/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/ts-loader/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/ts-loader/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/ts-loader/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ts-loader/node_modules/source-map": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/ts-loader/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+			"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+		},
+		"node_modules/tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+			"dependencies": {
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "4.26.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz",
+			"integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==",
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/type-is": {
+			"version": "1.6.18",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+			"dependencies": {
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.24"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "5.6.2",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+			"integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+			"devOptional": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=14.17"
+			}
+		},
+		"node_modules/ufo": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz",
+			"integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
+			"dev": true
+		},
+		"node_modules/unbzip2-stream": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+			"integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+			"dependencies": {
+				"buffer": "^5.2.1",
+				"through": "^2.3.8"
+			}
+		},
+		"node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+		},
+		"node_modules/unicode-canonical-property-names-ecmascript": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-ecmascript": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+			"dependencies": {
+				"unicode-canonical-property-names-ecmascript": "^2.0.0",
+				"unicode-property-aliases-ecmascript": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-value-ecmascript": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-property-aliases-ecmascript": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unimport": {
+			"version": "3.11.1",
+			"resolved": "https://registry.npmjs.org/unimport/-/unimport-3.11.1.tgz",
+			"integrity": "sha512-DuB1Uoq01LrrXTScxnwOoMSlTXxyKcULguFxbLrMDFcE/CO0ZWHpEiyhovN0mycPt7K6luAHe8laqvwvuoeUPg==",
+			"dev": true,
+			"dependencies": {
+				"@rollup/pluginutils": "^5.1.0",
+				"acorn": "^8.12.1",
+				"escape-string-regexp": "^5.0.0",
+				"estree-walker": "^3.0.3",
+				"fast-glob": "^3.3.2",
+				"local-pkg": "^0.5.0",
+				"magic-string": "^0.30.11",
+				"mlly": "^1.7.1",
+				"pathe": "^1.1.2",
+				"pkg-types": "^1.2.0",
+				"scule": "^1.3.0",
+				"strip-literal": "^2.1.0",
+				"unplugin": "^1.12.2"
+			}
+		},
+		"node_modules/unimport/node_modules/escape-string-regexp": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+			"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/unimport/node_modules/estree-walker": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "^1.0.0"
+			}
+		},
+		"node_modules/union-value": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+			"dependencies": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/union-value/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/unplugin": {
+			"version": "1.12.3",
+			"resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.12.3.tgz",
+			"integrity": "sha512-my8DH0/T/Kx33KO+6QXAqdeMYgyy0GktlOpdQjpagfHKw5DrD0ctPr7SHUyOT3g4ZVpzCQGt/qcpuoKJ/pniHA==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.12.1",
+				"webpack-sources": "^3.2.3",
+				"webpack-virtual-modules": "^0.6.2"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/unplugin-auto-import": {
+			"version": "0.17.8",
+			"resolved": "https://registry.npmjs.org/unplugin-auto-import/-/unplugin-auto-import-0.17.8.tgz",
+			"integrity": "sha512-CHryj6HzJ+n4ASjzwHruD8arhbdl+UXvhuAIlHDs15Y/IMecG3wrf7FVg4pVH/DIysbq/n0phIjNHAjl7TG7Iw==",
+			"dev": true,
+			"dependencies": {
+				"@antfu/utils": "^0.7.10",
+				"@rollup/pluginutils": "^5.1.0",
+				"fast-glob": "^3.3.2",
+				"local-pkg": "^0.5.0",
+				"magic-string": "^0.30.10",
+				"minimatch": "^9.0.4",
+				"unimport": "^3.7.2",
+				"unplugin": "^1.11.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@nuxt/kit": "^3.2.2",
+				"@vueuse/core": "*"
+			},
+			"peerDependenciesMeta": {
+				"@nuxt/kit": {
+					"optional": true
+				},
+				"@vueuse/core": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/unplugin-vue-components": {
+			"version": "0.26.0",
+			"resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.26.0.tgz",
+			"integrity": "sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==",
+			"dev": true,
+			"dependencies": {
+				"@antfu/utils": "^0.7.6",
+				"@rollup/pluginutils": "^5.0.4",
+				"chokidar": "^3.5.3",
+				"debug": "^4.3.4",
+				"fast-glob": "^3.3.1",
+				"local-pkg": "^0.4.3",
+				"magic-string": "^0.30.3",
+				"minimatch": "^9.0.3",
+				"resolve": "^1.22.4",
+				"unplugin": "^1.4.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@babel/parser": "^7.15.8",
+				"@nuxt/kit": "^3.2.2",
+				"vue": "2 || 3"
+			},
+			"peerDependenciesMeta": {
+				"@babel/parser": {
+					"optional": true
+				},
+				"@nuxt/kit": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/unplugin-vue-components/node_modules/local-pkg": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+			"integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/unplugin/node_modules/webpack-virtual-modules": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+			"integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+			"dev": true
+		},
+		"node_modules/unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+			"dependencies": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-value": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+			"integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+			"dependencies": {
+				"get-value": "^2.0.3",
+				"has-values": "^0.1.4",
+				"isobject": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+			"integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+			"dependencies": {
+				"isarray": "1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-values": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+			"integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+			"integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"escalade": "^3.1.2",
+				"picocolors": "^1.0.1"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+			"deprecated": "Please see https://github.com/lydell/urix#deprecated"
+		},
+		"node_modules/url-parse-lax": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+			"integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
+			"dependencies": {
+				"prepend-http": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/url-to-options": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+			"integrity": "sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+		},
+		"node_modules/utila": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+			"dev": true
+		},
+		"node_modules/utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/uuid": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+			"funding": [
+				"https://github.com/sponsors/broofa",
+				"https://github.com/sponsors/ctavan"
+			],
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
+			"dependencies": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"node_modules/value-or-promise": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.11.tgz",
+			"integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/vee-validate": {
+			"version": "4.13.2",
+			"resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-4.13.2.tgz",
+			"integrity": "sha512-HlpR/6MJ92TW9f135umMZKUqdd/tFQTxLNSf2ImbU4Y/MlLVAUpF1l64VdjTOhbClAqPjCb5p/SqHDxLpUHXrw==",
+			"dependencies": {
+				"@vue/devtools-api": "^6.6.1",
+				"type-fest": "^4.8.3"
+			},
+			"peerDependencies": {
+				"vue": "^3.4.26"
+			}
+		},
+		"node_modules/vite": {
+			"version": "5.4.2",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
+			"integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
+			"dev": true,
+			"dependencies": {
+				"esbuild": "^0.21.3",
+				"postcss": "^8.4.41",
+				"rollup": "^4.20.0"
+			},
+			"bin": {
+				"vite": "bin/vite.js"
+			},
+			"engines": {
+				"node": "^18.0.0 || >=20.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/vitejs/vite?sponsor=1"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.3"
+			},
+			"peerDependencies": {
+				"@types/node": "^18.0.0 || >=20.0.0",
+				"less": "*",
+				"lightningcss": "^1.21.0",
+				"sass": "*",
+				"sass-embedded": "*",
+				"stylus": "*",
+				"sugarss": "*",
+				"terser": "^5.4.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"less": {
+					"optional": true
+				},
+				"lightningcss": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"stylus": {
+					"optional": true
+				},
+				"sugarss": {
+					"optional": true
+				},
+				"terser": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vscode-uri": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+			"integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+			"dev": true
+		},
+		"node_modules/vue": {
+			"version": "3.5.8",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.8.tgz",
+			"integrity": "sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==",
+			"dependencies": {
+				"@vue/compiler-dom": "3.5.8",
+				"@vue/compiler-sfc": "3.5.8",
+				"@vue/runtime-dom": "3.5.8",
+				"@vue/server-renderer": "3.5.8",
+				"@vue/shared": "3.5.8"
+			},
+			"peerDependencies": {
+				"typescript": "*"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-axios": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.5.2.tgz",
+			"integrity": "sha512-GP+dct7UlAWkl1qoP3ppw0z6jcSua5/IrMpjB5O8bh089iIiJ+hdxPYH2NPEpajlYgkW5EVMP95ttXWdas1O0g==",
+			"peerDependencies": {
+				"axios": "*",
+				"vue": "^3.0.0 || ^2.0.0"
+			}
+		},
+		"node_modules/vue-cal": {
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/vue-cal/-/vue-cal-4.10.0.tgz",
+			"integrity": "sha512-gKOW+UAsUhzJHog/c3dfWN/CwxohpvO4ipBHzDWVngm+R0XZxly8NsGvczYmkfb3pFpuTP29ilAb0ix0sSsULg==",
+			"funding": {
+				"url": "https://github.com/sponsors/antoniandre"
+			},
+			"peerDependencies": {
+				"vue": "^3.2.0"
+			}
+		},
+		"node_modules/vue-codemod": {
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.5.tgz",
+			"integrity": "sha512-DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A==",
+			"dependencies": {
+				"@babel/core": "^7.10.3",
+				"@babel/preset-env": "^7.10.3",
+				"@babel/types": "^7.12.12",
+				"@types/jscodeshift": "^0.7.1",
+				"@vue/compiler-core": "^3.0.5",
+				"@vue/compiler-dom": "^3.0.5",
+				"debug": "^4.1.1",
+				"globby": "^11.0.2",
+				"inquirer": "^7.0.3",
+				"jscodeshift": "^0.11.0",
+				"lru-cache": "^6.0.0",
+				"source-map": "^0.6.1",
+				"yargs": "^16.2.0"
+			},
+			"bin": {
+				"vue-codemod": "dist/bin/vue-codemod.js"
+			},
+			"engines": {
+				"node": ">= 10.0"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/vue-codemod/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/inquirer": {
+			"version": "7.3.3",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+			"integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+			"dependencies": {
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"cli-cursor": "^3.1.0",
+				"cli-width": "^3.0.0",
+				"external-editor": "^3.0.3",
+				"figures": "^3.0.0",
+				"lodash": "^4.17.19",
+				"mute-stream": "0.0.8",
+				"run-async": "^2.4.0",
+				"rxjs": "^6.6.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0",
+				"through": "^2.3.6"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/rxjs": {
+			"version": "6.6.7",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+			"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+			"dependencies": {
+				"tslib": "^1.9.0"
+			},
+			"engines": {
+				"npm": ">=2.0.0"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/vue-codemod/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/vue-component-type-helpers": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.6.tgz",
+			"integrity": "sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==",
+			"dev": true
+		},
+		"node_modules/vue-eslint-parser": {
+			"version": "9.4.3",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
+			"integrity": "sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.3.4",
+				"eslint-scope": "^7.1.1",
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.1",
+				"esquery": "^1.4.0",
+				"lodash": "^4.17.21",
+				"semver": "^7.3.6"
+			},
+			"engines": {
+				"node": "^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
+		"node_modules/vue-hot-reload-api": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+			"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
+			"dev": true
+		},
+		"node_modules/vue-i18n": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.3.tgz",
+			"integrity": "sha512-8ul2S4Hy9orKs7eOlkw/zqnVu98GttUdyIMRyjoMpv6hFPxnybgBLdep/UCmdan5kUHyxqMnr2cGHTBuPBYJaw==",
+			"dependencies": {
+				"@intlify/core-base": "10.0.3",
+				"@intlify/shared": "10.0.3",
+				"@vue/devtools-api": "^6.5.0"
+			},
+			"engines": {
+				"node": ">= 16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/kazupon"
+			},
+			"peerDependencies": {
+				"vue": "^3.0.0"
+			}
+		},
+		"node_modules/vue-loader": {
+			"version": "17.4.2",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.4.2.tgz",
+			"integrity": "sha512-yTKOA4R/VN4jqjw4y5HrynFL8AK0Z3/Jt7eOJXEitsm0GMRHDBjCfCiuTiLP7OESvsZYo2pATCWhDqxC5ZrM6w==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"hash-sum": "^2.0.0",
+				"watchpack": "^2.4.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.1.0 || ^5.0.0-0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/compiler-sfc": {
+					"optional": true
+				},
+				"vue": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-loader/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/vue-loader/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/vue-loader/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/vue-loader/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/vue-loader/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/vue-loader/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/vue-password": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/vue-password/-/vue-password-3.1.0.tgz",
+			"integrity": "sha512-78ZFb8jkLJg/6F3Qz0Lqx6pmaR/oW1jwbJ5NGIkMx/EdKjZBbCsu8VXjGLVaZ/4bzfQZheCO1mQfYi4WkI32VA=="
+		},
+		"node_modules/vue-router": {
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.3.tgz",
+			"integrity": "sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==",
+			"dependencies": {
+				"@vue/devtools-api": "^6.6.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/posva"
+			},
+			"peerDependencies": {
+				"vue": "^3.2.0"
+			}
+		},
+		"node_modules/vue-style-loader": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+			"integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+			"dev": true,
+			"dependencies": {
+				"hash-sum": "^1.0.2",
+				"loader-utils": "^1.0.2"
+			}
+		},
+		"node_modules/vue-style-loader/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"dev": true
+		},
+		"node_modules/vue-template-es2015-compiler": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
+			"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
+			"dev": true
+		},
+		"node_modules/vue-tsc": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.6.tgz",
+			"integrity": "sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==",
+			"dev": true,
+			"dependencies": {
+				"@volar/typescript": "~2.4.1",
+				"@vue/language-core": "2.1.6",
+				"semver": "^7.5.4"
+			},
+			"bin": {
+				"vue-tsc": "bin/vue-tsc.js"
+			},
+			"peerDependencies": {
+				"typescript": ">=5.0.0"
+			}
+		},
+		"node_modules/watchpack": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+			"dev": true,
+			"dependencies": {
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/wbuf": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+			"dev": true,
+			"dependencies": {
+				"minimalistic-assert": "^1.0.0"
+			}
+		},
+		"node_modules/wcwidth": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+			"integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+			"dependencies": {
+				"defaults": "^1.0.3"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+		},
+		"node_modules/webpack": {
+			"version": "5.94.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+			"integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "^1.0.5",
+				"@webassemblyjs/ast": "^1.12.1",
+				"@webassemblyjs/wasm-edit": "^1.12.1",
+				"@webassemblyjs/wasm-parser": "^1.12.1",
+				"acorn": "^8.7.1",
+				"acorn-import-attributes": "^1.9.5",
+				"browserslist": "^4.21.10",
+				"chrome-trace-event": "^1.0.2",
+				"enhanced-resolve": "^5.17.1",
+				"es-module-lexer": "^1.2.1",
+				"eslint-scope": "5.1.1",
+				"events": "^3.2.0",
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.2.11",
+				"json-parse-even-better-errors": "^2.3.1",
+				"loader-runner": "^4.2.0",
+				"mime-types": "^2.1.27",
+				"neo-async": "^2.6.2",
+				"schema-utils": "^3.2.0",
+				"tapable": "^2.1.1",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
+				"webpack-sources": "^3.2.3"
+			},
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-bundle-analyzer": {
+			"version": "4.10.2",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+			"integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
+			"dev": true,
+			"dependencies": {
+				"@discoveryjs/json-ext": "0.5.7",
+				"acorn": "^8.0.4",
+				"acorn-walk": "^8.0.0",
+				"commander": "^7.2.0",
+				"debounce": "^1.2.1",
+				"escape-string-regexp": "^4.0.0",
+				"gzip-size": "^6.0.0",
+				"html-escaper": "^2.0.2",
+				"opener": "^1.5.2",
+				"picocolors": "^1.0.0",
+				"sirv": "^2.0.3",
+				"ws": "^7.3.1"
+			},
+			"bin": {
+				"webpack-bundle-analyzer": "lib/bin/analyzer.js"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/webpack-chain": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
+			"integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
+			"deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+			"dev": true,
+			"dependencies": {
+				"deepmerge": "^1.5.2",
+				"javascript-stringify": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-chain/node_modules/deepmerge": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+			"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/webpack-dev-middleware": {
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+			"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+			"dev": true,
+			"dependencies": {
+				"colorette": "^2.0.10",
+				"memfs": "^3.4.3",
+				"mime-types": "^2.1.31",
+				"range-parser": "^1.2.1",
+				"schema-utils": "^4.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/webpack-dev-server": {
+			"version": "4.15.2",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+			"integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+			"dev": true,
+			"dependencies": {
+				"@types/bonjour": "^3.5.9",
+				"@types/connect-history-api-fallback": "^1.3.5",
+				"@types/express": "^4.17.13",
+				"@types/serve-index": "^1.9.1",
+				"@types/serve-static": "^1.13.10",
+				"@types/sockjs": "^0.3.33",
+				"@types/ws": "^8.5.5",
+				"ansi-html-community": "^0.0.8",
+				"bonjour-service": "^1.0.11",
+				"chokidar": "^3.5.3",
+				"colorette": "^2.0.10",
+				"compression": "^1.7.4",
+				"connect-history-api-fallback": "^2.0.0",
+				"default-gateway": "^6.0.3",
+				"express": "^4.17.3",
+				"graceful-fs": "^4.2.6",
+				"html-entities": "^2.3.2",
+				"http-proxy-middleware": "^2.0.3",
+				"ipaddr.js": "^2.0.1",
+				"launch-editor": "^2.6.0",
+				"open": "^8.0.9",
+				"p-retry": "^4.5.0",
+				"rimraf": "^3.0.2",
+				"schema-utils": "^4.0.0",
+				"selfsigned": "^2.1.1",
+				"serve-index": "^1.9.1",
+				"sockjs": "^0.3.24",
+				"spdy": "^4.0.2",
+				"webpack-dev-middleware": "^5.3.4",
+				"ws": "^8.13.0"
+			},
+			"bin": {
+				"webpack-dev-server": "bin/webpack-dev-server.js"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.37.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack": {
+					"optional": true
+				},
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ipaddr.js": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+			"integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-server/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ws": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-merge": {
+			"version": "5.10.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+			"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+			"dev": true,
+			"dependencies": {
+				"clone-deep": "^4.0.1",
+				"flat": "^5.0.2",
+				"wildcard": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/webpack-sources": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack-virtual-modules": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz",
+			"integrity": "sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==",
+			"dev": true
+		},
+		"node_modules/webpack/node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/webpack/node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/webpack/node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/websocket-driver": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+			"dev": true,
+			"dependencies": {
+				"http-parser-js": ">=0.5.1",
+				"safe-buffer": ">=5.1.0",
+				"websocket-extensions": ">=0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/websocket-extensions": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/whatwg-fetch": {
+			"version": "3.6.20",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+			"integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
+			"dev": true
+		},
+		"node_modules/whatwg-mimetype": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+			"dependencies": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/widest-line": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+			"integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+			"dependencies": {
+				"string-width": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/wildcard": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+			"dev": true
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+		},
+		"node_modules/write-file-atomic": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+			"integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+			"dependencies": {
+				"graceful-fs": "^4.1.11",
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^3.0.2"
+			}
+		},
+		"node_modules/ws": {
+			"version": "7.5.10",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+			"integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+			"engines": {
+				"node": ">=8.3.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/xml-name-validator": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/xml2js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+			"integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+			"dependencies": {
+				"sax": ">=0.6.0",
+				"xmlbuilder": "~11.0.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/xmlbuilder": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/xss": {
+			"version": "1.0.15",
+			"resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
+			"integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
+			"dependencies": {
+				"commander": "^2.20.3",
+				"cssfilter": "0.0.10"
+			},
+			"bin": {
+				"xss": "bin/xss"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/xss/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+		},
+		"node_modules/xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"engines": {
+				"node": ">=0.4"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+		},
+		"node_modules/yaml": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/yaml-front-matter": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz",
+			"integrity": "sha512-ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ==",
+			"dependencies": {
+				"commander": "^6.2.0",
+				"js-yaml": "^3.14.1"
+			},
+			"bin": {
+				"yaml-front-matter": "bin/js-yaml-front.js"
+			}
+		},
+		"node_modules/yaml-front-matter/node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/yaml-front-matter/node_modules/commander": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+			"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/yaml-front-matter/node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.9",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yauzl": {
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+			"dependencies": {
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			}
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/yup": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/yup/-/yup-1.4.0.tgz",
+			"integrity": "sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==",
+			"dependencies": {
+				"property-expr": "^2.0.5",
+				"tiny-case": "^1.0.3",
+				"toposort": "^2.0.2",
+				"type-fest": "^2.19.0"
+			}
+		},
+		"node_modules/yup/node_modules/type-fest": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		}
+	}
+}

From 8972870275841f53517bec0145b9ae1dc16a4534 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 01:44:14 +0200
Subject: [PATCH 237/247] =?UTF-8?q?=F0=9F=92=9A=20Automatically=20set=20ve?=
 =?UTF-8?q?rsion=20number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dabcef12..4ffeaafa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -49,6 +49,14 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
+      - name: Set versions
+        run: |
+          TAG_VERSION=${{ github.ref }}
+          VERSION=${TAG_VERSION#refs/tags/v}
+          mvn versions:set -DnewVersion=$VERSION
+          mvn versions:commit
+          jq --arg version "$VERSION" '.version= $version' src/main/webui/package.json > tmp.$$.json && mv tmp.$$.json src/main/webui/package.json
+
       - name: Build with Maven
         run: mvn package
 

From 42b9e837bce9ec02525046d34ef4204974ff723c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 09:28:26 +0200
Subject: [PATCH 238/247] =?UTF-8?q?=F0=9F=92=9A=20Don't=20checkout=20new?=
 =?UTF-8?q?=20for=20docker=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4ffeaafa..a4103b69 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -37,11 +37,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_PAT }}
 
-      - name: Debug metadata outputs
-        run: |
-          echo "Tags: ${{ steps.meta.outputs.tags }}"
-          echo "Labels: ${{ steps.meta.outputs.labels }}"
-
       - name: Set up JDK 22
         uses: actions/setup-java@v4
         with:
@@ -64,6 +59,10 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: ./src/main/docker/Dockerfile.jvm
+          context: .
+          cache-from: |
+            user/app:cache
+            type=local,src=.
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file

From da347412cc1dc65330713137960209b767a78e83 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 09:45:54 +0200
Subject: [PATCH 239/247] =?UTF-8?q?=F0=9F=91=B7=20Update=20dockerfiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/docker/Dockerfile.jvm          | 19 +++++++++++--------
 src/main/docker/Dockerfile.legacy-jar   | 21 ++++++++++++---------
 src/main/docker/Dockerfile.native       | 10 +++++-----
 src/main/docker/Dockerfile.native-micro | 10 +++++-----
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
index f67a5b7a..dd0d3c80 100644
--- a/src/main/docker/Dockerfile.jvm
+++ b/src/main/docker/Dockerfile.jvm
@@ -7,18 +7,20 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/backend-jvm .
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/quinoa-jvm .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend-jvm
+# docker run -i --rm -p 8080:8080 quarkus/quinoa-jvm
 #
 # If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5005
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend-jvm
+# docker run -i --rm -p 8080:8080 quarkus/quinoa-jvm
 #
 # This image uses the `run-java.sh` script to run the application.
 # This scripts computes the command line to execute your Java application, and
@@ -75,9 +77,9 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.19
 
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+ENV LANGUAGE='en_US:en'
 
 
 # We make four distinct layers so if there are application changes the library layers can be re-used
@@ -88,7 +90,8 @@ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+
diff --git a/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar
index 9eac2593..ec0c2194 100644
--- a/src/main/docker/Dockerfile.legacy-jar
+++ b/src/main/docker/Dockerfile.legacy-jar
@@ -3,22 +3,24 @@
 #
 # Before building the container image run:
 #
-# ./mvnw package -Dquarkus.package.type=legacy-jar
+# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/backend-legacy-jar .
+# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/quinoa-legacy-jar .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend-legacy-jar
+# docker run -i --rm -p 8080:8080 quarkus/quinoa-legacy-jar
 #
 # If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5005
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend-legacy-jar
+# docker run -i --rm -p 8080:8080 quarkus/quinoa-legacy-jar
 #
 # This image uses the `run-java.sh` script to run the application.
 # This scripts computes the command line to execute your Java application, and
@@ -75,9 +77,9 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.19
 
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+ENV LANGUAGE='en_US:en'
 
 
 COPY target/lib/* /deployments/lib/
@@ -85,6 +87,7 @@ COPY target/*-runner.jar /deployments/quarkus-run.jar
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native
index affc5b36..7bd784f9 100644
--- a/src/main/docker/Dockerfile.native
+++ b/src/main/docker/Dockerfile.native
@@ -3,18 +3,18 @@
 #
 # Before building the container image run:
 #
-# ./mvnw package -Pnative
+# ./mvnw package -Dnative
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/backend .
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/quinoa .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend
+# docker run -i --rm -p 8080:8080 quarkus/quinoa
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
@@ -24,4 +24,4 @@ COPY --chown=1001:root target/*-runner /work/application
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/src/main/docker/Dockerfile.native-micro b/src/main/docker/Dockerfile.native-micro
index 0215af5b..06e013dd 100644
--- a/src/main/docker/Dockerfile.native-micro
+++ b/src/main/docker/Dockerfile.native-micro
@@ -6,18 +6,18 @@
 #
 # Before building the container image run:
 #
-# ./mvnw package -Pnative
+# ./mvnw package -Dnative
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/backend .
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/quinoa .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/backend
+# docker run -i --rm -p 8080:8080 quarkus/quinoa
 #
 ###
-FROM quay.io/quarkus/quarkus-micro-image:1.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
@@ -27,4 +27,4 @@ COPY --chown=1001:root target/*-runner /work/application
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

From 8128228fcfcfc2f671e07e4b93af10e6ca1302c0 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 10:47:29 +0200
Subject: [PATCH 240/247] =?UTF-8?q?=F0=9F=94=A7=20Add=20docker=20compose?=
 =?UTF-8?q?=20for=20production=20keycloak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml | 41 +++++++++++++++++++++++++++++++++++++++++
 keycloak/Dockerfile |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.yaml

diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..32797f8b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,41 @@
+services:
+  keycloak:
+    restart: on-failure:5
+    image: quay.io/keycloak/keycloak:latest
+    environment:
+      KC_DB: postgres
+      KC_DB_URL: jdbc:postgresql://postgres_db/keycloak
+      KC_DB_USERNAME: ${POSTGRES_USER:-keycloak}
+      KC_DB_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
+      KC_HOSTNAME: ${KC_HOSTNAME:-localhost}
+      KC_HTTP_ENABLED: true
+      HTTP_ADDRESS_FORWARDING: true
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-eX4mP13p455w0Rd}
+    command: start
+    ports:
+      - 7777:8080
+    depends_on:
+      - postgres_db
+    networks:
+      - keycloak_network
+
+  postgres_db:
+    image: postgres:latest
+    restart: always
+    volumes:
+      - keycloak_db:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: keycloak
+      POSTGRES_USER: ${POSTGRES_USER:-keycloak}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
+    networks:
+      - keycloak_network
+
+volumes:
+  keycloak_db:
+    driver: local
+
+networks:
+  keycloak_network:
+    driver: bridge
\ No newline at end of file
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 1bb7f63e..969b6d02 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -14,7 +14,7 @@ RUN /opt/keycloak/bin/kc.sh build
 
 FROM quay.io/keycloak/keycloak:latest
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
-COPY ../backend/src/main/resources/keycloak_realm.json /opt/keycloak/data/import/
+COPY ../src/main/resources/keycloak_realm.json /opt/keycloak/data/import/
 
 # change these values to point to a running postgres instance
 ENV KC_DB=postgres

From 84caccf7d3320e1e788937a061da0dc3cd11fc3c Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 13:11:53 +0200
Subject: [PATCH 241/247] =?UTF-8?q?=F0=9F=94=A7=20Add=20docker=20compose?=
 =?UTF-8?q?=20for=20turnierplaner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                  |  5 ---
 docker-compose.yaml            | 69 +++++++++++++++++++++++++++++++++-
 src/main/webui/src/settings.ts |  4 +-
 3 files changed, 70 insertions(+), 8 deletions(-)
 delete mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 5e28baef..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-backend/src
-!target/*-runner
-!target/*-runner.jar
-!target/lib/*
-!target/quarkus-app/*
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 32797f8b..904fd9f9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,61 @@
 services:
+  turnierplaner:
+    restart: on-failure:5
+    image: ghcr.io/secretj12/turnierplaner:0.0.2
+    container_name: turnierplaner-app
+    environment:
+      TURNIERPLANER_LANGUAGE: de
+      TURNIERPLANER_REGISTRATION_EXPIRE: 30
+      TURNIERPLANER_ADMIN_VERIFICATION_NEEDED: "true"
+
+      QUARKUS_DATASOURCE_USERNAME: turnierplaner
+      QUARKUS_DATASOURCE_PASSWORD: turnierplaner
+      QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://turnierplaner_db/turnierplaner
+
+      QUARKUS_HTTP_CORS: "true"
+      QUARKUS_HTTP_CORS_ORIGINS: "*"
+      QUARKUS_HTTP_PORT: 8080
+
+      QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/realms/quarkus
+      QUARKUS_OIDC_CLIENT_ID: backend-quarkus
+      QUARKUS_OIDC_CREDENTIALS_SECRET: '**********'
+      QUARKUS_OIDC_TLS_VERIFICATION: none
+
+      QUARKUS_MAILER_FROM: ${MAIL_FROM}
+      QUARKUS_MAILER_HOST: ${MAIL_HOST}
+      QUARKUS_MAILER_PORT: 587
+      QUARKUS_MAILER_START_TLS: REQUIRED
+      QUARKUS_MAILER_USERNAME: ${MAIL_USER}
+      QUARKUS_MAILER_PASSWORD: ${MAIL_PASS}
+    ports:
+      - "8080:8080"
+    depends_on:
+      turnierplaner_db:
+        condition: service_healthy
+      keycloak:
+        condition: service_started
+    networks:
+      - turnierplaner_network
+      - keycloak_network
+
+  turnierplaner_db:
+    image: postgres:latest
+    container_name: turnierplaner-db
+    environment:
+      POSTGRES_USER: turnierplaner
+      POSTGRES_PASSWORD: turnierplaner
+      POSTGRES_DB: turnierplaner
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - turnierplaner_db:/var/lib/postgresql/data
+    networks:
+      - turnierplaner_network
+
+
   keycloak:
     restart: on-failure:5
     image: quay.io/keycloak/keycloak:latest
@@ -16,7 +73,8 @@ services:
     ports:
       - 7777:8080
     depends_on:
-      - postgres_db
+      postgres_db:
+        condition: service_healthy
     networks:
       - keycloak_network
 
@@ -29,13 +87,22 @@ services:
       POSTGRES_DB: keycloak
       POSTGRES_USER: ${POSTGRES_USER:-keycloak}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     networks:
       - keycloak_network
 
 volumes:
   keycloak_db:
     driver: local
+  turnierplaner_db:
+    driver: local
 
 networks:
   keycloak_network:
+    driver: bridge
+  turnierplaner_network:
     driver: bridge
\ No newline at end of file
diff --git a/src/main/webui/src/settings.ts b/src/main/webui/src/settings.ts
index 2583e269..0ae1b00b 100644
--- a/src/main/webui/src/settings.ts
+++ b/src/main/webui/src/settings.ts
@@ -1,5 +1,5 @@
 export const settings = {
 	AUTH_DOMAIN: "http://localhost:7777/realms/Quarkus",
-	FRONTEND: "http://localhost:2000",
-	BACKEND: "http://localhost:2000",
+	FRONTEND: "http://localhost:8080",
+	BACKEND: "http://localhost:8080",
 }

From 2689d3663021ab28a92e5228aec0acac5d76d06e Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 14:54:32 +0200
Subject: [PATCH 242/247] =?UTF-8?q?=F0=9F=94=A7=20Load=20auth=20config=20f?=
 =?UTF-8?q?rom=20backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml                           |  5 +-
 .../turnierplaner/model/user/jUserConfig.java | 14 ++++-
 .../resources/ConfigResource.java             |  6 +-
 .../turnierplaner/resources/UserResource.java |  2 +-
 src/main/resources/application.properties     |  3 +-
 src/main/webui/src/App.vue                    | 61 +++++++++++--------
 src/main/webui/src/interfaces/config.ts       |  1 +
 src/main/webui/src/security/AuthService.ts    |  5 +-
 src/main/webui/src/security/settings.ts       | 42 ++++++++-----
 src/main/webui/src/settings.ts                |  6 +-
 10 files changed, 94 insertions(+), 51 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 904fd9f9..ad429c78 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 services:
   turnierplaner:
     restart: on-failure:5
-    image: ghcr.io/secretj12/turnierplaner:0.0.2
+    image: ghcr.io/secretj12/turnierplaner:0.0.1
     container_name: turnierplaner-app
     environment:
       TURNIERPLANER_LANGUAGE: de
@@ -16,7 +16,8 @@ services:
       QUARKUS_HTTP_CORS_ORIGINS: "*"
       QUARKUS_HTTP_PORT: 8080
 
-      QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/realms/quarkus
+      OIDC_FRONTEND: http://localhost:7777/realms/Quarkus
+      QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/realms/Quarkus
       QUARKUS_OIDC_CLIENT_ID: backend-quarkus
       QUARKUS_OIDC_CREDENTIALS_SECRET: '**********'
       QUARKUS_OIDC_TLS_VERIFICATION: none
diff --git a/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java b/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
index 1bd784ff..838c6da7 100644
--- a/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
+++ b/src/main/java/de/secretj12/turnierplaner/model/user/jUserConfig.java
@@ -7,21 +7,23 @@ public class jUserConfig {
     private String title;
     private String language;
     private boolean adminVerificationNeeded;
+    private String auth_url;
 
     public jUserConfig() {
     }
 
     public jUserConfig(DefaultConfig config) {
-        this(config, null);
+        this(config, null, "");
     }
 
-    public jUserConfig(DefaultConfig defConfig, Config config) {
+    public jUserConfig(DefaultConfig defConfig, Config config, String auth_config) {
         this.title = defConfig.getTitle() != null ? defConfig.getTitle() : "title";
         if (config == null)
             this.language = defConfig.getLanguage();
         else
             this.language = config.getLanguage();
         this.adminVerificationNeeded = defConfig.isAdminVerificationNeeded();
+        this.auth_url = auth_config;
     }
 
     public String getTitle() {
@@ -47,4 +49,12 @@ public boolean isAdminVerificationNeeded() {
     public void setAdminVerificationNeeded(boolean adminVerificationNeeded) {
         this.adminVerificationNeeded = adminVerificationNeeded;
     }
+
+    public String getAuth_url() {
+        return auth_url;
+    }
+
+    public void setAuth_url(String auth_url) {
+        this.auth_url = auth_url;
+    }
 }
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 2e59dd2a..8a0206cf 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -11,6 +11,7 @@
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
 import java.util.UUID;
@@ -28,6 +29,9 @@ public class ConfigResource {
     @Inject
     JsonWebToken jwt;
 
+    @ConfigProperty(name = "turnierplaner.frontend.oidc")
+    String frontendOidc;
+
     @GET
     @Path("/load")
     @Produces(MediaType.APPLICATION_JSON)
@@ -35,7 +39,7 @@ public jUserConfig loadUserConfig() {
         Config config = null;
         if (jwt.getSubject() != null)
             config = configRepository.findByUUID(UUID.fromString(jwt.getSubject()));
-        return new jUserConfig(defaultConfigRepository.findById(0L), config);
+        return new jUserConfig(defaultConfigRepository.findById(0L), config, frontendOidc);
     }
 
     @POST
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java b/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
index 6ed3c7a7..29d6fc75 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/UserResource.java
@@ -22,7 +22,7 @@ public class UserResource {
     @Inject
     Keycloak keycloak;
 
-    @ConfigProperty(name = "turniperlaner.keycloak.realm")
+    @ConfigProperty(name = "turnierplaner.keycloak.realm")
     String realm;
 
     @GET
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3a58c973..220ff6d0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,7 +3,8 @@ turnierplaner.club-name=title
 turnierplaner.language=de
 turnierplaner.registration.expire=30
 turnierplaner.admin-verification-needed=true
-turniperlaner.keycloak.realm=Quarkus
+turnierplaner.keycloak.realm=Quarkus
+turnierplaner.frontend.oidc=${OIDC_FRONTEND:http://localhost:7777/realms/Quarkus}
 
 # key cloak admin
 quarkus.keycloak.admin-client.server-url=http://localhost:7777
diff --git a/src/main/webui/src/App.vue b/src/main/webui/src/App.vue
index 25287ac9..7936ef87 100644
--- a/src/main/webui/src/App.vue
+++ b/src/main/webui/src/App.vue
@@ -1,39 +1,52 @@
 <script lang="ts" setup>
 import HeadContent from "@/components/header/HeadContent.vue"
 import { provide, ref, watch } from "vue"
-import { access_token, auth } from "@/security/AuthService"
+import { access_token, auth, reloadAuth } from "@/security/AuthService"
 import { getConfig } from "@/backend/config"
 import { useI18n } from "vue-i18n"
+import { rebuildAuthSettings } from "@/security/settings"
+import { settings } from "@/settings"
 
 let aside = false
 
+const { data: lConfig } = getConfig(ref(false))
 const silentLoginCompleted = ref(false)
-auth
-	.silentLogin()
-	.then(() => {
-		silentLoginCompleted.value = true
-	})
-	.catch(() => {
-		silentLoginCompleted.value = true
-		console.log("Error logging in")
-	})
-
 const loggedIn = ref(false)
 provide("loggedIn", loggedIn)
-auth.addUserLoadedListener(() => {
-	auth.getUser().then((user) => {
-		if (user !== null) {
-			access_token.value = user.access_token
-			loggedIn.value = true
-		} else {
-			access_token.value = null
+watch(
+	lConfig,
+	() => {
+		if (lConfig.value) {
+			settings.AUTH_DOMAIN = lConfig.value.auth_url
+			rebuildAuthSettings()
+			reloadAuth()
+			auth
+				.silentLogin()
+				.then(() => {
+					silentLoginCompleted.value = true
+				})
+				.catch(() => {
+					silentLoginCompleted.value = true
+					console.log("Error logging in")
+				})
+			auth.addUserLoadedListener(() => {
+				auth.getUser().then((user) => {
+					if (user !== null) {
+						access_token.value = user.access_token
+						loggedIn.value = true
+					} else {
+						access_token.value = null
+					}
+				})
+			})
+			auth.addUserUnloadedListener(() => {
+				access_token.value = null
+				loggedIn.value = false
+			})
 		}
-	})
-})
-auth.addUserUnloadedListener(() => {
-	access_token.value = null
-	loggedIn.value = false
-})
+	},
+	{ immediate: true },
+)
 
 const { data: config } = getConfig(loggedIn)
 const { locale } = useI18n()
diff --git a/src/main/webui/src/interfaces/config.ts b/src/main/webui/src/interfaces/config.ts
index a9faca30..4af3f76b 100644
--- a/src/main/webui/src/interfaces/config.ts
+++ b/src/main/webui/src/interfaces/config.ts
@@ -2,4 +2,5 @@ export interface Config {
 	title: string
 	language: string
 	adminVerificationNeeded: boolean
+	auth_url: string
 }
diff --git a/src/main/webui/src/security/AuthService.ts b/src/main/webui/src/security/AuthService.ts
index 8ad3f540..4e569e75 100644
--- a/src/main/webui/src/security/AuthService.ts
+++ b/src/main/webui/src/security/AuthService.ts
@@ -55,5 +55,8 @@ class AuthService {
 	}
 }
 
-export const auth = new AuthService()
+export let auth = new AuthService()
+export function reloadAuth() {
+	auth = new AuthService()
+}
 export const access_token = ref<string | null>(null)
diff --git a/src/main/webui/src/security/settings.ts b/src/main/webui/src/security/settings.ts
index b5b34b20..74ffc80d 100644
--- a/src/main/webui/src/security/settings.ts
+++ b/src/main/webui/src/security/settings.ts
@@ -1,21 +1,31 @@
 import { settings } from "@/settings"
 
-export const auth_settings = {
-	authority: settings.AUTH_DOMAIN,
-	client_id: "frontend-vue",
-	response_type: "code",
-	scope: "openid profile",
-
-	redirect_uri: settings.FRONTEND + "/callbackSignIn.html",
-	post_logout_redirect_uri: settings.FRONTEND + "/callbackSignOut.html",
-
-	popup_redirect_uri: settings.FRONTEND + "/callbackSignIn.html",
-	popup_post_logout_redirect_uri: settings.FRONTEND + "/callbackSignOut.html",
-	registration_endpoint:
-		settings.AUTH_DOMAIN + "/clients-registrations/openid-connect",
-
-	automaticSilentRenew: true,
-	filterProtocolClaims: true,
+function buildSettings() {
+	return {
+		authority: settings.AUTH_DOMAIN,
+		client_id: "frontend-vue",
+		response_type: "code",
+		scope: "openid profile",
+
+		redirect_uri: settings.FRONTEND + "/callbackSignIn.html",
+		post_logout_redirect_uri: settings.FRONTEND + "/callbackSignOut.html",
+
+		popup_redirect_uri: settings.FRONTEND + "/callbackSignIn.html",
+		popup_post_logout_redirect_uri: settings.FRONTEND + "/callbackSignOut.html",
+		registration_endpoint:
+			settings.AUTH_DOMAIN + "/clients-registrations/openid-connect",
+
+		automaticSilentRenew: true,
+		filterProtocolClaims: true,
+	}
 }
 
+export const auth_settings = buildSettings()
+
+export function rebuildAuthSettings() {
+	Object.assign(auth_settings, buildSettings())
+}
+
+rebuildAuthSettings()
+
 export const popup = true
diff --git a/src/main/webui/src/settings.ts b/src/main/webui/src/settings.ts
index 0ae1b00b..61bd9feb 100644
--- a/src/main/webui/src/settings.ts
+++ b/src/main/webui/src/settings.ts
@@ -1,5 +1,5 @@
 export const settings = {
-	AUTH_DOMAIN: "http://localhost:7777/realms/Quarkus",
-	FRONTEND: "http://localhost:8080",
-	BACKEND: "http://localhost:8080",
+	AUTH_DOMAIN: "",
+	FRONTEND: window.location.origin,
+	BACKEND: window.location.origin,
 }

From 9e1cae043046775d9302f03228b95d9e9e2c3901 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 16:25:43 +0200
Subject: [PATCH 243/247] =?UTF-8?q?=F0=9F=94=A7=20Add=20health=20checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index ad429c78..5af73a29 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -34,7 +34,7 @@ services:
       turnierplaner_db:
         condition: service_healthy
       keycloak:
-        condition: service_started
+        condition: service_healthy
     networks:
       - turnierplaner_network
       - keycloak_network
@@ -47,7 +47,7 @@ services:
       POSTGRES_PASSWORD: turnierplaner
       POSTGRES_DB: turnierplaner
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready" ]
+      test: [ "CMD-SHELL", "pg_isready -d turnierplaner -U turnierplaner" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -62,7 +62,7 @@ services:
     image: quay.io/keycloak/keycloak:latest
     environment:
       KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://postgres_db/keycloak
+      KC_DB_URL: jdbc:postgresql://keycloak_db/keycloak
       KC_DB_USERNAME: ${POSTGRES_USER:-keycloak}
       KC_DB_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
       KC_HOSTNAME: ${KC_HOSTNAME:-localhost}
@@ -70,17 +70,25 @@ services:
       HTTP_ADDRESS_FORWARDING: true
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-eX4mP13p455w0Rd}
+      KC_HEALTH_ENABLED: true
+      KC_METRICS_ENABLED: true
     command: start
     ports:
       - 7777:8080
     depends_on:
-      postgres_db:
+      keycloak_db:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000;echo -e 'GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n' >&3;if [ $? -eq 0 ]; then echo 'Healthcheck Successful';exit 0;else echo 'Healthcheck Failed';exit 1;fi;"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     networks:
       - keycloak_network
 
-  postgres_db:
+  keycloak_db:
     image: postgres:latest
+    container_name: keycloak-db
     restart: always
     volumes:
       - keycloak_db:/var/lib/postgresql/data
@@ -89,7 +97,7 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-keycloak}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready" ]
+      test: [ "CMD-SHELL", "pg_isready -d keycloak -U keycloak" ]
       interval: 10s
       timeout: 5s
       retries: 5

From 07683d2ef0324d4090e59b74a173f7402160bd78 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 17:58:53 +0200
Subject: [PATCH 244/247] =?UTF-8?q?=F0=9F=94=A7=20Include=20callback=20fil?=
 =?UTF-8?q?es=20to=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webui/vite.config.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/webui/vite.config.ts b/src/main/webui/vite.config.ts
index 8ae87cf8..ba8886e7 100644
--- a/src/main/webui/vite.config.ts
+++ b/src/main/webui/vite.config.ts
@@ -6,6 +6,16 @@ import { PrimeVueResolver } from "unplugin-vue-components/resolvers"
 
 // https://vitejs.dev/config/
 export default defineConfig({
+	build: {
+		rollupOptions: {
+			input: {
+				main: "index.html",
+				callbackSignIn: "callbackSignIn.html",
+				callbackSignOut: "callbackSignOut.html",
+				callbackSilent: "callbackSilent.html",
+			},
+		},
+	},
 	server: {
 		host: true,
 	},

From 42c9874d0aa708f11cad0a977e062e848855f1fb Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Fri, 4 Oct 2024 18:30:58 +0200
Subject: [PATCH 245/247] =?UTF-8?q?=F0=9F=90=9B=20Fix=20keycloak=20hostnam?=
 =?UTF-8?q?e=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml                       | 16 +++++++++++-----
 pom.xml                                   |  4 ++--
 src/main/resources/application.properties |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5af73a29..3f7ac68f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,8 @@
 services:
   turnierplaner:
-    restart: on-failure:5
-    image: ghcr.io/secretj12/turnierplaner:0.0.1
+    build:
+      context: .
+      dockerfile: src/main/docker/Dockerfile.jvm
     container_name: turnierplaner-app
     environment:
       TURNIERPLANER_LANGUAGE: de
@@ -17,6 +18,8 @@ services:
       QUARKUS_HTTP_PORT: 8080
 
       OIDC_FRONTEND: http://localhost:7777/realms/Quarkus
+      QUARKUS_OIDC_TOKEN_ISSUER: http://localhost:7777/realms/Quarkus
+      QUARKUS_KEYCLOAK_ADMIN_CLIENT_SERVER_URL: http://keycloak:8080
       QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/realms/Quarkus
       QUARKUS_OIDC_CLIENT_ID: backend-quarkus
       QUARKUS_OIDC_CREDENTIALS_SECRET: '**********'
@@ -59,17 +62,20 @@ services:
 
   keycloak:
     restart: on-failure:5
-    image: quay.io/keycloak/keycloak:latest
+    container_name: keycloak-app
+    image: quay.io/keycloak/keycloak:26.0
     environment:
       KC_DB: postgres
       KC_DB_URL: jdbc:postgresql://keycloak_db/keycloak
       KC_DB_USERNAME: ${POSTGRES_USER:-keycloak}
       KC_DB_PASSWORD: ${POSTGRES_PASSWORD:-eX4mP13p455w0Rd}
-      KC_HOSTNAME: ${KC_HOSTNAME:-localhost}
+      KC_HOSTNAME_STRICT: false
+#      KC_HOSTNAME: ${KC_HOSTNAME:-your.domain}
+#      KC_HOSTNAME_BACKCHANNEL_DYNAMIC: true
       KC_HTTP_ENABLED: true
       HTTP_ADDRESS_FORWARDING: true
       KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-eX4mP13p455w0Rd}
+      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin}
       KC_HEALTH_ENABLED: true
       KC_METRICS_ENABLED: true
     command: start
diff --git a/pom.xml b/pom.xml
index 6669bbe3..b30d5e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <java.version>21</java.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.13.3</quarkus.platform.version>
+        <quarkus.platform.version>3.15.1</quarkus.platform.version>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>${java.version}</maven.compiler.release>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>io.quarkiverse.quinoa</groupId>
             <artifactId>quarkus-quinoa</artifactId>
-            <version>2.4.5</version>
+            <version>2.4.9</version>
         </dependency>
 
         <!-- Testing -->
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 220ff6d0..13e170b6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -30,7 +30,7 @@ quarkus.live-reload.instrumentation=true
 # drop and create the database at startup (use `update` to only update the schema)
 quarkus.hibernate-orm.database.generation=drop-and-create
 # OIDC Configuration
-%prod.quarkus.oidc.auth-server-url=https://localhost:8080/realms/quarkus
+%prod.quarkus.oidc.auth-server-url=https://localhost:8080/realms/Quarkus
 quarkus.oidc.client-id=backend-quarkus
 quarkus.oidc.credentials.secret=**********
 quarkus.oidc.tls.verification=none

From 78b8334b8a41adaeb6d3f51a0f2325c5baef5152 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 5 Oct 2024 16:11:53 +0200
Subject: [PATCH 246/247] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Adjust=20some?=
 =?UTF-8?q?=20security=20related=20stuff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/CompetitionResource.java  |  5 ++---
 .../turnierplaner/resources/ConfigResource.java       |  2 ++
 .../turnierplaner/resources/MatchResource.java        |  8 +++++++-
 .../turnierplaner/resources/PlayerResource.java       |  6 +++++-
 .../turnierplaner/resources/TournamentResource.java   |  1 +
 .../secretj12/turnierplaner/tools/CommonHelpers.java  | 11 ++++++-----
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java b/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
index 5a4cf8e3..5cfc6bdf 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/CompetitionResource.java
@@ -74,12 +74,11 @@ public List<jUserCompetition> getAllCompetitions(@PathParam("tourName") String t
 
     @GET
     @Path("/prepare")
+    @RolesAllowed("director")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public List<jDirectorCompetitionUpdate> getPrepareCompetitions(@PathParam("tourName") String tourName) {
-        if (securityIdentity.hasRole("director"))
-            return competitions.listByName(tourName).stream().map(jDirectorCompetitionUpdate::new).toList();
-        throw new UnauthorizedException("Not authorized");
+        return competitions.listByName(tourName).stream().map(jDirectorCompetitionUpdate::new).toList();
     }
 
     @GET
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java b/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
index 8a0206cf..9306a2e5 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/ConfigResource.java
@@ -5,6 +5,7 @@
 import de.secretj12.turnierplaner.db.repositories.ConfigRepository;
 import de.secretj12.turnierplaner.db.repositories.DefaultConfigRepository;
 import de.secretj12.turnierplaner.model.user.jUserConfig;
+import io.quarkus.security.Authenticated;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -45,6 +46,7 @@ public jUserConfig loadUserConfig() {
     @POST
     @Path("/save")
     @Transactional
+    @Authenticated
     @Consumes(MediaType.APPLICATION_JSON)
     public void saveConfig(jUserConfig nConfig) {
         UUID uuid = UUID.fromString(jwt.getSubject());
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java b/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
index d1fa714d..f9b59db4 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/MatchResource.java
@@ -9,6 +9,7 @@
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
 import de.secretj12.turnierplaner.model.user.jUserMatchEvent;
+import de.secretj12.turnierplaner.tools.CommonHelpers;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
@@ -29,6 +30,9 @@ public class MatchResource {
     @Inject
     PlayerRepository players;
 
+    @Inject
+    CommonHelpers commonHelpers;
+
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserMatchEvent> getMatches(
@@ -48,6 +52,8 @@ public List<jUserMatchEvent> getMatches(
             throw new BadRequestException("Need to specify at least a tournament or a player");
 
         return matches.filterMatches(tournament, competition, player, fromD, toD)
-            .stream().map(jUserMatchEvent::new).toList();
+            .stream()
+            .filter(m -> commonHelpers.isTournamentAccessible(m.getCompetition().getTournament()))
+            .map(jUserMatchEvent::new).toList();
     }
 }
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java b/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
index 8d72b96a..8e1bd15a 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/PlayerResource.java
@@ -14,6 +14,7 @@
 import de.secretj12.turnierplaner.model.jPage;
 import de.secretj12.turnierplaner.model.user.jUserPlayer;
 import de.secretj12.turnierplaner.model.user.jUserPlayerRegistrationForm;
+import de.secretj12.turnierplaner.tools.CommonHelpers;
 import io.quarkus.mailer.Mailer;
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -51,17 +52,19 @@ public class PlayerResource {
     DefaultConfigRepository defaultConfigRepository;
     @Inject
     SecurityIdentity securityIdentity;
+    @Inject
+    CommonHelpers commonHelpers;
 
     @ConfigProperty(name = "turnierplaner.registration.expire")
     public int expire;
 
-    // expects search string as lower case!
     @GET
     @Path("/compFind/{tourId}/{compId}/")
     @Produces(MediaType.APPLICATION_JSON)
     public List<jUserPlayer> listCompPlayer(@PathParam("tourId") String tourId, @PathParam("compId") String compId,
                                             @QueryParam("search") String search,
                                             @DefaultValue("false") @QueryParam("playerB") boolean playerB) {
+        commonHelpers.checkTournamentAccessibility(tourId);
         Competition competition = competitionRepository.getByName(tourId, compId);
         if (competition == null)
             throw new BadRequestException("Invalid competition");
@@ -196,6 +199,7 @@ public String playerRegistration(jUserPlayerRegistrationForm playerForm) {
     @Transactional
     @Path("/update")
     @Blocking
+    @RolesAllowed("director")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
     public String playerRegistration(jDirectorPlayerUpdateForm uPlayer) {
diff --git a/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java b/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
index 48fa3030..41885eb4 100644
--- a/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
+++ b/src/main/java/de/secretj12/turnierplaner/resources/TournamentResource.java
@@ -92,6 +92,7 @@ public Set<jUserCourt> getCourts(@PathParam("tourName") String tourName) {
         Tournament tournament = tournaments.getByName(tourName);
         if (tournament == null)
             throw new NotFoundException("Could not find tournament");
+        common.checkTournamentAccessibility(tournament);
 
         return tournament.getCourts().stream().map(jUserCourt::new).collect(Collectors.toSet());
     }
diff --git a/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java b/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
index c91a54a7..0855ac0a 100644
--- a/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
+++ b/src/main/java/de/secretj12/turnierplaner/tools/CommonHelpers.java
@@ -17,15 +17,16 @@ public class CommonHelpers {
     SecurityIdentity securityIdentity;
 
     public void checkTournamentAccessibility(String tourName) {
-        Tournament tournament = tournaments.getByName(tourName);
-        if (tournament == null) throw new NotFoundException("Tournament could not be found");
-        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
-            throw new UnauthorizedException("Cannot access tournament");
+        checkTournamentAccessibility(tournaments.getByName(tourName));
     }
 
     public void checkTournamentAccessibility(Tournament tournament) {
         if (tournament == null) throw new NotFoundException("Tournament could not be found");
-        if (!securityIdentity.hasRole("director") && !tournament.isVisible())
+        if (!isTournamentAccessible(tournament))
             throw new UnauthorizedException("Cannot access tournament");
     }
+
+    public boolean isTournamentAccessible(Tournament tournament) {
+        return securityIdentity.hasRole("director") || tournament.isVisible();
+    }
 }

From 5801afd262063228f371b926ce816192108d0f53 Mon Sep 17 00:00:00 2001
From: Jonas Stahl <Jonas.M.Stahl@gmail.com>
Date: Sat, 5 Oct 2024 16:17:03 +0200
Subject: [PATCH 247/247] =?UTF-8?q?=E2=9C=85=20Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turnierplaner/resources/TestPlayerResource.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java b/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
index 9219f2f3..f8489bca 100644
--- a/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
+++ b/src/test/java/de/secretj12/turnierplaner/resources/TestPlayerResource.java
@@ -1,7 +1,9 @@
 package de.secretj12.turnierplaner.resources;
 
-import de.secretj12.turnierplaner.db.entities.*;
-import de.secretj12.turnierplaner.db.entities.competition.*;
+import de.secretj12.turnierplaner.db.entities.Player;
+import de.secretj12.turnierplaner.db.entities.Tournament;
+import de.secretj12.turnierplaner.db.entities.VerificationCode;
+import de.secretj12.turnierplaner.db.entities.competition.Competition;
 import de.secretj12.turnierplaner.db.repositories.CompetitionRepository;
 import de.secretj12.turnierplaner.db.repositories.PlayerRepository;
 import de.secretj12.turnierplaner.db.repositories.TournamentRepository;
@@ -56,6 +58,7 @@ private Competition genComp() {
     public void addPlayer() {
         Tournament tournament = new Tournament();
         tournament.setName("Clubmeisterschaft");
+        tournament.setVisible(true);
         tournamentRepository.persist(tournament);
 
         Competition herren = genComp();