tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site

Browse Source 
- buttons US FR working
    - if someone is in waitingpage and receive his opponent has left tournament, redirect to tournament page
This commit is contained in:
Kum1ta
2024-10-03 01:33:22 +02:00
parent d3fcde1f0b
commit b072b6979f
10 changed files with 102 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
View File

@ -106,8 +106,8 @@
</div>
</div>
<div class="select-line">
<div class="select-keys">US</div>
<div class="not-select-keys">FR</div>
<div class="select-keys USButton">US</div>
<div class="not-select-keys FRButton">FR</div>
</div>
</div>
</div>
@ -131,8 +131,8 @@
</div>
</div>
<div class="select-line">
<div class="select-keys">US</div>
<div class="not-select-keys">FR</div>
<div class="select-keys USButton">US</div>
<div class="not-select-keys FRButton">FR</div>
</div>
</div>
<div class="skin-select">
@ -164,8 +164,8 @@
</div>
</div>
<div class="select-line">
<div class="select-keys">US</div>
<div class="not-select-keys">FR</div>
<div class="select-keys USButton">US</div>
<div class="not-select-keys FRButton">FR</div>
</div>
</div>
@ -198,8 +198,8 @@
</div>
</div>
<div class="select-line">
<div class="select-keys">US</div>
<div class="not-select-keys">FR</div>
<div class="select-keys USButton">US</div>
<div class="not-select-keys FRButton">FR</div>
</div>
<span class="line"></span>
<p style="text-align: center;">Tournament code</p>

5
docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/01 13:16:39 by edbernar #+# #+# #
# Updated: 2024/10/02 13:31:25 by edbernar ### ########.fr #
# Updated: 2024/10/03 01:29:01 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -44,5 +44,8 @@
#
# 2 : message tournament : send a message to the tournament chat
# - message : message to send
#
# 3 : fetchAllData : fetch all data of the tournament
# --> server will send all the data of the tournament (players, messages, etc...) with his actions