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

Site

Browse Source 
- fix some bug on html
    - for tournament, receive action 0 1 2 3 are ready
    - update style tournament page
This commit is contained in:
Kum1ta
2024-10-02 05:03:01 +02:00
parent 4f9f7c6f93
commit eb6b2c8ada
7 changed files with 292 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html
View File

@ -14,13 +14,13 @@
<div class="circle" id="pfp-3">
<div class="container" style="margin-top: 50px;">
<p style="position: absolute; top: -30px; " id="user-3">username3</p>
<p style="position: absolute; bottom: -340px;" id="user-9">username9</p>
<div class="vertical-line-demi">
<p style="position: absolute; bottom: -280px;" id="user-9">username9</p>
<div class="vertical-line-demi" style="height: 220px;">
<div class="horizontal-container-final">
<div class="horizontal-line"></div>
<div class="circle" id="pfp-12"></div>
<p id="user-12">username12</p>
<p style="position:absolute; right: 25px; bottom: 83px; color: white; font-size: 35px;">VS</p>
<p style="position:absolute; right: 25px; bottom: 43px; color: white; font-size: 35px;">VS</p>
</div>
</div>
</div>
@ -29,7 +29,7 @@
</div>
<div class="circle" id="pfp-2"></div>
<p id="user-2">username2</p>
<div class="container">
<div class="container" style="margin-top: 20px;">
<p id="user-4">username4</p>
<div class="circle" id="pfp-4"></div>
<div class="vertical-line">
@ -58,7 +58,7 @@
<div class="horizontal-line"></div>
<div style="display: flex; flex-direction: column; align-items: center; margin-left: -25px; justify-items: center;">
<p style="position: absolute; top: -55px" id="user-13">username13</p>
<div class="circle" id="pfp-15"></div>
<div class="circle" id="pfp-13"></div>
<div class="vertical-line"></div>
<p style="position: absolute; bottom: -55px;" id="user-14">username14</p>
<div class="circle" id="pfp-14"></div>
@ -98,15 +98,13 @@
<div class="info-tournament">
<p id="info-title">Informations</p>
<div class="infoo">
<div class="alert-info">
<p>edbernard won against madegryc !</p>
<img src="/static/img/tournamentPage/eye.svg" id="eye"></img>
</div>
</div>
</div>
<div class="chat-tournament">
<p id="chat-title">Chat</p>
<div class="chat"></div>
<div class="chat">
</div>
<div class="inputMessageDiv">
<textarea type="text" id="inputMessage" placeholder="Enter your message here"></textarea>
<p id="sendButton">></p>

6
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 17:49:33 by edbernar ### ########.fr #
# Updated: 2024/10/02 04:48:02 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -26,6 +26,10 @@
#
# 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
#
# 3 : message : send a message to the tournament chat
# - username : name of the player who send the message
# - message : message to send
#client actions (actions sent by the client) :