diff --git a/assets/fonts/Pixellari.ttf b/assets/fonts/Pixellari.ttf new file mode 100644 index 0000000..5a3a3c2 Binary files /dev/null and b/assets/fonts/Pixellari.ttf differ diff --git a/assets/fonts/m42.TTF b/assets/fonts/m42.TTF deleted file mode 100644 index 3609477..0000000 Binary files a/assets/fonts/m42.TTF and /dev/null differ diff --git a/css/auth.css b/css/auth.css new file mode 100644 index 0000000..7d108f0 --- /dev/null +++ b/css/auth.css @@ -0,0 +1,41 @@ +.auth-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, 0.863); + padding: 30px; + border-radius: 5px; +} + +.auth-input { + border-radius: 2px; + padding: 5px; +} + +.auth-grp-label { + display: flex; + justify-content: space-between; +} + +.auth-btn { + margin: 3px; + padding: 4px; + font-size: 20px; + color: white; + border-radius: 5px; +} + +.auth-btn-val { + background-color: blue; +} + +.auth-btn-can { + background-color: red; +} + +.auth-btn-other { + background-color: darkgreen; +} + +.auth-select {} \ No newline at end of file diff --git a/css/contract.css b/css/contract.css new file mode 100644 index 0000000..3e479ab --- /dev/null +++ b/css/contract.css @@ -0,0 +1,83 @@ +/* Copyright © 2023 Entreprise SkamCraft */ + + + +body, +html { + height: 100%; +} + + + +.btn-infos { + margin: 2px; + /* color: black; */ + background-color: transparent; + border: 5px solid #0018e8; + border-radius: 10px; +} + +.btn-infos:hover { + border-color: #0018e8; + background-color: #0018e8; + ; +} + +.btn-accept { + margin: 2px; + /* color: black; */ + background-color: transparent; + border: 5px solid #0018e8; + border-radius: 10px; +} + +.btn-accept:hover { + border-color: rgb(33, 196, 0); + background-color: rgb(33, 196, 0); +} + +.card { + margin-bottom: 30px; +} + +.contract-screen { + display: flex; + justify-content: center; + background-image: url("/assets/contracts/contractscreen.png"); + background-repeat: no-repeat; + background-position: center; + height: 100vh; + +} + +.card-body { + display: grid; + grid-template-columns: 1fr 1fr; + margin-left: 200px; + margin-top: -160px; + width: 100%; +} + +.card-body button { + margin-top: 50px; + margin-right: 29px; + margin-left: -11px; + width: 240px; +} + +.contracts { + margin-left: 240px; + margin-top: 250px; + height: 100vh; + width: 100vh; +} + +/* Modal */ + +.status-onhold { + color: orange; +} + +.status-accepted { + color: greenyellow; +} \ No newline at end of file diff --git a/css/global.css b/css/global.css index 3e479ab..c0ba70b 100644 --- a/css/global.css +++ b/css/global.css @@ -1,83 +1,47 @@ /* Copyright © 2023 Entreprise SkamCraft */ - - -body, -html { - height: 100%; -} - - - -.btn-infos { - margin: 2px; - /* color: black; */ - background-color: transparent; - border: 5px solid #0018e8; - border-radius: 10px; -} - -.btn-infos:hover { - border-color: #0018e8; - background-color: #0018e8; - ; -} - -.btn-accept { - margin: 2px; - /* color: black; */ - background-color: transparent; - border: 5px solid #0018e8; - border-radius: 10px; +:root { + --text-color: white; } -.btn-accept:hover { - border-color: rgb(33, 196, 0); - background-color: rgb(33, 196, 0); +@font-face { + font-family: pixellari; + src: url("../assets/fonts/Pixellari.ttf"); } -.card { - margin-bottom: 30px; +body { + margin: 0; + background-image: url("../assets/img/background.png"); + font-family: pixellari; + color: var(--text-color); } -.contract-screen { - display: flex; - justify-content: center; - background-image: url("/assets/contracts/contractscreen.png"); - background-repeat: no-repeat; - background-position: center; - height: 100vh; - +input { + border: none; + font-family: pixellari; } -.card-body { - display: grid; - grid-template-columns: 1fr 1fr; - margin-left: 200px; - margin-top: -160px; - width: 100%; -} -.card-body button { - margin-top: 50px; - margin-right: 29px; - margin-left: -11px; - width: 240px; +button { + border: none; + font-family: pixellari; } -.contracts { - margin-left: 240px; - margin-top: 250px; - height: 100vh; - width: 100vh; +select { + border: none; + font-family: pixellari; } -/* Modal */ -.status-onhold { - color: orange; +.container { + width: 100%; + height: inherit; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } -.status-accepted { - color: greenyellow; +.title { + font-size: 40px; } \ No newline at end of file diff --git a/css/style.css b/css/style.css deleted file mode 100644 index 856b483..0000000 --- a/css/style.css +++ /dev/null @@ -1,196 +0,0 @@ -/* Copyright © 2023 Entreprise SkamKraft */ - -: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-image: url("/assets/img/background.png"); - font-family: 'M42'; - font-size: 7px; - margin: 0px; - padding: 0px; -} - -/* Main */ -.container { - color: white; - background-color: rgba(0, 0, 0, 0.726); - display: flex; - margin: 10px; - width: fit-content; - margin: auto; - margin-top: 10px; margin-bottom: 30px; - flex-direction: column; - align-items: center; - border: 4px solid rgba(68, 68, 68, 0.575); -} - -.max-container { - background-color: rgba(0, 0, 0, 0.726); - color: white; - display: flex; - margin: 10px; - width: 95%; - margin: auto; - margin-top: 10px; margin-bottom: 30px; - flex-direction: column; - align-items: center; - border: 4px solid rgba(68, 68, 68, 0.575); -} - -.con-title { - font-size: 15px; - border-bottom: 2px solid black; -} - -.btn { - padding: 10px; - font-size: 8px; - font-family: 'M42'; - color: white; - border: none; - border-radius: 10px; -} - -.btn-val { - background-color: rgba(0, 0, 255, 0.637); -} - -.btn-cancel { - background-color: rgba(255, 0, 0, 0.699); -} - -/*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: 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 { - 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(255, 255, 255); - --links-backcolor: rgb(0, 0, 0); - --links-border-color: rgb(255, 255, 255); - height: 70%; - display: flex; - justify-content: space-between; -} - -.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; -} - -.stats { - color: white; -} - -/* General */ -.smooth { - padding: 5px; - padding-left: 10px; - padding-right: 10px; - border-radius: 5px; -} - -.in-big { - font-family: 'M42'; - font-size: 6px; - padding: 5px; - width: 100%; - margin-bottom: 10px; - border-radius: 5px; - border: none; -} - -.errors p { - background-color: rgba(255, 56, 56, 0.733); - border: 3px solid rgb(255, 111, 111); - padding: 10px; - color: white; - border-radius: 5px; - text-align: center; -} - -/* Modal */ -.ext-modal { - background-color: rgba(255, 255, 255, 0.767); - border-radius: 10px; - padding: 50px; -} - -.my-modal { - display: flex; - flex-direction: column; - align-items: center; -} - -.modal-title { - font-size: 15px; - margin-bottom: 40px; -} - -.show-token { - width: fit-content; - border: 2px solid black; - border-radius: 10px; - padding: 30px; - font-size: 5px; - white-space:pre-wrap; - word-break:break-word; -} - -.my-modal #timer { - text-align: center; - border: 1px solid black; - border-radius: 10px; - width: 10%; - padding: 5px; - margin-bottom: 10px; -} - -#canvas { - border-radius: 10px; -} \ No newline at end of file diff --git a/css/system.css b/css/system.css new file mode 100644 index 0000000..e69de29 diff --git a/css/ui.css b/css/ui.css index 085f1e5..5bfc966 100644 --- a/css/ui.css +++ b/css/ui.css @@ -3,9 +3,10 @@ #block-content { margin: 0; padding: 0; + width: 100%; + height: 100vh; } .modal-disable::backdrop { background-color: rgba(0, 0, 0, 0.493); -} - +} \ No newline at end of file diff --git a/html/template.html b/html/template.html index 3d63083..c34d499 100644 --- a/html/template.html +++ b/html/template.html @@ -1,12 +1,2 @@ - -
- +
\ No newline at end of file diff --git a/html/templates/auth/login.html b/html/templates/auth/login.html index 04c3c7e..15568fa 100644 --- a/html/templates/auth/login.html +++ b/html/templates/auth/login.html @@ -1,12 +1,20 @@ -
-

Login

- - Remember me ? -
- - +
+
+

Login

+ +
+

Remember me ?

+ +
+
+ + +
+
+ +
+
-
\ No newline at end of file diff --git a/html/templates/auth/reg.html b/html/templates/auth/reg.html index 6cdb9be..956423a 100644 --- a/html/templates/auth/reg.html +++ b/html/templates/auth/reg.html @@ -1,16 +1,24 @@ -
-

New Agent

- - - Remember me ? -
- - +
+
+

New Agent

+ + +
+

Remember me ?

+ +
+
+ + +
+
+ +
+
-
\ No newline at end of file diff --git a/index.html b/index.html index bd71585..d133fc9 100644 --- a/index.html +++ b/index.html @@ -1,15 +1,22 @@ - - - - - - - - - - - - - + + + Skamkraft + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/js/controllers/login.js b/js/controllers/login.js index a981ba0..cf264e3 100644 --- a/js/controllers/login.js +++ b/js/controllers/login.js @@ -2,24 +2,28 @@ import { Auth } from "../skama_code/auth/auth.js"; import { My } from "../skama_code/api/agent.js"; import home from "./home.js"; import menu_mod from "./menu_mod.js"; -import { AgentBuilder } from "../skama_code/api/agent.js"; +import reg from "./reg.js" export default function login(temp_engine) { const auth = new Auth(); temp_engine.after_render((temp_engine) => { menu_mod(temp_engine); - + temp_engine.add_event("#btn-login", "click", () => { - const is_checked = $("#box-remember").is(":checked"); + const is_checked = $("#in-remember").is(":checked"); const token = $("#in-token").val(); auth.store = is_checked; auth.login(token) }); - + temp_engine.add_event("#btn-cancel", "click", () => { - $("#input-token").val(""); - $("#box-remember").prop("checked", false); + $("#in-token").val(""); + $("#in-remember").prop("checked", false); + }); + + temp_engine.add_event("#btn-reg", "click", () => { + reg(temp_engine); }); }); diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js index f4566f0..5d9bfb3 100644 --- a/js/controllers/menu_mod.js +++ b/js/controllers/menu_mod.js @@ -3,6 +3,7 @@ import home from "./home.js"; import login from "./login.js"; import reg from "./reg.js"; import systems from "./systems.js"; +import contract from "./contracts.js"; function init_menu(temp_engine) { temp_engine.add_event("#reg-link", "click", () => { @@ -22,6 +23,9 @@ function init_menu(temp_engine) { localStorage.removeItem("token"); home(temp_engine); }); + temp_engine.add_event("#contracts-link", "click", () => { + contract(temp_engine); + }) } function loged_links() { diff --git a/js/index.js b/js/index.js index 886d57b..c687061 100644 --- a/js/index.js +++ b/js/index.js @@ -1,9 +1,9 @@ // Copyright © 2023 Entreprise SkamKraft 'use strict'; import { TemplateEngine } from "./skama_code/ui/templeting_engine.js"; -import home from "./controllers/home.js"; +import login from "./controllers/login.js"; let temp_engine = new TemplateEngine("html"); -home(temp_engine); +login(temp_engine); diff --git a/js/skama_code b/js/skama_code index b6e56fa..9143450 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit b6e56fa736370ef8a5bb0b6d913ed1ee71ce3aed +Subproject commit 9143450f8979521f7d944f8f71e8640813235136