Sort la sauce sacha

main
anulax1225 ago%!(EXTRA string=11 months)
parent a3108d3a44
commit be0ff228d1
  1. 5
      css/global.css
  2. 3
      html/templates/contracts/contracts.html
  3. 0
      html/templates/contracts/contracts_modal.html
  4. 1
      html/templates/modal_profile.html
  5. 3
      js/controllers/contracts.js
  6. 4
      js/controllers/home.js
  7. 7
      js/controllers/profile.js
  8. 2
      js/skama_code

@ -14,7 +14,7 @@ body{
background-image: url("/assets/img/background.png"); background-image: url("/assets/img/background.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
overflow-x: hidden; overflow: hidden;
font-family: var(--text-familly); font-family: var(--text-familly);
color: var(--text-color); color: var(--text-color);
margin: 0; margin: 0;
@ -41,6 +41,9 @@ select {
padding: 0; padding: 0;
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-repeat: no-repeat;
background-size: cover;
overflow: hidden;
} }
.modal-disable::backdrop { .modal-disable::backdrop {

@ -1,5 +1,2 @@
<div class="contracts"> <div class="contracts">
</div> </div>
<div class="img">
<img src="/assets/contracts/screen.png" alt="screen">
</div>

@ -16,5 +16,6 @@
<div class="profile-footer"> <div class="profile-footer">
<button id="btn-logout">Logout</button> <button id="btn-logout">Logout</button>
<button id="btn-close">X</button>
</div> </div>
</div> </div>

@ -10,11 +10,10 @@ export default function contracts(temp_engine) {
let modal = new Modal("contract-modal", temp_engine); let modal = new Modal("contract-modal", temp_engine);
temp_engine.after_render((temp_engine) => { temp_engine.after_render((temp_engine) => {
$("#block-content").css("background-image", "url('/assets/contracts/screen.png')");
modal.load("templates/contracts/contracts_modal.html"); modal.load("templates/contracts/contracts_modal.html");
Contract.list(10, 1, (contracts) => { Contract.list(10, 1, (contracts) => {
//Evenements accepter //Evenements accepter
temp_engine.add_event(".btn-accept", "click", (e) => { temp_engine.add_event(".btn-accept", "click", (e) => {
contracts.forEach((contract) => { contracts.forEach((contract) => {

@ -1,6 +1,8 @@
import menu_mod from "./menu_mod.js"; import menu_mod from "./menu_mod.js";
export default function home(temp_engine) { export default function home(temp_engine) {
temp_engine.after_render(menu_mod); temp_engine.after_render(() => {
menu_mod(temp_engine);
});
temp_engine.render("templates/home.html"); temp_engine.render("templates/home.html");
} }

@ -9,7 +9,7 @@ export default function profile(temp_engine) {
modal.show(); modal.show();
$('#name').append(My.agent.name); $('#name').append(My.agent.name);
$('#faction').append(My.agent.faction); $('#faction').append(My.agent.faction);
$('#credit').append(My.agent.credit); $('#credit').append(My.agent.credits);
$('#hq').append(My.agent.hq); $('#hq').append(My.agent.hq);
$('#shipcount').append(My.agent.ships_cpt); $('#shipcount').append(My.agent.ships_cpt);
@ -23,6 +23,11 @@ export default function profile(temp_engine) {
auth.unload_token(); auth.unload_token();
login(temp_engine); login(temp_engine);
}) })
$('#btn-close').on('click', () =>
{
modal.close();
});
}); });
modal.load("templates/modal_profile.html"); modal.load("templates/modal_profile.html");

@ -1 +1 @@
Subproject commit df0d1be1df444b48cd1b6c09e5188af501bc9793 Subproject commit 69a0cb7793bc81dbe53fdaf1a078d7a8d696bb7e
Loading…
Cancel
Save