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

Site

Browse Source 
- fix bug cause of last commit
    - starting tournamemnt page
This commit is contained in:
Kum1ta
2024-10-02 00:11:28 +02:00
parent c1ce1aea24
commit c065e1cb76
11 changed files with 476 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose/requirements/djangoserver/file/server/server/templates/index.html
View File

@ -15,6 +15,7 @@
<link rel='stylesheet' type='text/css' href='/static/style/profilPage/profil.css'>
<link rel='stylesheet' type='text/css' href='/static/style/settings/settings.css'>
<link rel='stylesheet' type='text/css' href='/static/style/index/loading.css'>
<link rel='stylesheet' type='text/css' href='/static/style/tournamentPage/tournamentPage.css'>
<script type="module" src='/static/javascript/main.js'></script>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

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

@ -28,18 +28,30 @@
</div>
</div>
<div class="popup" 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>

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

@ -0,0 +1,123 @@
<div id="tournamentPage">
<div class="top-bracket">
<p id="actuality-tournament">Waiting for opponent...</p>
<p id="code-tournament">Code : 45HW28</p>
</div>
<div class="bracket">
<div class="left">
<div class="container">
<p id="user-1">username1</p>
<div class="circle" id="pfp-1"></div>
<div class="vertical-line">
<div class="horizontal-container">
<div class="horizontal-line"></div>
<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">
<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>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="circle" id="pfp-2"></div>
<p id="user-2">username2</p>
<div class="container">
<p id="user-4">username4</p>
<div class="circle" id="pfp-4"></div>
<div class="vertical-line">
<div class="horizontal-container">
<div class="horizontal-line"></div>
<div class="circle" id="pfp-9"></div>
</div>
</div>
<div class="circle" id="pfp-5"></div>
<p id="user-5">username5</p>
</div>
</div>
</div>
<div class="right">
<div class="container" style="left: 350px;">
<div class="horizontal-container" style="margin-top: 75px;">
<p style="margin-right: 10px;" id="user-58">username58</p>
<div class="circle" id="pfp-58">
</div>
<div class="horizontal-line"></div>
<div class="container" style="margin-left: -25px;">
<div style="display: flex; flex-direction: row; ">
<div class="circle" id="pfp-27">
<div class="horizontal-container" style="position: absolute; left: 280px; transform: translateY(-38%); display: flex; flex-direction: row; align-items: center; justify-items: center; z-index: -1;">
<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="vertical-line"></div>
<p style="position: absolute; bottom: -55px;" id="user-14">username14</p>
<div class="circle" id="pfp-14"></div>
</div>
</div>
</div>
</div>
<div class="vertical-line-demi" style="height: 260px;">
<p style="position: absolute; top: -105px" id="user-27">username27</p>
<p style="position: absolute; bottom: -105px" id="user-31">username31</p>
<div class="horizontal-container-final"></div>
</div>
<div style="display: flex; flex-direction: row;">
<div class="circle" id="pfp-31">
<div class="horizontal-container" style="position: absolute; left: 280px; transform: translateY(-37%); z-index: -1;">
<div class="horizontal-line"></div>
<div style="display: flex; flex-direction: column; align-items: center; margin-left: -25px; justify-items: center;">
<div class="circle" id="pfp-15"></div>
<p style="position: absolute; top: -55px;" id="user-15">username15</p>
<div class="vertical-line"></div>
<p style="position: absolute; bottom: -55px;" id="user-16">username16</p>
<div class="circle" id="pfp-16"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="all-tournament">
<div class="info-tournament">
<p id="info-title">Informations</p>
<div class="info">
<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="inputMessageDiv">
<textarea type="text" id="inputMessage" placeholder="Enter your message here"></textarea>
<p id="sendButton">></p>
</div>
</div>
</div>
</div>
<div class="bottom">
<div class="buttonStartGame">
<p>Start</p>
</div>
</div>
</div>

3
docker-compose/requirements/djangoserver/file/server/server/urls.py
View File

@ -25,7 +25,7 @@ urlpatterns = [
path("multiOnlineGamePage", views.multiOnlineGamePage, name='multiOnlineGamePage'),
path("waitingGamePage", views.waitingGamePage, name='waitingGamePage'),
path("profilPage", views.profilPage, name='profilPage'),
# path("game", views.game, name='game'),
path("game", views.game, name='game'),
path("wait_game", views.game, name='wait_game'),
path("login42", views.login42, name='login42'),
path("logout", views.logout, name='logout'),
@ -34,6 +34,7 @@ urlpatterns = [
path("pfp/<str>", views.pfp, name='pfp'),
path("banner/<str>", views.banner, name='banner'),
path("settingsPage", views.settingsPage, name='settingsPage'),
path("tournamentPage", views.tournamentPage, name='tournamentPage'),
]
handler404 = "server.views.handler404"

7
docker-compose/requirements/djangoserver/file/server/server/views.py
View File

@ -158,3 +158,10 @@ def settingsPage(request):
if(not request.session.get("logged_in", False)):
return(HttpResponse("you are not logged in",status=403))
return render(request, "settingsPage.html", {})
def tournamentPage(request):
if(request.method != "POST"):
return index(request)
if(not request.session.get("logged_in", False)):
return(HttpResponse("you are not logged in",status=403))
return render(request, "tournamentPage.html", {})