From c9880c95d97a242b8af626f02a407adcfb4099cd Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 20 Nov 2023 14:14:36 +0100 Subject: [PATCH] feat: Changement font + debut Lobby --- Website/Media/mathEducFont.ttf | Bin 79576 -> 77704 bytes Website/controllers/ControllerUserLobby.php | 33 +++++++++ Website/templates/adminAdministrators.twig | 2 +- Website/templates/adminChapters.twig | 2 +- Website/templates/adminQuestions.twig | 2 +- Website/templates/lobby.twig | 76 ++++++++++++++++++++ Website/usages/Config.php | 3 +- 7 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 Website/controllers/ControllerUserLobby.php create mode 100644 Website/templates/lobby.twig diff --git a/Website/Media/mathEducFont.ttf b/Website/Media/mathEducFont.ttf index 43b47beee3072510297262f470908a065a7b2c9d..3d85ed9f7e8677dc2d4e41a5fd9f9794d5afaa46 100755 GIT binary patch delta 1609 zcmb7EdrXs86hG(tzP3&<#YL1~f7X6iT7AK#M?NMK={$ zFw<`lOxz-o_+a2N@3f$Uh}(3`88^2Obxx;IHVusEBt~U+w?&=tk0ramoY(K(bM7O# z=h7(Gbe*#U0)P}6frY#kt7B9eXJ{V)8Yr7rVA5Gy&+c3UAh1$yX+gDBA+v-X0`RS& z^UI4Y#isn|zv}^nJ+z3VSXX7CybLg=ky?-9vf84>gGqw`)As`USPXhyVdx(faymCc zCBb0O+jUcXMLaDYPKj`X$y&27AgGlNiXlRoSRO()=M63RWcn5(QSrz?j6=X(G!HcO@6V(c5D2bR-(IO@JEy|D1%wcvNW z7mb6rg07?Em#>1mT=vE$kDs0Pr@2B#lte=zFnlzs0|l^BI1y7|mbBCXV?8Vu^t%Lz&BaS;#H+AWmgy5=%wyE=Mit5Gavc z6-mAA-~=Z&<2bA2HVWPqzAZc;l87oj7JD8OPZQh3ZQ_SsW0I~ZA4<*MSu)Gi4byym z;^YdsS^k}`#`m6I#q@Olh8d{=GXuU191fZY2?{x>I2>9$OB1FG7lj|1J!5w1oQR0b zxvS<5&FhW~kL-&G_CbRk!2&wZMw(xpryzrEn5KCGy- zsI!e`#S^5XFVE3#N*4dHKY1m`5yED`iz7ld#%tr#50uQ%zHCKy6oD z<0R_i8}8aiHeKIzee*}})xGc7@?e|w1#1Q~pjQ0|9=> zUk)7NKMyM5FKV($W$-a1^Fnqoq&HN`kioEb1!UR0PL>~!I>YzP*Ybkse)3JUktMOJ ztt{z{KaHdzF@Pg`l8&%s*^+98A4oaQ*QVYlCXJXQwQm?1l2+f0!&AJlD2UgLvm_&AsMY(i_Z&5 zW#mT795L~1yCS6dVup1rALsMIx^W;tL*u#pH?~A%#hn(B(Nm7$4^M&`>R>f zJs=j7-g8>y@w}0k&R;{4ap43*JTKwYvGS@pU39ytS6~mhu$DjnI ztcU?$XBQUozm1+GXGdg6E{|SB(ml40;XUs^W?4}2lKVQoi;fTcQO-Ep1MsfM(J~8-=y(){TF#L&mmbj37l|iC z>PRSeePPZMIND8JpW5XMpdQ+u`NEfYF*KsQwNr(ytxMDx5TS%5$OJP~gC0zfPjw|I zKt=ma)HACBH6*p(Rb!w}97NNJNm0Q9+L{s^9cpZ1qyn2#nW}PYwZPVzoPhrMG*T;7 zp4O7GLVbbRG#SUa*+jQq;MOT_t#N5pB3D*YsS{fCReGzAOS4s)1vXV|Y=Xe1O;yIa OwTfPm_CItw!TTTR03bjB delta 5510 zcmc&&3s_WD9zW;4=KX%kFgOf2po}ogz>I<-Ac7zY3K>M%!oj!$Q=_D6_agR zXG?0$Y_p_|ycOh{`dMFFW@ImOiyo$#Yi?z=etl-J=Q`+WWox_p$^5@_{^$J9{r}Fr zcmDr#f9G_5Oq}=!K?4W?kN_{hfhQ*~#yYdP^ko2G3$m8yEzB?gK59YxQB(`d>YSdf zGya+d0NDuuwxF!J(IEAN?FK;IgT}KeJV@12CEZU}VJi3hX3^D4=BW zF&C5)tAX|U!W_dNgX35iwgj_xhHfwW3O4F9oumaK97y@rQbrnLI6+bzE{`t|io_DB zOs-I>)Ee!$AYHINWV|8N7#2Rk6cIUbQj~debc`j|YKx1vJElxcNSro3X-0BN>ddrR z=^3*#v*u*aotKk4e?eaU9SiR)C@d;ow0Oxz$>QZ#O>Zs`{{D8ED^j+Wq<2@)aMQ`~-Yf-2!$!x2B}_ z6gcy7&B}LR+gkLezItTvjn|Go3tj;4mA!lX@8{lXdi@yicG4TyZ|>T%>38>n?myh` zKL9`-dg^BO(E&3+i6t~dF9LSK@9{XIm29Vqs9uho)51;T?dJ#a+xR;LnBbCdK-42{ zl`N6A$z1YqMViv0^eTr`3)O_WU9(7g@3`YZdv&?NtMuLD`wY3ENuigGC&Dg<_e@Bd z&}YI-2O`cyo|{-dDSgs`sC;wJnr=yIp0O(>I_2CYdd)Yr1NiUAqEOXRO;%U+NA*GUy)kc$O=dU%o00=T{6hNt+D;xy##fcong_ zYjsy^NNeAk_JGg{-mmZeru|I&nU0?IcW*e$gtWbPlQg%J4qg5E>*dR-07V=m}~7zE5^{Z>|OGDtASZ}gIkDzX>%9gKQ~z0jQD zd(C`^9iCi^Gv8V|anxQF_aee#rrC7_b4NlSYa){F!h9=}2YfLp-=VHCRX{LN=`M^$ z%NS6O^b=9!_rMGaKn-XC9Z-;LxeJOV-qn~)#DiR3D#W=Nv(ly|Oo`U(cpThj5#Shy z%ANx`a89^Pgkza=`eJhnlCuF6N`z421;|k(<9Pv>hx53&R{@1mC=m-K)j$kHGO?%{ z@Cb<093EZ`1OnicqdeElbAU37VAVNG#OeqPq>lo?6Wt+7VK_>drtS|t%v zBrs!UB}W|vZB~t1V^t_Qa*dJ`5oY9snc}5krYLCSC^c9Z$AnC#c++$!b;xmd0-yokZDb`4(Z) zYK&e^5G2X7WaPF>m^wN{)nl=+QGDVRz)W)RIMdg;yu!bT>05?3D`yqLxTZ3U8K3o?kdfUv#6z)tzT_11y3<84j>>R+t+iqY>f zvym;X+ln#U-QAFxxO_hw-lrQCY>r%P_OZjAEq6lZ!~6Ma3eWf*w)cI6li@iEOY z+U*+C9E-k^y|3tBKdGvx88Y9DnOvW?wG`vi>_lLkAemm@T$+fYFTEVrvaB zn%@$z{!f%})@_Z~A5ZzdJ~ev`!WACj@}yFsP$w3lwKc;8lddBM_Ui(+7w$>6Ke78h zT&cQ+u;tuH!Fh;+JAqs!?*J+#PEHFQ)^)3r)1Lp54(f8x3E39^94L9T7pP`FJ--ezWnZ3P?QP#Y&wP8~Ey%q1t(K4azXII9hYJ^R`nL;V z0qkEagG#L5t$^n_5cC)6U@e-g|D|A09Legu(bu1Sdi#HV1}Wh zXw;2HhImx0{VitLi77cv_0<+js&!P`SnU_bKrMa6VzXFzjn%I5iZXXy>8K@cR69oX zlu?~Bs%HkY)j_zb8=RD9zCM>RV1M2A=-Bj~J^{jsO2 GtmR*784G0q diff --git a/Website/controllers/ControllerUserLobby.php b/Website/controllers/ControllerUserLobby.php new file mode 100644 index 0000000..f9bf141 --- /dev/null +++ b/Website/controllers/ControllerUserLobby.php @@ -0,0 +1,33 @@ +twig =$twig; + $this->vues = $vues; + + $this->mdLobby = new ModelLobby(); + + $lobbies = $this->mdLobby->getlobbies(); + + + echo $twig->render($vues["lobby"], [ + 'lobbies' => $lobbies, + ]); + + } catch (PDOException $e) { + // Gérez les erreurs PDO ici + } catch (Exception $e2) { + // Gérez d'autres erreurs ici + } + } +} \ No newline at end of file diff --git a/Website/templates/adminAdministrators.twig b/Website/templates/adminAdministrators.twig index 8573692..04230bf 100644 --- a/Website/templates/adminAdministrators.twig +++ b/Website/templates/adminAdministrators.twig @@ -14,7 +14,7 @@

Liste des administrators

    {% for admin in administrators %} -
  • +
  • {{ admin.username }}
    Modifier diff --git a/Website/templates/adminChapters.twig b/Website/templates/adminChapters.twig index 34b8e7a..e25f9df 100644 --- a/Website/templates/adminChapters.twig +++ b/Website/templates/adminChapters.twig @@ -14,7 +14,7 @@

    Liste des chapitres

      {% for chapter in chapters %} -
    • +
    • {{ chapter.name }}
      Modifier diff --git a/Website/templates/adminQuestions.twig b/Website/templates/adminQuestions.twig index f634257..4d36d1a 100644 --- a/Website/templates/adminQuestions.twig +++ b/Website/templates/adminQuestions.twig @@ -14,7 +14,7 @@

      Liste des questions

        {% for question in questions %} -
      • +
      • {{ question.content }}
        Modifier diff --git a/Website/templates/lobby.twig b/Website/templates/lobby.twig new file mode 100644 index 0000000..a1467af --- /dev/null +++ b/Website/templates/lobby.twig @@ -0,0 +1,76 @@ + + + + + Math'Educ + + + + + +
        + +
        +

        Liste des Lobbies

        +
        + ajouter un Lobby +
        +
        + +
          +
        • +

          Lobby

          +

          Nombre de joueurs

          +

          +
          • + {% for lobby in lobbies %} +
        • +
          {{lobby.name}}
          +
          {{lobby.nbPlayer}}/6
          +
          + Rejoindre +
          +
          • + {% endfor %} +
        +
        + + + + + + \ No newline at end of file diff --git a/Website/usages/Config.php b/Website/usages/Config.php index 82edcd7..817fd76 100644 --- a/Website/usages/Config.php +++ b/Website/usages/Config.php @@ -16,4 +16,5 @@ $vues["adminChapters"]="adminChapters.twig"; $vues["adminChaptersModal"]="adminChaptersModal.twig"; $vues["adminQuestions"]="adminQuestions.twig"; $vues["adminQuestionsModal"]="adminQuestionsModal.twig"; -$vues["viewScore"]="viewScore.twig"; \ No newline at end of file +$vues["viewScore"]="viewScore.twig"; +$vues["lobby"]="lobby.twig"; \ No newline at end of file