stan/esports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into dev

Browse Source
This commit is contained in:
Stan
2026-03-13 18:28:54 +01:00
committed by GitHub
parent 240b9305eb 90420aa18d
commit 97b723510d
2 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/routes/(app)/matches/+page.svelte
View File

@@ -9,6 +9,8 @@
let createError = $state('');
let inviteError = $state('');
let inviteSuccess = $state(false);
let formDataLoading = $state(false);
let formData = $state<any>(null);
// Challenge form state
let selectedCreatorTeamId = $state('');
@@ -18,10 +20,25 @@
let useCustomBo = $state(false);
let opponentSearch = $state('');
const personalTeam = $derived((data as any).userTeams?.find((t: any) => t.isPersonal));
const nonPersonalUserTeams = $derived(
(data as any).userTeams?.filter((t: any) => !t.isPersonal) ?? []
);
// Load form data when create/invite modals open
$effect(async () => {
if ((showCreate || showInvite) && !formData && !formDataLoading) {
formDataLoading = true;
const formData_elem = new FormData();
const response = await fetch('?/loadCreateFormData', {
method: 'POST',
body: formData_elem
});
const result = await response.json();
if (result.data) {
formData = result.data;
}
formDataLoading = false;
}
});
const personalTeam = $derived((formData ?? data).userTeams?.find((t: any) => t.isPersonal));
const nonPersonalUserTeams = $derived((formData ?? data).userTeams?.filter((t: any) => !t.isPersonal) ?? []);
const hasMultipleTeams = $derived(nonPersonalUserTeams.length > 0);
// Auto-select personal team by default
@@ -31,8 +48,8 @@
}
});
const selectedCreatorTeam = $derived(data.teams.find((t: any) => t.id === selectedCreatorTeamId));
const selectedInvitedTeam = $derived(data.teams.find((t: any) => t.id === selectedInvitedTeamId));
const selectedCreatorTeam = $derived((formData ?? data).teams.find((t: any) => t.id === selectedCreatorTeamId));
const selectedInvitedTeam = $derived((formData ?? data).teams.find((t: any) => t.id === selectedInvitedTeamId));
const creatorIsPersonal = $derived(selectedCreatorTeam?.isPersonal ?? true);
const creatorMaxSize = $derived(selectedCreatorTeam?.memberCount ?? 1);
@@ -42,7 +59,7 @@
// Filter opponent teams for search
const filteredOpponentTeams = $derived(
data.teams.filter((t: any) => {
(formData ?? data).teams.filter((t: any) => {
if (t.id === selectedCreatorTeamId) return false;
if (!opponentSearch) return true;
return t.name.toLowerCase().includes(opponentSearch.toLowerCase());
@@ -141,26 +158,22 @@
</p>
</div>
<div class="flex gap-2">
{#if (data as any).userTeams?.length > 0}
{#if (formData ?? data).userTeams?.length > 0}
<button
onclick={() => {
showInvite = !showInvite;
if (showInvite) showCreate = false;
}}
class="font-600 rounded-md border border-accent/30 px-4 py-2 text-sm text-accent transition-colors hover:bg-accent/10"
onclick={() => { showInvite = !showInvite; if (showInvite) showCreate = false; }}
disabled={formDataLoading && showInvite}
class="rounded-md border border-accent/30 px-4 py-2 text-sm font-600 text-accent transition-colors hover:bg-accent/10 disabled:opacity-50"
>
{showInvite ? 'Cancel' : 'Challenge'}
{showInvite && formDataLoading ? 'Loading...' : showInvite ? 'Cancel' : 'Challenge'}
</button>
{/if}
{#if data.canCreateMatch}
<button
onclick={() => {
showCreate = !showCreate;
if (showCreate) showInvite = false;
}}
class="font-600 rounded-md bg-accent px-4 py-2 text-sm text-surface-900 transition-colors hover:bg-accent-hover"
onclick={() => { showCreate = !showCreate; if (showCreate) showInvite = false; }}
disabled={formDataLoading && showCreate}
class="rounded-md bg-accent px-4 py-2 text-sm font-600 text-surface-900 transition-colors hover:bg-accent-hover disabled:opacity-50"
>
{showCreate ? 'Cancel' : 'New Match'}
{showCreate && formDataLoading ? 'Loading...' : showCreate ? 'Cancel' : 'New Match'}
</button>
{/if}
</div>