From 671653b331d28298414026ddacae2ff6d206e4a5 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Thu, 21 Dec 2023 15:26:08 +0100 Subject: [PATCH] Reworked code architecture --- js/index.js | 6 +++--- js/scripts/main.js | 26 +++++++++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/js/index.js b/js/index.js index fd52e0a..6b93806 100644 --- a/js/index.js +++ b/js/index.js @@ -1,11 +1,11 @@ // Copyright © 2023 Entreprise SkamKraft 'use strict'; import { TemplateEngine } from "./skama_code/ui/templeting_engine.js"; -import { init_login } from "./scripts/main.js"; +import { login } from "./scripts/main.js"; let temp_engine = new TemplateEngine("html"); -init_login(temp_engine); +login(temp_engine); temp_engine.add_event("#signin-link", "click", () => { - init_login(temp_engine); + login(temp_engine); }); diff --git a/js/scripts/main.js b/js/scripts/main.js index ff60d41..9b8c309 100644 --- a/js/scripts/main.js +++ b/js/scripts/main.js @@ -3,27 +3,38 @@ import { Auth } from "../skama_code/auth/auth.js"; let my_agent = null; +function home(temp_engine) { + temp_engine.render("templates/home.html"); +} + + function menu_mod() { if(my_agent && my_agent.name) $(".pseudo").text(`Agent name : ${my_agent.name}`); } -export function init_login(temp_engine) { +export function login(temp_engine) { let auth = new Auth(true); let modal = new Modal("login-modal", temp_engine); - temp_engine.render("templates/login.html"); - menu_mod(); + function render_login() { + temp_engine.render(`templates/login.html`); + modal.load("templates/login_modal.html") + } + + modal.add_class("ext-modal"); + temp_engine.after_render(menu_mod); + + render_login(); temp_engine.add_event("#ok", "click", () => { - temp_engine.render("templates/home.html"); - menu_mod(); + home(temp_engine); }); temp_engine.add_event("#forget", "click", () => { my_agent = null; auth.unload_token(); modal.close(); - temp_engine.render("templates/login.html"); + render_login(); }); temp_engine.add_event("#val", "click", () => { @@ -35,9 +46,6 @@ export function init_login(temp_engine) { $("#in-token").val(""); }); - modal.add_class("ext-modal"); - modal.load("templates/login_modal.html"); - auth.done((agent) => { modal.show(); my_agent = agent;