christoph/svelte-formula11
1
Fork 0
Code Issues 23 Actions Packages Projects 1 Activity

Compare commits

base: christoph:17a1ea85247be71e8b358cab473a141c71d9f396
Branches Tags
christoph:master
...
compare: christoph:8c18cef7aad93ede472d335fffee64d00d71a9b6
Branches Tags
christoph:master

3 Commits
17a1ea8524 ... 8c18cef7aa

Author SHA1 Message Date
Christoph Urlacher
8c18cef7aa Racepicks: Use grid for accordion
All checks were successful
Build Formula11 Docker Image / pocketbase-docker (push) Successful in 27s
Details
2025-03-14 00:27:40 +01:00
Christoph Urlacher
e63c905f0e Seasonpicks: Use grid for accordion + adjust breakpoints 2025-03-14 00:27:33 +01:00
Christoph Urlacher
b36ec6c3cd Seasonpicks: Increase hottake row height in table 2025-03-14 00:13:23 +01:00
2 changed files with 242 additions and 238 deletions
Expand all files Collapse all files

28
src/routes/racepicks/+page.svelte
View File

@ -75,18 +75,16 @@
<span class="font-bold">Next Race Guess</span> <span class="font-bold">Next Race Guess</span>
</svelte:fragment> </svelte:fragment>
<svelte:fragment slot="content"> <svelte:fragment slot="content">
<div class="justify-center gap-2 lg:flex"> <div class="grid grid-cols-2 gap-2 lg:mx-auto lg:w-fit lg:grid-cols-6">
<!-- Show information about the next race --> <!-- Show information about the next race -->
<div class="mt-2 flex gap-2"> <div class="card flex w-full min-w-40 flex-col p-2 shadow lg:max-w-40">
<div class="card flex w-full min-w-40 flex-col p-2 shadow">
<span class="font-bold"> <span class="font-bold">
{data.currentrace.name} {data.currentrace.name}
</span> </span>
{#if data.currentrace.sprintdate} {#if data.currentrace.sprintdate}
<div class="flex gap-2"> <div class="flex gap-2">
<span class="w-12">SQuali:</span> <span class="w-12">SQuali:</span>
<span>{format_date(data.currentrace.sprintqualidate, shortdatetimeformat)}</span <span>{format_date(data.currentrace.sprintqualidate, shortdatetimeformat)}</span>
>
</div> </div>
<div class="flex gap-2"> <div class="flex gap-2">
<span class="w-12">SRace:</span> <span class="w-12">SRace:</span>
@ -108,7 +106,9 @@
<Countdown date={data.currentrace.racedate} extraclass="font-bold" /> <Countdown date={data.currentrace.racedate} extraclass="font-bold" />
</div> </div>
</div> </div>
<div class="card w-full min-w-40 p-2 shadow">
<!-- Show race pictogram -->
<div class="card w-full min-w-40 p-2 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">Track Layout:</h1> <h1 class="mb-2 text-nowrap font-bold">Track Layout:</h1>
<LazyImage <LazyImage
src={data.currentrace.pictogram_url ?? "Invalid"} src={data.currentrace.pictogram_url ?? "Invalid"}
@ -118,12 +118,11 @@
imgstyle="background: transparent;" imgstyle="background: transparent;"
/> />
</div> </div>
</div>
<!-- Only show the userguess if signed in --> <!-- Only show the userguess if signed in -->
{#if data.user} {#if data.user}
<div class="mt-2 flex gap-2"> <!-- PXX pick -->
<div class="card w-full min-w-40 p-2 pb-0 shadow"> <div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">Your P{data.currentrace.pxx} Pick:</h1> <h1 class="mb-2 text-nowrap font-bold">Your P{data.currentrace.pxx} Pick:</h1>
<LazyImage <LazyImage
src={get_by_value(drivers, "id", data.racepick?.pxx ?? "")?.headshot_url ?? src={get_by_value(drivers, "id", data.racepick?.pxx ?? "")?.headshot_url ??
@ -136,7 +135,9 @@
onclick={racepick_handler} onclick={racepick_handler}
/> />
</div> </div>
<div class="card w-full min-w-40 p-2 pb-0 shadow">
<!-- DNF pick -->
<div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">Your DNF Pick:</h1> <h1 class="mb-2 text-nowrap font-bold">Your DNF Pick:</h1>
<LazyImage <LazyImage
src={get_by_value(drivers, "id", data.racepick?.dnf ?? "")?.headshot_url ?? src={get_by_value(drivers, "id", data.racepick?.dnf ?? "")?.headshot_url ??
@ -149,11 +150,9 @@
onclick={racepick_handler} onclick={racepick_handler}
/> />
</div> </div>
</div>
{/if} {/if}
<!-- Show users that have and have not picked yet --> <!-- Show users that have picked -->
<div class="mt-2 flex max-h-[155px] gap-2 overflow-y-scroll">
<div class="card w-full min-w-40 p-2 shadow lg:max-w-40"> <div class="card w-full min-w-40 p-2 shadow lg:max-w-40">
<h1 class="text-nowrap font-bold"> <h1 class="text-nowrap font-bold">
Picked ({picked.length}/{currentpicked.length}): Picked ({picked.length}/{currentpicked.length}):
@ -170,6 +169,8 @@
{/each} {/each}
</div> </div>
</div> </div>
<!-- Show users that have not picked yet -->
<div <div
class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40" class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40"
> >
@ -189,7 +190,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</svelte:fragment> </svelte:fragment>
</AccordionItem> </AccordionItem>
</Accordion> </Accordion>

60
src/routes/seasonpicks/+page.svelte
View File

@ -67,7 +67,7 @@
<span class="font-bold">Your Season Pick</span> <span class="font-bold">Your Season Pick</span>
</svelte:fragment> </svelte:fragment>
<svelte:fragment slot="content"> <svelte:fragment slot="content">
<div class="justify-center gap-2 lg:flex"> <div class="grid grid-cols-2 gap-2 lg:mx-auto lg:w-fit lg:grid-cols-5 2xl:grid-cols-10">
<!-- Only show the stuff if signed in --> <!-- Only show the stuff if signed in -->
{#if data.user} {#if data.user}
{@const teamwinners = data.seasonpick {@const teamwinners = data.seasonpick
@ -81,13 +81,14 @@
.sort((a: Driver, b: Driver) => a.code.localeCompare(b.code)) .sort((a: Driver, b: Driver) => a.code.localeCompare(b.code))
: [undefined]} : [undefined]}
<!-- Hottake + Doohanstarts --> <!-- Hottake -->
<div class="mt-2 flex gap-2"> <div class="card w-full min-w-40 p-2 shadow lg:max-w-40">
<div class="card w-full min-w-40 p-2 shadow">
<h1 class="mb-2 text-nowrap font-bold">Hottake:</h1> <h1 class="mb-2 text-nowrap font-bold">Hottake:</h1>
<span class="text-sm">{data.seasonpick?.hottake}</span> <span class="text-sm">{data.seasonpick?.hottake}</span>
</div> </div>
<div class="card w-full min-w-40 p-2 shadow">
<!-- Doohanstarts -->
<div class="card w-full min-w-40 p-2 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">Doohan Starts:</h1> <h1 class="mb-2 text-nowrap font-bold">Doohan Starts:</h1>
{#if data.seasonpick} {#if data.seasonpick}
<span class="text-sm"> <span class="text-sm">
@ -95,15 +96,13 @@
</span> </span>
{/if} {/if}
</div> </div>
</div>
<!-- WDC + WCC --> <!-- WDC -->
<div class="mt-2 flex gap-2"> <div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<div class="card w-full min-w-40 p-2 pb-0 shadow">
<h1 class="mb-2 text-nowrap font-bold">WDC:</h1> <h1 class="mb-2 text-nowrap font-bold">WDC:</h1>
<LazyImage <LazyImage
src={get_by_value(drivers, "id", data.seasonpick?.wdcwinner ?? "") src={get_by_value(drivers, "id", data.seasonpick?.wdcwinner ?? "")?.headshot_url ??
?.headshot_url ?? get_driver_headshot_template(data.graphics)} get_driver_headshot_template(data.graphics)}
imgwidth={DRIVER_HEADSHOT_WIDTH} imgwidth={DRIVER_HEADSHOT_WIDTH}
imgheight={DRIVER_HEADSHOT_HEIGHT} imgheight={DRIVER_HEADSHOT_HEIGHT}
containerstyle="height: 115px; margin: auto;" containerstyle="height: 115px; margin: auto;"
@ -112,7 +111,9 @@
onclick={seasonpick_handler} onclick={seasonpick_handler}
/> />
</div> </div>
<div class="card w-full min-w-40 p-2 pb-0 shadow">
<!-- WDC -->
<div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">WCC:</h1> <h1 class="mb-2 text-nowrap font-bold">WCC:</h1>
<LazyImage <LazyImage
src={get_by_value(teams, "id", data.seasonpick?.wccwinner ?? "")?.banner_url ?? src={get_by_value(teams, "id", data.seasonpick?.wccwinner ?? "")?.banner_url ??
@ -125,11 +126,9 @@
onclick={seasonpick_handler} onclick={seasonpick_handler}
/> />
</div> </div>
</div>
<!-- Overtakes + DNFs --> <!-- Overtakes -->
<div class="mt-2 flex gap-2"> <div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<div class="card w-full min-w-40 p-2 pb-0 shadow">
<h1 class="mb-2 text-nowrap font-bold">Most Overtakes:</h1> <h1 class="mb-2 text-nowrap font-bold">Most Overtakes:</h1>
<LazyImage <LazyImage
src={get_by_value(drivers, "id", data.seasonpick?.mostovertakes ?? "") src={get_by_value(drivers, "id", data.seasonpick?.mostovertakes ?? "")
@ -142,7 +141,9 @@
onclick={seasonpick_handler} onclick={seasonpick_handler}
/> />
</div> </div>
<div class="card w-full min-w-40 p-2 pb-0 shadow">
<!-- DNFs -->
<div class="card w-full min-w-40 p-2 pb-0 shadow lg:max-w-40">
<h1 class="mb-2 text-nowrap font-bold">Most DNFs:</h1> <h1 class="mb-2 text-nowrap font-bold">Most DNFs:</h1>
<LazyImage <LazyImage
src={get_by_value(drivers, "id", data.seasonpick?.mostdnfs ?? "")?.headshot_url ?? src={get_by_value(drivers, "id", data.seasonpick?.mostdnfs ?? "")?.headshot_url ??
@ -155,11 +156,11 @@
onclick={seasonpick_handler} onclick={seasonpick_handler}
/> />
</div> </div>
</div>
<!-- Teamwinners + Podiums --> <!-- Teamwinners -->
<div class="mt-2 flex gap-2"> <div
<div class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow"> class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40"
>
<h1 class="mb-2 text-nowrap font-bold">Teamwinners:</h1> <h1 class="mb-2 text-nowrap font-bold">Teamwinners:</h1>
<div class="mt-1 grid grid-cols-4 gap-x-0 gap-y-0.5"> <div class="mt-1 grid grid-cols-4 gap-x-0 gap-y-0.5">
{#each teamwinners.slice(0, 12) as winner} {#each teamwinners.slice(0, 12) as winner}
@ -173,7 +174,11 @@
{/each} {/each}
</div> </div>
</div> </div>
<div class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow">
<!-- Podiums -->
<div
class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40"
>
<h1 class="mb-2 text-nowrap font-bold">Podiums:</h1> <h1 class="mb-2 text-nowrap font-bold">Podiums:</h1>
<div class="mt-1 grid grid-cols-4 gap-x-0 gap-y-0.5"> <div class="mt-1 grid grid-cols-4 gap-x-0 gap-y-0.5">
{#each podiums as podium} {#each podiums as podium}
@ -187,12 +192,10 @@
{/each} {/each}
</div> </div>
</div> </div>
</div>
{/if} {/if}
<!-- Show users that have and have not picked yet --> <!-- Show users that have picked -->
{#if seasonpicks.length === 0} {#if seasonpicks.length === 0}
<div class="mt-2 flex gap-2">
<div <div
class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40" class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40"
> >
@ -211,6 +214,8 @@
{/each} {/each}
</div> </div>
</div> </div>
<!-- Show users that have not picked yet -->
<div <div
class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40" class="card max-h-[155px] w-full min-w-40 overflow-y-scroll p-2 shadow lg:max-w-40"
> >
@ -229,7 +234,6 @@
{/each} {/each}
</div> </div>
</div> </div>
</div>
{/if} {/if}
</div> </div>
</svelte:fragment> </svelte:fragment>
@ -244,7 +248,7 @@
<div class="mt-4 h-10 w-7 lg:w-36"></div> <div class="mt-4 h-10 w-7 lg:w-36"></div>
<!-- Hottake --> <!-- Hottake -->
<div class="card mt-2 flex h-20 w-7 flex-col !rounded-r-none bg-surface-300 p-2 shadow lg:w-36"> <div class="card mt-2 flex h-32 w-7 flex-col !rounded-r-none bg-surface-300 p-2 shadow lg:w-36">
<span class="hidden text-nowrap text-sm font-bold lg:block">Hottake</span> <span class="hidden text-nowrap text-sm font-bold lg:block">Hottake</span>
<span class="block rotate-90 text-nowrap text-xs font-bold lg:hidden">Hottake</span> <span class="block rotate-90 text-nowrap text-xs font-bold lg:hidden">Hottake</span>
</div> </div>
@ -361,7 +365,7 @@
<!-- Hottake --> <!-- Hottake -->
<div <div
class="mt-2 h-20 w-full overflow-y-scroll border bg-surface-300 px-1 py-2 leading-3 lg:px-2" class="mt-2 h-32 w-full overflow-y-scroll border bg-surface-300 px-1 py-2 leading-3 lg:px-2"
> >
<div class="mx-auto w-fit text-xs font-bold lg:text-sm">{hottake?.hottake ?? "?"}</div> <div class="mx-auto w-fit text-xs font-bold lg:text-sm">{hottake?.hottake ?? "?"}</div>
</div> </div>