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

Merge branch 'main' of github.com:Kum1ta/PTME_Transcendence into main

Browse Source
This commit is contained in:
hubourge
2024-09-23 17:38:24 +02:00
parent 604088ecdd 3a6887e722
commit 1bf35086fa
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/09/20 00:16:57 by edbernar #+# #+# # # Created: 2024/09/20 00:16:57 by edbernar #+# #+# #
# Updated: 2024/09/23 00:47:12 by edbernar ### ########.fr # # Updated: 2024/09/23 15:08:37 by edbernar ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -26,6 +26,8 @@ def getUserInfo(socket, content):
if (not user): if (not user):
socket.sync_send({"type":"user_info", "content": None}) socket.sync_send({"type":"user_info", "content": None})
return return
socket.sync_send({"type":"user_info", "content":{'username': user['username'], 'pfp': user['pfp'], 'banner': user['banner'], 'id': user['id']}}) online = True if user['id'] in socket.onlinePlayers else False
print("User is online: ", online)
socket.sync_send({"type":"user_info", "content":{'username': user['username'], 'pfp': user['pfp'], 'banner': user['banner'], 'id': user['id'], 'online': online, 'github': user['github_link'], 'discord': user['discord_username']}})
except Exception as e: except Exception as e:
socket.sendError("invalid request", 9005, e) socket.sendError("invalid request", 9005, e)

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

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/19 23:08:31 by edbernar #+# #+# */ /* Created: 2024/09/19 23:08:31 by edbernar #+# #+# */
/* Updated: 2024/09/23 00:59:35 by edbernar ### ########.fr */ /* Updated: 2024/09/23 15:18:00 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -25,16 +25,25 @@ class ProfilPage
const username = document.getElementsByTagName('h2')[0]; const username = document.getElementsByTagName('h2')[0];
const pfp = document.getElementsByClassName('profile-image')[0]; const pfp = document.getElementsByClassName('profile-image')[0];
const banner = document.getElementsByClassName('background-card')[0]; const banner = document.getElementsByClassName('background-card')[0];
const githubButton = document.getElementById('github');
const discordButton = document.getElementById('discord');
const convButton = document.getElementById('newConv'); const convButton = document.getElementById('newConv');
let interval = null;
LiveChat.create(); LiveChat.create();
if (typeof(user) == 'string') if (typeof(user) == 'string')
sendRequest("get_user_info", {username: user}); {
interval = setInterval(() => {
if (userMeInfo.id > 0)
{
sendRequest("get_user_info", {username: user})
clearInterval(interval);
}
}, 100);
}
else else
sendRequest("get_user_info", {id: user}); sendRequest("get_user_info", {id: user});
waitForUserInfo().then((userInfo) => { waitForUserInfo().then((userInfo) => {
console.log(userInfo);
if (userInfo == null) if (userInfo == null)
{ {
pageRenderer.changePage('homePage'); pageRenderer.changePage('homePage');
@ -42,13 +51,16 @@ class ProfilPage
} }
if (typeof(user) != 'string') if (typeof(user) != 'string')
history.replaceState({}, document.title, window.location.pathname + '/' + userInfo.username); history.replaceState({}, document.title, window.location.pathname + '/' + userInfo.username);
username.innerText = userInfo.username + ' (status not implemented)'; username.innerHTML = userInfo.username + '<span class="online-status"></span>';
if (!userInfo.online)
document.getElementsByClassName('online-status')[0].style.backgroundColor = '#E74040';
pfp.style.backgroundImage = `url("${userInfo.pfp}")` pfp.style.backgroundImage = `url("${userInfo.pfp}")`
pfp.style.backgroundSize = "cover"; pfp.style.backgroundSize = "cover";
pfp.style.backgroundRepeat = "no-repeat"; pfp.style.backgroundRepeat = "no-repeat";
banner.style.backgroundImage = `url("${userInfo.banner}")` banner.style.backgroundImage = `url("${userInfo.banner}")`
banner.style.backgroundSize = "cover"; banner.style.backgroundSize = "cover";
banner.style.backgroundRepeat = "no-repeat"; banner.style.backgroundRepeat = "no-repeat";
externButtons(userInfo)
if (userInfo.id == userMeInfo.id) if (userInfo.id == userMeInfo.id)
{ {
pfp.innerHTML = `<div id='editPenPfpBg'><img class='editPenPfp' src='/static/img/profilPage/editPen.png'/></div>` pfp.innerHTML = `<div id='editPenPfpBg'><img class='editPenPfp' src='/static/img/profilPage/editPen.png'/></div>`
@ -70,7 +82,22 @@ class ProfilPage
{ {
LiveChat.dispose(); LiveChat.dispose();
} }
}
function externButtons(userInfo)
{
const githubButton = document.getElementById('github');
const discordButton = document.getElementById('discord');
if (userInfo.github)
githubButton.setAttribute('href', userInfo.github);
else
githubButton.remove();
if (userInfo.discord)
discordButton.setAttribute('name', userInfo.discord);
else
discordButton.remove();
} }
export { ProfilPage }; export { ProfilPage };