anulax
/
skamkraft.anulax.ch
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed strategy and authentication

Browse Source
vinayak
anulax1225 ago%!(EXTRA string=1 year)
parent 5896c35d54
commit b2008bb866
11 changed files with 150 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      README.md
  2. 2
      html/template.html
  3. 28
      js/api/agent.js
  4. 4
      js/api/config.js
  5. 3
      js/api/planet.js
  6. 3
      js/api/system.js
  7. 86
      js/auth/auth.js
  8. 13
      js/commun/commun.js
  9. 26
      js/commun/strategie.js
  10. 41
      js/index.js
  11. 20
      js/ui/templeting_engine.js

0
README.md
Unescape View File

2
html/template.html
Unescape View File

@ -7,7 +7,7 @@
<li class="nav-link smooth" id="systems-link">System</li> <li class="nav-link smooth" id="systems-link">System</li>
<li class="nav-link smooth" id="ships-link">Ships</li> <li class="nav-link smooth" id="ships-link">Ships</li>
<li class="nav-link smooth" id="signin-link">Sign in</li> <li class="nav-link smooth" id="signin-link">Sign in</li>
<li class="nav-link smooth" id="signup-link">Sigh up</li> <li class="nav-link smooth" id="signup-link">Sign up</li>
</ul> </ul>
</nav> </nav>
<main id="block-content"></main> <main id="block-content"></main>

28
js/api/agent.js
Unescape View File

