starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with main

Browse Source
This commit is contained in:
Xamora 2024-01-14 15:55:17 +01:00
commit 131e599d17
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/static/js/index.js
View File

@ -37,8 +37,16 @@ const getParams = match => {
}; };
const navigateTo = async (uri) => { const navigateTo = async (uri) => {
if (await router(uri) === 0) if (await router(uri) !== 0)
history.pushState(null, null, uri); return;
history.pushState(null, null, uri);
let link = document.querySelector('a[href=\'' + location.pathname + '\']');
if (link) {
document.querySelector('[data-link].active')?.classList.remove('active');
link.classList.add('active');
}
}; };
async function renderView(view) async function renderView(view)
@ -121,8 +129,10 @@ document.addEventListener("DOMContentLoaded", () => {
document.body.addEventListener("click", e => { document.body.addEventListener("click", e => {
if (e.target.matches("[data-link]")) { if (e.target.matches("[data-link]")) {
e.preventDefault(); e.preventDefault();
document.querySelector('[data-link].active').classList.remove('active'); if (e.target.classList.contains('nav-link')) {
e.target.classList.add('active'); document.querySelector('[data-link].active')?.classList.remove('active');
e.target.classList.add('active');
}
navigateTo(e.target.href.slice(location.origin.length)); navigateTo(e.target.href.slice(location.origin.length));
} }
}); });

1
frontend/static/js/views/Search.js
View File

@ -60,6 +60,7 @@ export default class extends AbstractView {
// username // username
let username = document.createElement("a"); let username = document.createElement("a");
username.setAttribute('data-link', '');
username.id = `username${user.id}` username.id = `username${user.id}`
username.href = `/profiles/${user.id}`; username.href = `/profiles/${user.id}`;
username.style.color = client.notice.online_users[user.id] !== undefined ? "green" : "red"; username.style.color = client.notice.online_users[user.id] !== undefined ? "green" : "red";