From 53cefa07f2578e4d861ae08cc6455e324846b834 Mon Sep 17 00:00:00 2001 From: Ruben Tome Date: Thu, 14 Dec 2023 14:37:48 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20fonctionnalit=C3=A9=20pour=20accepter?= =?UTF-8?q?=20les=20contrats?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/global.css | 14 +++++++ img/procurement.png | Bin 0 -> 3587 bytes img/shuttle.png | Bin 0 -> 3022 bytes img/transportation.png | Bin 0 -> 3867 bytes scripts/api.js | 11 ++++++ scripts/auth.js | 3 +- scripts/main.js | 85 +++++++++++++++++++++++++++++++---------- 7 files changed, 92 insertions(+), 21 deletions(-) create mode 100644 img/procurement.png create mode 100644 img/shuttle.png create mode 100644 img/transportation.png diff --git a/css/global.css b/css/global.css index 2521b66..bc5eda0 100644 --- a/css/global.css +++ b/css/global.css @@ -72,3 +72,17 @@ footer p { justify-content: center; margin-bottom: 0px; } + +/* Modal */ +.modal-content { + color: white; +} + +#exampleModal { + color: white; + background-color: rgba(255, 255, 255, 0.1) +} + +#modal-footer { + background-color: #272727; +} \ No newline at end of file diff --git a/img/procurement.png b/img/procurement.png new file mode 100644 index 0000000000000000000000000000000000000000..f7cac9ba10639dbe1bb1bfcef7d7e84bb09e246c GIT binary patch literal 3587 zcmds4c~BEs8h_oi(18J44i(YR9*8R_D6XJ@w2F9xG6D(=WE71G3W}&hAnC{|;|v2h zjwcvU1|3ljCVQaR9BQ$^J#|Jx_?s6C==dX2L zzU3&^**N{+tTIDwW#c59D4pq>F>@y5!u9bBA6YIie81=EA*8i=`tq_(r=ugcO!(rC zWXlonouciI=@~bNZ>titP10-vM=6?N5rz}wzxm5*y(s76)W{U89<{n9+$XQTbi&~9 zSYN16(Ji;=Nx4(7!yeXjaAy#gpJ|BUr#YnT@s#b31Uc1`MhUszCz1FuK`4XtZ%xCA zcq57}+jhg1l?CB=*zFUw1{hw(8C4Z|&TX7QHTISG&o8tNmRoXM)dxI!PNyF6eQ2h1 z&pB(s@PruVAWG;+MB+;T_o-tl^sT_Sapt#OL(Wc4pLvAc4Tx>l4#zi(u8b91p6{!W z4``n^S(JjrJI4{q+nKosaN;(O+gj~jhT%_iN!d<6eltM^jU#y8l~Fix)`Vi86v!WP zs7LVQ&D0@+w6;=)UhH~V+{)d0DB-Dd=_RwgzW1S_q4#w?JUs3nP!X|CZOcR1JuCDm zIwylg{`uhp8(GGeL038R7*>`64S6B2v&Zl~7s?B1NK z>DR#$WC##F&osq|t_)yMLFg?lLpsNT zMukC9?kpp~uv+N@gEg$|EbQd_-X$2`2_^iOftBk0Y!P1BVq;^YnC_ zg{nnAtlyyC1;g$2NLfg?Tbvi-wNuc@iL$iUvV$kK?m;nz~R*vI6yOtVp zsI6ZxD647th$W-kg{e^JRlD9;;#juU=uo%l#FHqq_$jjzje4}t_t_;O@o_-WxE?HcJc-{vl$=rr?y**K;h#xgwpS@S z)dOXr*Y~-#XOBg*f0%muIkfHhpC-}_&kMG^x1|FX%45+6BVQJYy`{0f$+5*pEBnkhmJhb0P%O;*t0ii>9_sp2?)< z1L2tsej*3e;5z|NrvU&9_r+0kr9XofhvqbcAp!c6hIqpQR-q7GRLOeDm)5o;nuP3b z7kl$A_GA+p&v+k0;w4aca`Y`LoG_p$R)@A)&dQQulX7XT35M&Cq)aRE4D`$$a+4p} z@eLAdL2hD?)={+WHD<_J*2;bU=HP|TBHTDI! zWI?twknQYE0>i^0kCu#V_knDu>3_P75`|V=7q&{3%;j=V9IR=Na0qZ792oGvJFb7y z#G;ZCzoV)^sjH?mEvj}zl4>tYH@8W$WN2`hUF2KPA<*kz9KG0sWx!y&K0Jl|hg2*& zG!h~~;y4yPZN0Fbl>y^nZ3A^q7;Y;5py-I}>UCAI-lZ+)?rAjsDkAq-a7Cb666oy` zIhG=koUpj9BJN@aU+EjtmD?C}xGO7n0&NR*uH?oL^cL^e^ zrE94fhOdMs{jOhv-SGBc{G+o&k zDV%Y+skyGj@>#F;WR59d17t{pug*+{Hl)~7iEujA13*D$ge^|Yz_9-Ei_so9KWc>W`cj?=xO{_pW|nPm4|I_%h9K|Fu_xZw{Kq zD;gX1%lPJTqgT`dp_5CM-S?&{?ekT3=a4uZ1of;l_bZ%O2pN^epO4||p}h14ejnT^ zAQjyz{NYXk<*hHQcnhfr=8cowfmEEADAg(Y(B`tE?_LcyHmY*DKUZ-gO}jzwsBoQM zhknivfgpvsAgXj}Jwg5en(!1p;7~t-sLu@Vg)-*SX#J20l;O!B?{_yqo!41p{l+I5 ziPu4zYpGki2ZSTdg}mdvVR>Wk6gm#eqBT`Nl|tkAGBaLgDcmcJ0d_@HI>17(=8t6n zESy?;y=P{F0~l02d;?DW%K-a}&qXBm1<|)>FU9cVco(KUn2?ZgUvczr@-|%0Roy@O z>p;c7jy}6LO%U+-&BoCA%AxD~a_s-=sK4j%cUtrR21vRqSR~SzW*)fX?{@#;MLj2H z=XCehp|!p9T$V%%rBY3hL7V=kDU(L$_NSB^(TQ+XGIb7zi-Ip55&L$vJGaqj^wb|m z<;8fNz*mwIA<&pQRxER=;{J@et$-WzZm?EELG?Y7`WmD^D+r`m0QtBtcp99pYZ&wo lCjAHAZGO+olGsM0)%9Y)@cC)SL3pb}Ygf6uX06~I`wN3LOcnqD literal 0 HcmV?d00001 diff --git a/img/shuttle.png b/img/shuttle.png new file mode 100644 index 0000000000000000000000000000000000000000..92dab5d989f2487089e57c57ec718aef2a38bf90 GIT binary patch literal 3022 zcmeHJYfw{n7XRP7H}nST7#`vS7o$MIYCw>OHh`C|AdEaxKtUdwv7n+9SR{m~z>QT= zF$K}FAg}C3po*KtK#2{HMxmg_ph4>L)<}s6gjB%<%4`3+vmbV*{k&iN@Sl6;%$f82 zo!>p@Siw7%7_Tx004xdc-yRA8LcDvp5!5L2D{jCKHN}6=Q2-om-aRCvVp}=@CS<^N zpYRMsJK!v~*g*r2_b8~QE1jcqfp*E+ja!F}PI=Sp=~GKeqTblKV_VZT_teKOR^;W& znzPlfibl%}qL4?4+_%-0uAvEfr`$CthSTT-36KxMhbH_l68N2HRi{cz>(?&Swn)?k zRkI-(s?%ypi8M28dZ1YmT?$b%OLZV;d!mZ~zm#GjFEwZLP)u*m0)|?t3xYCD97v|U z{0)YW+i%Luaqf$+ewwCquiyv_vyY~D@h`vHw>Ump25R?D*c0qk2qooecrT8idl1T| z4Vo+zt2AYSs(=asjh?@Z^0jQAHa_s|nO^hP!sekLji=4+ zd95?&HqRaJYab38T^P|!4s+7hyJgi)YN(qyp8bKOJPz4qcgTPEKKCW#Tng4SA`9o{0OCgZY4OgFBEr?n%7N=#MQ}pm?JZ zmA2(1iDsPI*k^;FK?tSh{{Hu7b1Enx#urj)WQ5e?t1dU|CT5BEQY5Xb^y8$( zez&B(=VeX9GMREDV)e(eHc?uR7b4EE4D==Ck+7`D88ZfgZZLKrH|)Q99`J8r7V=wf z?4nR?H;f$7>beX;zoZ6E3LY!&$eL8n4GYU+w{}l!+cjrI;-q@!iQ7rZVUyk&^ENV< z*4y^-wVk&9D0U3y?-i~LAmua|gO*@si=bZ6v-J&)Ey2d&+|IgE3jp65ZQ$~s=ra6t zbNa_chdLDhRC|2x!Cg6A!JG8|`u;@9REN$#deG)+-|$O~Bri=}{Lxfa_H6vPW_-pc zgyd~5rxR>5=&oRUuMvXsAPkZ<<`^EhP6&bv{QKwx-AM>E$`dC6KLAVDp&>6K4_fJZ zgKCes-0e_G<6N!!tj1~`yk4)3hP@S6@oAU>P$DT=k3 zu|WHSZx2yvkzWwYGkhO*hEZZWI-MhM#}sC1))BudW`Epz<_NVW@i68`63K9A(wZ46 z&0&KOTnQ4$aoPw&2=tcj+YmG!?tY_#Ck*S*GaneVP#fvZ7LTDAqUPe2$I+ZogO~W z>Pr$_C^2tQaN2jD3c+sWh1;-VMO z{?S9lzz_5M()3H-OH~bWAF07KNApdSNq-z~g(u_Av!J9!>7cfeho0~++K1D&T!nj4 zccIS-L6^cR{&e~eb#hM~x;S&av|;&6{q!}Fn)&0U36K8Wl0K^r^O)(nxq-&iy=89g zRex@5Oib4HT8rIBsWnl4t$!iq2cYKzU6$(zA&eHuuz9hTU~h)7+kDu>l+FqwkegRb zU(@I{MZ|T3SGi^VB>cj-bFWFEgFw_s8}1wBu#uZIrT!DT9N{v*|sG`=YC z?ZgY;F|nI9r|0i8B5tf`R*+px=wp1V<6r>KBZ4*W#uPL5OJNS+t0C;vp`Wl(>?z!w ze-*ecMbH-bGia#@l*7G(Br3K`utu>n=7r5BCCYnI15M*H)x1o0@nPi9&mFt2ao-d2 zXVf+-t#B`alz9K-4qF0g*w5wnRUgij54YO?_fD1fql+MIaXhoV#bgCM&_RH2@OJU% H?34cnt%tDP literal 0 HcmV?d00001 diff --git a/img/transportation.png b/img/transportation.png new file mode 100644 index 0000000000000000000000000000000000000000..7c197ce04aef4e4c2bb29b1cac80a454ce18d4e8 GIT binary patch literal 3867 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 { + const url = `${spacetradersApiUrl}my/contracts/${contratId}/accept`; + const headers = { + 'Content-Type': 'application/json', + Accept: "application/json", + Authorization: `Bearer ${token}`, + }; + + return REQUEST(url, "POST", headers); + } }, }; diff --git a/scripts/auth.js b/scripts/auth.js index 5fd96b6..f633cf8 100644 --- a/scripts/auth.js +++ b/scripts/auth.js @@ -63,7 +63,8 @@ export default { } else { showError("Symbol ou faction invalide"); } - } catch { + } catch (error) { + console.log(error) showError("Erreur lors de l'inscription"); } }, diff --git a/scripts/main.js b/scripts/main.js index 2fa94d0..20f7307 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -67,21 +67,56 @@ async function contract() { $('main').empty() contracts.forEach(contrat => { - console.log(contrat); - const card = - ` + let img + let status + let card + console.log(contrat) + if (contrat.type = "PROCUREMENT") { + img = "/img/procurement.png" + } + else if (contrat.type = "TRANSPORT") { + img = "/img/transportation.png" + } + else { + img = "/img/shuttle.png" + } + if (contrat.accepted) { + status = "accepté" + card = + `
- -
-
${contrat.factionSymbol}
-

${contrat.accepted}

- - -
-
+ +
+
${contrat.factionSymbol}
+

${contrat.deadlineToAccept}

+

Status : ${status}

+ +
+ ` + } + else { + status = "en attente" + card = + ` +
+ +
+
${contrat.factionSymbol}
+

${contrat.deadlineToAccept}

+

Status : ${status}

+ + +
+
+ ` + } + + $('main').append(card) + + $('#btn-infos').on('click', async function () { const token = localStorage.getItem("token"); const contrat = await SpaceTraders.Contract.get($(this).attr('contratID'), token); @@ -90,20 +125,30 @@ async function contract() { - ` + ` $('main').append(modal) }) + + $('#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é"); + this.remove(); + }) + }) }