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

clean: respect es11

Browse Source
This commit is contained in:
starnakin
2024-02-20 09:22:11 +01:00
parent 54ef19a340
commit c143d96443
36 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/static/js/views/GameOfflineView.js
View File

@ -26,13 +26,13 @@ export default class extends AbstractView {
startGame() {
if (this.game == null) {
document.getElementById('startGameButton').innerHTML = 'Reset Game';
this.game = new Game;
this.game = new Game();
}
else {
document.getElementById('app').removeChild(this.game.canvas);
document.getElementById('app').removeChild(this.game.scoresDisplay);
this.game.cleanup();
this.game = new Game;
this.game = new Game();
}
}

4
frontend/static/js/views/GameView.js
View File

@ -77,7 +77,7 @@ export default class extends AbstractView
async join_game()
{
await this.game.join()
await this.game.join();
let canva = document.createElement("canvas");
@ -100,7 +100,7 @@ export default class extends AbstractView
this.game.players[index] = this.my_player;
}
this.register_key()
this.register_key();
this.render();
}

2
frontend/static/js/views/HomeView.js
View File

@ -4,7 +4,7 @@ import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js"
export default class extends AbstractAuthenticatedView {
constructor(params) {
super(params, 'homeWindowTitle');
this.redirect_url = "/login"
this.redirect_url = "/login";
}
async getHtml() {

14
frontend/static/js/views/MatchMakingView.js
View File

@ -13,23 +13,23 @@ export default class extends AbstractAuthenticatedView {
if (client.matchmaking.searching)
{
client.matchmaking.stop();
document.getElementById("button").value = "Find a game"
document.getElementById("button").value = "Find a game";
}
else
{
let nb_players = document.getElementById("nb_players-input").value
let nb_players = document.getElementById("nb_players-input").value;
await client.matchmaking.start(this.onreceive.bind(this), this.ondisconnect.bind(this), nb_players);
document.getElementById("button").value = "Stop matchmaking"
document.getElementById("button").value = "Stop matchmaking";
}
}
ondisconnect(event)
{
if (event.code === 1000)
clear("innerText", ["detail"])
document.getElementById("button").value = "Find a game"
clear("innerText", ["detail"]);
document.getElementById("button").value = "Find a game";
}
onreceive(data)
@ -39,7 +39,7 @@ export default class extends AbstractAuthenticatedView {
navigateTo(`/games/${data.game_id}`);
return;
}
this.display_data(data)
this.display_data(data);
}
display_data(data)
@ -50,7 +50,7 @@ export default class extends AbstractAuthenticatedView {
async postInit()
{
document.getElementById("button").onclick = this.press_button.bind(this)
document.getElementById("button").onclick = this.press_button.bind(this);
}
async getHtml() {

2
frontend/static/js/views/PageNotFoundView.js
View File

@ -1,5 +1,5 @@
import AbstractView from "./abstracts/AbstractView.js";
import { lang } from '../index.js'
import { lang } from '../index.js';
export default class extends AbstractView {
constructor(params) {

14
frontend/static/js/views/ProfilePageView.js
View File

@ -1,5 +1,5 @@
import AbstractView from "./abstracts/AbstractView.js";
import { client, lang } from "../index.js"
import { client, lang } from "../index.js";
export default class extends AbstractView {
constructor(params) {
@ -37,9 +37,9 @@ export default class extends AbstractView {
client.notice.rewrite_profile = async () => {
let result = await this.profile.getFriend();
await this.profile.getBlock()
await this.profile.getBlock();
await this.friendButton();
}
};
}
async blockButton() {
@ -80,7 +80,7 @@ export default class extends AbstractView {
let no = document.getElementById("no") || document.createElement("p");
let friend = document.getElementById("friend") || document.createElement("p");
if (client.notice.data["asker"].includes(this.user_id)) {
if (client.notice.data.asker.includes(this.user_id)) {
if (friend)
friend.remove();
@ -89,13 +89,13 @@ export default class extends AbstractView {
yes.textContent = lang.get('profileAcceptRequest', 'Accept Friend');
yes.onclick = async () => {
client.notice.accept_friend(this.user_id);
}
};
no.id = "no";
no.textContent = lang.get('profileDenyRequest', 'Decline Friend');
no.onclick = async () => {
client.notice.refuse_friend(this.user_id);
}
};
this.info.appendChild(yes);
this.info.appendChild(document.createTextNode(" "));
@ -107,7 +107,7 @@ export default class extends AbstractView {
if (yes && no)
yes.remove(); no.remove();
friend.id = "friend"
friend.id = "friend";
friend.onclick = async () => {
if (this.profile.isFriend)
await client.notice.remove_friend(this.user_id);

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

@ -1,6 +1,6 @@
import AbstractView from "./abstracts/AbstractView.js";
import { client, lang } from "../index.js";
import {Message} from "../api/chat/message.js"
import {Message} from "../api/chat/message.js";
export default class extends AbstractView {
constructor(params) {
@ -10,8 +10,8 @@ export default class extends AbstractView {
async wait_get_online_users() {
return new Promise((resolve) => {
const checkInterval = setInterval(() => {
console.log(client.notice.data["online"]);
if (Object.keys(client.notice.data["online"]).length > 0) {
console.log(client.notice.data.online);
if (Object.keys(client.notice.data.online).length > 0) {
clearInterval(checkInterval);
resolve();
}
@ -25,7 +25,7 @@ export default class extends AbstractView {
let profiles = await client.profiles.all();
//console.log(client.notice.data);
if (client.notice.data == undefined || client.notice.data["online"] == undefined)
if (client.notice.data == undefined || client.notice.data.online == undefined)
return console.log("Error");
//await client.notice.getOnlineUser();
@ -66,12 +66,12 @@ export default class extends AbstractView {
// username
let username = document.createElement("a");
username.setAttribute('data-link', '');
username.id = `username${user.id}`
username.id = `username${user.id}`;
username.href = `/profiles/${user.username}`;
if (logged && user.id == client.me.id)
username.style.color = "green";
else {
let online = client.notice.data["online"][user.id];
let online = client.notice.data.online[user.id];
username.style.color = online !== undefined ? online : "gray";
}
username.appendChild(document.createTextNode(user.username));
@ -134,7 +134,7 @@ export default class extends AbstractView {
let search_document = document.getElementById("input_user");
if (search_document == undefined || search_document == null)
return
return;
let search = search_document.value.toLowerCase();
@ -146,7 +146,7 @@ export default class extends AbstractView {
if (user.id == client.me.id)
username.style.color = "green";
else {
let online = client.notice.data["online"][user.id];
let online = client.notice.data.online[user.id];
username.style.color = online !== undefined ? online : "gray";
}
}
@ -233,7 +233,7 @@ export default class extends AbstractView {
messages.appendChild(text);
});
return messages
return messages;
}
async reload_display_messages() {
@ -274,7 +274,7 @@ export default class extends AbstractView {
chat.appendChild(members);
return members
return members;
}
async display_invite() {
@ -291,9 +291,9 @@ export default class extends AbstractView {
let yes = document.getElementById("yes") || document.createElement("button");
let no = document.getElementById("no") || document.createElement("button");
let invitedBy = undefined;
let invitedBy;
for (let x in others) {
if (client.notice.data["invited"].includes(others[x])) {
if (client.notice.data.invited.includes(others[x])) {
invitedBy = others[x];
}
}
@ -309,7 +309,7 @@ export default class extends AbstractView {
invite.id = "invite";
invite.style.background = "orange";
invite.innerText = "invite";
invite.title = "Invite to play a game"
invite.title = "Invite to play a game";
invite.onclick = async () => {
await client.notice.send_invite(others);
};
@ -318,18 +318,18 @@ export default class extends AbstractView {
else {
if (invite)
invite.remove()
invite.remove();
yes.id = "yes";
yes.style.background = "green";
yes.title = "Accept to play a game"
yes.title = "Accept to play a game";
yes.onclick = async () => {
await client.notice.accept_invite(invitedBy);
};
no.id = "no";
no.style.background = "red";
no.title = "Refuse to play a game"
no.title = "Refuse to play a game";
no.onclick = async () => {
await client.notice.refuse_invite(invitedBy);
};
@ -342,7 +342,7 @@ export default class extends AbstractView {
async hide_chat() {
let closes = ["chat", "invite"]
let closes = ["chat", "invite"];
closes.forEach(close => {
if (document.getElementById(close))
document.getElementById(close).remove();

11
frontend/static/js/views/SettingsView.js
View File

@ -36,14 +36,13 @@ export default class extends AbstractAuthenticatedView
let response_data = await client.account.delete(current_password);
console.log(await client.isAuthenticated())
if (response_data === null || response_data === "user deleted")
{
navigateTo("/login");
return;
}
clear("innerHTML", ["current_password-input"])
fill_errors({"current_password-input": response_data["password"]}, "innerHTML")
clear("innerHTML", ["current_password-input"]);
fill_errors({"current_password-input": response_data.password}, "innerHTML");
}
async save_account()
@ -67,10 +66,10 @@ export default class extends AbstractAuthenticatedView
}
if (response_data === "data has been alterate")
response_data = {"save-account": "saved"}
response_data = {"save-account": "saved"};
clear("innerHTML", ["username", "new_password", "current_password", "save-account", "delete-account"])
fill_errors(response_data, "innerHTML")
clear("innerHTML", ["username", "new_password", "current_password", "save-account", "delete-account"]);
fill_errors(response_data, "innerHTML");
}
async save_profile()

2
frontend/static/js/views/abstracts/AbstractView.js
View File

@ -1,4 +1,4 @@
import {lang} from '../../index.js'
import {lang} from '../../index.js';
export default class {
constructor(params, titleKey) {

11
frontend/static/js/views/accounts/AuthenticationView.js
View File

@ -8,7 +8,6 @@ export default class extends AbstractNonAuthenticatedView
{
super(params, 'loginWindowTitle', lastUrlBeforeLogin);
this.redirect_url = lastUrlBeforeLogin;
this.current_mode = undefined
}
async leavePage()
@ -36,7 +35,7 @@ export default class extends AbstractNonAuthenticatedView
[username_input, password_input].forEach(input => {
input.addEventListener('keydown', async ev => {
if (ev.key === 'Enter')
await this.authentication.bind(this)()
await this.authentication.bind(this)();
});
});
username_input.focus();
@ -59,7 +58,7 @@ export default class extends AbstractNonAuthenticatedView
if (username === '' || password === '')
return false;
return true
return true;
}
/**
@ -102,7 +101,7 @@ export default class extends AbstractNonAuthenticatedView
password_label.innerText = lang.get(password_label_text, "ERROR LANG");
let toggle_register_login_label_text = this.current_mode === "register" ? "registerAlreadyAccount" : "loginNoAccount";
toggle_register_login_label.innerText = lang.get(toggle_register_login_label_text, "ERROR LANG");;
toggle_register_login_label.innerText = lang.get(toggle_register_login_label_text, "ERROR LANG");
let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG");
@ -130,7 +129,7 @@ export default class extends AbstractNonAuthenticatedView
let response;
if (this.current_mode === "register")
response = await client.account.create(username, password)
response = await client.account.create(username, password);
else
response = await client.login(username, password);
@ -140,7 +139,7 @@ export default class extends AbstractNonAuthenticatedView
return;
}
let response_data = await response.json()
let response_data = await response.json();
console.log(response_data);

6
frontend/static/js/views/tournament/TournamentCreateView.js
View File

@ -14,14 +14,14 @@ export default class extends AbstractAuthenticatedView
{
let name = document.getElementById("name-input").value;
let nb_players = document.getElementById("nb_players-input").value;
let nb_players_by_game = document.getElementById("nb_players_by_game-input").value
let nb_players_by_game = document.getElementById("nb_players_by_game-input").value;
let response_data = await client.tournaments.createTournament(nb_players, nb_players_by_game, name);
if (response_data === null)
return;
let id = response_data["id"]
let id = response_data.id;
if (id !== undefined)
{
navigateTo(`/tournaments/${id}`);
@ -47,6 +47,6 @@ export default class extends AbstractAuthenticatedView
<input type="number" id="nb_players_by_game-input" placeholder="Number of players by game">
<span id="nb_players_by_game"></span>
<input type="button" id="create-button" value="Create tournament">
`
`;
}
}

10
frontend/static/js/views/tournament/TournamentPageView.js
View File

@ -17,13 +17,13 @@ export default class extends AbstractAuthenticatedView
async receive(data)
{
if (data.detail === "nb_participants" || data.detail === "update_participants")
document.getElementById("nb_participants").innerText = `${data.nb_participants} / ${this.tournament.nb_players}`
document.getElementById("nb_participants").innerText = `${data.nb_participants} / ${this.tournament.nb_players}`;
if (data.detail === "go_to")
navigateTo(data.url);
if (data.detail === "is_participant")
this.updateParticipating(data.is_participant)
this.updateParticipating(data.is_participant);
if (data.detail === "error")
document.getElementById("display").innerText = data.error_message
document.getElementById("display").innerText = data.error_message;
}
async updateParticipating(state)
@ -45,7 +45,7 @@ export default class extends AbstractAuthenticatedView
this.tournament.join(this.receive.bind(this), this.ondisconnect.bind(this));
let button = document.getElementById("button")
let button = document.getElementById("button");
button.onclick = this.pressButton.bind(this);
@ -93,6 +93,6 @@ export default class extends AbstractAuthenticatedView
</table>
<input type="button" id="button" value="Join tournament" disabled>
<span id="display"></span>
`
`;
}
}

12
frontend/static/js/views/tournament/TournamentsListView.js
View File

@ -17,14 +17,14 @@ export default class extends AbstractAuthenticatedView
add_nb_player_by_game_selector()
{
let nb_players_by_game_list = new Set()
let nb_players_by_game_list = new Set();
this.tournaments.forEach(tournament => {
nb_players_by_game_list.add(tournament.nb_players_by_game);
});
let select = document.getElementById("nb-players-by-game-select");
let new_children = []
let new_children = [];
const opt = document.createElement("option");
opt.value = "all";
@ -37,7 +37,7 @@ export default class extends AbstractAuthenticatedView
opt.value = nb_players_by_game;
opt.text = nb_players_by_game;
new_children.push(opt);
})
});
select.replaceChildren(...new_children);
}
@ -56,7 +56,7 @@ export default class extends AbstractAuthenticatedView
{
const tournaments_list = document.getElementById("tournaments-list");
const new_children = []
const new_children = [];
this.display_tournaments.forEach(tournament => {
@ -102,7 +102,7 @@ export default class extends AbstractAuthenticatedView
async postInit()
{
await this.update_search()
await this.update_search();
document.getElementById("state-select").onchange = this.update_search.bind(this);
document.getElementById("nb-players-by-game-select").onchange = this.update_query.bind(this);
}
@ -128,6 +128,6 @@ export default class extends AbstractAuthenticatedView
<tbody id="tournaments-list">
</tbody>
</table>
`
`;
}
}