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

Site :

Browse Source 
- PTME -> METH
This commit is contained in:
Misthaa
2024-09-22 18:59:37 +02:00
parent 1d719ffc64
commit 183c487ff6
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose/docker-compose.yml
View File

@ -70,7 +70,7 @@ volumes:
driver_opts: driver_opts:
type: none type: none
o: bind o: bind
device: '~/PTME_data' device: '~/METH_data'
networks: networks:
transcendence: transcendence:

2
docker-compose/requirements/djangoserver/file/server/server/templates/err404.html
View File

@ -1,5 +1,5 @@
<div id="topBar"> <div id="topBar">
<h1>PTME</h1> <h1>METH</h1>
</div> </div>
<div style='color: white; position: absolute; left: 50%; top: 50%; text-align: center; transform: translate(-50%, -50%); font-size: 10vh;' id="content"> <div style='color: white; position: absolute; left: 50%; top: 50%; text-align: center; transform: translate(-50%, -50%); font-size: 10vh;' id="content">
<h1>404</h1> <h1>404</h1>

4
docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html
View File

@ -1,7 +1,7 @@
<div id="divNotification"> <div id="divNotification">
</div> </div>
<div id="topBar"> <div id="topBar">
<h1>PTME</h1> <h1>METH</h1>
<div id="topButton"> <div id="topButton">
<p id="buttonPlay">PLAY</p> <p id="buttonPlay">PLAY</p>
<p id="buttonProject">PROJECT</p> <p id="buttonProject">PROJECT</p>
@ -130,7 +130,7 @@
<footer> <footer>
<div class="footer-content"> <div class="footer-content">
<div class="footer-left"> <div class="footer-left">
<h1>PTME</h1> <h1>METH</h1>
<p>ft_transcendance project<br>for 42 shcool</p> <p>ft_transcendance project<br>for 42 shcool</p>
</div> </div>
<div class="footer-right"> <div class="footer-right">

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

@ -1,5 +1,5 @@
<div id="topBarLobby"> <div id="topBarLobby">
<h1 id="homeButton">PTME</h1> <h1 id="homeButton">METH</h1>
<div class="search-container"> <div class="search-container">
<input type="text" placeholder="Search..." class="search-input" id="searchInputUser"> <input type="text" placeholder="Search..." class="search-input" id="searchInputUser">
</div> </div>

2
docker-compose/requirements/djangoserver/file/server/server/templates/waitingGamePage.html
View File

@ -1,5 +1,5 @@
<div id="topBar"> <div id="topBar">
<h1>PTME</h1> <h1>METH</h1>
</div> </div>
<div style='color: white; position: absolute; left: 50%; top: 50%; text-align: center; transform: translate(-50%, -50%); font-size: 5vh;'> <div style='color: white; position: absolute; left: 50%; top: 50%; text-align: center; transform: translate(-50%, -50%); font-size: 5vh;'>
<p id="sentence">Waiting for other players to start the game</p> <p id="sentence">Waiting for other players to start the game</p>

12
docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py
View File