@ -1,3 +1,4 @@
// Copyright © 2023 Entreprise SkamKraft
'use strict'; 'use strict';
import { SpaceTraders } from "./config.js" import { SpaceTraders } from "./config.js"
@ -18,7 +19,7 @@ export class Agent {
} }
export class AgentBuilder { export class AgentBuilder {
static async create(symbol, faction, callback, email = "") { static async create(symbol, faction, callback, error_handler, email = "") {
const url = `${SpaceTraders.host}register`; const url = `${SpaceTraders.host}register`;
await $.ajax({ await $.ajax({
url: url, url: url,
@ -30,10 +31,13 @@ export class AgentBuilder {
let agent = new Agent(reponse.data.agent, reponse.data.token) let agent = new Agent(reponse.data.agent, reponse.data.token)
callback(agent); callback(agent);
}, },
error: (err) => {
error_handler(["Symbol is invalid."])
}
}); });
} }
static async get(token, callback){ static async get(token, callback, error_handler){
const url = `${SpaceTraders.host}my/agent`; const url = `${SpaceTraders.host}my/agent`;
await $.ajax({ await $.ajax({
url: url, url: url,
@ -46,16 +50,20 @@ export class AgentBuilder {
let agent = new Agent(reponse.data, token); let agent = new Agent(reponse.data, token);
callback(agent); callback(agent);
}, },
error: (err) => {
error_handler(["Token invalide."]);
}
}); });
} }
static async get_public(symbol, callback) { static async get_public(symbol, callback) {
const url = `${SpaceTraders.host}agents/${symbol}`; const url = `${SpaceTraders.host}agents/${symbol}`;
const headers = { Accept: "application/json" };
await $.ajax({ await $.ajax({
url: url, url: url,
method: "GET", method: "GET",
headers: headers, headers: {
Accept: "application/json"
},
success: (reponse) => { success: (reponse) => {
let agent = new Agent(reponse.data); let agent = new Agent(reponse.data);
callback(agent); callback(agent);
@ -65,12 +73,13 @@ export class AgentBuilder {
static async list(limit, page, callback, agents = []) { static async list(limit, page, callback, agents = []) {
const url = `${SpaceTraders.host}agents`; const url = `${SpaceTraders.host}agents`;
const headers = { Accept: "application/json" };
const data = { limit, page }; const data = { limit, page };
await $.ajax({ await $.ajax({
url: url, url: url,
method: "GET", method: "GET",
headers: headers, headers: {
Accept: "application/json"
},
data: data, data: data,
success: (reponse) => { success: (reponse) => {
reponse.data.forEach(agent => { reponse.data.forEach(agent => {
@ -84,15 +93,16 @@ export class AgentBuilder {
static async list_all(callback) { static async list_all(callback) {
await this.list(1,1, (agents, meta) => { await this.list(1,1, (agents, meta) => {
let maxPage = meta.total / 20; let maxPage = meta.total / 20;
this.r_listing(1, maxPage, [], callback); this.#r_listing(1, maxPage, [], callback);
}); });
} }
static async r_listing(page, maxPage, agents, callback) { static async #r_listing(page, maxPage, agents, callback) {
if (page < maxPage) { if (page < maxPage) {
this.list(20, page++,() => { this.list(20, page++,() => {
setTimeout(() => { setTimeout(() => {
this.r_listing(page++, maxPage, agents, callback); callback(agents);
this.#r_listing(page++, maxPage, agents, callback);
}, 1000); }, 1000);
}, agents); }, agents);
} else { } else {

4
js/api/config.js
Unescape View File

@ -1,3 +1,5 @@
'use strict';
export const SpaceTraders = { export const SpaceTraders = {
host: "https://api.spacetraders.io/v2/" host: "https://api.spacetraders.io/v2/",
limit_max: 20,
} }

3
js/api/planet.js
Unescape View File

@ -0,0 +1,3 @@
export class Planet {
}

3
js/api/system.js
Unescape View File

@ -0,0 +1,3 @@
export class System {
}

86
js/auth/auth.js
Unescape View File

@ -1,36 +1,40 @@
// Copyright © 2023 Entreprise SkamKraft
'use strict';
import { AgentBuilder } from '../api/agent.js' import { AgentBuilder } from '../api/agent.js'
import Strategie from '../commun/strategie.js'; import Strategie from '../commun/strategie.js';
let strategies = {
register: [
{
name: "symbol",
validations: [
"required",
"max_length|14"
]
},
{
name: "faction",
validations: [
"required"
]
}
],
login: [
{
name: "token",
validations: [
"required"
]
}
]
}
export class Auth { export class Auth {
constructor(store = false) { constructor(store = false) {
this.store = store; this.store = store;
this.validated = () => {}; this.validated = () => {};
this.error_handler = () => {}; this.error_handler = () => {};
this.strategies = { this.strategies = strategies;
register: [
{
name: "symbol",
validations: [
"required",
"max_lenght|14"
]
},
{
name: "faction",
validations: [
"required"
]
}
],
login: [
{
name: "token",
validations: [
"required"
]
}
]
}
} }
done(validated) { done(validated) {
@ -43,24 +47,38 @@ export class Auth {
return this; return this;
} }
login(token) { async login(token) {
let validateur = new Strategie(this.strategies.login); let validateur = new Strategie(this.strategies.login);
validateur.validate("token", token); validateur.validate("token", token);
if (validateur.errors) this.error_handler(validateur.errors); if (validateur.errors.length > 0) this.error_handler(validateur.errors);
else { else {
if (store) localStorage.setItem("token", token); if (this.store) localStorage.setItem("token", token);
AgentBuilder.get(token, this.validated); await AgentBuilder.get(token, this.validated, this.error_handler);
} }
} }
register(new_agent) { async relog() {
if(this.is_login()) await AgentBuilder.get(localStorage.getItem("token"), this.validated, this.error_handler);
else return false;
}
async register(new_agent) {
let validateur = new Strategie(this.strategies.register); let validateur = new Strategie(this.strategies.register);
validateur.validate("symbol", new_agent.symbol); validateur.validate("symbol", new_agent.symbol);
validateur.validate("faction", new_agent.faction); validateur.validate("faction", new_agent.faction);
if (validateur.errors) this.error_handler(validateur.errors); if (validateur.errors.length > 0) this.error_handler(validateur.errors);
else { else {
if (store) localStorage.setItem("token", token); await AgentBuilder.create(new_agent.symbol, new_agent.faction, (agent) => {
AgentBuilder.create(new_agent.symbol, new_agent.faction, this.validated); if (this.store) localStorage.setItem("token", agent.token);
this.validated(agent);
}, this.error_handler);
}
}
#is_login() {
if (this.store && localStorage.getItem("token")) {
return true
} }
return false
} }
} }

13
js/commun/commun.js
Unescape View File

@ -0,0 +1,13 @@
// Copyright © 2023 Entreprise SkamKraft
'use strict';
export class Initialzer {
constructor(UI) {
this.UI = UI;
}
init_menu_link(tag, template) {
this.UI.add_event(tag, "click", () => {
this.UI.render(`templates/${template}`);
})
}
}

26
js/commun/strategie.js
Unescape View File

@ -1,3 +1,4 @@
// Copyright © 2023 Entreprise SkamKraft
export default class Strategie { export default class Strategie {
constructor(strategie) { constructor(strategie) {
this.strategie = strategie; this.strategie = strategie;
@ -5,44 +6,43 @@ export default class Strategie {
} }
validate(name, input) { validate(name, input) {
this.errors = [];
this.strategie.forEach(input_strat => { this.strategie.forEach(input_strat => {
if(input_strat.name === name) input_strat.validations.forEach((validation) => { if(input_strat.name === name) input_strat.validations.forEach((validation) => {
let args = validation.split("|"); let args = validation.split("|");
switch (args[0]) { switch (args[0]) {
case "required": case "required":
this.test(this.required(input), `${name} is required.`); this.#test(Strategie.#required(input), `${name} is required.`);
break; break;
case "max_lenght": case "max_length":
this.test(this.max_lenght(input, args[1]), `${name} must have a max lenght of ${args[1]}.`); this.#test(Strategie.#max_length(input, parseInt(args[1])), `${name} must have a max lenght of ${args[1]}.`);
break; break;
case "min_lenght": case "min_length":
this.test(this.min_lenght(input, args[1]), `${name} must have a min lenght of ${args[1]}`); this.#test(Strategie.#min_length(input, parseInt(args[1])), `${name} must have a min lenght of ${args[1]}`);
break; break;
} }
}); });
}); });
} }
test(test, error) { #test(test, error) {
if(!test) this.errors.push(error); if(!test) this.errors.push(error);
} }
valide_email(input) { static #valide_email(input) {
} }
min_lenght(input, lenght) { static #min_length(input, length) {
if(input.lenght < lenght) return false; if(input.length < length) return false;
return true; return true;
} }
max_lenght(input, lenght) { static #max_length(input, length) {
if(input.lenght > args[0]) return false; if(input.length > length) return false;
return true; return true;
} }
required(input) { static #required(input) {
if (input === undefined || input === null || input === "") return false; if (input === undefined || input === null || input === "") return false;
return true; return true;
} }

41
js/index.js
Unescape View File

@ -1,19 +1,34 @@
import {UIRenderer} from "./ui/templeting_engine.js"; // Copyright © 2023 Entreprise SkamKraft
'use strict';
import { UIRenderer } from "./ui/templeting_engine.js";
import { Initialzer } from "./commun/commun.js";
import { AgentBuilder } from "./api/agent.js";
import { Auth } from "./auth/auth.js";
let token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZGVudGlmaWVyIjoiSEFSRElDSyIsInZlcnNpb24iOiJ2Mi4xLjQiLCJyZXNldF9kYXRlIjoiMjAyMy0xMi0wMiIsImlhdCI6MTcwMjY2Mjc2Mywic3ViIjoiYWdlbnQtdG9rZW4ifQ.PrvaOz3W79acq6RoxryMW53PRRz824_AM0VGLwfXCOsGCOCAIY-rn6-bZTOnLAtp4xPSDqEk4c38oWYAWW59p0iMDDLpur6ONnjT0RjjsQS9zr5BByfBpP36CT23IZSSzk3XxGrFolHJAyU3K1liYfNbsPuNTXlkHGNHq6yMqH4ZQUPFsXEsCkg9cUynkdLw3C39SvWhtJ89oblj_8tQp2k8dxhZemepuXtiI51eFMpv8A0WRAi7pVYo_ajJujY9QDLYn_m5hDZWTlQMIstjPaDl99p2IMweIMO2Q2G-0lKiWQ4sl6VW5tuVrz1HLYU6kyMjFQWNn6kFDE7LWMTrfw";
let UI = new UIRenderer("html"); let UI = new UIRenderer("html");
UI.render("templates/home.html") let initer = new Initialzer(UI);
UI.render("templates/home.html");
function init_menu_link(tag, template) { let auth = new Auth();
UI.add_event(tag, "click", () => { auth.done((agent) => {
UI.render(`templates/${template}`); console.log(agent);
}) }).fail((errs) => {
} errs.forEach(err => {
console.log(err);
});
});
await auth.register({
symbol: "lkdsjfsjdlfjlk",
faction: "COSMIC"
});
$(document).ready(() => { $(document).ready(() => {
init_menu_link("#contracts-link", "contracts.html"); initer.init_menu_link("#contracts-link", "contracts.html");
init_menu_link("#ships-link", "ships.html"); initer.init_menu_link("#ships-link", "ships.html");
init_menu_link("#systems-link", "systems.html"); initer.init_menu_link("#systems-link", "systems.html");
init_menu_link("#signup-link", "register.html"); initer.init_menu_link("#signup-link", "register.html");
init_menu_link("#signin-link", "login.html"); initer.init_menu_link("#signin-link", "login.html");
init_menu_link(".nav-brand", "home.html"); initer.init_menu_link(".nav-brand", "home.html");
}); });

20
js/ui/templeting_engine.js
Unescape View File

@ -1,16 +1,26 @@
// Copyright © 2023 Entreprise SkamKraft
'use strict';
export class UIRenderer { export class UIRenderer {
constructor(path) { constructor(path) {
this.templatePath = path; this.templatePath = path;
} }
render(template, tag = "#block-content") {
this.get_template((reponse) => { render(template) {
this.#get_template((reponse) => {
$('body').html(reponse); $('body').html(reponse);
this.get_template((reponse) => { this.#get_template((reponse) => {
$(tag).html(reponse); $("block-content").html(reponse);
}, template) }, template)
}); });
} }
get_template(callback, template = "") {
frag_load(tag, template) {
this.#get_template((reponse) => {
$(tag).html(reponse);
}, template);
}
#get_template(callback, template = "") {
let url = template === "" ? `${this.templatePath}/template.html`: `${this.templatePath}/${template}`; let url = template === "" ? `${this.templatePath}/template.html`: `${this.templatePath}/${template}`;
let data = $.ajax(url,{ let data = $.ajax(url,{
async: false, async: false,

Write Preview
Loading…
Cancel
Save