Ajout du nouveau background pour les contracts et ajout des fleches

ruben
Ruben Tome ago%!(EXTRA string=1 year)
parent 65eca099b4
commit 5797ce4818
  1. BIN
      assets/contracts/background.png
  2. BIN
      assets/contracts/contractscreen.png
  3. BIN
      assets/contracts/procurement.png
  4. BIN
      assets/contracts/screen.png
  5. BIN
      assets/contracts/shuttle.png
  6. BIN
      assets/contracts/transportation.png
  7. 7
      css/global.css
  8. 12
      css/style.css
  9. 4
      html/templates/contracts/contracts.html
  10. 9
      js/controllers/contracts.js

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 945 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -5,6 +5,7 @@
body, body,
html { html {
height: 100%; height: 100%;
background-image: url("/assets/contracts/contractscreen.png");
} }
@ -43,10 +44,11 @@ html {
.contract-screen { .contract-screen {
display: flex; display: flex;
justify-content: center; justify-content: center;
background-image: url("/assets/contracts/contractscreen.png"); background-image: url("/assets/contracts/screen.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
height: 100vh; height: 100vh;
width: 100%;
} }
@ -56,10 +58,10 @@ html {
margin-left: 200px; margin-left: 200px;
margin-top: -160px; margin-top: -160px;
width: 100%; width: 100%;
border-width: 100px;
} }
.card-body button { .card-body button {
margin-top: 50px;
margin-right: 29px; margin-right: 29px;
margin-left: -11px; margin-left: -11px;
width: 240px; width: 240px;
@ -69,7 +71,6 @@ html {
margin-left: 240px; margin-left: 240px;
margin-top: 225px; margin-top: 225px;
height: 100vh; height: 100vh;
width: 100vh;
} }
/* Modal */ /* Modal */

@ -30,7 +30,8 @@ body {
margin: 10px; margin: 10px;
width: fit-content; width: fit-content;
margin: auto; margin: auto;
margin-top: 10px; margin-bottom: 30px; margin-top: 10px;
margin-bottom: 30px;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
border: 4px solid rgba(68, 68, 68, 0.575); border: 4px solid rgba(68, 68, 68, 0.575);
@ -43,7 +44,8 @@ body {
margin: 10px; margin: 10px;
width: 95%; width: 95%;
margin: auto; margin: auto;
margin-top: 10px; margin-bottom: 30px; margin-top: 10px;
margin-bottom: 30px;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
border: 4px solid rgba(68, 68, 68, 0.575); border: 4px solid rgba(68, 68, 68, 0.575);
@ -102,7 +104,7 @@ footer {
} }
.nav-nav .nav-links { .nav-nav .nav-links {
--links-color: rgb(0,0,0); --links-color: rgb(0, 0, 0);
--links-backcolor: rgb(255, 123, 71); --links-backcolor: rgb(255, 123, 71);
--links-border-color: rgb(255, 173, 118); --links-border-color: rgb(255, 173, 118);
height: 70%; height: 70%;
@ -177,8 +179,8 @@ footer {
border-radius: 10px; border-radius: 10px;
padding: 30px; padding: 30px;
font-size: 5px; font-size: 5px;
white-space:pre-wrap; white-space: pre-wrap;
word-break:break-word; word-break: break-word;
} }
.my-modal #timer { .my-modal #timer {

@ -3,6 +3,6 @@
<div class="contracts"></div> <div class="contracts"></div>
</div> </div>
<div class="arrows"> <div class="arrows">
<input type="image" id="leftarrow" alt="Login" src="/assets/contracts/leftarrow.png" /> <input type="image" id="leftarrow" alt="" src="/assets/contracts/leftarrow.png" />
<input type="image" id="rightarrow" alt="Login" src="/assets/contracts/rightarrow.png" /> <input type="image" id="rightarrow" alt="" src="/assets/contracts/rightarrow.png" />
</div> </div>

@ -28,8 +28,6 @@ export default (temp_engine) => {
$(e.target).parent().children(".status-onhold").html("Status : accepté"); $(e.target).parent().children(".status-onhold").html("Status : accepté");
$(e.target).parent().children(".status-onhold").attr("class", 'status-accepted'); $(e.target).parent().children(".status-onhold").attr("class", 'status-accepted');
$(e.target).html("Contract accepted") $(e.target).html("Contract accepted")
// $(e.target).remove();
}); });
} }
}); });
@ -86,9 +84,9 @@ export default (temp_engine) => {
<p style="color:white" class="card-text">${contract.deadline}</p> <p style="color:white" class="card-text">${contract.deadline}</p>
<p style="color:white" class="card-text">${contract.deadline}</p> <p style="color:white" class="card-text">${contract.deadline}</p>
<p class="card-text status-accepted">Status : ${status}</p> <p class="card-text status-accepted">Status : ${status}</p>
<button data-id="${contract.id}" class="btn-modify btn btn-primary btn-accept" data-toggle="modal" data-target="#Modify" >Contract accepted</button> <p></p>
<button data-id="${contract.id}" type="button" class="btn btn-primary btn-infos" data-bs-toggle="modal" data-bs-target="#exampleModal">Infos</button> <button data-id="${contract.id}" type="button" class="btn btn-primary btn-infos" data-bs-toggle="modal" data-bs-target="#exampleModal">Infos</button>
<button data-id="${contract.id}" class="btn-modify btn btn-primary btn-accept" data-toggle="modal" data-target="#Modify" >Contract accepted</button>
</div> </div>
</div> </div>
` `
@ -117,9 +115,6 @@ export default (temp_engine) => {
} }
$('.contracts').append(card); $('.contracts').append(card);
$('.contracts').append(card);
}); });

Loading…
Cancel
Save