From 068153abb82fbc5d47902feda165ef85dadeb816 Mon Sep 17 00:00:00 2001
From: ZimPoPo <Michael.Makaci@icloud.com>
Date: Wed, 13 Mar 2024 13:49:37 +0100
Subject: [PATCH] Update skama_code and add auto login

---
 html/template.html                   |  6 +--
 html/templates/auth/login_modal.html |  9 -----
 html/templates/auth/reg_modal.html   | 10 -----
 js/controllers/home.js               | 18 ++++++---
 js/controllers/menu_mod.js           | 58 ++++++++++++++--------------
 js/skama_code                        |  2 +-
 6 files changed, 44 insertions(+), 59 deletions(-)
 delete mode 100644 html/templates/auth/login_modal.html
 delete mode 100644 html/templates/auth/reg_modal.html

diff --git a/html/template.html b/html/template.html
index f99fc29..3d63083 100644
--- a/html/template.html
+++ b/html/template.html
@@ -4,11 +4,7 @@
     <img src="assets/logo/elephant.png" />
   </div>
   <div class="stats"></div>
-  <ul class="nav-links">
-    <li class="nav-link smooth" id="systems-link">Systems</li>
-    <li class="nav-link smooth" id="login-link">Log in</li>
-    <li class="nav-link smooth" id="reg-link">New Agent</li>
-  </ul>
+  <ul class="nav-links"></ul>
 </nav>
 <main id="block-content"></main>
 <footer>
diff --git a/html/templates/auth/login_modal.html b/html/templates/auth/login_modal.html
deleted file mode 100644
index 37f30ac..0000000
--- a/html/templates/auth/login_modal.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright © 2023 Entreprise SkamKraft -->
-
-<div class="my-modal">
-    <p class="modal-title">Login success</p>
-    <div>
-        <button id="ok" class="btn btn-val">Continue</button>
-        <button id="forget_login" class="btn btn-cancel">Forget agent</button>
-    </div>
-</div>
diff --git a/html/templates/auth/reg_modal.html b/html/templates/auth/reg_modal.html
deleted file mode 100644
index fa72c87..0000000
--- a/html/templates/auth/reg_modal.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- Copyright © 2023 Entreprise SkamKraft -->
-
-<div class="my-modal">
-    <p class="modal-title">Login success</p>
-    <p class="show-token"></p>
-    <div>
-        <button id="ok" class="btn btn-val">Continue</button>
-        <button id="forget_reg" class="btn btn-cancel">Forget agent</button>
-    </div>
-</div>
diff --git a/js/controllers/home.js b/js/controllers/home.js
index e872c3e..f0e797f 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -1,10 +1,18 @@
+import { AgentBuilder, My } from "../skama_code/api/agent.js";
+import { Auth } from "../skama_code/auth/auth.js";
 import menu_mod from "./menu_mod.js";
 
 export default function home(temp_engine) {
-    console.log("test");
-    temp_engine.after_render(menu_mod);
-    temp_engine.render("templates/home.html");
-}
-
+  //Auto login
+  const auth = new Auth();
 
+  if (auth.relog()) {
+    AgentBuilder.get(localStorage.getItem("token"), (agent) => {
+      My.agent = agent;
+      menu_mod(temp_engine);
+    });
+  }
 
+  temp_engine.after_render(menu_mod);
+  temp_engine.render("templates/home.html");
+}
diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js
index 42a979a..47b0e50 100644
--- a/js/controllers/menu_mod.js
+++ b/js/controllers/menu_mod.js
@@ -1,31 +1,31 @@
 import { My } from "../skama_code/api/agent.js";
+import home from "./home.js";
 import login from "./login.js";
 import reg from "./reg.js";
-import home from "./home.js";
 import { systems } from "./systems.js";
 
 function init_menu(temp_engine) {
-    temp_engine.add_event("#reg-link", "click", () => {
-        reg(temp_engine);
-    });
-    temp_engine.add_event("#login-link", "click", () => {
-        login(temp_engine);
-    });
-    temp_engine.add_event("#systems-link", "click", () => {
-        systems(temp_engine);
-    });
-    temp_engine.add_event(".nav-brand", "click", () => {
-        home(temp_engine);
-    });
-    temp_engine.add_event("#logout-link", "click", () => {
-        My.agent = null;
-        localStorage.removeItem("token");
-        home(temp_engine);
-    });
+  temp_engine.add_event("#reg-link", "click", () => {
+    reg(temp_engine);
+  });
+  temp_engine.add_event("#login-link", "click", () => {
+    login(temp_engine);
+  });
+  temp_engine.add_event("#systems-link", "click", () => {
+    systems(temp_engine);
+  });
+  temp_engine.add_event(".nav-brand", "click", () => {
+    home(temp_engine);
+  });
+  temp_engine.add_event("#logout-link", "click", () => {
+    My.agent = null;
+    localStorage.removeItem("token");
+    home(temp_engine);
+  });
 }
 
 function loged_links() {
-    $(".nav-links").prepend(`
+  $(".nav-links").html(`
         <li class="nav-link smooth" id="systems-link">Systems</li>
         <li class="nav-link smooth" id="contracts-link">Contracts</li>
         <li class="nav-link smooth" id="ships-link">Ships</li>
@@ -34,14 +34,14 @@ function loged_links() {
 }
 
 function unloged_links() {
-    $(".nav-links").prepend(`
+  $(".nav-links").html(`
         <li class="nav-link smooth" id="login-link">Log in</li>
         <li class="nav-link smooth" id="reg-link">New Agent</li>
     `);
 }
 
 function show_stats() {
-    $(".stats").html(`
+  $(".stats").html(`
         <p>Agent name : ${My.agent.name}</p>
         <p>Credits : ${My.agent.credits}</p>
         <p>Ships : ${My.agent.ships_cpt}</p>
@@ -51,11 +51,11 @@ function show_stats() {
 }
 
 export default function menu_mod(temp_engine) {
-    init_menu(temp_engine);
-    if (My.agent) {
-        show_stats();
-        loged_links();
-    } else {
-        unloged_links();
-    }
-}
\ No newline at end of file
+  init_menu(temp_engine);
+  if (My.agent) {
+    show_stats();
+    loged_links();
+  } else {
+    unloged_links();
+  }
+}
diff --git a/js/skama_code b/js/skama_code
index 77c8056..f6c0518 160000
--- a/js/skama_code
+++ b/js/skama_code
@@ -1 +1 @@
-Subproject commit 77c805654739b07aeecccb90ee53c9126ff158a0
+Subproject commit f6c0518ebb6f53be77117d72ac3d4fa56307a37c