6 Commits

Author SHA1 Message Date
b287db4d0a pin clock to bottom
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-15 20:34:14 +02:00
b3ce711e6b fix: width of general container 2023-04-15 20:26:22 +02:00
456c0635a4 reload data every 90s
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-15 20:02:06 +02:00
b50398f6eb monospace clock 2023-04-15 20:01:55 +02:00
e04e6713bc default fallback on no data 2023-04-15 20:01:49 +02:00
de373390ba updated pnpm lock 2023-04-15 20:01:34 +02:00
2 changed files with 244 additions and 228 deletions

20
pnpm-lock.yaml generated
View File

@@ -2,31 +2,31 @@ lockfileVersion: '6.0'
devDependencies:
'@odit/license-exporter':
specifier: ^0.0.11
specifier: 0.0.11
version: 0.0.11
'@svitejs/vite-plugin-svelte':
specifier: ^0.11.1
specifier: 0.11.1
version: 0.11.1(svelte@3.36.0)(vite@2.1.4)
'@tsconfig/svelte':
specifier: ^1.0.10
specifier: 1.0.10
version: 1.0.10
'@types/html-minifier':
specifier: ^4.0.0
specifier: 4.0.0
version: 4.0.0
axios:
specifier: ^0.21.1
specifier: 0.21.1
version: 0.21.1
html-minifier:
specifier: ^4.0.0
specifier: 4.0.0
version: 4.0.0
husky:
specifier: ^5.1.3
specifier: 5.1.3
version: 5.1.3
prettier:
specifier: ^2.2.1
specifier: 2.2.1
version: 2.2.1
prettier-plugin-svelte:
specifier: ^2.2.0
specifier: 2.2.0
version: 2.2.0(prettier@2.2.1)(svelte@3.36.0)
release-it:
specifier: 14.5.0
@@ -41,7 +41,7 @@ devDependencies:
specifier: 4.7.0
version: 4.7.0(svelte@3.36.0)
validator:
specifier: ^13.5.2
specifier: 13.5.2
version: 13.5.2
vite:
specifier: 2.1.4

View File

@@ -130,7 +130,7 @@
}, 1000);
setInterval(() => {
fetch_all();
}, 15000);
}, 90000);
setInterval(() => {
current_page = pages.cycle(current_page);
}, 20000);
@@ -140,228 +140,244 @@
class="min-h-screen flex items-center justify-center bg-gray-100"
style="background-image: url('/beamershow_background.png');background-position: center;background-size: contain;background-repeat:no-repeat;"
>
<div class="max-w-xl w-full">
{#if current_page === "general"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900">
{hours}:{minutes}:{seconds}
</h1>
<!-- -->
<div class="flex flex-wrap -mx-1 overflow-hidden mt-5">
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_runners}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("laeufer")}
</h1>
</div>
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_distance}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("kilometer-gesamt")}
</h1>
</div>
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_donation}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("spendensumme")}
</h1>
<div class="w-full">
<div style="width:55vw;" class="mx-auto">
<!-- -->
{#if current_page === "general"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900">
Statistiken
</h1>
<!-- -->
<div class="flex flex-wrap -mx-1 overflow-hidden mt-5">
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_runners || "0"}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("laeufer")}
</h1>
</div>
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_distance || "0"}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("kilometer-gesamt")}
</h1>
</div>
<div class="my-1 px-1 w-full overflow-hidden sm:w-1/2 md:w-1/3">
<h1 class="text-5xl font-semibold text-center text-gray-900">
{general.total_donation || "0"}
</h1>
<h1 class="text-2xl font-semibold text-center text-gray-900">
{$_("spendensumme")}
</h1>
</div>
</div>
</div>
</div>
{:else if current_page === "runners_distance"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5">
{$_("top-laeufer")} ({$_("distanz")})
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("laeufer")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organisation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
</thead>
<tbody>
{#each runners as r, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{r.firstname}
{r.lastname}
</td>
<td class="border p-4 dark:border-dark-5">
{r.group.name}
</td>
<td class="border p-4 dark:border-dark-5">
{r.distance / 1000} km
</td>
{:else if current_page === "runners_distance"}
<div transition:slide|local>
<h1
class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5"
>
{$_("top-laeufer")} ({$_("distanz")})
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("laeufer")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organisation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "runners_laptime"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5">
{$_("top-laeufer")} ({$_("rundenzeit")})
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("laeufer")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organisation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("schnellste-rundenzeit")}
</th>
</tr>
</thead>
<tbody>
{#each runners_by_laptime as r, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{r.firstname}
{r.lastname}
</td>
<td class="border p-4 dark:border-dark-5">
{r.group.name}
</td>
<td class="border p-4 dark:border-dark-5">
{format_laptime(r.minLaptime)}
</td>
</thead>
<tbody>
{#each runners as r, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{r.firstname}
{r.lastname}
</td>
<td class="border p-4 dark:border-dark-5">
{r.group.name}
</td>
<td class="border p-4 dark:border-dark-5">
{r.distance / 1000} km
</td>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "runners_laptime"}
<div transition:slide|local>
<h1
class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5"
>
{$_("top-laeufer")} ({$_("rundenzeit")})
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("laeufer")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organisation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("schnellste-rundenzeit")}
</th>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "orgs_distance"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5">
{$_("top-organsiationen")}
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organsiation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
</thead>
<tbody>
{#each orgs as o, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{o.name}
</td>
<td class="border p-4 dark:border-dark-5">
{o.distance / 1000} km
</td>
</thead>
<tbody>
{#each runners_by_laptime as r, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{r.firstname}
{r.lastname}
</td>
<td class="border p-4 dark:border-dark-5">
{r.group.name}
</td>
<td class="border p-4 dark:border-dark-5">
{format_laptime(r.minLaptime)}
</td>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "orgs_distance"}
<div transition:slide|local>
<h1
class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5"
>
{$_("top-organsiationen")}
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("organsiation")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "teams_distance"}
<div transition:slide|local>
<h1 class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5">
{$_("top-teams")}
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("team")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
</thead>
<tbody>
{#each teams as t, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{t.name}
</td>
<td class="border p-4 dark:border-dark-5">
{t.distance / 1000} km
</td>
</thead>
<tbody>
{#each orgs as o, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{o.name}
</td>
<td class="border p-4 dark:border-dark-5">
{o.distance / 1000} km
</td>
</tr>
{/each}
</tbody>
</table>
</div>
{:else if current_page === "teams_distance"}
<div transition:slide|local>
<h1
class="mr-6 text-7xl font-semibold text-center text-gray-900 mb-5"
>
{$_("top-teams")}
</h1>
<table class="table p-4 bg-white shadow rounded-lg w-full">
<thead>
<tr>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("platz")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("team")}
</th>
<th
class="border p-4 dark:border-dark-5 whitespace-nowrap font-normal text-gray-900"
>
{$_("kilometer")}
</th>
</tr>
{/each}
</tbody>
</table>
</div>
{:else}
<!-- content here -->
{/if}
</thead>
<tbody>
{#each teams as t, i}
<tr class="text-gray-700">
<td class="border p-4 dark:border-dark-5">
{i + 1}
</td>
<td class="border p-4 dark:border-dark-5">
{t.name}
</td>
<td class="border p-4 dark:border-dark-5">
{t.distance / 1000} km
</td>
</tr>
{/each}
</tbody>
</table>
</div>
{:else}
<!-- content here -->
{/if}
</div>
</div>
<h1
class="text-5xl font-semibold text-center text-gray-900 font-mono bottom-2 w-full fixed"
>
{hours}:{minutes}:{seconds}
</h1>
</div>