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

Lobby page

Browse Source 
- add auto scroll when click on gamemode
Profile page
    - fix some bug
This commit is contained in:
Kum1ta
2024-11-14 16:55:03 +01:00
parent 2f8eca141a
commit 5fa02a32cd
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */
/* Updated: 2024/10/14 21:45:07 by edbernar ### ########.fr */
/* Updated: 2024/11/14 16:48:15 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -81,7 +81,7 @@ class LobbyPage
listSelectCard[1].addEventListener('click', selectGameModeTwo);
listSelectCard[2].addEventListener('click', selectGameModeThree);
listSelectCard[3].addEventListener('click', selectGameModeFour);
func[gameMode]();
func[gameMode](null, true);
document.getElementsByClassName('mode-card')[0].getElementsByTagName('p')[0].innerHTML = listSelectCard[gameMode].innerHTML;
for (let i = 0; i < document.body.children.length; i++)
{
@ -213,11 +213,20 @@ function closePopUpWhenClickOutsite (event)
document.getElementById('loginPopup').style.display = 'none';
};
function selectGameModeOne()
function selectGameModeOne(event, disableScroll = false)
{
const menuList = document.getElementsByClassName('menuSelected');
const gameModeDiv = document.getElementsByClassName('game-mode')[0].children;
if (!disableScroll)
{
setTimeout(() => {
window.scroll({
top: 100000,
behavior: 'smooth'
});
}, 50);
}
for (let i = 0; i < menuList.length; i++)
{
menuList[i].style.display = 'none';
@ -239,11 +248,20 @@ function selectGameModeOne()
gameMode = 0;
}
function selectGameModeTwo()
function selectGameModeTwo(event, disableScroll = false)
{
const menuList = document.getElementsByClassName('menuSelected');
const gameModeDiv = document.getElementsByClassName('game-mode')[0].children;
if (!disableScroll)
{
setTimeout(() => {
window.scroll({
top: 100000,
behavior: 'smooth'
});
}, 50);
}
for (let i = 0; i < menuList.length; i++)
{
menuList[i].style.display = 'none';
@ -274,11 +292,20 @@ function selectGameModeTwo()
gameMode = 1;
}
function selectGameModeThree()
function selectGameModeThree(event, disableScroll = false)
{
const menuList = document.getElementsByClassName('menuSelected');
const gameModeDiv = document.getElementsByClassName('game-mode')[0].children;
if (!disableScroll)
{
setTimeout(() => {
window.scroll({
top: 100000,
behavior: 'smooth'
});
}, 50);
}
for (let i = 0; i < menuList.length; i++)
{
menuList[i].style.display = 'none';
@ -306,11 +333,20 @@ function selectGameModeThree()
gameMode = 2;
}
function selectGameModeFour()
function selectGameModeFour(event, disableScroll = false)
{
const menuList = document.getElementsByClassName('menuSelected');
const gameModeDiv = document.getElementsByClassName('game-mode')[0].children;
if (!disableScroll)
{
setTimeout(() => {
window.scroll({
top: 100000,
behavior: 'smooth'
});
}, 50);
}
for (let i = 0; i < menuList.length; i++)
{
menuList[i].style.display = 'none';

9
docker-compose/requirements/nginx/static/javascript/profilPage/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/19 23:08:31 by edbernar #+# #+# */
/* Updated: 2024/10/28 22:56:32 by edbernar ### ########.fr */
/* Updated: 2024/11/14 15:27:15 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -153,12 +153,11 @@ function inputChange(isPfp, event)
let binary = '';
const bytes = new Uint8Array(buffer);
const len = bytes.byteLength;
for (let i = 0; i < len; i++) {
for (let i = 0; i < len; i++)
binary += String.fromCharCode(bytes[i]);
}
return window.btoa(binary);
}
if (validTypes.includes(file.type))
}
if (file && validTypes.includes(file.type))
{
reader.onload = (e) => {
const arrayBuffer = e.target.result;