derniere version

ago%!(EXTRA string=1 year) · 3bfec8032f
parent 2c2507cf79
commit 3bfec8032f
64 changed files with 173 additions and 246 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
 [submodule "js/skama_code"]
 	path = js/skama_code
 	url = https://github.com/anulax1225/skama_code
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,3 @@
 {
    "liveServer.settings.port": 5501
 }
--- a/assets/KRITA/ANTIMATTER.kra
+++ b/assets/KRITA/ANTIMATTER.kra
--- a/assets/KRITA/SKAMKRAFTLOGO.kra
+++ b/assets/KRITA/SKAMKRAFTLOGO.kra
--- a/assets/KRITA/SKAMKRAFTLOGO1.kra
+++ b/assets/KRITA/SKAMKRAFTLOGO1.kra
--- a/assets/KRITA/agent.kra
+++ b/assets/KRITA/agent.kra
--- a/assets/KRITA/asteroid1.kra
+++ b/assets/KRITA/asteroid1.kra
--- a/assets/KRITA/asteroid2.kra
+++ b/assets/KRITA/asteroid2.kra
--- a/assets/KRITA/asteroid3.kra
+++ b/assets/KRITA/asteroid3.kra
--- a/assets/KRITA/asteroid4.kra
+++ b/assets/KRITA/asteroid4.kra
--- a/assets/KRITA/background.kra
+++ b/assets/KRITA/background.kra
--- a/assets/KRITA/backgroundfinal.kra
+++ b/assets/KRITA/backgroundfinal.kra
--- a/assets/KRITA/blackhole.kra
+++ b/assets/KRITA/blackhole.kra
--- a/assets/KRITA/bluesystem.kra
+++ b/assets/KRITA/bluesystem.kra
--- a/assets/KRITA/greensystem.kra
+++ b/assets/KRITA/greensystem.kra
--- a/assets/KRITA/jumpgate.kra
+++ b/assets/KRITA/jumpgate.kra
--- a/assets/KRITA/medkit.kra
+++ b/assets/KRITA/medkit.kra
--- a/assets/KRITA/pinksystem.kra
+++ b/assets/KRITA/pinksystem.kra
--- a/assets/KRITA/planetproto.kra
+++ b/assets/KRITA/planetproto.kra
--- a/assets/KRITA/plastic.kra
+++ b/assets/KRITA/plastic.kra
--- a/assets/KRITA/procurement.kra
+++ b/assets/KRITA/procurement.kra
--- a/assets/KRITA/redsystem.kra
+++ b/assets/KRITA/redsystem.kra
--- a/assets/KRITA/shuttle.kra
+++ b/assets/KRITA/shuttle.kra
--- a/assets/KRITA/spaceship.kra
+++ b/assets/KRITA/spaceship.kra
--- a/assets/KRITA/spaceshiporbits.kra
+++ b/assets/KRITA/spaceshiporbits.kra
--- a/assets/KRITA/transportation.kra
+++ b/assets/KRITA/transportation.kra
--- a/assets/KRITA/whitehole.kra
+++ b/assets/KRITA/whitehole.kra
--- a/assets/KRITA/yellowsystem.kra
+++ b/assets/KRITA/yellowsystem.kra
--- a/assets/img/background.jpg
+++ b/assets/img/background.jpg
--- a/assets/img/background.png
+++ b/assets/img/background.png
--- a/assets/logo/elephant.png
+++ b/assets/logo/elephant.png
--- a/assets/planets/asteroid1.png
+++ b/assets/planets/asteroid1.png
--- a/assets/planets/asteroid2.png
+++ b/assets/planets/asteroid2.png
--- a/assets/planets/asteroid3.png
+++ b/assets/planets/asteroid3.png
--- a/assets/planets/asteroid4.png
+++ b/assets/planets/asteroid4.png
--- a/assets/planets/blackhole.png
+++ b/assets/planets/blackhole.png
--- a/assets/planets/jumpgate.png
+++ b/assets/planets/jumpgate.png
--- a/assets/planets/whitehole.png
+++ b/assets/planets/whitehole.png
--- a/assets/spaceships/blueprint.png
+++ b/assets/spaceships/blueprint.png
--- a/assets/spaceships/vaisseau.avif
+++ b/assets/spaceships/vaisseau.avif
--- a/assets/systems/bluesystem.png
+++ b/assets/systems/bluesystem.png
--- a/assets/systems/galaxie1.png
+++ b/assets/systems/galaxie1.png
--- a/assets/systems/greensystem.png
+++ b/assets/systems/greensystem.png
--- a/assets/systems/pinksystem.png
+++ b/assets/systems/pinksystem.png
--- a/assets/systems/redsystem.png
+++ b/assets/systems/redsystem.png
--- a/assets/systems/yellowsystem.png
+++ b/assets/systems/yellowsystem.png
--- a/css/animation.css
+++ b/css/animation.css
@ -2,7 +2,7 @@
 .ext-modal[open] {
-    animation: myFadeIn 2.0s ease normal;
+    animation: myFadeIn 0.5s ease normal;
 }
