From 11aab9281bb6a81a223c2de54044ef9e1c3ead84 Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Fri, 15 Dec 2023 01:51:13 +0100
Subject: [PATCH] Adding new features

---
 css/style.css                                 | 75 +++++++++++++++++++
 html/template.html                            | 20 ++---
 .../ships/ship.js => html/templates/home.html |  0
 html/templates/test.html                      |  2 -
 html/templates/test2.html                     |  2 -
 js/api/{agent => }/agent.js                   |  6 +-
 js/api/{ships/ship_crew.js => planet.js}      |  0
 js/api/{ships/ship_engine.js => ship.js}      |  0
 js/api/{ships/ship_movement.js => system.js}  |  0
 js/auth/auth.js                               | 66 ++++++++++++++++
 js/auth/login.js                              |  0
 js/auth/register.js                           |  0
 js/commun.js                                  |  0
 js/commun/strategie.js                        | 49 ++++++++++++
 js/index.js                                   | 12 +--
 js/{api/systems/get_systems.js => ui/Menu.js} |  0
 .../get_waypoints_system.js => ui/Modal.js}   |  0
 17 files changed, 206 insertions(+), 26 deletions(-)
 rename js/api/ships/ship.js => html/templates/home.html (100%)
 delete mode 100644 html/templates/test.html
 delete mode 100644 html/templates/test2.html
 rename js/api/{agent => }/agent.js (95%)
 rename js/api/{ships/ship_crew.js => planet.js} (100%)
 rename js/api/{ships/ship_engine.js => ship.js} (100%)
 rename js/api/{ships/ship_movement.js => system.js} (100%)
 create mode 100644 js/auth/auth.js
 delete mode 100644 js/auth/login.js
 delete mode 100644 js/auth/register.js
 delete mode 100644 js/commun.js
 create mode 100644 js/commun/strategie.js
 rename js/{api/systems/get_systems.js => ui/Menu.js} (100%)
 rename js/{api/systems/get_waypoints_system.js => ui/Modal.js} (100%)

