From 97f10da14623e1fa6f71a0db66d4d231c2c06ead Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Fri, 29 Nov 2024 02:36:18 +0100
Subject: [PATCH] relocate new user/report button
---
src/routes/admin/reports/+page.svelte | 23 ++++++++++---------
.../admin/reports/NewReportModal.svelte | 2 +-
src/routes/admin/users/+page.svelte | 13 ++++++++++-
src/routes/admin/users/HeaderBar.svelte | 12 +++++-----
src/routes/admin/users/NewUserModal.svelte | 2 +-
5 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/routes/admin/reports/+page.svelte b/src/routes/admin/reports/+page.svelte
index b848453..eed54fe 100644
--- a/src/routes/admin/reports/+page.svelte
+++ b/src/routes/admin/reports/+page.svelte
@@ -100,7 +100,18 @@
<div class="h-full flex flex-row">
<div class="w-full flex flex-col overflow-scroll">
- <HeaderBar bind:reportFilter />
+ <div class="grid grid-cols-[5fr_1fr_10fr_1fr_5fr]">
+ <div />
+ <div />
+ <HeaderBar bind:reportFilter />
+ <div class="divider divider-horizontal my-auto h-3/4" />
+ <div class="flex items-center">
+ <button class="btn" on:click={() => newReportModal.show()}>
+ <Plus />
+ <span>Neuer Report</span>
+ </button>
+ </div>
+ </div>
<hr class="divider my-1 mx-8 border-none" />
<table class="table table-fixed h-fit">
<colgroup>
@@ -182,16 +193,6 @@
<td>{report.draft ? 'Entwurf' : 'Erstellt'}</td>
</tr>
{/each}
- <tr>
- <td colspan="100">
- <div class="flex justify-center items-center">
- <button class="btn btn-sm" on:click={() => newReportModal.show()}>
- <Plus />
- <span>Neuer Report</span>
- </button>
- </div>
- </td>
- </tr>
</PaginationTableBody>
</table>
</div>
diff --git a/src/routes/admin/reports/NewReportModal.svelte b/src/routes/admin/reports/NewReportModal.svelte
index fbb4ab0..a863668 100644
--- a/src/routes/admin/reports/NewReportModal.svelte
+++ b/src/routes/admin/reports/NewReportModal.svelte
@@ -37,7 +37,7 @@
class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"
on:click|preventDefault={() => globalCloseForm.submit()}>✕</button
>
- <h3 class="font-roboto text-xl">Neuer Report</h3>
+ <h3 class="font-roboto text-3xl">Neuer Report</h3>
<div class="space-y-2 mt-2 px-1 max-h-[70vh] overflow-y-scroll">
<div>
<Search
diff --git a/src/routes/admin/users/+page.svelte b/src/routes/admin/users/+page.svelte
index 0107973..57759f7 100644
--- a/src/routes/admin/users/+page.svelte
+++ b/src/routes/admin/users/+page.svelte
@@ -69,7 +69,18 @@
</script>
<div class="h-full flex flex-col overflow-hidden">
- <HeaderBar bind:userFilter />
+ <div class="grid grid-cols-[10fr_1fr_10fr_1fr_10fr]">
+ <div />
+ <div />
+ <HeaderBar bind:userFilter />
+ <div class="divider divider-horizontal my-auto h-3/4" />
+ <div class="flex items-center">
+ <button class="btn" on:click={() => newUserModal.show()}>
+ <Plus />
+ <span>Neuer Spieler</span>
+ </button>
+ </div>
+ </div>
<hr class="divider my-1 mx-8 border-none" />
<div class="h-full overflow-scroll" bind:this={userTableContainerElement}>
<table class="table table-auto">
diff --git a/src/routes/admin/users/HeaderBar.svelte b/src/routes/admin/users/HeaderBar.svelte
index 958d75a..9a6afcb 100644
--- a/src/routes/admin/users/HeaderBar.svelte
+++ b/src/routes/admin/users/HeaderBar.svelte
@@ -8,14 +8,14 @@
};
</script>
-<form class="flex flex-row justify-center items-center space-x-4 mx-4 my-2 w-full">
- <div class="w-1/6">
- <Input size="sm" placeholder="..." bind:value={userFilter.name}>
- <span slot="label">Suche</span>
+<form class="flex flex-row justify-center items-center space-x-4 my-2 w-full">
+ <div class="w-full">
+ <Input size="sm" placeholder="..." bind:value={userFilter.name} pickyWidth={false}>
+ <span slot="label">Username</span>
</Input>
</div>
- <div class="w-1/6">
- <Select label="Edition" size="sm" bind:value={userFilter.playertype}>
+ <div class="w-full">
+ <Select label="Edition" size="sm" bind:value={userFilter.playertype} pickyWidth={false}>
<option value={null}>Alle</option>
<option value="java">Java</option>
<option value="bedrock">Bedrock</option>
diff --git a/src/routes/admin/users/NewUserModal.svelte b/src/routes/admin/users/NewUserModal.svelte
index 2aa7a53..3dcb721 100644
--- a/src/routes/admin/users/NewUserModal.svelte
+++ b/src/routes/admin/users/NewUserModal.svelte
@@ -52,7 +52,7 @@
class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"
on:click|preventDefault={() => globalCloseForm.submit()}>✕</button
>
- <h3 class="font-roboto text-xl">Neuer Spieler</h3>
+ <h3 class="font-roboto text-3xl">Neuer Spieler</h3>
<div class="grid grid-cols-2 gap-4">
<Input type="text" required bind:value={firstname}>
<span slot="label">Vorname</span>