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

Site :

Browse Source 
- Fix "REGISTER" to "Register"
    - Fix "NEWS" to "AUTHORS"
    - Fix Chat Button to icon (No notifications)
    - Fix not center title on login and register screen
This commit is contained in:
Misthaa
2024-09-17 14:28:57 +02:00
parent e4cebd99df
commit 522f4f602a
6 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,9 @@
<div id="topBar">
<h1>PTME</h1>
<div id="topButton">
<p>HOME</p>
<p onclick="scrollToSection()">HOME</p>
<p>PROJECT</p>
<p>NEWS</p>
<p>AUTHORS</p>
</div>
<div id="loginButton">
<p>LOGIN</p>
@ -58,7 +58,7 @@
<label for="password">Confirm password</label>
<input type="password" id="password-confirm" name="password">
<button type="submit" class="login-btn">REGISTER</button>
<button type="submit" class="login-btn">Register</button>
<div class="old-player">
Already have an account? <a href="#">Log in</a>
</div>
@ -68,7 +68,7 @@
</div>
<div id="chatButton">
<p>CHAT</p>
<img src="/static/img/homePage/bulle.png">
</div>
<div id="chatDiv">
<div id="topChatHome">

BIN
docker-compose/requirements/nginx/static/img/homePage/bulle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

12
docker-compose/requirements/nginx/static/javascript/homePage/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/25 00:02:19 by edbernar #+# #+# */
/* Updated: 2024/08/25 18:26:17 by edbernar ### ########.fr */
/* Updated: 2024/09/17 13:06:30 by marvin ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,6 +22,7 @@ class HomePage
Login.create();
LiveChat.create();
window.addEventListener('scroll', scrool);
window.addEventListener('bScroll', scrollToSection)
}
static dispose()
@ -30,9 +31,16 @@ class HomePage
Login.dispose();
LiveChat.dispose();
window.removeEventListener('scroll', scrool);
window.removeEventListener('bScroll', scrollToSection)
}
};
function scrollToSection() {
document.querySelector('#homeSection relative').scrollIntoView({
behavior: 'smooth'
});
console.log("CACA");
}
function scrool()
{

13
docker-compose/requirements/nginx/static/style/homePage/home.css
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* home.css :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 12:00:55 by edbernar #+# #+# */
/* Updated: 2024/09/13 10:40:18 by edbernar ### ########.fr */
/* Updated: 2024/09/17 14:20:28 by marvin ### ########.fr */
/* */
/* ************************************************************************** */
@ -119,7 +119,7 @@ body {
}
#topBar #loginButton:hover {
background-color: #020202;
background-color: transparent;
color: white;
cursor: pointer;
}
@ -173,8 +173,7 @@ body {
.right-side-register h1 {
font-size: 2rem;
margin-bottom: 30px;
align-items: center;
justify-content: center;
text-align: center;
}
.close {
@ -189,8 +188,7 @@ body {
.right-side h1 {
font-size: 2rem;
margin-bottom: 30px;
align-items: center;
justify-content: center;
text-align: center;
}
form {
@ -251,7 +249,6 @@ button {
.old-player {
text-align: center;
margin-bottom: 20px;
}
.old-player a {

33
docker-compose/requirements/nginx/static/style/homePage/liveChat.css
View File

@ -3,33 +3,38 @@
/* ::: :::::::: */
/* liveChat.css :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 13:53:39 by edbernar #+# #+# */
/* Updated: 2024/08/25 18:20:50 by edbernar ### ########.fr */
/* Updated: 2024/09/17 14:13:56 by marvin ### ########.fr */
/* */
/* ************************************************************************** */
#chatButton {
position: fixed;
bottom: 10px;
left: 30px;
background-color: white;
width: 100px;
height: 40px;
text-align: center;
cursor : pointer;
z-index: 10;
}
#chatButton p {
margin: 0;
margin-top: 10px;
bottom: 40px;
left: 60px;
background-color: #020202;
border-radius: 50%;
height: 70px;
width: 70px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
transition: transform 0.3s ease;
}
#chatButton:hover {
background-color: rgb(204, 204, 204);
transform: scale(1.2);
}
#chatButton img{
width: 45px;
height: 45px;
}
#chatDiv {

2
docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css
View File

@ -185,7 +185,7 @@ body {
padding: 0;
padding-inline: 50px;
display: flex;
background-color: #020202;
background-color: transparent;
gap: 2rem;
align-items: center;
justify-content: center;