diff --git a/css/style.css b/css/style.css
index e69de29..0fa94e7 100644
--- a/css/style.css
+++ b/css/style.css
@@ -0,0 +1,75 @@
+:root {
+    --main-back-color: rgb(143, 143, 143);
+    --second-back-color: black;
+}
+
+@font-face {
+    font-family: M42;
+    src: url("/assets/fonts/m42.TTF");
+}
+
+* {
+    box-sizing: border-box;
+}
+
+body {
+    background-color: var(--main-back-color);
+    font-family: 'M42';
+    font-size: 7px;
+    margin: 0px;
+    padding: 0px;
+}
+
+/*footer*/
+footer {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    display: flex;
+    justify-content: center;
+    background-color: var(--second-back-color);
+    color: white;
+}
+
+/*nav bar*/
+.nav-nav {
+    --nav-img-width: 100px;
+    background-color: var(--second-back-color);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.nav-nav .nav-brand {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.nav-nav .nav-brand img {
+    width: var(--nav-img-width);
+}
+
+.nav-nav .nav-links {
+    --links-color: rgb(0,0,0);
+    --links-backcolor: rgb(255, 123, 71);
+    --links-border-color: rgb(255, 173, 118);
+    height: 70%;
+    display: flex;
+    justify-content: space-between;
+}
+
+.smooth {
+    padding: 5px;
+    border-radius: 10px;
+}
+
+.nav-link {
+    margin-right: 10px;
+    background-color: var(--links-backcolor);
+    color: var(--links-color);
+    border: 4px solid var(--links-border-color); 
+    list-style: none;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-shadow: 3px 2px white;
+}
\ No newline at end of file
diff --git a/html/template.html b/html/template.html
index 6d4fdca..1dd5c17 100644
--- a/html/template.html
+++ b/html/template.html
@@ -1,14 +1,16 @@
-<nav>
-  <div class=".nav-brand">
-    <img src="assets/" />
+<nav class="nav-nav">
+  <div class="nav-brand">
+    <img src="assets/logo/logoblancnotext.png" />
   </div>
   <ul class="nav-links">
-    <li class="nav-link">Contracts</li>
-    <li class="nav-link">System</li>
-    <li class="nav-link">Ships</li>
-    <li class="nav-link">Profile</li>
-    <li class="nav-link">Ships</li>
+    <li class="nav-link smooth">Contracts</li>
+    <li class="nav-link smooth">System</li>
+    <li class="nav-link smooth">Ships</li>
+    <li class="nav-link smooth">Sign in</li>
+    <li class="nav-link smooth">Sigh up</li>
   </ul>
 </nav>
 <main id="block-content"></main>
-<footer></footer>
+<footer>
+  <p>Skamcraft Sarl</p>
+</footer>
diff --git a/js/api/ships/ship.js b/html/templates/home.html
similarity index 100%
rename from js/api/ships/ship.js
rename to html/templates/home.html
diff --git a/html/templates/test.html b/html/templates/test.html
deleted file mode 100644
index aba8eea..0000000
--- a/html/templates/test.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>Coucou</p>
-<button id="btn1">Btn 1</button>
\ No newline at end of file
diff --git a/html/templates/test2.html b/html/templates/test2.html
deleted file mode 100644
index 2a9b82e..0000000
--- a/html/templates/test2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>Hello</p>
-<button id="btn2">Btn 2</button>
\ No newline at end of file
diff --git a/js/api/agent/agent.js b/js/api/agent.js
similarity index 95%
rename from js/api/agent/agent.js
rename to js/api/agent.js
index c837c96..1d366a2 100644
--- a/js/api/agent/agent.js
+++ b/js/api/agent.js
@@ -1,5 +1,5 @@
 'use strict';
-import { SpaceTraders } from "../config.js"
+import { SpaceTraders } from "./config.js"
 
 export class Agent {
   constructor(agent, token = "") {
@@ -49,7 +49,7 @@ export class AgentBuilder {
     });
   }
 
-  static async getPublic(symbol, callback) {
+  static async get_public(symbol, callback) {
     const url = `${SpaceTraders.host}agents/${symbol}`;
     const headers = { Accept: "application/json" };
     await $.ajax({
@@ -81,7 +81,7 @@ export class AgentBuilder {
     });
   }
 
-  static async listAll(callback) {
+  static async list_all(callback) {
     await this.list(1,1, (agents, meta) => {
       let maxPage = meta.total / 20;
       this.r_listing(1, maxPage, [], callback);
diff --git a/js/api/ships/ship_crew.js b/js/api/planet.js
similarity index 100%
rename from js/api/ships/ship_crew.js
rename to js/api/planet.js
diff --git a/js/api/ships/ship_engine.js b/js/api/ship.js
similarity index 100%
rename from js/api/ships/ship_engine.js
rename to js/api/ship.js
diff --git a/js/api/ships/ship_movement.js b/js/api/system.js
similarity index 100%
rename from js/api/ships/ship_movement.js
rename to js/api/system.js
diff --git a/js/auth/auth.js b/js/auth/auth.js
new file mode 100644
index 0000000..53964e1
--- /dev/null
+++ b/js/auth/auth.js
@@ -0,0 +1,66 @@
+import { AgentBuilder } from '../api/agent.js'
+import Strategie from '../commun/strategie.js';
+
+export class Auth {
+    constructor(store = false) {
+        this.store = store;
+        this.validated = () => {};
+        this.error_handler = () => {};
+        this.strategies = {
+            register: [
+                {
+                    name: "symbol",
+                    validations: [
+                        "required",
+                        "max_lenght|14"
+                    ]
+                },
+                {
+                    name: "faction",
+                    validations: [
+                        "required"
+                    ]
+                }
+            ],
+            login: [
+                {
+                    name: "token",
+                    validations: [
+                        "required"
+                    ]
+                }
+            ]
+        }
+    }
+
+    done(validated) {
+        this.validated = validated;
+        return this;
+    }
+    
+    fail(error_handler) {
+        this.error_handler = error_handler;
+        return this;
+    }
+
+    login(token) {
+        let validateur = new Strategie(this.strategies.login);
+        validateur.validate("token", token);
+        if (validateur.errors) this.error_handler(validateur.errors);
+        else {
+            if (store) localStorage.setItem("token", token);
+            AgentBuilder.get(token, this.validated);
+        }
+    }
+
+    register(new_agent) {
+        let validateur = new Strategie(this.strategies.register);
+        validateur.validate("symbol", new_agent.symbol);
+        validateur.validate("faction", new_agent.faction);
+        if (validateur.errors) this.error_handler(validateur.errors);
+        else {
+            if (store) localStorage.setItem("token", token);
+            AgentBuilder.create(new_agent.symbol, new_agent.faction, this.validated);
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/auth/login.js b/js/auth/login.js
deleted file mode 100644
index e69de29..0000000
diff --git a/js/auth/register.js b/js/auth/register.js
deleted file mode 100644
index e69de29..0000000
diff --git a/js/commun.js b/js/commun.js
deleted file mode 100644
index e69de29..0000000
diff --git a/js/commun/strategie.js b/js/commun/strategie.js
new file mode 100644
index 0000000..dbe9bf5
--- /dev/null
+++ b/js/commun/strategie.js
@@ -0,0 +1,49 @@
+export default class Strategie {
+    constructor(strategie) {
+        this.strategie = strategie;
+        this.errors = [];
+    }
+
+    validate(name, input) {
+        this.errors = [];
+        this.strategie.forEach(input_strat => {
+            if(input_strat.name === name) input_strat.validations.forEach((validation) => {
+                let args = validation.split("|");
+                switch (args[0]) {
+                    case "required": 
+                        this.test(this.required(input), `${name} is required.`);
+                        break;
+                    case "max_lenght":
+                        this.test(this.max_lenght(input, args[1]), `${name} must have a max lenght of ${args[1]}.`);
+                        break;
+                    case "min_lenght":
+                        this.test(this.min_lenght(input, args[1]), `${name} must have a min lenght of ${args[1]}`);
+                        break;
+                }
+            });
+        });
+    }
+
+    test(test, error) {
+        if(!test) this.errors.push(error); 
+    }
+
+    valide_email(input) {
+
+    }
+
+    min_lenght(input, lenght) {
+        if(input.lenght < lenght) return false;
+        return true;
+    }
+
+    max_lenght(input, lenght) {
+        if(input.lenght > args[0]) return false;
+        return true;
+    }
+
+    required(input) {
+        if (input === undefined || input === null || input === "") return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/js/index.js b/js/index.js
index 32177ea..a155af6 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,17 +1,9 @@
 import {UIRenderer} from "./ui/templeting_engine.js";
-import { Agent, AgentBuilder } from "./api/agent/agent.js";
-
-AgentBuilder.listAll((agents) => {
-    console.log(agents);
-});
-
-AgentBuilder.create("ZEUslkdjlka", "COSMIC", (agent) => {
-    console.log(agent);
-});
 
 let UI = new UIRenderer("html");
 
-UI.render("templates/test.html");
+
+UI.render("templates/home.html");
 
 UI.add_event("#btn1", "click", () => {
     UI.render("templates/test2.html");
diff --git a/js/api/systems/get_systems.js b/js/ui/Menu.js
similarity index 100%
rename from js/api/systems/get_systems.js
rename to js/ui/Menu.js
diff --git a/js/api/systems/get_waypoints_system.js b/js/ui/Modal.js
similarity index 100%
rename from js/api/systems/get_waypoints_system.js
rename to js/ui/Modal.js