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

Site

Browse Source 
- Fix bug with 42 loggin button
This commit is contained in:
Kum1ta
2024-08-30 12:03:39 +02:00
parent bdbaa99597
commit 4140a93677
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/03 08:10:38 by edbernar #+# #+# # # Created: 2024/08/03 08:10:38 by edbernar #+# #+# #
# Updated: 2024/08/29 21:26:10 by tomoron ### ########.fr # # Updated: 2024/08/30 11:26:02 by edbernar ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #

14
docker-compose/requirements/nginx/static/javascript/login/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* main.js :+: :+: :+: */ /* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: madegryc <madegryc@student.42.fr> +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */ /* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */
/* Updated: 2024/08/26 18:10:12 by madegryc ### ########.fr */ /* Updated: 2024/08/30 11:59:13 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,8 +23,10 @@ class Login
const form = document.getElementById('loginForm'); const form = document.getElementById('loginForm');
let nodeText = null; let nodeText = null;
const registerButton = document.getElementsByClassName('new-player')[0]; const registerButton = document.getElementsByClassName('new-player')[0];
const button42 = document.getElementsByClassName('login-42-btn')[0];
registerButton.addEventListener('click', changeWindowLogin); registerButton.addEventListener('click', changeWindowLogin);
button42.addEventListener('click', redirection);
waitForLogin().then(() => { waitForLogin().then(() => {
if (userMeInfo.id !== -1) if (userMeInfo.id !== -1)
{ {
@ -46,7 +48,9 @@ class Login
const form = document.getElementById('loginForm'); const form = document.getElementById('loginForm');
const registerButton = document.getElementById('new-player'); const registerButton = document.getElementById('new-player');
const loginBackButton = document.getElementById('old-player'); const loginBackButton = document.getElementById('old-player');
const button42 = document.getElementsByClassName('login-42-btn')[0];
registerButton.removeEventListener('click', redirection);
loginButton.removeEventListener('click', showLoginDiv); loginButton.removeEventListener('click', showLoginDiv);
form.removeEventListener('submit', connect); form.removeEventListener('submit', connect);
registerButton.removeEventListener('click', changeWindowLogin); registerButton.removeEventListener('click', changeWindowLogin);
@ -54,6 +58,12 @@ class Login
} }
} }
function redirection(e)
{
e.preventDefault();
window.location.replace('https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-d9d6d46bd0be36dc13718981df4bfcf37e574ea364a07fcb5c39658be0f5706c&redirect_uri=https://localhost:8000/login42&response_type=code&scope=public');
}
function changeWindowLogin(e) function changeWindowLogin(e)
{ {
const registerWindow = document.getElementsByClassName('right-side-register')[0]; const registerWindow = document.getElementsByClassName('right-side-register')[0];