diff --git a/css/global.css b/css/global.css index 5296ef1..b5b416d 100644 --- a/css/global.css +++ b/css/global.css @@ -52,7 +52,20 @@ button:hover { } main { + flex: 1; + overflow-y: scroll; + display: flex; + justify-content: left; + flex-wrap: wrap; + padding-left: 30px; +} + + +.spacer { + margin-bottom: 35px; + margin-left: 100px; + margin-right: 100px; } #credits { @@ -87,10 +100,16 @@ footer p { background-color: #272727; } -#status { +#status-onhold { color: orange; } +#status-accepted{ + color: greenyellow; +} #revenu { color: white -} \ No newline at end of file +} + + + diff --git a/index.html b/index.html index 4978638..032c858 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"> - + SkamCraft diff --git a/scripts/api.js b/scripts/api.js index b328163..28ff322 100644 --- a/scripts/api.js +++ b/scripts/api.js @@ -130,6 +130,27 @@ export default { Authorization: `Bearer ${token}`, }; + return REQUEST(url, "POST", headers); + }, + + deliver : async(contratId, token)=>{ + const url = `${spacetradersApiUrl}my/contracts/${contratId}/deliver`; + const headers = { + 'Content-Type': 'application/json', + Accept: "application/json", + Authorization: `Bearer ${token}`, + }; + + return REQUEST(url, "POST", headers); + }, + fulfill: async (contratId, token) =>{ + const url = `${spacetradersApiUrl}my/contracts/${contratId}/fulfill`; + const headers = { + 'Content-Type': 'application/json', + Accept: "application/json", + Authorization: `Bearer ${token}`, + }; + return REQUEST(url, "POST", headers); } }, diff --git a/scripts/main.js b/scripts/main.js index 68a64a8..44da34d 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -63,7 +63,7 @@ async function contract() { const token = localStorage.getItem("token"); const contracts = await SpaceTraders.Contract.list(token); - + $('main').empty() contracts.forEach(contrat => { @@ -82,14 +82,14 @@ async function contract() { } if (contrat.accepted) { status = "accepted" - card = + card = ` -
+
${contrat.factionSymbol}

${contrat.deadlineToAccept}

-

Status : ${status}

+

Status : ${status}

@@ -99,12 +99,12 @@ async function contract() { status = "on hold" card = ` -
+
${contrat.factionSymbol}

${contrat.deadlineToAccept}

-

Status : ${status}

+

Status : ${status}

Revenu : ${contrat.terms.payment.onAccepted} $

@@ -116,6 +116,15 @@ async function contract() { $('main').append(card) + $('main').append(card) + $('main').append(card) + $('main').append(card) + $('main').append(card) + $('main').append(card) + $('main').append(card) + + + $('#btn-infos').on('click', async function () { @@ -145,10 +154,11 @@ async function contract() { }) $('#btn-accept').on('click', async function () { - console.log("test") const token = localStorage.getItem("token"); await SpaceTraders.Contract.accept($(this).attr('contratID'), token); - $("#status").html("Status : accepté"); + $("#status-onhold").html("Status : accepté"); + document.getElementById("status-onhold").id = "status-accepted"; + agent(); this.remove(); })