Skip to content

Commit

Permalink
Fix Linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
KwikKill committed Oct 2, 2024
1 parent 157f622 commit 5365e21
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/components/TournamentGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const { tourney_teams } = storeToRefs(tournamentStore);
</h1>
<div class="gap-4">
<div v-for="game in matchs" :key="game.id">
<div v-if="game.teams.length == 2" class="flex justify-center">
<div v-if="game.teams.length === 2" class="flex justify-center">
<div class="mb-4 flex flex-1 justify-between divide-x overflow-hidden border-2 text-xl font-bold md:ml-10">
<div class="w-full truncate p-3">
{{ get_validated_team_by_id(game.teams[0])?.name || "TBD" }}
Expand Down
2 changes: 1 addition & 1 deletion src/stores/user.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const useUserStore = defineStore('user', () => {
const inscriptions = ref<{
ongoing: Ref<[string, PlayerRegistrationDeref | RegistrationDeref][]>;
past: Ref<[string, PlayerRegistrationDeref | RegistrationDeref][]>;
unpaid: Ref<{ [key: string]: boolean }>;
unpaid: Ref<Record<string, boolean>>;
}>({
ongoing: ref([]),
past: ref([]),
Expand Down
43 changes: 22 additions & 21 deletions src/views/Me.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import FormField from '@/components/FormField.vue';
import Modal from '@/components/Modal.vue';
import PasswordInput from '@/components/PasswordInput.vue';
import { BestofType, type ScorePatch } from '@/models/match';
import type { PlayerRegistrationDeref, RegistrationDeref } from '@/models/registration';
import type { Tournament } from '@/models/tournament';
import { useTournamentStore } from '@/stores/tournament.store';
import { useUserStore } from '@/stores/user.store';
Expand Down Expand Up @@ -253,7 +254,7 @@ const openScoreModal = () => {
<div class="text-md m-1 flex w-16 justify-around rounded bg-blue-700 p-1">
<svg
v-if="role === 'dev'"
class="h-6 w-6"
class="size-6"
fill="none"
stroke="currentColor"
stroke-width="1.5"
Expand Down Expand Up @@ -311,13 +312,13 @@ const openScoreModal = () => {
<fa-awesome-icon size="xs" icon="fa-solid fa-warning" /> </h2>
</div>
</div-->
<div v-if="inscriptions.ongoing?.length > 0" class="m-4">
<div v-if="(inscriptions.ongoing as [string, PlayerRegistrationDeref | RegistrationDeref][])?.length > 0" class="m-4">
<h1 class="text-xl">
Edition Actuelle
</h1>
<div class="m-1 grid gap-3 md:grid-cols-3">
<div
v-for="inscription in inscriptions.ongoing"
v-for="inscription in (inscriptions.ongoing as [string, PlayerRegistrationDeref | RegistrationDeref][])"
:key="inscription[1].id"
:class="{ /*[`bg-red-900`]: inscriptions.unpaid[inscription.team.id]*/ }"
class="container flex max-w-xs flex-col-reverse break-words bg-cyan-900 text-center"
Expand All @@ -326,32 +327,32 @@ const openScoreModal = () => {
<div class="flex flex-1 flex-col justify-center">
<div class="m-2 flex flex-row items-stretch justify-center gap-2">
<div
:class="{ [`bg-red-600`]: inscriptions.unpaid[inscription[1].id], [`bg-green-600`]: !inscriptions.unpaid[inscription[1].id] }"
:class="{ [`bg-red-600`]: (inscriptions.unpaid as Record<string, boolean>)[inscription[1].id], [`bg-green-600`]: !(inscriptions.unpaid as Record<string, boolean>)[inscription[1].id] }"
class="center rounded p-2 font-bold text-white transition duration-150 ease-in-out hover:cursor-pointer hover:ring hover:ring-pink-500"
@click.prevent="
inscriptions.unpaid[inscription[1].id]
(inscriptions.unpaid as Record<string, boolean>)[inscription[1].id]
? (
modal_payment = true,
payRegistration(inscription[1].team.tournament as unknown as Tournament, inscription[0])
)
: $router.push(`/tournament/${inscription[1].team.tournament.id }/team/${inscription[1].team.id }`)"
: $router.push(`/tournament/${inscription[1].team.tournament.id}/team/${inscription[1].team.id}`)"
@keydown.prevent="
inscriptions.unpaid[inscription[1].id]
(inscriptions.unpaid as Record<string, boolean>)[inscription[1].id]
? (
modal_payment = true,
payRegistration(inscription[1].team.tournament as unknown as Tournament, inscription[0])
)
: $router.push(`/tournament/${inscription[1].team.tournament.id }/team/${inscription[1].team.id }`)"
: $router.push(`/tournament/${inscription[1].team.tournament.id}/team/${inscription[1].team.id}`)"
>
{{ inscriptions.unpaid[inscription[1].id] ? 'Terminer l\'inscription' : (inscription[1].team.players[0] === user.id || inscription[0] === "manager") ? 'Gérer l\'équipe' : 'Voir l\'équipe' }}
{{ (inscriptions.unpaid as Record<string, boolean>)[inscription[1].id] ? 'Terminer l\'inscription' : (inscription[1].team.players[0] === user.id || inscription[0] === "manager") ? 'Gérer l\'équipe' : 'Voir l\'équipe' }}
</div>
</div>
</div>
</div>
<div class="hidden flex-col md:block">
<router-link
class="mt-auto text-zinc-400"
:to="`/tournament/${inscription[1].team.tournament.id }/rules`"
:to="`/tournament/${inscription[1].team.tournament.id}/rules`"
>
Règlement du tournoi
</router-link>
Expand All @@ -364,7 +365,7 @@ const openScoreModal = () => {
<img
:src="inscription[1].team.tournament.logo"
alt="image du tournoi"
class="h-32 w-32 max-w-full overflow-hidden"
class="size-32 max-w-full overflow-hidden"
style="width: 100%; object-fit: cover;"
/>
<div
Expand All @@ -386,23 +387,23 @@ const openScoreModal = () => {
</div>
</div>
</div>
<div v-if="inscriptions.past?.length > 0" class="m-4">
<div v-if="(inscriptions.past as [string, PlayerRegistrationDeref | RegistrationDeref][])?.length > 0" class="m-4">
<h1 class="text-xl">
Autres Editions
</h1>
<div class="m-1 grid gap-3 md:grid-cols-3">
<router-link
v-for="inscription in inscriptions.past"
v-for="inscription in (inscriptions.past as [string, PlayerRegistrationDeref | RegistrationDeref][])"
:key="inscription[1].id"
:to="`/tournament/${inscription[1].team.tournament.id }/team/${inscription[1].team.id }`"
:to="`/tournament/${inscription[1].team.tournament.id}/team/${inscription[1].team.id}`"
class="container flex max-w-xs flex-col-reverse break-words bg-cyan-900 text-center"
>
<div class="my-1 hidden md:block">
<div class="m-1 flex h-8 flex-1 flex-col justify-center">
<div>
<router-link
class="center rounded bg-green-600 p-2 font-bold text-white transition duration-150 ease-in-out hover:ring hover:ring-pink-500"
:to="`/tournament/${inscription[1].team.tournament.id }/team/${inscription[1].team.id }`"
:to="`/tournament/${inscription[1].team.tournament.id}/team/${inscription[1].team.id}`"
>
{{ (inscription[1].team.players[0] === user.id || inscription[0] === 'manager') ? 'Gérer l\'équipe' : 'Voir l\'équipe' }}
</router-link>
Expand All @@ -412,15 +413,15 @@ const openScoreModal = () => {
<div class="hidden flex-col md:block">
<router-link
class="mt-auto text-zinc-400"
:to="`/tournament/${inscription[1].team.tournament.id }/rules`"
:to="`/tournament/${inscription[1].team.tournament.id}/rules`"
>
Règlement du tournoi
</router-link>
</div>
<img
:src="inscription[1].team.tournament.logo"
alt="image du tournoi"
class="h-32 w-32 max-w-full overflow-hidden"
class="size-32 max-w-full overflow-hidden"
style="width: 100%; object-fit: cover;"
/>
<div class="m-1 flex flex-1 flex-col justify-center">
Expand Down Expand Up @@ -602,9 +603,9 @@ const openScoreModal = () => {
class="flex justify-between"
label="{{id}}"
>
<label :for="'input' + id">{{ name }}</label>
<label :for="`input${id}`">{{ name }}</label>
<input
:id="'input' + id"
:id="`input${id}`"
v-model="data_score.score[id]"
:class="{ error: context.invalid }"
aria-label="score"
Expand Down Expand Up @@ -660,9 +661,9 @@ const openScoreModal = () => {
:on-blur="v$_time_game.$touch"
label="times"
>
<label :for="'input' + n">Partie {{ n }} </label>
<label :for="`input${n}`">Partie {{ n }} </label>
<input
:id="'input' + n"
:id="`input${n}`"
v-model="data_score.times[n]"
:class="{ error: context.invalid }"
aria-label="duration"
Expand Down

0 comments on commit 5365e21

Please sign in to comment.