From d5ba9405bd1fda4797891e2bca5c50e8fbd05b49 Mon Sep 17 00:00:00 2001
From: pfleu <pierre.fleutot@audemarspiguet.com>
Date: Mon, 12 Feb 2024 18:28:29 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20:=20on=20remet=20la=20possibilit=C3=A9=20?=
=?UTF-8?q?d'utiliser=20Wikstraktor.=20D=C3=A9but=20int=C3=A9gration=20CSS?=
=?UTF-8?q?=20:=20nouvelles=20icones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/css/app.css | 4 +
public/assets/images/Icon/ballot-white.png | Bin 0 -> 899 bytes
public/assets/images/Icon/ballot.png | Bin 0 -> 1464 bytes
public/assets/images/Icon/bell-white.png | Bin 0 -> 3202 bytes
public/assets/images/Icon/dashboard-white.png | Bin 0 -> 870 bytes
public/assets/images/Icon/dashboard.png | Bin 0 -> 1750 bytes
public/assets/images/Icon/notebook-white.png | Bin 0 -> 825 bytes
public/assets/images/Icon/notebook.png | Bin 0 -> 1258 bytes
src/Manager/WiktionaryManager.php | 85 +++++++++-----
templates/base.html.twig | 1 +
templates/nav.html.twig | 111 ++++--------------
11 files changed, 85 insertions(+), 116 deletions(-)
create mode 100644 public/assets/images/Icon/ballot-white.png
create mode 100644 public/assets/images/Icon/ballot.png
create mode 100644 public/assets/images/Icon/bell-white.png
create mode 100644 public/assets/images/Icon/dashboard-white.png
create mode 100644 public/assets/images/Icon/dashboard.png
create mode 100644 public/assets/images/Icon/notebook-white.png
create mode 100644 public/assets/images/Icon/notebook.png
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index 31ba69b..71916b9 100755
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -629,4 +629,8 @@ audio::-webkit-media-controls-mute-button {
/*background-color: lightgrey;*/
pointer-events: none;
opacity: 0.7;
+}
+
+.icon-nav {
+ height: 26px;
}
\ No newline at end of file
diff --git a/public/assets/images/Icon/ballot-white.png b/public/assets/images/Icon/ballot-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ea40348ffae7ceafe97342441a7bd0ae266b8b
GIT binary patch
literal 899
zcmeAS@N?(olHy`uVBq!ia0vp^NkE*=!3HFMXH4JAz`)p&>FgZf>FlgfP?VpRnUl)E
zpfRy_qOHea2brVs!Ao7W_`(DVPXru2*tDW!amYpvF|X)_q3n~r_b>2tp7iLE#tt!=
zKM`xJc38ZA^+1cGNnYU`pI?_=(4+s8oVq3W`+k3Xckl5#Sp^d<AJg4x456EQLTuF1
zidQE+5M^@WNaA4@GXCmPWypN~V=2FU{QE^Vr+?p>zc~ElY@QFDM~Z#Sbsq6Pn(6EP
ze2>3OnyROwow}U)i>4#}G1Ft~9><hKJeZlNJb9KnpK$k4zG>Dort(a!m}RkOh165-
z$myczqUT)o>fQS8WW2<wZ0*c-mu1{!ygd{+1&y*a7Bg`NMwtfrEXlBc_E5g)k7v=z
zCtA%DlNm!-OpvkvA^+#yH60({U7iaiF8ocpEwAj5Af9n8_xJA`+h(gb{FmHu>DIq2
z<{5ug_TIau<nD0atf27jwI{X@ir6J;E~z>fso4823}Co-{>AJfhyS`4Hb47z?bh*^
z%o7%_o0i|u?3}R0<K}C*_k3mFzP+CrR&Sp?yJ%r|s>Uv0w6G<4ySp&_2f+n<mrn+Y
za29w(76W7OItVj5Y0Rzw3bL1Y`ns~eVB!(vG3U4Za~T+u4W2HJAr-gY-U$?HGT?Cy
zJhkJ$?&IY>i}?<1@jbLtd%@0UOLbpuVyL*NWP4^??(GXlw_od+p`$pfr!1XwV#=CJ
zmTWEpj7l90f-VglN)9Z73X2%}S8?Bte{yzT$evtxm#Xsx(SnkyQ-mjmI?a+SRC&MO
z^MrwXP|1<%Mtf14-7Q-#Zqct{<vcy<$=t8|Z~kA;@_voAh*`AylI~^7tmm{8@Amu%
zeQ`!8i0`#O>v=uJx9c+Fe{cz1l6j%!7TDRhf<sVr(aRhgm;G~QZ(LXU<#5<DFW)es
zq!R|poA|QtURdsCb?BSua@UTfbz3h9F5+D7(y?^k$0f>57plsgpXt~3u5rBHw?ZlL
zNR&(Pw2WO=OI$B+w6a;Gf8d*F;i8kvEAJe*4%F4Y$Wy1cS6x<cr*g^RAL}j%wwZPS
zLvu&Xg5nvoi&t!}E$u`2zllS@k)=a{2_;yN_zz6#KG-dO(fTimpP}LQ2bO0?*3^Z*
SKD8ZaAcLo?pUXO@geCwb>ww(=
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/ballot.png b/public/assets/images/Icon/ballot.png
new file mode 100644
index 0000000000000000000000000000000000000000..140220df84faaedbe60da18a5fd180eca73109d6
GIT binary patch
literal 1464
zcmV;p1xNacP)<h;3K|Lk000e1NJLTq003eD003tQ1^@s6`)HTF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^J4ptCx$WX<>f~bh2RIvyaN?V~-2a`*`ph-iL
z;^HW{799LotU9<j>+0Yt2!bCV&JIqBE>hzEl0u6Z503ls?%w0>9UwF+Of|bE09CV$
zR6HhTbE{(D6#_yCVhjTkGxbDzF$2%>bq^n3@1i`*``n+SSIL_U@QK88OgAjz4dR(i
zOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pqBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UF
zmle)ioYhK=weHDZ7|LraX|B^8MjT5>APEsNYAB-u3sG7%QcR?1Kjz^da{Nhh$>b`7
zkz)Z>sE`~#_#gc4)+|g-x=EoJ(EVcDA0t3u7iiXP`}^3on<s$(8MxBg{%Ql5{Up8K
z)*?qh-!^b@-PYti;Bp5Te9|RDawI=Zp-=$c&*+<SK>sb!v*z~J+Q;bwkfE-YZ-9eC
zV6;ft>mKh8cJ}t~nO1*4W1DiJi)ARf00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru=mHE81_q=E6k`AY1GPy+K~#9!?VQg`6k!<0Kf5JS
zDI&O07WTtD2x*Z}MB%A|4pvlFh;<T!F4ZL>D5&UGbng#{utSs)K}FX(W`_Nw46>|9
zNr+0*4l|3o?d;BsGqdv!-w({eadzkB`RqII`#kT=fDmGeRLt754rl@9hkTx&z$2hf
zKY{-_3H${nBihD*qYC>>>VWYGC1kf>Kqd|WNXJCPMqo|}&N~lil!z(HOL*>u5+Ni)
zB7{Upgpde{5E3B~LLzb)1dajwfomo-cy0nE^a5LfulC<JfDgba^@!3*$Z`>@x+@VS
zlmOO3&~J&D9b>>HU@vgq4yqRk0IkHN${KgNa9+G=%Q<$f9q{b`p90kdzPmB!_}r~k
z;V&-Yy~FVhz$X_Hnu<t>jfl9<nw$pMe*0211bizX;Xx5m8Y5h?$_{uwp1Y8cG3AmF
zcM&O|8))|MnI_<&NfJz%HB|xkUCPKxsKzi%$s^pzFjj(T30)x>MoTa;v#tW}0XwGc
z+ito96Q-~Es0QxZdBh}8lY~Ud<m&5^BxST(7)nTwsI-$VFG72<3VCs+%$@+aWfFJ?
z440y@C$K7^UhlxpcTMji`a8i3)tYL2e9s@?Y}A*gO~7Tsf1t!9%7Amg<|suRA%0IA
z#f8qOL@WUIDBh0j!^a|&9}&BO3dP%za$si^A`U6m!N<s}h($QB4~QwY0gJ;F(M~e&
zg$g4-I}oM_U6w+Ml@}2Wz<R~kHO;`9FiISLdczao4Dfc^zM(wFUB_BuE(M?S>>I**
z_B+dJ-~zD0$EEyqkc~|P10GZUfrL$SD}2Tv?KZ$}XaQ<HHoONIO^}FD;Eu=7)Y`EN
zOhkvz#3pI@sjYPcdGZmwS0hJ(`UFW>0sQb0hY>dd-3->PSnCdcdc<Sk3h>f!3H88n
zpJQI79mDR~Hll~ptra9?yIm~E#Y)*3;3HP8UHE4lSmrQwcQsfal!U-a9&NLkHL0W#
zQOP4!WPp05_ytM>@WN}4IIOq@PP^A0kpkXe-6|u3V*prb&!k-Sh%J&33d?c0%OkBp
zIv#_zQ)c}gxT=_i!mvUhgb+d)NWO&b79Q?C5WeUGb`_hxE>$uY{S;P@Zp8$NkO(0W
z5+Ni)B7{Upgpde{5E3B~LLwwWNQ6WPiI4~(5fULJLL!7j2#JsgArYpDm{3?kXTpt$
ze#I$tp1C=w9{7UZC==E;i1qHL88|)gp22$cbe(>@f$|!-iS^X35JCtcOyVC_8Q18Q
SCi>R^0000<MNUMnLSTa8eTLEi
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/bell-white.png b/public/assets/images/Icon/bell-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6f467da0e6ee44ba954efe5b33dc448abaa17d1
GIT binary patch
literal 3202
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
HZ>jtjBasw?
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/dashboard-white.png b/public/assets/images/Icon/dashboard-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..509ad075c2e54e08342ab090dc39e272ebd5a858
GIT binary patch
literal 870
zcmeAS@N?(olHy`uVBq!ia0vp^DL|aV!3HGfY!tU-U|?*?baoE#baqxKD9TUE%t>Wn
z(3n^|(bnUzgUr$R;H9owd|?8GCjyQhY+BK=IAkM-m{;_|Q1;2*`xkgRPkQu7V~3c`
zpNKV9J1kzmdZ5M8B(HFe&#y}_=+Xa4PTdmxeZN1xyZ88=tb&P_kLhkThS1GDAvS7h
z#jBGZh%z~GB=Il{8Gm)DGGspgv6Npv{{14G)4%V`UmSjNHqVF7BgH=EI*)iC&Ghwt
zzQ<oCP1RG;PF>FYMbnY~nCY=~k7G(A9?VQso;*vPPq_Oi-!$tPQ+cLV%(7UtLh31Z
z<aE(<(Q~eP^=^H4GG5|Twsz*a%Q9{<-X02^f<{>yi<!6sqfCQ*mSosJdnjM@$Fu0<
z6RqZn$&8^ZCdk<TkpJ`UnvRd}F3*J$7yc&QmREL25YM=l`}_BeZL`%I{!8w-bn9Oh
z^NhbLd+%LSa(B3IR#15N+7sIcMeGtamsFjLRP22h1~A+^|6+EL!++fio1cBVcI)^{
z<_QbeP0Md+c23yhar3p@d%m)7-`>v*tG7>{U9_+}Rbv-0TG*1j-CY>|gW!U_%O?Xx
zI14-?i-9qC9fTR3G-g)-1=&kHeO=jKF!2cTFzfYlqyb|x+0(@_q~g}wJC1pW4R~Av
zgTL?Jyjg34Z`YNTw-o>WGjlj_&|EjVtwM%@A!hNu-ydzxe~#~7y-N1~>^ZB2xbJDI
z+D5C2|Cyb%>&YrU*Ltm`!RuZHeF@dPTeQ~C)&JS)gRi1~EO}Rv_OfqHcW!Ck`^>u+
zKTR{0b>d)DY-td1a^O%@Xb}(qMk<2O(t^Z4k$TV4b?a-E_hpK)-19wbPZu0BP@Zn8
z;_I_~^~<p1i!OKXfBK-|2t%-Y_MTIrD;dk||N5R~1$vdizRv$+(u}F6uX#r3&F)Uz
znX|wB>8GOxI@9&rI{hQ>J`>(|TUEArrk7O9$|a2v&PWcx>mZJ09EMXx>dO|c?Yw(&
zr+3)%Z}YCn9)B275~J75e5fe2>Lb`GVJDBikGj3=856^u+3fkU7nU+)^jm<O<>~6@
Jvd$@?2>^(yY`_2j
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/dashboard.png b/public/assets/images/Icon/dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aceae8e03eb1879d45969f060a644143f483c8c
GIT binary patch
literal 1750
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
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/notebook-white.png b/public/assets/images/Icon/notebook-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..e61dc50dbe45f97489c1bbab183796caac52eb47
GIT binary patch
literal 825
zcmeAS@N?(olHy`uVBq!ia0vp^$so+Z1|<8f_f2JBU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}*5j~)%+dJZrLJ0hVFHCG0*)SRTG6pMWFv=|SM<VA_Q~G+7kD~Pdh|$RhnUQt
zh&5I_EMC8QpvBQ7uW*jfuS+lJ(f>(K-4gtLzdyda_xPQxf{B)o>25WK(9Jy|Hfm|b
ztCJpxGC6T1@h}S+e|4!cWIq3~lwUsn{UV#wzwgXn9DZ^(&xg(<#Xjabk9Z%=^!0we
z$6qE*)l<<<UC#VP(~<s|>9KW>V@e_(%uH0CJWHKVxceyIH0v2td8Ss(vRJf2>M3{R
zbkTFsbFO;zZhdz$UgA`?cILXvGHx>79txa-Mp+t*nYaU^OoM!uWY|A@C|~r)v*_d#
zt>%fzjG-$g$k_jo|MTvej*ssy&xH~f{wCd)S9VAc&$yQR`}d7)v(+2^OYXRI>t7c0
zjK3;-?_E=Jcerm>P<Z#+6Wa$x>=HGXRGo`d?0pvoFx)%;Vs??kf87h4pMAS_>-bCN
z2@BUv%Wr6QPT1mc^R?W2zOrxM-p>rHw@;p3w6Hr>V;3-5*pj^6T^Rm@;DWu&Cj&(|
z3p^r=fiZX;gc+SQW>)|O*-JcqUD;nS@d)xLB|VX_0LG-5r;B4q#jUq@5B4=Hh&Tiq
z{`;?gdFr|qreO~hpX<$@)ickA$Fy*o>m(J=@7_!Ki_iVMbWn5Y?&EEH6<Uk4uKwEA
z{WIV8eEnvNEk~_q+eq}PXV|Z6*|cj-;WQ(O#wJE*g9HvXo`VgF5(ZZmso9Hst8v?4
zerR!HE?dXn_Z3`Au31JdyJLKXRryrZ+j)i;S~vKt{F}08t-9J><ATW->-QU;vdylw
zc3IM!Uf$zjT`*a3wjBtb7J-<_f@D4mb6dgz0jM~HEdg=>R2;}oez#}u<&+i2N@}dd
z+D^_Ww>sC?m}vBDPG9`}Rv<mQPy0TIKdW!`cTtJPPkLXtE*E~Y-=D~{K~hIAc=4W9
jR<~NGsCZ5)`NBAZ)#uI0>7I4KKxOcB^>bP0l+XkKwK-q>
literal 0
HcmV?d00001
diff --git a/public/assets/images/Icon/notebook.png b/public/assets/images/Icon/notebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a427382236245a4e7bc273e42f6803c9ddca1d
GIT binary patch
literal 1258
zcmV<G1Qq*<P)<h;3K|Lk000e1NJLTq003hE003hM1^@s6k2}7V0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^J4ptCx$WX<>f~bh2RIvyaN?V~-2a`*`ph-iL
z;^HW{799LotU9<j>+0Yt2!bCV&JIqBE>hzEl0u6Z503ls?%w0>9UwF+Of|bE09CV$
zR6HhTbE{(D6#_yCVhjTkGxbDzF$2%>bq^n3@1i`*``n+SSIL_U@QK88OgAjz4dR(i
zOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pqBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UF
zmle)ioYhK=weHDZ7|LraX|B^8MjT5>APEsNYAB-u3sG7%QcR?1Kjz^da{Nhh$>b`7
zkz)Z>sE`~#_#gc4)+|g-x=EoJ(EVcDA0t3u7iiXP`}^3on<s$(8MxBg{%Ql5{Up8K
z)*?qh-!^b@-PYti;Bp5Te9|RDawI=Zp-=$c&*+<SK>sb!v*z~J+Q;bwkfE-YZ-9eC
zV6;ft>mKh8cJ}t~nO1*4W1DiJi)ARf00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru=mHE82M5X&6|?{V0_RCYK~#9!?VZ1C6hRzEU(ES~
z_yYt3f)GSRtwJDwKsrT2DiQpFB3RnlY6KN6M6?hkt*B{i{H<U>MH?lGAQG{#5Qzo_
z8;K^-oW-6Xa(C|DUT!DMd$4d!@;#V+_nF<9J?20}L_|ayr>#bNH?R#@U8nX0@V-j>
zA)srXorf9V1#qeIIvDzaX`uX{qqj!=Xo}iUkB2~eQ767srR^lJFw&8t4;TQhWvE#W
zbf)~@50wvkrpT5fO-30wobo)a2Oa~zGQ9T`a1mIRHW{VJucK-D-v(R-dNRKEB497@
z4LI=c9~XEJ(-2(^i1?fB)f$!27^`yDcPb-rl%Wh!hB8DM$`EBlH1*HREN}~WL$W^8
zYTAGeBnyD;G0XS~Yz0OF=xZNvpMY1S=X#jB9Eb>jM<frAn!)o*;_@6Vm+>mF58vyU
zFW}vQ^|vQx8M}eaf%J6?uq);ZcnP=*+^&qXKMLsM5|XEq{h{B=ms*s*fyyCH`kGEJ
z`Jc5Hl8ir$7c@*Q2G%$OPZ$Oc0uu%HvlBQ4?2CDrdPeeXh>3#x`5D*`JdIh#b&~HD
zg}^LuBW4*Lf%SK3?32C~0g2cV^96h@$pYOVFh+4p=o^8fz`EG)rh0&zPEDNjDMOT@
z3{i$ML>bBuWhg_GA<9sOC_@>d3}uKilp)GchA2ZBq6|@nGDI255M?Msl%Wh!hB8DM
z$`ECUGMYqrF6x!h7@y{%UKx!s4m`+Fe?=M1<w%2dlfY?ZG?ynNzw4Kk3)I;1Ng4SV
zY*s3i(fV}MOocL9n~u7vP)2LhQ8yLJXk9wK181Cphmnr+z(-{ipN>?iP)769aj#1I
z*)*xBC1W=7lbUDi*FC_U%Ij%h2soCuxY{0tZ-Gq_%NWa1`-SA!2s$cKr?M1ROU7}E
z*<~{XMoBhC&dX$05w(&rOtLDu6IfZN_G^vy5#ZfC9GYGN=YSb6e<C6xA|ko?4J7mV
UMoq29cmMzZ07*qoM6N<$g0KWABLDyZ
literal 0
HcmV?d00001
diff --git a/src/Manager/WiktionaryManager.php b/src/Manager/WiktionaryManager.php
index fbe33c2..2df69e3 100644
--- a/src/Manager/WiktionaryManager.php
+++ b/src/Manager/WiktionaryManager.php
@@ -46,39 +46,70 @@ class WiktionaryManager
return $this->lastSearch['data'];
}
- //$time_start = microtime(true); /*Debug*/
-
- $url = 'http://localhost:5000/search/' . $language . '/' . $language . '/' . $word . '/a_wikstraktor';
- $client = HttpClient::create();
- $result = null;
+ // usage: wikstraktor.py [-h] [-l LANGUAGE] [-w WIKI_LANGUAGE] [-m MOT]
+// [-f DESTINATION_FILE] [-A] [-C]
+//
+// Interroger un wiktionnaire
+// ex :
+// ‣./wikstraktor.py -m blue
+// ‣./wikstraktor.py -m blue -f blue.json -A -C
+// ‣./wikstraktor.py -l en -w fr -m blue -f blue.json -A -C
+
+// options:
+// -h, --help show this help message and exit
+// -l LANGUAGE, --language LANGUAGE
+// la langue du mot
+// -w WIKI_LANGUAGE, --wiki_language WIKI_LANGUAGE
+// la langue du wiki
+// -m MOT, --mot MOT le mot à chercher
+// -f DESTINATION_FILE, --destination_file DESTINATION_FILE
+// le fichier dans lequel stocker le résultat
+// -A, --force_ascii json avec que des caractères ascii
+// -C, --compact json sans indentation
+
+
+ //$time_start = microtime(true); /*Debug*/
+
+ if ($_ENV['WIKTIONARY_TOOL'] == 'WIKSTRAKTOR') {
+ $command = $_ENV['WIKSTRAKTOR_COMMAND'] . ' -l ' . $language . ' -w ' . $language . ' -m "' . $word . '" -A -C 2>&1';
+ $result = exec($command);
+ //dump($word);dump($command);dump(microtime(true)-$time_start);dump($result);die();/*Debug*/
+ } else {
+
+
+ //$time_start = microtime(true); /*Debug*/
+
+ $url = 'http://localhost:5000/search/' . $language . '/' . $language . '/' . $word . '/a_wikstraktor';
+ $client = HttpClient::create();
+ $result = null;
// Make the initial request with a timeout
- try {
- $response = $client->request('GET', $url);
- // dump($response->getStatusCode());die();
-
- // Check the HTTP status code
- if ($response->getStatusCode() === 200) {
- // Server is up and returned a successful response
- $result = $response->getContent();
- }
- } catch (TransportExceptionInterface $exception) {
- if (empty(exec('ps aux | grep "[a]pp.py"'))) {
- // Server is down, restart it
- exec('nohup /var/www/live-query-wiktextract/venv/bin/python3 /var/www/live-query-wiktextract/src/app.py');
- if (!empty(exec('ps aux | grep "[a]pp.py"'))) {
- $response = $client->request('GET', $url);
-
- if ($response->getStatusCode() === 200) {
- // Server is up and returned a successful response
- $result = $response->getContent();
+ try {
+ $response = $client->request('GET', $url);
+ // dump($response->getStatusCode());die();
+
+ // Check the HTTP status code
+ if ($response->getStatusCode() === 200) {
+ // Server is up and returned a successful response
+ $result = $response->getContent();
+ }
+ } catch (TransportExceptionInterface $exception) {
+ if (empty(exec('ps aux | grep "[a]pp.py"'))) {
+ // Server is down, restart it
+ exec('nohup /var/www/live-query-wiktextract/venv/bin/python3 /var/www/live-query-wiktextract/src/app.py');
+ if (!empty(exec('ps aux | grep "[a]pp.py"'))) {
+ $response = $client->request('GET', $url);
+
+ if ($response->getStatusCode() === 200) {
+ // Server is up and returned a successful response
+ $result = $response->getContent();
+ }
+ } else {
+ throw new \Exception('Server is down');
}
- } else {
- throw new \Exception('Server is down');
}
}
}
-
//dump(gettype($result));dump($url);dump(microtime(true)-$time_start);dump($result);/*Debug*/
// Output and error handling
diff --git a/templates/base.html.twig b/templates/base.html.twig
index b389d0e..a014398 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -25,6 +25,7 @@
<script src="{{ asset('assets/js/jquery.mjs.nestedSortable.js') }}"></script>
<script src="{{ asset('bundles/fosjsrouting/js/router.min.js') }}"></script>
<script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>
+{# <script src="https://kit.fontawesome.com/3729f42e63.js" crossorigin="anonymous"></script>#}
<script src="{{ asset('assets/js/app.js') }}"></script>
{% endblock %}
</head>
diff --git a/templates/nav.html.twig b/templates/nav.html.twig
index 26a6021..baee7ed 100644
--- a/templates/nav.html.twig
+++ b/templates/nav.html.twig
@@ -22,7 +22,7 @@
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
- <i class="bi bi-nav bi-journals"></i> {{ "Lexiques"|trans }}</a>
+ <img src="{{ asset('assets/images/Icon/notebook-white.png') }}" class="icon-nav"> {{ "Lexiques"|trans }}</a>
<ul class="dropdown-menu">
{% for lexicon in lexicon_manager.myLexicons(app.user) %}
<li><a class="dropdown-item {{ lexicon.user ? 'fw-bold' }}" href="{{ path('app_lexicon_show', {id: lexicon.id}) }}">{{ lexicon }}</a></li>
@@ -40,106 +40,39 @@
</li>#}
<li class="nav-item">
<a class="nav-link {{ 'app_dashboard' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_dashboard_index') }}">
- <i class="bi bi-nav bi-speedometer"></i> {{ "Tableau de bord"|trans }}</a>
+ <img src="{{ asset('assets/images/Icon/dashboard-white.png') }}" class="icon-nav"> {{ "Tableau de bord"|trans }}</a>
</li>
- {% if is_granted('ROLE_ADMIN') %}
+ {% if is_granted('ROLE_ADMIN') %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
- <i class="bi bi-nav bi-journals"></i> {{ "Lexiques"|trans }}</a>
+ <i class="fa fa-nav fa-cog"></i></a>
<ul class="dropdown-menu">
- {% for lexicon in lexicon_manager.myLexicons(app.user) %}
- <li><a class="dropdown-item {{ lexicon.user ? 'fw-bold' }}" href="{{ path('app_lexicon_show', {id: lexicon.id}) }}">{{ lexicon }}</a></li>
- {% endfor %}
- <li><a class="dropdown-item" href="{{ path('app_group_new') }}"><i class="fa fa-plus-circle"></i> {{ "Créer un lexique de groupe"|trans }}</a></li>
- </ul>
- </li>
- {# <li class="nav-item">#}
- {# <a class="nav-link {{ 'app_group' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_group_index') }}">#}
- {# <i class="fa fa-nav fa-users"></i> {{ "Groupes"|trans }}</a>#}
- {# </li>#}
-{# <li class="nav-item">#}
-{# <a class="nav-link {{ 'app_friend' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_friend_index') }}">#}
-{# <i class="bi bi-nav bi-person-heart"></i> {{ "Amis"|trans }}</a>#}
-{# </li>#}
- <li class="nav-item">
- <a class="nav-link {{ 'app_dashboard' in app.request.attributes.get('_route') ? 'active' }}" href="#">
- <i class="bi bi-nav bi-speedometer"></i> {{ "Tableau de bord"|trans }}</a>
- </li>
- {% if is_granted('ROLE_ADMIN') %}
- <li class="nav-item dropdown">
- <a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
- <i class="fa fa-nav fa-cog"></i></a>
- <ul class="dropdown-menu">
-
- <li>
- <a class="dropdown-item" href="{{ path('app_user_index') }}">
- <i class="bi bi-nav bi-person"></i> {{ "Utilisateurs"|trans }}</a>
- </li>
- {# <li>#}
- {# <a class="dropdown-item" href="{{ path('app_lexicon_index') }}"><i class="bi bi-nav bi-card-list"></i> Lexiques</a>#}
- {# </li>#}
- <li>
- <a class="dropdown-item" href="{{ path('app_client_index') }}">
- <i class="bi bi-nav bi-window"></i> {{ "Applis clientes"|trans }}</a>
- </li>
+ <li>
+ <a class="dropdown-item" href="{{ path('app_user_index') }}">
+ <i class="bi bi-nav bi-person"></i> {{ "Utilisateurs"|trans }}</a>
+ </li>
+ {# <li>#}
+ {# <a class="dropdown-item" href="{{ path('app_lexicon_index') }}"><i class="bi bi-nav bi-card-list"></i> Lexiques</a>#}
+ {# </li>#}
+ <li>
+ <a class="dropdown-item" href="{{ path('app_client_index') }}">
+ <i class="bi bi-nav bi-window"></i> {{ "Applis clientes"|trans }}</a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ path('app.swagger_ui') }}"><i class="bi bi-nav bi-terminal"></i> Swagger</a>
+ </li>
+ {% if app.environment|upper == 'DEV' %}
<li>
- <a class="dropdown-item" href="{{ path('app.swagger_ui') }}"><i class="bi bi-nav bi-terminal"></i> Swagger</a>
+ <a class="dropdown-item" href="{{ path('app_wiktionnary_search') }}"><i class="bi bi-nav bi-book"></i> {{ "Wiktionnaire"|trans }}</a>
</li>
- {% if app.environment|upper == 'DEV' %}
- <li>
- <a class="dropdown-item" href="{{ path('app_wiktionnary_search') }}"><i class="bi bi-nav bi-book"></i> {{ "Wiktionnaire"|trans }}</a>
- </li>
- {% endif %}
- </ul>
- </li>
- {% endif %}
-
-
- {# <li class="nav-item dropdown">#}
- {# <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">#}
- {# Dropdown#}
- {# </a>#}
- {# <ul class="dropdown-menu">#}
- {# <li><a class="dropdown-item" href="#">Groupes</a></li>#}
- {# <li><a class="dropdown-item" href="#">Amis</a></li>#}
- {# <li><hr class="dropdown-divider"></li>#}
- {# <li><a class="dropdown-item" href="#">Something else here</a></li>#}
- {# </ul>#}
- {# </li>#}
- {# <li class="nav-item">#}
- {# <a class="nav-link disabled">Disabled</a>#}
- {# </li>#}
- </ul>
-
- <ul class="navbar-nav ms-auto mb-2 mb-lg-0 me-2">
- <li class="nav-item"><a class="nav-link {{ 'app_user_profile' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_user_profile') }}"><i class="bi bi-nav bi-person-circle"></i> {{ app.user }}</a></li>
- <li class="nav-item" title="{{ "Déconnexion"|trans }}">
- <a class="nav-link" style="padding-left: 0;" href="{{ path('app_logout') }}">
- <i class="fa fa-times-circle text-danger"></i>
- <span class="d-xl-none">{{ "Déconnexion"|trans }}</span>
- </a>
+ {% endif %}
+ </ul>
</li>
-
{% endif %}
-
- {# <li class="nav-item dropdown">#}
- {# <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">#}
- {# Dropdown#}
- {# </a>#}
- {# <ul class="dropdown-menu">#}
- {# <li><a class="dropdown-item" href="#">Groupes</a></li>#}
- {# <li><a class="dropdown-item" href="#">Amis</a></li>#}
- {# <li><hr class="dropdown-divider"></li>#}
- {# <li><a class="dropdown-item" href="#">Something else here</a></li>#}
- {# </ul>#}
- {# </li>#}
- {# <li class="nav-item">#}
- {# <a class="nav-link disabled">Disabled</a>#}
- {# </li>#}
</ul>
<ul class="navbar-nav ms-auto mb-2 mb-lg-0 me-2">
--
GitLab