diff --git a/assets/sounds/skamkraft_main_theme.mp3 b/assets/sounds/skamkraft_main_theme.mp3 new file mode 100644 index 0000000..ea152bc Binary files /dev/null and b/assets/sounds/skamkraft_main_theme.mp3 differ diff --git a/css/animation.css b/css/animation.css index b811574..6d3c145 100644 --- a/css/animation.css +++ b/css/animation.css @@ -1,8 +1,25 @@ /* Copyright © 2023 Entreprise SkamKraft */ +.languettes input:hover{ + animation: slide-left; + position: relative; + animation-timing-function: ease; + animation-fill-mode: forwards; + animation-duration: 1s; +} +@keyframes slide-left { + 0% { + right: 0px; + top: 0px; + } + 100% { + right: 25px; + top: 0px; + } +} .ext-modal[open] { - animation: myFadeIn 0.5s ease normal; + animation: myFadeIn 0.5s ease normal; } @keyframes myFadeIn{ diff --git a/css/global.css b/css/global.css index e0c6fb4..de7b394 100644 --- a/css/global.css +++ b/css/global.css @@ -10,12 +10,10 @@ } body { - margin: 0; - background-image: url("../assets/img/background.png"); + background-image: url(/assets/img/backgroundfinal.png); background-repeat: no-repeat; + background-size: 100%; overflow-x: hidden; - font-family: pixellari; - color: var(--text-color); } input { @@ -34,20 +32,6 @@ select { font-family: pixellari; } - -.container { - width: 100%; - height: inherit; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; -} - -.title { - font-size: 40px; -} - .languettes { display: flex; flex-direction: column; @@ -59,15 +43,3 @@ select { width: 5%; } -.languettes input:hover{ - animation: slide-left; - position: relative; - animation-timing-function: ease; - animation-fill-mode: forwards; - animation-duration: 1s; -} - -@keyframes slide-left { - 0% {right: 0px; top: 0px;} -100% {right: 25px; top: 0px;} -} \ No newline at end of file diff --git a/html/template.html b/html/template.html index d894437..ce8a0c7 100644 --- a/html/template.html +++ b/html/template.html @@ -1,5 +1,11 @@
+ +
diff --git a/index.html b/index.html index d133fc9..1242f1b 100644 --- a/index.html +++ b/index.html @@ -1,22 +1,19 @@ + + Skamkraft + + + + + + + + + + + + - - Skamkraft - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/js/controllers/menu_mod.js b/js/controllers/menu_mod.js index 55a117a..bd6606d 100644 --- a/js/controllers/menu_mod.js +++ b/js/controllers/menu_mod.js @@ -15,13 +15,13 @@ function init_menu(temp_engine) { temp_engine.add_event("#systems-link", "click", () => { systems(temp_engine); }); - temp_engine.add_event(".nav-brand", "click", () => { + temp_engine.add_event("#home-link", "click", () => { home(temp_engine); }); temp_engine.add_event("#logout-link", "click", () => { My.agent = null; localStorage.removeItem("token"); - home(temp_engine); + login(temp_engine); }); temp_engine.add_event("#contracts-link", "click", () => { contract(temp_engine); @@ -45,16 +45,6 @@ function unloged_links() { // `); } -function show_stats() { - $(".stats").html(` -

Agent name : ${My.agent.name}

-

Credits : ${My.agent.credits}

-

Ships : ${My.agent.ships_cpt}

-

Faction : ${My.agent.faction}

-

HQ : ${My.agent.hq}

- `); -} - export default function menu_mod(temp_engine) { init_menu(temp_engine); if (My.agent) { diff --git a/js/controllers/systems.js b/js/controllers/systems.js index 4873880..7c99882 100644 --- a/js/controllers/systems.js +++ b/js/controllers/systems.js @@ -1,4 +1,4 @@ -import { CanvasRenderer } from "../skama_code/rendering/canvas_render.js"; +import { CanvasRenderer } from "../skama_code/ui/canvas_render.js"; import menu_mod from "./menu_mod.js"; import { My } from "../skama_code/api/agent.js"; import { SystemBuilder } from "../skama_code/api/system.js"; diff --git a/js/index.js b/js/index.js index 42ab380..c687061 100644 --- a/js/index.js +++ b/js/index.js @@ -2,23 +2,8 @@ 'use strict'; import { TemplateEngine } from "./skama_code/ui/templeting_engine.js"; import login from "./controllers/login.js"; -import home from "./controllers/home.js"; -import { Auth } from "./skama_code/auth/auth.js"; -import { AgentBuilder } from "./skama_code/api/agent.js"; -import { My } from "./skama_code/api/agent.js"; let temp_engine = new TemplateEngine("html"); - -//Auto login -const auth = new Auth(); - -if (auth.relog()) { -AgentBuilder.get(localStorage.getItem("token"), (agent) => { - My.agent = agent; - home(temp_engine); -}); -} - login(temp_engine); diff --git a/js/skama_code b/js/skama_code index 9143450..77c8056 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit 9143450f8979521f7d944f8f71e8640813235136 +Subproject commit 77c805654739b07aeecccb90ee53c9126ff158a0