From e852f0c03a613d9ae990dcb0d20faafc1f5670a1 Mon Sep 17 00:00:00 2001 From: Daniel Serdoura Date: Wed, 19 Jun 2024 12:06:19 +0200 Subject: [PATCH] lister dans la daronne a sacha pour evite trop req --- css/leaderboard.css | 4 ++-- js/controllers/contracts.js | 2 +- js/controllers/home.js | 2 +- js/controllers/leaderboard.js | 2 +- js/controllers/login.js | 2 +- js/controllers/menu_mod.js | 9 ++++++--- js/controllers/register.js | 2 +- js/controllers/ships.js | 2 +- js/skama_code | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/css/leaderboard.css b/css/leaderboard.css index cc5dcc1..2a3e4b7 100644 --- a/css/leaderboard.css +++ b/css/leaderboard.css @@ -9,8 +9,7 @@ width: 60%; padding: 20px; font-size:x-large; - border: 0px solid black; - border-top-color: white; + border : 1px solid white; border-bottom-color: white; border-bottom-width: 1px; border-top-right-radius: 5px; @@ -23,6 +22,7 @@ margin: auto; align-items: center; flex-direction: column; + border : 1px solid white; width: 60%; height: 50vh; overflow-y: scroll; diff --git a/js/controllers/contracts.js b/js/controllers/contracts.js index dd1ddc6..fd02766 100644 --- a/js/controllers/contracts.js +++ b/js/controllers/contracts.js @@ -107,7 +107,7 @@ export default function contracts(temp_engine) { temp_engine.add_event(".btn-close", "click", () => { modal.close(); }); - menu_mod(temp_engine); + menu_mod(temp_engine, null); }); temp_engine.render("templates/contracts/contracts.html") } diff --git a/js/controllers/home.js b/js/controllers/home.js index 4ad0463..f5dc42c 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -3,7 +3,7 @@ import menu_mod from "./menu_mod.js"; export default function home(temp_engine) { temp_engine.after_render(() => { $("body").css("background-image", "url('/assets/img/background.png')") - menu_mod(temp_engine); + menu_mod(temp_engine, null); }); temp_engine.render("templates/home.html"); } diff --git a/js/controllers/leaderboard.js b/js/controllers/leaderboard.js index 690dfd1..c3d5386 100644 --- a/js/controllers/leaderboard.js +++ b/js/controllers/leaderboard.js @@ -4,8 +4,8 @@ import { AgentBuilder } from "../skama_code/api/agent.js"; export default function ldb(temp_engine) { temp_engine.after_render((temp_engine) => { $("body").css("background-image", "url('/assets/img/background.png')") - menu_mod(temp_engine); let bagents = new AgentBuilder(); + menu_mod(temp_engine, bagents); bagents.list_all((agents) => { drawAgents(agents, sortAgentByCredits); }); diff --git a/js/controllers/login.js b/js/controllers/login.js index 9afbbc2..2aae3be 100644 --- a/js/controllers/login.js +++ b/js/controllers/login.js @@ -9,7 +9,7 @@ export default function login(temp_engine) { temp_engine.after_render((temp_engine) => { $("body").css("background-image", "url('/assets/img/background.png')") - menu_mod(temp_engine); + menu_mod(temp_engine, null); temp_engine.add_event("#btn-login", "click", () => { const is_checked = $("#in-remember").is(":checked"); diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js index eb74cdc..b5efb13 100644 --- a/js/controllers/menu_mod.js +++ b/js/controllers/menu_mod.js @@ -4,7 +4,7 @@ import contracts from "./contracts.js"; import ships from "./ships.js"; import leaderboard from "./leaderboard.js"; -function loged_links(temp_engine) { +function loged_links(temp_engine, lister) { $("#links").html(` @@ -16,16 +16,19 @@ function loged_links(temp_engine) { profile(temp_engine); }); temp_engine.add_event("#contracts-link", "click", () => { + if(lister) lister.stop(); contracts(temp_engine); }) temp_engine.add_event("#ships-link", "click", () => { + if(lister) lister.stop(); ships(temp_engine); }) temp_engine.add_event("#leaderboard-link", "click", () => { + if(lister) lister.stop(); leaderboard(temp_engine); }) } -export default (temp_engine) => { - if(My.agent) loged_links(temp_engine); +export default (temp_engine, lister) => { + if(My.agent) loged_links(temp_engine, lister); } diff --git a/js/controllers/register.js b/js/controllers/register.js index ffbf2f3..a69231a 100644 --- a/js/controllers/register.js +++ b/js/controllers/register.js @@ -10,7 +10,7 @@ export default function register(temp_engine) { temp_engine.after_render((temp_engine) => { $("body").css("background-image", "url('/assets/img/background.png')") - menu_mod(temp_engine); + menu_mod(temp_engine, null); Faction.list_all((factions) => { factions.forEach((faction) => { diff --git a/js/controllers/ships.js b/js/controllers/ships.js index 4e32377..7045bb1 100644 --- a/js/controllers/ships.js +++ b/js/controllers/ships.js @@ -8,7 +8,7 @@ export default (temp_engine) => { let slideIndex = 1; temp_engine.after_render((temp_engine) => { - menu_mod(temp_engine); + menu_mod(temp_engine, null); $("body").css("background-image", "url('/assets/spaceships/hangar.png')") modal.load("templates/ships/ships_modal.html"); diff --git a/js/skama_code b/js/skama_code index ba1e1d8..cebf7ef 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit ba1e1d88709df819706bd463de60a58105ac3830 +Subproject commit cebf7ef7eed47f79e4686ef812ed42a891c13ff6