From 3f057a589aee6df01ddcff346ca6184bd5ace3d0 Mon Sep 17 00:00:00 2001
From: Arthur Branchu-Harel <arthur.branchuharel@gmail.com>
Date: Wed, 16 Oct 2024 19:06:43 +0200
Subject: [PATCH 1/2] use player name as team name when solo game

---
 src/components/TeamCard.vue        |  6 ++++-
 src/components/TournamentTeams.vue |  3 ++-
 src/stores/tournament.store.ts     |  3 +++
 src/views/TournamentRegister.vue   | 35 +++++++++++++++++++++++++-----
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/components/TeamCard.vue b/src/components/TeamCard.vue
index d3aac12..726a974 100755
--- a/src/components/TeamCard.vue
+++ b/src/components/TeamCard.vue
@@ -10,6 +10,7 @@ storeToRefs(useUserStore());
 
 defineProps<{
   team: Team;
+  soloGame?: boolean;
 }>();
 </script>
 
@@ -19,7 +20,10 @@ defineProps<{
       {{ team.name }}
       <img v-if="team.validated" src="/src/assets/images/check_with_bg.svg" alt="Logo validé" class="inline-block size-6"/>
     </h1>
-    <ul class="ml-4 list-disc text-xl">
+    <ul
+      v-if="soloGame"
+      class="ml-4 list-disc text-xl"
+    >
       <li v-for="player in team.players" :key="((player as PlayerRegistration).user)">
         <p>
           {{ (player as PlayerRegistration).name_in_game }}
diff --git a/src/components/TournamentTeams.vue b/src/components/TournamentTeams.vue
index 5b8bd8d..2817440 100644
--- a/src/components/TournamentTeams.vue
+++ b/src/components/TournamentTeams.vue
@@ -13,7 +13,7 @@ const { getTournamentTeams } = tournamentStore;
 
 getTournamentTeams();
 
-const { tourney_teams } = storeToRefs(tournamentStore);
+const { tourney_teams, soloGame } = storeToRefs(tournamentStore);
 </script>
 
 <template>
@@ -30,6 +30,7 @@ const { tourney_teams } = storeToRefs(tournamentStore);
           v-for="team in tourney_teams.validated_teams"
           :key="team.id"
           :team="team"
+          :solo-game="soloGame"
         />
       </div>
     </div>
diff --git a/src/stores/tournament.store.ts b/src/stores/tournament.store.ts
index fe359d4..1a199e4 100755
--- a/src/stores/tournament.store.ts
+++ b/src/stores/tournament.store.ts
@@ -489,6 +489,8 @@ export const useTournamentStore = defineStore('tournament', () => {
     return res;
   };
 
+  const soloGame = computed(() => (tournament.value as TournamentDeref | undefined)?.game.players_per_team === 1);
+
   function $reset() {
     eventsList.value = {};
     tournamentsList.value = {};
@@ -543,5 +545,6 @@ export const useTournamentStore = defineStore('tournament', () => {
     get_ticket_pdf,
     get_unpaid_registration,
     validate_registration,
+    soloGame,
   };
 });
diff --git a/src/views/TournamentRegister.vue b/src/views/TournamentRegister.vue
index 98c4329..c9b473e 100755
--- a/src/views/TournamentRegister.vue
+++ b/src/views/TournamentRegister.vue
@@ -26,9 +26,7 @@ const tournamentStore = useTournamentStore();
 const {
   registerTeam, registerPlayerOrManager, getTournamentFull, payRegistration,
 } = tournamentStore;
-const { tournamentsList } = storeToRefs(tournamentStore);
-const tournament = computed<Tournament | undefined>(() => tournamentsList.value[props.id]);
-// const tournament = ref<Tournament>();
+const { tournament, soloGame } = storeToRefs(tournamentStore);
 
 const acceptRules = helpers.withParams(
   { type: 'acceptRules' },
@@ -52,7 +50,7 @@ const selected_team = computed(() => {
 });
 
 const rules = computed(() => ({
-  team: { required },
+  team: soloGame ? {} : { required },
   name_in_game: register_form.role === 'player' ? { required } : {},
   password: { required, minLengthValue: minLength(8) },
   role: { required },
@@ -68,6 +66,10 @@ const register_team = async () => {
   const isValid = await v$.value.$validate();
   if (!isValid) return;
 
+  if (soloGame) {
+    register_form.team = register_form.name_in_game;
+  }
+
   try {
     await registerTeam(
       tournament.value?.id as number,
@@ -177,7 +179,7 @@ const view_password = ref<boolean>(false);
           @submit.prevent="create ? register_team() : register_player()"
         >
           <FormField
-            v-if="create"
+            v-if="create && !soloGame"
             v-slot="context"
             :validations="v$.team"
             class="flex flex-col text-xl"
@@ -196,6 +198,27 @@ const view_password = ref<boolean>(false);
               @blur="v$.team.$touch"
             />
           </FormField>
+          <FormField
+            v-else-if="soloGame"
+            v-slot="context"
+            :validations="v$.name_in_game"
+            class="flex flex-col text-xl"
+          >
+            <label for="name_in_game">
+              Pseudo en jeu
+            </label>
+            <input
+              id="name_in_game"
+              v-model="register_form.name_in_game"
+              class="text-black disabled:opacity-75"
+              :class="{ error: context.invalid }"
+              :disabled="register_form.role === 'manager'"
+              placeholder="Pseudo"
+              type="text"
+              required
+              @blur="v$.name_in_game.$touch"
+            />
+          </FormField>
           <FormField
             v-else
             v-slot="context"
@@ -221,6 +244,7 @@ const view_password = ref<boolean>(false);
             </select>
           </FormField>
           <FormField
+            v-if="!soloGame"
             v-slot="context"
             :validations="v$.name_in_game"
             class="flex flex-col text-xl"
@@ -240,6 +264,7 @@ const view_password = ref<boolean>(false);
               @blur="v$.name_in_game.$touch"
             />
           </FormField>
+          <div v-else/> <!-- for padding -->
           <FormField
             v-slot="context"
             :validations="v$.password"

From 2f7390b05ff6441c1c34fe8f9dead10d5941a6ea Mon Sep 17 00:00:00 2001
From: Arthur Branchu-Harel <arthur.branchuharel@gmail.com>
Date: Thu, 17 Oct 2024 16:14:58 +0200
Subject: [PATCH 2/2] fix missing team field for joining team for solo game

---
 src/views/TournamentRegister.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/TournamentRegister.vue b/src/views/TournamentRegister.vue
index c9b473e..f320d9f 100755
--- a/src/views/TournamentRegister.vue
+++ b/src/views/TournamentRegister.vue
@@ -199,7 +199,7 @@ const view_password = ref<boolean>(false);
             />
           </FormField>
           <FormField
-            v-else-if="soloGame"
+            v-else-if="create && soloGame"
             v-slot="context"
             :validations="v$.name_in_game"
             class="flex flex-col text-xl"
@@ -243,8 +243,9 @@ const view_password = ref<boolean>(false);
               </option>
             </select>
           </FormField>
+          <div v-if="create && soloGame"/> <!-- for padding -->
           <FormField
-            v-if="!soloGame"
+            v-else
             v-slot="context"
             :validations="v$.name_in_game"
             class="flex flex-col text-xl"
@@ -264,7 +265,6 @@ const view_password = ref<boolean>(false);
               @blur="v$.name_in_game.$touch"
             />
           </FormField>
-          <div v-else/> <!-- for padding -->
           <FormField
             v-slot="context"
             :validations="v$.password"