From fcf14a77f420df4888379115a94e12f377b042f8 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 3 Mar 2020 22:22:48 +0100 Subject: [PATCH] Added feedback on button (#1) and some changes --- cron.sh | 8 -------- package.json | 3 ++- public/car.png | Bin 1227 -> 0 bytes public/gas-station.png | Bin 991 -> 0 bytes public/gps.png | Bin 649 -> 0 bytes public/waze.png | Bin 1523 -> 0 bytes src/App.css | 8 ++++++++ src/App.js | 2 +- src/Components/Footer.js | 33 ++++++++++++++++++++++++--------- src/Components/GasStation.js | 7 ++----- src/Components/Map.js | 11 +++++------ yarn.lock | 34 +++++++--------------------------- 12 files changed, 49 insertions(+), 57 deletions(-) delete mode 100755 cron.sh delete mode 100644 public/car.png delete mode 100644 public/gas-station.png delete mode 100644 public/gps.png delete mode 100644 public/waze.png diff --git a/cron.sh b/cron.sh deleted file mode 100755 index 5435105..0000000 --- a/cron.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash - -mkdir ./extracts -cd ./extracts -wget https://donnees.roulez-eco.fr/opendata/jour -unzip jour -mv *.xml ../gasStations.xml -rm jour \ No newline at end of file diff --git a/package.json b/package.json index 64da0bb..4410f1f 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "react": "^16.13.0", "react-bootstrap": "^1.0.0-beta.17", "react-dom": "^16.13.0", + "react-icons": "^3.9.0", "react-map-gl": "^5.2.3", "react-moment": "^0.9.7", "react-scripts": "3.4.0", @@ -64,4 +65,4 @@ "husky": "^4.2.3", "lint-staged": "^10.0.8" } -} \ No newline at end of file +} diff --git a/public/car.png b/public/car.png deleted file mode 100644 index 4eaf4bd62780541410183d85ef72d07e38e143e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1227 zcmV;+1T_1JP)-wh#)9R8&la zVky`NqM@WU^&>_}n)JAs_uysT+?hM`W-?7WKe&r`-#z!7|Cu{;KW3n!qN1XrqN3sw zMJ4#W0k})jZNN>yHNfhoSPb|NI0uZG*$6OP|Gi|n0(eT&_mV6_IWOrjFaWG7SxYKv zz&=UmG766>r+{5$3-e)2+Xjvyr3i z523zqk@R6g621afE}Ggfk`BfMHwN@M?0gc?V5g+NTz-J(3KN*X_89R$0@t|=QzihQ zPtv5rZYs`KVMrQs1ayXA&&;T!)7--a>V7gcFyZ{^T;9MizNQGZB^jHw7}_315q75)J_ zd^%`j1ORMy*dOy1(C*IaMuM$um~VlZHv9JBIPfRImb#ffN$)rPK5u4+fRFQZzCqHb zjw=v3G^1#91R&|Vm?=2?Y%55Js9ngzNf{etJJZVAvb3nYzzCs;n>A$aMsfY<~`dZf5mN}*+W z9+!Y_E~3-coEQ&R#3f*Bfq|4o%N`>x0k;+yNGX`v7vVZ*0wi_2{#&Aq17C(KT?x1x zxVg}978x@e1m?o^QR{$>l7>h)&0S&~GqZl+LimrC5m4XfXB9u6(Jn15S2BiQ&1`@O z@eq9r+>s%m(`L5A%vPJ(THrvUMK%ta*?Kdpnb|hrL_+&hW_C9b)1MPbM|_W%nvRY2mt`%Zw7&b>;5d}E`q@SJtk8=slKw~$*o32>-FYSec*$|Wh8^v%^${C&A~a%V zy#!}+3oG1ivnGL%FlGFn{7E#}6*0Pk3^ONQ|;fJJe9NFFz zYT6-b#L;#j!OiWCQ7}&HRo(7rJDHc}1xR|$;c!;cAaEzaE9|cw?dA#g7;&tU`|a;Z zU^l_X6VFTf+tDu9^Z#agl>D_uT=~q$iKP8)J}>SsDgj7(FJoY{`0p;el>O7XBZY~t zbETx?8LrCHDg8Vs_cs8pa+*b2!FI{1Pb+$x&k>HQ)tFzsCf1 zl=jaRHY!+DU2yoAmh=X#)3X|QJmDEcx_fMMH pC~ydv%F$0nMMXtLMMcG>!T(4Fx!PKX4Eq28002ovPDHLkV1fnNH`D+C diff --git a/public/gas-station.png b/public/gas-station.png deleted file mode 100644 index c77de8357a7adb6cb691e7ce32d996d37f8df088..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 991 zcmV<510ei~P)dn!N+pPhroSU0x=r*K90ZA%pqnWLW)=}7G^z**1O)>@hz1SHsG#&uizozx zZia)*d>!l~=05wn_L1c}?FaVYd~1Dcf9pN###(DbPfySP88yszlce>)1Hg?f{6aAB z3$VxbHsH^SyaF~!dK5Tg`%Pf`r~|rF(g{h9@Eiqhu83_zfzL<Dv;YS4SnlJ&`MKNd^{_2=HZv-)l`OI8l>+M_a`%5ruKsuBzl(NjvKbo~%iqU6Xzi z_^a+E4Y&@NQ;|Na#J-EHbv#p&J}pVMr$YmqE@@u>0FO}Lf|@c3JYCTR97~$@hK>PqB^?3|QoU{6lzG51!vByb zfoI9K(_7JH5S$G>*ulRI?*TJpLOsUtR^2S%A>f_11t&2J*nSt-JNWrc(PpQl#diCd zF~wQnvl9C?A%&$VKp8=sp5r7y5WN7g1Bgv8K;PiZ3lKYi0Lm^=pZT%WVwCTWK3 z)M)4~(14*kNGY~}e}NB5(&hp8QF5hHr!Q^z`%ua}Hhtkz7mh96A61 N002ovPDHLkV1j);xw8NO diff --git a/public/gps.png b/public/gps.png deleted file mode 100644 index 0ff3406af4df490eb9df6be900a5ad9827ab8f7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sk0P)Kq`bN zEW`&ybWz%Ll$3~q5)mp&q#)wT1ws@EQMhtJfl@fK6r3Wnu(8+n5^|-{N;`M%%p1)N z%s~htk+cpR0)60@Ssyr*v>rl8cq&@0mNVf2FkWB-N$agv%asz3<2Xp#%L()(ZFuk7 zX_{7>&1Thm-sWEOrZrXlX4dnp zE%xm?=T>XA+QYQeYPG~Uw+eJ8xIHUyv*;1W`6o*1JLk55lR4cvan5Z?>QA)zxQILe z#@_ojKpe+a;D*P!?*V6KJs$Vs#<*DQ*tDiF2F7Wc2CL=+a1HD-dk1!bYvW?EnGb*{ zmtX|s=eP}g3n6?SjYg}$7vQJ)s=!C{eKIZ+T2r{nw@A_&i?=vivbBj8T|G=;F2Q$z z`}_NMM*d1kWZWz^)A|dNRxEq3(P(6ee*i~ww2zE~#bjf;GR3Ud>k)9l#G;i&ZqY7G zYZ}hE_dN4dn8w^ncE}yOT)U=FaO`##Rue*~@@JWf&UHxBG!&g{;LKtd!+YNZE-5*t zz@^2Mhxh(9wi^rV%D7L5_x=@dK1clAIRB0)ie3Vz1>&dXdp;_aN&+0@#1HJ>|3i`_ jk)&-&+ewl{W#fJW2E5DR_TBRY00000NkvXXu0mjf4!|tP diff --git a/public/waze.png b/public/waze.png deleted file mode 100644 index 57e427bec86cf5cf0ddb42a09cc463101ca2ca60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1523 zcmVr7g5tD-u*{6fJ^^#2Bjyi%|)Q8sokq zNJRZ0QBy#JOM*)zVBC#~2^s~Vevn{HG$y!2tfoYisvlIeAT_oct6-p{t?)|wo*&M8 zb!OguuQPL(VtoH(l6!OS`JXe(J#)^P3ni3LLJ5ZtDw0-Mmb5~oljj4M0MmdeKpjv6 zR04xQFR%yL1+)Rpz-FLt1ni9j#{dg~jX*b$@n{EukAQoDQxdg41jYg@fc^M&x==d= ztR;ehi0c!m1(qVSHMYom2Y^46wkP}k1f|s$kv{~y4y*)z4Q+Kqm<9Ys@XQSWTY%+2 z19lTI8E6FFM+Pj2w->l2%1-!V3D8fzfqQ{RfpH=EtARU#UjlSwfYrd5kUG3@B(NdC zpnXWkkB(ShC4~p#E8yga^%X@0vOG;gnvrifPE;d4z|`Fi93QjpA-rlRPXnuf@}vv^ zZU_E0>}W++W~_MFP}&b%9kF8FepslngSK*A1|VhJS31bf2R;QJAzUSTA<%*(W40(quT1at zRsJ}-H$B!;ZalJ&hfPW*A^UocXSSuBxqYutAG)l7GnDH->_>8xp~p20&fzYD$94tI zH15Cg)K44#j^Y+a*=>q!8aWSiK^5?q!qJQ2%!*(&`UF9bAfgTokJ)`pTP`rvg?A;K!?Hc4#Ur48Stbbm%_g8f1M$_($Q|}k>#$E zY{$=&&p~%$8RTGNegVFVkVB4)(H1-CY%yd{A5NeO$??}C+g8dT7(~wge6g7P4rP!? zZ7c8wa-g!iz$!-N`x069gGhYwE$|ZV&K4x! zH$N|1r%9tByvoCXk;Jv=hawrIj%kgP(8Jaga9*S)#)lio_bpxrHZL0_eZbskY>Wk? zfG5cJ9UtJ9unl1xdKEU;HZXiaaSGxy<^eNsi}nhk8Yzq43|xU8Mo$Gk3$V3?kVoV7 z1pj@J2Hpj3M6VFd0KN`*e;@DyMis^qwZL06azvf4X@iN#iEt<3S4C7!tMw;^t)9ll(OP{w5$0%nvZvfO z#HWnTwlT`}1l$f>bEx;UB^0{wo2{FQaL)DQ%sch9g-cP?M4PAFj)Xa5gPAzlv|Sdw z?H;_15%tLl)wu5jHh*+4aOCVHnvmNIv#_u3G&%4#S#qYxulpyC3n=ao(?}WJWyh(= z%A||%c4c)R7N`O4M}C{>L8845q=?xNg0~^d(UIls$?8}}0zX2BL73eoNzM{VDB*vO Ze*p87|1c2=^BVvF002ovPDHLkV1noDxd;FN diff --git a/src/App.css b/src/App.css index 124051f..587ff76 100644 --- a/src/App.css +++ b/src/App.css @@ -1,9 +1,17 @@ .locationIcon { width: 32px; +} + +div.mapboxgl-marker { margin-top: -16px; margin-left: -16px; } +div.mapboxgl-marker.gasStation { + margin-top: -24px; + margin-left: -30px; +} + div.react-toast-notifications__container { z-index: 1031 ; } diff --git a/src/App.js b/src/App.js index f5277d9..5e376c3 100644 --- a/src/App.js +++ b/src/App.js @@ -113,7 +113,7 @@ class Application extends React.Component { toggleAboutModal={this.toggleAboutModal} /> -