From d89274dbad2069fc43903b7ddf1eef857dd9d395 Mon Sep 17 00:00:00 2001 From: Makaci Michael Gabriel Date: Fri, 22 Mar 2024 12:05:29 +0100 Subject: [PATCH] Ajout menu --- assets/menu/contracts.png | Bin 0 -> 349 bytes assets/menu/home.png | Bin 0 -> 419 bytes assets/menu/info.png | Bin 0 -> 362 bytes assets/menu/leaderboard.png | Bin 0 -> 380 bytes assets/menu/ships.png | Bin 0 -> 360 bytes css/auth.css | 9 ++++++++- css/global.css | 26 ++++++++++++++++++++++++++ css/system.css | 0 html/template.html | 5 ++++- html/templates/auth/reg.html | 4 ++-- js/controllers/menu_mod.js | 19 ++++++++++--------- js/controllers/reg.js | 15 ++++++++++----- js/index.js | 15 +++++++++++++++ 13 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 assets/menu/contracts.png create mode 100644 assets/menu/home.png create mode 100644 assets/menu/info.png create mode 100644 assets/menu/leaderboard.png create mode 100644 assets/menu/ships.png delete mode 100644 css/system.css diff --git a/assets/menu/contracts.png b/assets/menu/contracts.png new file mode 100644 index 0000000000000000000000000000000000000000..233bd0881445bf91d5f8f25099e580ce988c1dc5 GIT binary patch literal 349 zcmV-j0iyniP)L;@ZRLbTTE3p@=P+ zbWt}{=*P#e#HigXIp%pjl2cX~Lg-jRLKG(hxM`Y*w7TwPS?UrWWDSsuaND*$kmgh0 z4#t6T9AnH4`j&89h?1@^4Qd!OKxq}sL32>*fK+eypwz+7qwYG%x~|u*?78%2d%_uEs5AlOc+z$UAzZ1>|zp- z+91_SZWhli- z+QE@3JFy)K8ewF-AzmnxqaWC4;8KyEt>(ZZQGT!eapiz>`VM2>xx{$P1E#6 zsh#>za0%3Pz4%9+OG>z-5L8bz0?>O3p95{F zG(q!E02X{PKsM5laxQ)5r?i_2QXN_}&JCm=ZuJgIn9@)Za#KN>_$xmEy~>Azp`cd* zZ++asP|&M@xBmM2=zW{#x%i8~9{9J9=z#Q$s;WHYX6*uq=s*4qaR-{rdLUKzyJ`Rc N002ovPDHLkV1i}Kws`;m literal 0 HcmV?d00001 diff --git a/assets/menu/info.png b/assets/menu/info.png new file mode 100644 index 0000000000000000000000000000000000000000..5f40e33a269c39420dab35bc056d9c4463e63c31 GIT binary patch literal 362 zcmV-w0hRuVP)WrvcsBqw{{I6W_uTQGG9b;f4oPV!I4Ke^b|^{$qkAw0=VzCC4rhK&cHU16p017ocu%6c%5&!@I07*qo IM6N<$f@ju_A^-pY literal 0 HcmV?d00001 diff --git a/assets/menu/leaderboard.png b/assets/menu/leaderboard.png new file mode 100644 index 0000000000000000000000000000000000000000..815bf699b969c8a2b9ada52db9b354bd6ad432e6 GIT binary patch literal 380 zcmV-?0fYXDP)**8`qrx{~*XUGbtX{uSm1CgB!%#GuCP?mRkp69&66ICtLqPcZlPe{Y1 zZ-O?__q~m|K~vHk*F;R$#FBT&sX^&oP=ZQON>0#`b63IoUmEoc(uL3fHB9ShzT`Oi zkf0Ih-MFNI)Lc=6AVy;}PEA}YpEOu%A?`eCkV_7AN)SnKdnL#vhdL#QB)Gj2 -
\ No newline at end of file +
+
+ +
diff --git a/html/templates/auth/reg.html b/html/templates/auth/reg.html index 956423a..01b2e46 100644 --- a/html/templates/auth/reg.html +++ b/html/templates/auth/reg.html @@ -3,10 +3,10 @@

New Agent

- +

Remember me ?

diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js index 5d9bfb3..55a117a 100644 --- a/js/controllers/menu_mod.js +++ b/js/controllers/menu_mod.js @@ -29,19 +29,20 @@ function init_menu(temp_engine) { } function loged_links() { - $(".nav-links").html(` - - - - + $("#links").html(` + + + + + `); } function unloged_links() { - $(".nav-links").html(` - - - `); + // $(".menu-links").html(` + // + // + // `); } function show_stats() { diff --git a/js/controllers/reg.js b/js/controllers/reg.js index b284dfa..57b5543 100644 --- a/js/controllers/reg.js +++ b/js/controllers/reg.js @@ -2,6 +2,7 @@ import { Auth } from "../skama_code/auth/auth.js"; import { My } from "../skama_code/api/agent.js"; import { Faction } from "../skama_code/api/faction.js" import home from "./home.js"; +import login from "./login.js"; import menu_mod from "./menu_mod.js"; export default function reg(temp_engine) { @@ -18,17 +19,21 @@ export default function reg(temp_engine) { }); temp_engine.add_event("#btn-register", "click", () => { - const is_checked = $("#box-remember").is(":checked"); - const symbol = $("#input-name").val(); - const faction = $("#input-faction").val(); + const is_checked = $("#in-remember").is(":checked"); + const symbol = $("#in-name").val(); + const faction = $("#in-faction").val(); auth.store = is_checked; auth.register({name: symbol, faction: faction}); }); temp_engine.add_event("#btn-cancel", "click", () => { - $("#input-name").val(""); - $("#box-remember").prop("checked", false); + $("#in-name").val(""); + $("#in-remember").prop("checked", false); }); + + temp_engine.add_event("#btn-log", "click", () => { + login(temp_engine); + }) }); auth.done((agent) => { diff --git a/js/index.js b/js/index.js index c687061..42ab380 100644 --- a/js/index.js +++ b/js/index.js @@ -2,8 +2,23 @@ 'use strict'; import { TemplateEngine } from "./skama_code/ui/templeting_engine.js"; import login from "./controllers/login.js"; +import home from "./controllers/home.js"; +import { Auth } from "./skama_code/auth/auth.js"; +import { AgentBuilder } from "./skama_code/api/agent.js"; +import { My } from "./skama_code/api/agent.js"; let temp_engine = new TemplateEngine("html"); + +//Auto login +const auth = new Auth(); + +if (auth.relog()) { +AgentBuilder.get(localStorage.getItem("token"), (agent) => { + My.agent = agent; + home(temp_engine); +}); +} + login(temp_engine);