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

update

Browse Source
This commit is contained in:
Kum1ta
2024-10-01 21:30:56 +02:00
parent a8863ad379
commit 2e133231da
6 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,18 +28,30 @@
</div>
</div>
<div class="popup-background" id="popup-background">
<div class="popup-background" id="popup-skin-selector">
<div class="popup-skin">
<h1>Select your skin</h1>
<div class="color-grid">
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
<div class="color-box color-box-skin"></div>
</div>
</div>
</div>
<div class="popup-background" id="popup-goal-selector">
<div class="popup-skin">
<h1>Select your skin</h1>
<div class="color-grid">
<div class="color-box color-box-goal"></div>
<div class="color-box color-box-goal"></div>
<div class="color-box color-box-goal"></div>
<div class="color-box color-box-goal"></div>
</div>
</div>
</div>

10
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/01 14:00:29 by edbernar ### ########.fr #
# Updated: 2024/10/01 17:49:33 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -18,16 +18,22 @@
# - isFull : true/false
# - started : true/false
# - code : code of the tournament
#
# 1 : someoneJoin : tell the client someone join the tournament (considering clients will place selon the order of the join)
# - id : id of the player
# - name : name of the player
# - username : name of the player
# - pfp : pfp of the player
#
# 2 : someoneLeave : tell the client someone leave the tournament (if game not started, players will be replaced in the order of the join)
# - id : id of the player who leave
#client actions (actions sent by the client) :
# 0 : start : start a tournament. if code == "", create a new tournament, else join the tournament with the code
# - code : code of the tournament
# 1 : leave : leave the tournament
#
# 2 : message tournament : send a message to the tournament chat
# - message : message to send