Merge pull request #56 from HE-Arc/dev

Fix merge bugs
HE-Arc · May 2, 2024 · 92db1ec · 92db1ec
2 parents bca46b1 + 4b5bcc8
commit 92db1ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/api/arconnectmanager/settings.py b/api/arconnectmanager/settings.py
@@ -78,7 +78,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'allauth.account.middleware.AccountMiddleware',
+    #'allauth.account.middleware.AccountMiddleware',
 ]
 
 ROOT_URLCONF = 'arconnectmanager.urls'

diff --git a/frontend/src/views/ManageTournamentsView.vue b/frontend/src/views/ManageTournamentsView.vue
@@ -66,13 +66,16 @@ onMounted(async () => {
                 </div>
                 <div>
                     <span @click="nextTournamentStatus(tournament)" class="material-symbols-outlined"
-                        :class="{ 'disabled': tournament.status.id == TournamentStatus.Completed.id }">
+                        :class="{ 'disabled': tournament.status.id == TournamentStatus.Completed.id }"
+                        title="Cliquez pour passer au prochain plan">
                         next_plan
                     </span>
-                    <span @click="deleteTournament(tournament.id, tournament.name)" class="material-symbols-outlined">
+                    <span @click="deleteTournament(tournament.id, tournament.name)" class="material-symbols-outlined"
+                        title="Cliquez pour supprimer le tournoi">
                         delete
                     </span>
-                    <span @click="editTournament(tournament.id)" class="material-symbols-outlined">
+                    <span @click="editTournament(tournament.id)" class="material-symbols-outlined"
+                        title="Cliquez pour modifier le tournoi">
                         edit
                     </span>
                 </div>

diff --git a/frontend/src/views/TournamentsView.vue b/frontend/src/views/TournamentsView.vue
@@ -7,7 +7,7 @@ const tournaments = ref([]);
 
 onMounted(async () => {
     tournaments.value = await TournamentService.getAllTournaments()
-};
+});
 
 </script>