@ -3,10 +3,10 @@
# ::: :::::::: # # ::: :::::::: #
# createAccount.py :+: :+: :+: # # createAccount.py :+: :+: :+: #
# +:+ +:+ +:+ # # +:+ +:+ +:+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: marvin <marvin@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/09 08:08:00 by edbernar #+# #+# # # Created: 2024/08/09 08:08:00 by edbernar #+# #+# #
# Updated: 2024/09/18 07:24:47 by edbernar ### ########.fr # # Updated: 2024/09/22 18:58:55 by marvin ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -80,7 +80,7 @@ def createAccount(socket, content):
def sendVerifMail(verif_str, mail, username): def sendVerifMail(verif_str, mail, username):
msg = MIMEMultipart() msg = MIMEMultipart()
msg['From'] = 'PTME <ptme@tmoron.fr>' msg['From'] = 'METH <meth@tmoron.fr>'
msg['To'] = mail msg['To'] = mail
msg['Subject'] = 'Account verification' msg['Subject'] = 'Account verification'
msg.attach(MIMEText(''' msg.attach(MIMEText('''
@ -145,14 +145,14 @@ def sendVerifMail(verif_str, mail, username):
<table class="container" role="presentation"> <table class="container" role="presentation">
<tr> <tr>
<td> <td>
<h1>Bienvenue chez PTME !</h1> <h1>Bienvenue chez METH !</h1>
<p>Bonjour ''' + username + ''',</p> <p>Bonjour ''' + username + ''',</p>
<p>Merci d'avoir créé un compte avec PTME ! Nous sommes ravis de vous accueillir parmi nous.</p> <p>Merci d'avoir créé un compte avec METH ! Nous sommes ravis de vous accueillir parmi nous.</p>
<p>Pour compléter votre inscription, veuillez vérifier votre adresse e-mail en cliquant sur le bouton ci-dessous :</p> <p>Pour compléter votre inscription, veuillez vérifier votre adresse e-mail en cliquant sur le bouton ci-dessous :</p>
<p><a href="''' + URLMAIL + verif_str +'''" class="button">Confirmer mon adresse e-mail</a></p> <p><a href="''' + URLMAIL + verif_str +'''" class="button">Confirmer mon adresse e-mail</a></p>
<p>Si vous n'avez pas demandé cette inscription, vous pouvez ignorer cet e-mail.</p> <p>Si vous n'avez pas demandé cette inscription, vous pouvez ignorer cet e-mail.</p>
<p>Merci,</p> <p>Merci,</p>
<p>L'équipe PTME</p> <p>L'équipe METH</p>
<div class="footer"> <div class="footer">
<p>42, 49 Bd Besson Bey, 16000 Angoulême, France</p> <p>42, 49 Bd Besson Bey, 16000 Angoulême, France</p>
</div> </div>

2
docker-compose/requirements/nginx/Dockerfile
View File

@ -5,7 +5,7 @@ RUN apt upgrade -y
RUN apt install openssl nginx -y RUN apt install openssl nginx -y
RUN mkdir -p /etc/nginx/ssl RUN mkdir -p /etc/nginx/ssl
RUN openssl req -x509 -nodes -out /etc/nginx/ssl/inception.crt -keyout /etc/nginx/ssl/inception.key -subj "/C=FR/ST=IDF/L=Paris/O=42/OU=42/CN=ptme.com/UID=ptme" RUN openssl req -x509 -nodes -out /etc/nginx/ssl/inception.crt -keyout /etc/nginx/ssl/inception.key -subj "/C=FR/ST=IDF/L=Paris/O=42/OU=42/CN=meth.com/UID=meth"
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY static /var/www/static COPY static /var/www/static

2
docker-compose/requirements/nginx/nginx.conf
View File

@ -15,7 +15,7 @@ http {
server { server {
access_log /dev/stdout; access_log /dev/stdout;
error_log /dev/stdout; error_log /dev/stdout;
server_name ptme.com; server_name meth.com;
listen 8000 ssl; listen 8000 ssl;
ssl_protocols TLSv1.2 TLSv1.3; ssl_protocols TLSv1.2 TLSv1.3;

18
docker-compose/requirements/nginx/static/javascript/Page.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* Page.js :+: :+: :+: */ /* Page.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/25 00:00:21 by edbernar #+# #+# */ /* Created: 2024/08/25 00:00:21 by edbernar #+# #+# */
/* Updated: 2024/09/20 01:02:39 by edbernar ### ########.fr */ /* Updated: 2024/09/22 18:58:44 by marvin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,12 +21,12 @@ class Page
{ {
actualPage = null; actualPage = null;
availablePages = [ availablePages = [
{url:'/', servUrl: '/homePage', class: HomePage, name: 'homePage', title: 'PTME - Home'}, {url:'/', servUrl: '/homePage', class: HomePage, name: 'homePage', title: 'METH - Home'},
{url:'/lobby', servUrl: '/lobbyPage', class: LobbyPage, name: 'lobbyPage', title: 'PTME - Lobby'}, {url:'/lobby', servUrl: '/lobbyPage', class: LobbyPage, name: 'lobbyPage', title: 'METH - Lobby'},
{url:'/game', servUrl: '/multiLocalGamePage', class: multiLocalGamePage, name: 'multiLocalGamePage', title: 'PTME - Game'}, {url:'/game', servUrl: '/multiLocalGamePage', class: multiLocalGamePage, name: 'multiLocalGamePage', title: 'METH - Game'},
{url:'/wait_game', servUrl: '/waitingGamePage', class: WaitingGamePage, name: 'waitingGamePage', title: 'PTME - Wait for a game'}, {url:'/wait_game', servUrl: '/waitingGamePage', class: WaitingGamePage, name: 'waitingGamePage', title: 'METH - Wait for a game'},
{url:'/game', servUrl: '/multiOnlineGamePage', class: MultiOnlineGamePage, name: 'multiOnlineGamePage', title: 'PTME - Game'}, {url:'/game', servUrl: '/multiOnlineGamePage', class: MultiOnlineGamePage, name: 'multiOnlineGamePage', title: 'METH - Game'},
{url:'/profil', servUrl: '/profilPage', class: ProfilPage, name: 'profilPage', title: 'PTME - Profil'}, {url:'/profil', servUrl: '/profilPage', class: ProfilPage, name: 'profilPage', title: 'METH - Profil'},
] ]
constructor() constructor()
@ -108,7 +108,7 @@ class Page
data.text().then(text => { data.text().then(text => {
document.body.innerHTML = text; document.body.innerHTML = text;
this.actualPage = null; this.actualPage = null;
document.title = 'PTME - Page not found'; document.title = 'METH - Page not found';
history.pushState({}, this.availablePages[i].title, this.availablePages[i].url); history.pushState({}, this.availablePages[i].title, this.availablePages[i].url);
}) })
}) })

8
docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* main.js :+: :+: :+: */ /* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */ /* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */
/* Updated: 2024/09/21 17:27:24 by edbernar ### ########.fr */ /* Updated: 2024/09/22 18:58:55 by marvin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -34,7 +34,7 @@ class LobbyPage
{ {
static create() static create()
{ {
const ptmeButton = document.getElementById("homeButton"); const methButton = document.getElementById("homeButton");
const startButton = document.getElementsByClassName('buttonStartGame')[0]; const startButton = document.getElementsByClassName('buttonStartGame')[0];
const usernameP = document.getElementById('loginButton').getElementsByTagName('p')[0]; const usernameP = document.getElementById('loginButton').getElementsByTagName('p')[0];
const loginButton = document.getElementById('loginButton'); const loginButton = document.getElementById('loginButton');
@ -67,7 +67,7 @@ class LobbyPage
barSelector = new barSelecter(document.getElementById('bar')); barSelector = new barSelecter(document.getElementById('bar'));
goalSelector = new goalSelecter(document.getElementById('goal')); goalSelector = new goalSelecter(document.getElementById('goal'));
startButton.addEventListener('click', startMode); startButton.addEventListener('click', startMode);
ptmeButton.addEventListener('click', goBackHome); methButton.addEventListener('click', goBackHome);
} }
static dispose() static dispose()