@keyframes myFadeIn{
--- a/css/style.css
+++ b/css/style.css
@ -15,7 +15,7 @@
 }
 body {
-    background-image: url("/assets/img/background.jpg");
+    background-image: url("/assets/img/background.png");
    font-family: 'M42';
    font-size: 7px;
    margin: 0px;
@ -84,11 +84,12 @@ footer {
 /*nav bar*/
 .nav-nav {
-    --nav-img-width: 100px;
+    --nav-img-width: 75px;
    background-color: var(--second-back-color);
    display: flex;
    justify-content: space-between;
    align-items: center;
    padding: 10px 10px 10px 10px;
 }
 .nav-nav .nav-brand {
@ -102,9 +103,9 @@ footer {
 }
 .nav-nav .nav-links {
-    --links-color: rgb(0,0,0);
+    --links-color: rgb(255, 255, 255);
-    --links-backcolor: rgb(255, 123, 71);
+    --links-backcolor: rgb(0, 0, 0);
-    --links-border-color: rgb(255, 173, 118);
+    --links-border-color: rgb(255, 255, 255);
    height: 70%;
    display: flex;
    justify-content: space-between;
--- a/html/template.html
+++ b/html/template.html
@ -1,7 +1,7 @@
 <!-- Copyright © 2023 Entreprise SkamKraft -->
 <nav class="nav-nav">
  <div class="nav-brand">
-    <img src="assets/logo/logoblancnotext.png" />
+    <img src="assets/logo/elephant.png" />
  </div>
  <div class="stats"></div>
  <ul class="nav-links">
--- a/html/templates/ship/ship.html
+++ b/html/templates/ship/ship.html
@ -1,13 +0,0 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Ship</title>
  </head>
  <body>
    <div class="ships">
    </div>
  </body>
 </html>
--- a/html/templates/ship/ship_modal.html
+++ b/html/templates/ship/ship_modal.html
@ -1,9 +0,0 @@
 <!-- Copyright © 2023 Entreprise SkamKraft -->
 <div class="my-modal">
  <div class="infos">
  </div>
  <div>
      <button class="btn btn-val btn-close">Close</button>
  </div>
 </div>
--- a/index.html
+++ b/index.html
@ -5,8 +5,6 @@
    <link rel="stylesheet" href="css/style.css">
    <link rel="stylesheet" href="css/ui.css">
    <link rel="stylesheet" href="css/animation.css">
    <link rel="stylesheet" href="css/ships.css">
    <script src="js/lib/fabric.js"></script>
    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>    
    <script type="module" src="js/index.js" defer></script>
--- 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");
 }
--- a/js/controllers/login.js
+++ b/js/controllers/login.js
@ -8,13 +8,9 @@ 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.add_class("ext-modal");
    temp_engine.after_render((temp_engine) => {
-    modal.load("templates/auth/login_modal.html");
+        modal.load("templates/auth/login_modal.html")
        menu_mod(temp_engine);
        temp_engine.add_event("#ok", "click", () => {
            home(temp_engine);
@ -37,16 +33,14 @@ export default function login(temp_engine) {
        });
    });
-  render_login();
+    temp_engine.render(`templates/auth/login.html`);
-  auth
+    auth.done((agent) => {
    .done((agent) => {
        modal.show();
        My.agent = agent;
-    })
+    }).fail((errs) => {
    .fail((errs) => {
        $(".errors").html("");
-      errs.forEach((err) => {
+        errs.forEach(err => {
            $(".errors").append(`
                <p>${err}</p>
            `);
--- a/js/controllers/menu_mod.js
+++ b/js/controllers/menu_mod.js
@ -3,7 +3,6 @@ import login from "./login.js";
 import reg from "./reg.js";
 import home from "./home.js";
 import { systems } from "./systems.js";
 import Ship from "./ships.js";
 function init_menu(temp_engine) {
    temp_engine.add_event("#reg-link", "click", () => {
@ -18,9 +17,6 @@ function init_menu(temp_engine) {
    temp_engine.add_event(".nav-brand", "click", () => {
        home(temp_engine);
    });
  temp_engine.add_event("#ships-link", "click", () => {
    Ship(temp_engine);
  });
 }
 function loged_links() {
--- a/js/controllers/reg.js
+++ b/js/controllers/reg.js
@ -9,16 +9,10 @@ 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);
+    temp_engine.after_render((temp_engine) => {
-
+        menu_mod(temp_engine);
-    render_reg();
+        modal.load("templates/auth/reg_modal.html");
        temp_engine.add_event("#ok", "click", () => {
            home(temp_engine);
        });
@ -46,6 +40,9 @@ export default function reg(temp_engine) {
            $("#in-name").val("");
            $("#in-faction").val("");
        });
    });
    temp_engine.render(`templates/auth/reg.html`);
    auth.done((agent) => {
        $(".show-token").text(agent.token);
--- a/js/controllers/systems.js
+++ b/js/controllers/systems.js
@ -26,12 +26,12 @@ function draw_system(system) {
        offsetY: 0,
    });
-    fabric.Image.fromURL('/assets/systems/galaxie1.png', function(img_planet) {
+    fabric.Image.fromURL('/assets/systems/bluesystem.png', function(img_planet) {
        img_planet.set({
            selectable: false,
-            scaleX: 0.05,
+            scaleX: 0.20,
-            scaleY: 0.05,
+            scaleY: 0.20,
            shadow: shadow,
            left: system.position.x/offset.x + w/2,
            top: system.position.y/offset.y+ h/2,
--- a/js/skama_code/api/agent.js
+++ b/js/skama_code/api/agent.js
@ -4,6 +4,8 @@ import { SpaceTraders } from "./config.js"
 export class My {
  static agent = null;
  static temp_engine = null;
  static canvas_renderer = null;
 }
 export class Agent {
@ -23,6 +25,11 @@ export class Agent {
 }
 export class AgentBuilder {
  constructor(end = false) {
    this.stopped = false;
    this.end = end;
  }
  static create(symbol, faction, callback, error_handler) {
      const url = `${SpaceTraders.host}/register`;
      $.ajax({
@ -94,22 +101,22 @@ export class AgentBuilder {
    });
  }
-  static list_all(callback, end = false) {
+  static list_all(callback) {
    this.list(20, 1, (agents, meta) => {
      let maxPage = meta.total / 20;
-      this.#r_listing(2, maxPage, agents, callback, end);
+      this.#r_listing(2, maxPage, agents, callback);
    });
  }
-  static #r_listing(page, maxPage, agents, callback, end) {
+  static #r_listing(page, maxPage, agents, callback) {
    if (page < maxPage) {
      this.list(20, page++,() => {
        setTimeout(() => {
-          if (!end) {
+          if (!this.end) {
            callback(agents);
            agents = [];
          }
-          this.#r_listing(page++, maxPage, agents, callback, end); 
+          if (!this.stopped) this.#r_listing(page++, maxPage, agents, callback, end); 
        }, 1000);
      }, agents);
    } else {
--- a/js/skama_code/api/config.js
+++ b/js/skama_code/api/config.js
@ -3,5 +3,5 @@
 export const SpaceTraders = {
        host: "https://api.spacetraders.io/v2",
-        limit_max: 20,
+        timing: 1000,
 }
--- a/js/skama_code/api/ntm.js
+++ b/js/skama_code/api/ntm.js
--- a/js/skama_code/api/ship.js
+++ b/js/skama_code/api/ship.js
@ -101,7 +101,7 @@ export class Ship {
  }
  orbit(callback, error_handler) {
-    if (this.nav.status == "ORBIT")
+    if (this.nav.status == "IN_ORBIT")
      return error_handler("Ship already in orbit.");
    const url = `${SpaceTraders.host}/my/ships/${this.symbol}/orbit`;
@ -121,76 +121,4 @@ export class Ship {
      },
    });
  }
  dock(callback, error_handler) {
    if (this.nav.status == "DOCKED")
      return error_handler("Ship already docked");
    const url = `${SpaceTraders.host}/my/ships/${this.symbol}/dock`;
    $.ajax({
      url: url,
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Accept: "application/json",
        Authorization: `Bearer ${My.agent.token}`,
      },
      success: (response) => {
        callback(response.data);
      },
      error: (err) => {
        error_handler(err);
      },
    });
  }
  navigate(waypoint, callback, error_handler) {
    if (this.nav.status != "ORBIT")
      return error_handler("Ship must be in orbit.");
    const url = `${SpaceTraders.host}/my/ships/${this.symbol}/navigate`;
    $.ajax({
      url: url,
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Accept: "application/json",
        Authorization: `Bearer ${My.agent.token}`,
      },
      processData: false,
      data: `{\n  "waypointSymbol": "${waypoint}"\n}`,
      success: (response) => {
        callback(response);
      },
      error: (err) => {
        error_handler(err);
      },
    });
  }
  refuel(callback, error_handler) {
    if (this.nav.status != "ORBIT")
      return error_handler("Ship must be in orbit.");
    const url = `${SpaceTraders.host}/my/ships/${this.symbol}/refuel`;
    $.ajax({
      url: url,
      method: "POST",
      headers: {
        "Content-Type": "application/json",
        Accept: "application/json",
        Authorization: "Bearer 123",
      },
      processData: false,
      data: '{\n  "units": "100",\n  "fromCargo": false\n}',
      success: (response) => {
        callback(response);
      },
      error: (err) => {
        error_handler(err);
      },
    });
  }
 }
--- a/js/skama_code/api/system.js
+++ b/js/skama_code/api/system.js
@ -12,9 +12,15 @@ export class System {
        this.type = data.type;
        this.position = new Position(data.x, data.y);
        this.factions = data.factions;
        this.stopped = false;
        this.end = false;
    }
-    get(name, callback, error_handler) {
+    when_end() {
        this.end = true;
    }
    get_planet(name, callback, error_handler) {
        const url = `${SpaceTraders.host}/systems/${this.name}/waypoints/${name}`;
        $.ajax({
            url: url,
@ -29,7 +35,7 @@ export class System {
        });
    } 
-    list(limit, page, callback, planets = []) {
+    list_planets(limit, page, callback, planets = []) {
        const url = `${SpaceTraders.host}/systems/${this.name}/waypoints`
        $.ajax({
            url: url,
@ -47,23 +53,27 @@ export class System {
        });
    }
-    list_all(callback, end = false) {
+    stop() {
-        this.list(20, 1, (planets, meta) => {
+        this.stopped = true;
    }
    list_all_planets(callback, end = false) {
        this.list_planets(20, 1, (planets, meta) => {
            let maxPage = meta.total / 20;
            this.#r_listing(2, maxPage, planets, callback, end);
        });
    }
-    #r_listing(page, maxPage, planets, callback, end) {
+    #r_listing(page, maxPage, planets, callback) {
        if (page < maxPage) {
-            this.list(20, page++, () => {
+            this.list_planets(20, page++, () => {
                setTimeout(() => {
                    if (!end) {
                        callback(planets);
                        planets = [];
                    }
-                    this.#r_listing(page++, maxPage, planets, callback, end); 
+                    if (!this.stopped) this.#r_listing(page++, maxPage, planets, callback, end); 
-                }, 1000);
+                }, SpaceTraders.timing);
            }, planets);
        } else {
            callback(planets);
@ -72,6 +82,13 @@ export class System {
 }
 export class SystemBuilder {
    constructor(end = false) {
        this.stopped = false;
        this.end = end;
        this.page = 1;
    }
    static parse_system_name(name) {
        return name.split("-").slice(-1, 2).join("-");
    }
@ -109,24 +126,27 @@ export class SystemBuilder {
        });
    }
-    static list_all(callback, end = false) {
+    stop() {
-        this.list(20, 1, (systems, meta) => {
+        this.stopped = true;
-            let maxPage = meta.total / 20;
+    }
-            this.#r_listing(2, maxPage, systems, callback, end);
+
    list_all(callback) {
        SystemBuilder.list(20, this.page, (systems, meta) => {
            this.max_page = meta.total / 20;
            this.#r_listing(systems, callback);
        });
    }
-    static #r_listing(page, maxPage, systems, callback, end) {
+    #r_listing(systems, callback) {
        if (page < maxPage) {
-            this.list(20, page++, () => {
+            SystemBuilder.list(20, this.page++, () => {
                setTimeout(() => {
-                    if (!end) {
+                    if (!this.end) {
                        console.log(systems);
                        callback(systems);
                        systems = [];
                    }
-                    this.#r_listing(page++, maxPage, systems, callback, end); 
+                    if (!this.stopped) this.#r_listing(page++, maxPage, systems, callback); 
-                }, 1000);
+                }, SpaceTraders.timing);
            }, systems);
        } else {
            callback(systems);
--- a/js/skama_code/commun/my.js
+++ b/js/skama_code/commun/my.js
@ -0,0 +1,5 @@
 export class My {
    static agent = null;
    static temp_engine = null;
    static canvas_renderer = null;
 }
--- a/js/skama_code/ui/templeting_engine.js
+++ b/js/skama_code/ui/templeting_engine.js
@ -1,5 +1,5 @@
 // Copyright © 2023 Entreprise SkamKraft
-"use strict";
+'use strict';
 export class TemplateEngine {
  constructor(path) {
    this.templatePath = path;
@ -7,12 +7,11 @@ export class TemplateEngine {
  render(template) {
    this.get_template((reponse) => {
-      $("body").html(reponse);
+      $('body').html(reponse);
      this.get_template((reponse) => {
        $("#block-content").html(reponse);
-        if (this.after_render_callback)
+        if (this.after_render_callback)  this.#flush_events().after_render_callback(this);
-          this.#flush_events().after_render_callback(this);
+      }, template)
      }, template);
    });
  }
@ -23,16 +22,13 @@ export class TemplateEngine {
  }
  get_template(callback, template = "") {
-    let url =
+    let url = template === "" ? `${this.templatePath}/template.html`: `${this.templatePath}/${template}`;
      template === ""
        ? `${this.templatePath}/template.html`
        : `${this.templatePath}/${template}`;
    $.ajax(url,{
      method: "GET",
      success: callback,
      error: (err) => {
        console.log(err);
-      },
+      }
    });
  }