From be0ff228d157d1b7f703135d8ae38efa4bd41f55 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Fri, 14 Jun 2024 13:52:23 +0200 Subject: [PATCH] Sort la sauce sacha --- css/global.css | 5 ++++- html/templates/contracts/contracts.html | 3 --- html/templates/contracts/contracts_modal.html | 0 html/templates/modal_profile.html | 1 + js/controllers/contracts.js | 3 +-- js/controllers/home.js | 4 +++- js/controllers/profile.js | 7 ++++++- js/skama_code | 2 +- 8 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 html/templates/contracts/contracts_modal.html diff --git a/css/global.css b/css/global.css index e3c2acd..f790fa6 100644 --- a/css/global.css +++ b/css/global.css @@ -14,7 +14,7 @@ body{ background-image: url("/assets/img/background.png"); background-repeat: no-repeat; background-size: cover; - overflow-x: hidden; + overflow: hidden; font-family: var(--text-familly); color: var(--text-color); margin: 0; @@ -41,6 +41,9 @@ select { padding: 0; width: 100%; height: 100vh; + background-repeat: no-repeat; + background-size: cover; + overflow: hidden; } .modal-disable::backdrop { diff --git a/html/templates/contracts/contracts.html b/html/templates/contracts/contracts.html index 2c27e04..16ebb0b 100644 --- a/html/templates/contracts/contracts.html +++ b/html/templates/contracts/contracts.html @@ -1,5 +1,2 @@
-
-
- screen
\ No newline at end of file diff --git a/html/templates/contracts/contracts_modal.html b/html/templates/contracts/contracts_modal.html new file mode 100644 index 0000000..e69de29 diff --git a/html/templates/modal_profile.html b/html/templates/modal_profile.html index 1a7fba4..c908516 100644 --- a/html/templates/modal_profile.html +++ b/html/templates/modal_profile.html @@ -16,5 +16,6 @@ \ No newline at end of file diff --git a/js/controllers/contracts.js b/js/controllers/contracts.js index 348a48f..32d3b0c 100644 --- a/js/controllers/contracts.js +++ b/js/controllers/contracts.js @@ -10,11 +10,10 @@ export default function contracts(temp_engine) { let modal = new Modal("contract-modal", temp_engine); temp_engine.after_render((temp_engine) => { - + $("#block-content").css("background-image", "url('/assets/contracts/screen.png')"); modal.load("templates/contracts/contracts_modal.html"); Contract.list(10, 1, (contracts) => { - //Evenements accepter temp_engine.add_event(".btn-accept", "click", (e) => { contracts.forEach((contract) => { diff --git a/js/controllers/home.js b/js/controllers/home.js index 90821fe..a43eeac 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,6 +1,8 @@ import menu_mod from "./menu_mod.js"; export default function home(temp_engine) { - temp_engine.after_render(menu_mod); + temp_engine.after_render(() => { + menu_mod(temp_engine); + }); temp_engine.render("templates/home.html"); } diff --git a/js/controllers/profile.js b/js/controllers/profile.js index c50b1a9..4d18f23 100644 --- a/js/controllers/profile.js +++ b/js/controllers/profile.js @@ -9,7 +9,7 @@ export default function profile(temp_engine) { modal.show(); $('#name').append(My.agent.name); $('#faction').append(My.agent.faction); - $('#credit').append(My.agent.credit); + $('#credit').append(My.agent.credits); $('#hq').append(My.agent.hq); $('#shipcount').append(My.agent.ships_cpt); @@ -23,6 +23,11 @@ export default function profile(temp_engine) { auth.unload_token(); login(temp_engine); }) + + $('#btn-close').on('click', () => + { + modal.close(); + }); }); modal.load("templates/modal_profile.html"); diff --git a/js/skama_code b/js/skama_code index df0d1be..69a0cb7 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit df0d1be1df444b48cd1b6c09e5188af501bc9793 +Subproject commit 69a0cb7793bc81dbe53fdaf1a078d7a8d696bb7e