CraftAttack/varo-website
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show missing players in team table
All checks were successful
deploy / build-and-deploy (/testvaro, /opt/website-test, website-test) (push) Successful in 14s
Details
deploy / build-and-deploy (/varo, /opt/website, website) (push) Successful in 14s
Details

Browse Source
This commit is contained in:
bytedream
2025-06-16 13:16:53 +02:00
parent 8cc103510c
commit 6051c4dd69
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/website/index/Teams.svelte
View File

@ -12,25 +12,17 @@
const entries = teams.map((team) => ({ const entries = teams.map((team) => ({
...team, ...team,
memberOne: memberOne: Object.assign(team.memberOne, {
team.memberOne.id != null dead: team.memberOne.id != null ? deaths.findIndex((d) => d.deadUserId === team.memberOne.id) !== -1 : null,
? { }),
...team.memberOne, memberTwo: Object.assign(team.memberTwo, {
dead: deaths.findIndex((d) => d.deadUserId === team.memberOne.id) !== -1 dead: team.memberTwo.id != null ? deaths.findIndex((d) => d.deadUserId === team.memberTwo.id) !== -1 : null,
} }),
: undefined,
memberTwo:
team.memberTwo.id != null
? {
...team.memberTwo,
dead: deaths.findIndex((d) => d.deadUserId === team.memberTwo.id) !== -1
}
: undefined,
kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length
})); }));
entries.sort((a, b) => { entries.sort((a, b) => {
const aAllowed = !!a.memberOne && !!a.memberTwo && !(a.memberOne.dead && a.memberTwo.dead); const aAllowed = !!a.memberOne.id && !!a.memberTwo.id && !(a.memberOne.dead && a.memberTwo.dead);
const bAllowed = !!b.memberOne && !!b.memberTwo && !(b.memberOne.dead && b.memberTwo.dead); const bAllowed = !!b.memberOne.id && !!b.memberTwo.id && !(b.memberOne.dead && b.memberTwo.dead);
if (!aAllowed && !bAllowed) { if (!aAllowed && !bAllowed) {
return 0; return 0;
} else if (!aAllowed || !bAllowed) { } else if (!aAllowed || !bAllowed) {
@ -61,37 +53,37 @@
{team.name} {team.name}
</h3> </h3>
</div> </div>
{#if !team.memberOne || !team.memberTwo} {#if !team.memberOne.id || !team.memberTwo.id}
<span>Team unvollständig</span> <span>Team unvollständig</span>
{/if} {/if}
</td> </td>
<td class="max-w-9 overflow-ellipsis"> <td class="max-w-9 overflow-ellipsis">
{#if team.memberOne}
<div class="flex items-center gap-x-2"> <div class="flex items-center gap-x-2">
{#if team.memberOne.id != null}
<img <img
class="h-4 pixelated" class="h-4 pixelated"
src={team.memberOne.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberOne.username}/8`} src={team.memberOne.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberOne.username}/8`}
alt="head" alt="head"
/> />
<span class="text-xs sm:text-md" class:line-through={team.memberOne.dead} {/if}
<span class="text-xs sm:text-md" class:line-through={team.memberOne.dead} class:text-gray-500={team.memberOne.id == null}
>{team.memberOne.username}</span >{team.memberOne.username}</span
> >
</div> </div>
{/if}
</td> </td>
<td> <td>
{#if team.memberTwo}
<div class="flex items-center gap-x-2"> <div class="flex items-center gap-x-2">
{#if team.memberTwo.id != null}
<img <img
class="h-4 pixelated" class="h-4 pixelated"
src={team.memberTwo.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberTwo.username}/8`} src={team.memberTwo.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberTwo.username}/8`}
alt="head" alt="head"
/> />
<span class="text-xs sm:text-md" class:line-through={team.memberTwo.dead} {/if}
<span class="text-xs sm:text-md" class:line-through={team.memberTwo.dead} class:text-gray-500={team.memberTwo.id == null}
>{team.memberTwo.username}</span >{team.memberTwo.username}</span
> >
</div> </div>
{/if}
</td> </td>
<td> <td>
<span class="text-xs sm:text-md">0</span> <span class="text-xs sm:text-md">0</span>