From 0166d68476ef049b27ec7c692b6b752f6e7bd89d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 6 Mar 2023 09:57:57 +0100 Subject: [PATCH 1/4] refs #3723 Set docker memory limit --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 33d8c2809..6494739f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,4 +11,7 @@ services: replicas: ${FRONT_REPLICAS:?} placement: constraints: - - node.role == worker \ No newline at end of file + - node.role == worker + resources: + limits: + memory: 1G From 642ad91f268355cb635f4f104674aa68ba92959e Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 9 May 2023 11:42:48 +0200 Subject: [PATCH 2/4] fix(jenkins): get env --- quasar.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/quasar.config.js b/quasar.config.js index cbcbae4dc..1579a7b4a 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -54,6 +54,7 @@ module.exports = configure(function (/* ctx */) { target: { browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'], node: 'node18', + env: import.meta.env, }, vueRouterMode: 'hash', // available values: 'hash', 'history' From 1768304d4f8a6b3f0e00cd5b3f4c81be4de65c01 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 9 May 2023 14:05:36 +0200 Subject: [PATCH 3/4] fix icons --- quasar.config.js | 1 - src/components/LeftMenu.vue | 16 ++++++++-------- src/css/fonts/icomoon.eot | Bin 46556 -> 49176 bytes src/css/fonts/icomoon.svg | 8 +++++--- src/css/fonts/icomoon.ttf | Bin 46384 -> 49004 bytes src/css/fonts/icomoon.woff | Bin 46460 -> 49080 bytes src/css/icons.scss | 23 ++++++++++++++++------- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/quasar.config.js b/quasar.config.js index 1579a7b4a..cbcbae4dc 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -54,7 +54,6 @@ module.exports = configure(function (/* ctx */) { target: { browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'], node: 'node18', - env: import.meta.env, }, vueRouterMode: 'hash', // available values: 'hash', 'history' diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue index 7f2fb579f..88ca934d6 100644 --- a/src/components/LeftMenu.vue +++ b/src/components/LeftMenu.vue @@ -127,7 +127,7 @@ async function togglePinned(item, event) { diff --git a/src/css/fonts/icomoon.eot b/src/css/fonts/icomoon.eot index f85902086955f012e8540c4339d6e32c8cd42aef..6a158c806f3d7e215af3cca22ba80fed7ad300b4 100644 GIT binary patch delta 2986 zcmZ8jTWlOx89x8H&V6>*v%9`ucHOlTx9-l~T)T-Cp`u77Qgg9uP#cg%O7f7jR zkOq|Uf+`@GRy;r(At87uYQd=ht5rjv`ha+%4^#;8#0yA82qc7L!FOhC$Eo%2%$alk z^Z(y}Ip6W0{>Fdsb)kpvGIsU7TY4bfz1@#*oq9R@@YA>E8KZH=*h`l;pSzBC3E#Kz zb}nCi;Y;8D?vHoz{WHdXy>;c8%}cXi`}ymP?OOf86-+pb@=biN;d}PVwXGZcE5pCS z_YKB)aP`?QZr)z~AYtsCmte!Wwt3?^`w@Shv3FmF{`8kOuZ=wO`HerG#>5*?c)X>5Ch&up*qv7L+j&i686^Z&amJ`#8N1sG^2 z)ribdX*JT8PIawbOePu%=_I9(*k>K0YiVt;RE$^XQNr3P_0x7QJweOV?)6t`sgT+r zU8K3R-AEhlW$HDc(9Z_FlXQa8lhkYVPtZx4gUbD~K-jTB4c%<$`=E_eb(|&$ufqGm zv%5mwcE>*RLE3E(Fj|6i2HgTmX8=s_W3q^vMP#sloYLcjrH%aw z>81U4uiG2ki>)x5yL^;74Vwm=oI;XXwGOB$q>2OnL?HZo&6CYE!jLQwL8uIlpNy1pi{dC^APMLRg+K7!!|-c zC{31+1}*f4If^zYSJ2~w)h(|YC{NeN9@}tD zWU31_<*R6BW4;XS(s)3e7FWzMMa3T{Rr37NIG!n2W-FOjaWtk#ko07w5yzvxSJui9 z2`&T2sd!$^^Q$iB{9r!}VwLa`0O3gC;DaOyVT7I3LTJea$GF&IpT*CVj1w6hNTsbc zkz^$sn5zI;`%0+760GS!`*pw8^tF>4$@fd4LZ`ei8jM9cGNJWqWIPc?vM09fL9>A(cTLH)rbnT>56 z5Jgr^T1$Qfxyr-K{VI}JQ9{71lqz)Hk=TUBpE%a@xFAID#EvOB7$;|zo0<3w5(|rf zAUXFGFw@lB`ej%7dT2gDGH0)!o-9qp+SjKpibcZ}X-yB;k3a5OhonOjHOj!s=i6=6 z5#8b`EJ=+T!M4(9j%2P}nF_6J#%03V4kdK9o zJ+B^Gk2btqtet2)+SirKw(_Wj3ABr%NJ2MPyl}EqZVpxEDsZ=OO4MwH5gH+^`K(wtKm&E)=_+ zcHzD|$bBLVdwu11Cc@;uvF#MN@nmd#oEmfw2VF_RF#!uHUxp$7z)dWtIw4pM>-fXz z&_Ze%j`%nN4i1>`oW1N7v{t?mt-)P4@4ws}mtZt7kEi^Ii{aV^`W+1zPsiBqdQi+8 z3WqiKiZc|TLjets@9;Nmf9{>LU*acl1T*&ZN$v~}VMkPRah9-}RgWb&QvPJ(RopOE zHW~y0Rii+{5P#?neG96#%eizc1}?=^vqaQ^8v1!3fv2lniM`i#=(wdfU>yWv01oF~ zgUPCS63SsbRni{3B#2)V=(92%$B{kx9!NmrN3;wGZmbQt;0J3S;v#_v*?JW2aQvVF zQF0YI$PolC1i&Lm!?7k s$rqpeXk+oS|9I;8r`~_sd3pu^&N6nBZ?O^Ufbs3$zCE-vb?06BKMs*G^8f$< delta 375 zcmbQyzes&k%9~{X1vvCr)-o_`PyzB)GIC2Qeice2 z0r?&b3`{IJ`N@f5dA2JU7&iF;&0xt*tSDfZ%~Zy~usHyzULh|rS28s&{H8ll0BAAe zyn_7V5(Z|V6vI}5$tjG@h7~}j6wpD;3|tJ13<@t(UZ%awcv<|i=4IW>hL=q*TmJw3 z{~x3tD8~Sjn=HVj#3A-q><>^2<7CDI;*$jqux$2a+A?YL*I5>fn=2QDOUYz59hw=> zZ}XLbn+2@*fyK9zAO?t@{AQOqW8-F(-OCvnnKxhAW58(U`N=E9JIH62&kf%OKPA6e we*661`RDl`3lIsY3s@I$DKIK Generated by IcoMoon - + @@ -98,7 +98,7 @@ - + @@ -108,7 +108,9 @@ + + @@ -132,4 +134,4 @@ - \ No newline at end of file + diff --git a/src/css/fonts/icomoon.ttf b/src/css/fonts/icomoon.ttf index b69a350351f4cb2462d8fd93c63d731b467f450d..b484f2a6022b2897ea5e4eff21768a430dce4a00 100644 GIT binary patch delta 2971 zcmZuzO^h5z74BERUHv;V+taiEKQoirwKv&J&)?b`+lmlTP_T%9cDA%_b>kl=&^h{Qrd;Sdx@3nHvQL^(wQaUutNK%6+BNJL0TTnv2Gy}MpVj9yn) zSG{`gd#_%7HMjoGKKc)Pc|QN}kyn-+ho&9JdFj&Db64@M;QJ=t?xkm5_{ys<|6~{6 zKXaUSw=ZAZdb<6MpTFTayHSc?mY$D_hsDIzML5JI-&v1O550Ze5wU_{GgXKZ=33pz!+DXP?`4IHsK6oqpxr z>+xmuQsCi^a>$v#@j05hafKEH259Gp^!xAUpRY4@;++byTL( zMmd-$C}gvg9kXo%qS7oKt(N^YdWbN0iiTNtke#68)Ex{@(P}B_C|jY$tlP|*-QzT9 zLSdMX1}EtRWhZIS8J?h%v8$#ED*Chpm(Q3sWx4`VNqm!V$h z4?=P2N@0Yo8@J*Toq199T_$oS4X4LOr?$O%AU)NX`t+vJk*+VN(wEV~=28{vmFa*O zt*q%IlFA<=S@HbII9{mM+BL7{DvS^(;fY!^jwgMus-!03Oa!i5^Sspa>xMD5zZ~{3 zOF7(0~zInwF z6$HjDJkBg&VKvd$WseDq8i8RsP~)Wn9gGK!`;(*{+b|%KZ2n1DOMVT>D#9!LN)oUj zIfq>#WN6GptV8Y392t0w6QXxxS65v0lhemr{If_bECPaH%#(mjbBi07jP%vmQi5Ez zuRc0knTwUL9)60iXeLQ1da!Xcf6Q2iq(U7vs{qTEx?OA}%EgnI5(=9H<5HnGlErFm zE)46g_H2qV8yM3F!s$4kiIGD)f>3p=q6yEhYN&CmSfCQ zU<0iun=Q$c4h*6KSeZ$?#HgU%@W%s`GOQwAWh+h#q#uIp1QUMRwp$G&N(f&^orXUV zhEq{A6V+f?kdAHTK%yzT*V4@;aAP?t6RU_x+m_gD2S3I|?0JpQdbIHsVhu&pQ88Z( z!T={7D1$u_gkr9F;cTVa8mleV;BNV0p4tsYWC#eVv^Hp;#pSSb@zrCLyUqjT@DJHH zoh4`8$(?tc_d#GM=?1QZlAu(lJnNQ$x;-%b9tnY2z!UZ=SOvN7QEBu^!sz3MD3%OY z2(oxzv(o}s>~mkP3x2sv<7sc-d}mSHO9Rqrmim^9K&T}Hf`=qtd zR5O&M{rhldSzc}K1p#vhzU_EkPV6HBL6_Qx={@TY`?yK&sYy zT1vH&flK?cgrBv#O5@Ii-hR{;0xnN5bAG_Jn2V_kEffccNAbeA7i=kpjcEC4r}2RXDC300vej{vA1n~ z-Z^W(_)p;oX6*43%pD)YiYPTWOPI~;M-m(U-ICXA(x20=hoOOP+U< znQ$!zCiq;dLezsA3VIKLr|L}dJ8!7aHI=tu9R#8Q4hLU>$?8QCs$o1=Q69V`h+k38 zsWuBsIt~aXR+!J3B{BoHB6kKByM_iGR(laY%YLEwS|Jc2}yUDz=7 z0LR;nln0O?TpK;cN~XbmXvrJ-%CQa1O`^0dXK<6)51U$(gxE(U8aC|C6`2K-$Dmca zCBVPI=ubAiXy(3!WD!tQ#|shxW`ho66$H(d8VeDC)%EMxO#z#M{3TLrq&VkEukOR5 z4wZT8T!9rK5v*^B+I){1fj#={~uJ OzqgKaedof?ZTcU^7Ap?` delta 346 zcmaF!k7>gzrU?r5`-Q7n85kI47#J9)q$d^^0BHdre*=)_NYANEV=!X11M+t;Fsw7l zNKH&p{$m7Gzy1wS-Yf$sz@f*omVse|3Xrdoky}#nt56~d$oF7iU}DM1Pfirevt7Z! zu*nB#21{;YMFGQXrZNVG%>h953VDgSlBsdwH{F2(K#LjY733F}Ffaq97`6&b+|evt z0c1%5-NVel#lXm*@G|9P+GHCnu0ew(ih+$c6VHr@DLof4V0(D) z5R)JjlK7&auCoylOcp_WQL=Fo+$@F-!G}DE_+UWu5b~rT0Ywz@kRg7jYG!se&AGR3 z-8%Q2@0@$?cl*21cJ)WUxOw5JjVCSZ<^|{sxXph1H?Lm6B<8N+eU_WE zs9w8pY4bVE{lT(Cz)gH(_;(kd{wnl-|7X~Q4|1*@>%5m-+IS9*-~KBWPUr3C;@Pin zTzU#~pFrsqZjZ13?V-z0KLZfAetPB8@5k)DW|b^y83Z=H^)njVdW&YZKBTej9eU%( z8Cmn6y(2%6?}#&4-%hF#*$1W7NLwZ~wR$m`7$~HZl-|pI9b#%}ZLm~~SLi;%w`0^# z+r4y^mZ{zAAETv0YJ+r<=F)Z}ZM2uE*MLGl8}yFSDy2uM*Xpm*QJRCwow7h!u|N&e zY?wQsjZ<};CJ2wh`(EE&p>DgweLhIL?Eywhkj|i6KqGk~p>>sA|FrjB@ zH@axeMyq)cO{)ix{iK)n+r4gYa67ibZ0_NGeFoSZ_ETD1@Z1CLt=FqV8K?9>Gzg0$!%QJdgU;>M}rn>!#;>MPgjZxp+71kwWF1*bk%iA4$;XMOxF=gXjjt1 zgJYXsHPD`^k3F#N+L2vdsA*qEGwbtZXqUzV612EtAJSC(1nH9JkH+y#xiVYHyozHm zMUs@KDvdZE^}VvuHjxx6aGZ+g)jYrI3L*B^!yvvA9ugoNB^|twA}MXjlSWFTgcKMT zYq&3(U9z3XHi6QHt;r-SabT_nWaDe83rnzO0^`^HTGKa9ZX{o?qz;|(!e}rSnaB>= ztF7XRC>jq(7b{-L*q%}O|d1vf?Va{<$g6Oe9=V&DsvUM zTex4=c!v=hB7!Qd^kz?4*7o(Q%al3R-DJu4#doZE>#UVouUqeev5wLf?tp@kOshES zOgZfiD1Dd2K`h`2=KdwH`7U=xpC^niu7rF^e~}<_cYzo{6?yFtL*zHgq-iVu5; zz{rL6K|W8r{VuMKJ9&`fz6W;OxWdwAwU*y9lZ2G8q~Ox7F5sulwy|+ZLT@i>hJf1= z#GK_s&M9T~O*&mDc029DeRq)iL>PR1<##5+6mM}k1#UbU+dfVWsz-pX6ycbFg|x52 zP`u|R%&ATYR>ODva5{`sMuj6jj(~#$COu~-dl{vbFGOhw*UjrMHzyPr4b0>Y)2D22lzfImi(NE+oJsNaWao4YwNLcsr5t01|x5(POS)8k~J>3n-d0 zY=dx;s5Yx7aFOr}r`AnE>?0Bl8@zLQWbpo50Y!N@ClO$F zF%Y7JprtWGAp&4szlz;duo>t#ky=-))1LOKJ}layaUVOKV?~HWPr4-oJb;ILRfD5J zJG{a05)FapY>D)c!G%dkk2_I@CzvNKw*T?+S4PMGb#upkB3}KUKoyTX1cK7z`Z`<_1@sr0tK2bTbdGed5Zl3z&^tCfzICJyNhi9X+ zKREmMwcgq*Ykyk%&m%89^1=Gzm;e3fvyZ-e&N;V||4)BWY+56^C$Y8h=Fs-7?YHUw D_aQpz delta 411 zcmdn-pXtvlCb4pVH#Y`G1|Zm4!@v!u4Hy_FFWfISQAfUh3Q%Cme&K4?^u*!<1_s7I zKt2Z)3#8{%rZF%uu`n>KGXY~GR=bSU#1saG4HiH(W+1Hm$A~opCSs^^VGcc( zwHdi36+khd`5^sFEWZjRl5+Bsf$BER0NMi-V`LG_GqPQgn^*zVxOomxqXHPuW-7}| z%uNM~?Exy92f}gTH{A>Ji%Wohh?)4O+Yo3ngA{`R12Y2`&}#}WQ(mUM%y?P+vgT#o z%Z8UtFI)cq{r?}R2596<29Vt34U9@0Vt>W{0JVVpEeKkKY4|C2l>qM zx#8R3r{p)wZ=c^g|2+R=0U`l)0qX)T1x5w#3gQdC5Ed4;DC|YJ6wsv%42_%b?Y+ea E0HqUx5&!@I diff --git a/src/css/icons.scss b/src/css/icons.scss index 920a59626..29ee53ede 100644 --- a/src/css/icons.scss +++ b/src/css/icons.scss @@ -26,12 +26,6 @@ -moz-osx-font-smoothing: grayscale; } -.icon-pin:before { - content: '\e950'; -} -.icon-pin_off:before { - content: '\e95b'; -} .icon-frozen:before { content: '\e900'; } @@ -56,7 +50,7 @@ .icon-greenery:before { content: '\e907'; } -.icon-planta:before { +.icon-plant:before { content: '\e908'; } .icon-handmade:before { @@ -401,3 +395,18 @@ .icon-trolley:before { content: '\e95c'; } +.icon-agency-term:before { + content: '\e950'; +} +.icon-client-unpaid:before { + content: '\e95b'; +} +.icon-trolley:before { + content: '\e95c'; +} +.icon-grafana:before { + content: '\e965'; +} +.icon-troncales:before { + content: '\e967'; +} From 1b95280a32491147025bcfe5035a040c4e6dfb7a Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 11 May 2023 08:54:51 +0200 Subject: [PATCH 4/4] fix icon class --- src/components/LeftMenu.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue index 88ca934d6..8839bd030 100644 --- a/src/components/LeftMenu.vue +++ b/src/components/LeftMenu.vue @@ -200,13 +200,11 @@ async function togglePinned(item, event) {