From 9e0fe1627bd752af3793e58c2bb6cdaddb5158f0 Mon Sep 17 00:00:00 2001
From: ambigipathyv <vinayak.ambigapathy@rpn.ch>
Date: Thu, 11 Jan 2024 16:30:18 +0100
Subject: [PATCH] Modified controllers after fixing temp engine

---
 js/controllers/home.js     |  1 +
 js/controllers/login.js    | 49 ++++++++++++++--------------
 js/controllers/menu_mod.js |  2 +-
 js/controllers/reg.js      | 65 ++++++++++++++++++--------------------
 4 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/js/controllers/home.js b/js/controllers/home.js
index 9bafb7f..e872c3e 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -1,6 +1,7 @@
 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");
 }
diff --git a/js/controllers/login.js b/js/controllers/login.js
index 9761989..3b4cc9e 100644
--- a/js/controllers/login.js
+++ b/js/controllers/login.js
@@ -8,35 +8,32 @@ export default function login(temp_engine) {
     let auth = new Auth(true);
     let modal = new Modal("login-modal", temp_engine);
 
-    function render_login() {
-        temp_engine.render(`templates/auth/login.html`);
-        modal.load("templates/auth/login_modal.html")
-    }
-
     modal.add_class("ext-modal");
-    temp_engine.after_render(menu_mod);
-
-    render_login();
-
-    temp_engine.add_event("#ok", "click", () => {
-        home(temp_engine);
-    });
-
-    temp_engine.add_event("#forget_login", "click", () => {
-        My.agent = null;
-        auth.unload_token();
-        modal.close();
-        render_login();
-    });
-
-    temp_engine.add_event("#val", "click", () => {
-        let token = $("#in-token").val();
-        auth.login(token);
+    temp_engine.after_render((temp_engine) => {
+        modal.load("templates/auth/login_modal.html")
+        menu_mod(temp_engine);
+        temp_engine.add_event("#ok", "click", () => {
+            home(temp_engine);
+        });
+    
+        temp_engine.add_event("#forget_login", "click", () => {
+            My.agent = null;
+            auth.unload_token();
+            modal.close();
+            render_login();
+        });
+    
+        temp_engine.add_event("#val", "click", () => {
+            let token = $("#in-token").val();
+            auth.login(token);
+        });
+    
+        temp_engine.add_event("#cancel", "click", () => {
+            $("#in-token").val("");
+        });
     });
 
-    temp_engine.add_event("#cancel", "click", () => {
-        $("#in-token").val("");
-    });
+    temp_engine.render(`templates/auth/login.html`);
 
     auth.done((agent) => {
         modal.show();
diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js
index 6287759..4310621 100644
--- a/js/controllers/menu_mod.js
+++ b/js/controllers/menu_mod.js
@@ -13,7 +13,7 @@ function init_menu(temp_engine) {
     });
     temp_engine.add_event("#systems-link", "click", () => {
         systems(temp_engine);
-    })
+    });
     temp_engine.add_event(".nav-brand", "click", () => {
         home(temp_engine);
     });
diff --git a/js/controllers/reg.js b/js/controllers/reg.js
index a8b8425..ade8c69 100644
--- a/js/controllers/reg.js
+++ b/js/controllers/reg.js
@@ -9,43 +9,40 @@ export default function reg(temp_engine) {
     let auth = new Auth(true);
     let modal = new Modal("reg-modal", temp_engine);
 
-    function render_reg() {
-        temp_engine.render(`templates/auth/reg.html`);
-        modal.load("templates/auth/reg_modal.html")
-    }
-
     modal.add_class("ext-modal");
-    temp_engine.after_render(menu_mod);
-
-    render_reg();
-
-    temp_engine.add_event("#ok", "click", () => {
-        home(temp_engine);
-    });
-
-    temp_engine.add_event("#forget_reg", "click", () => {
-        My.agent = null;
-        auth.unload_token();
-        modal.close();
-        render_reg();
-    });
-
-    temp_engine.add_event("#val", "click", () => {
-        if (!active) {
-            active = true;
-            let name = $("#in-name").val();
-            let faction = $("#in-faction").val();
-            auth.register({
-                name: name,
-                faction: faction
-            });
-        }
+    temp_engine.after_render((temp_engine) => {
+        menu_mod(temp_engine);
+        modal.load("templates/auth/reg_modal.html");
+        temp_engine.add_event("#ok", "click", () => {
+            home(temp_engine);
+        });
+    
+        temp_engine.add_event("#forget_reg", "click", () => {
+            My.agent = null;
+            auth.unload_token();
+            modal.close();
+            render_reg();
+        });
+    
+        temp_engine.add_event("#val", "click", () => {
+            if (!active) {
+                active = true;
+                let name = $("#in-name").val();
+                let faction = $("#in-faction").val();
+                auth.register({
+                    name: name,
+                    faction: faction
+                });
+            }
+        });
+    
+        temp_engine.add_event("#cancel", "click", () => {
+            $("#in-name").val("");
+            $("#in-faction").val("");
+        });
     });
 
-    temp_engine.add_event("#cancel", "click", () => {
-        $("#in-name").val("");
-        $("#in-faction").val("");
-    });
+    temp_engine.render(`templates/auth/reg.html`);
 
     auth.done((agent) => {
         $(".show-token").text(agent.token);