From 10cf3dd8db24d105233201ac40b585dee8e55fa5 Mon Sep 17 00:00:00 2001
From: Giorgio UTZERI <giorgio.utzeri.etu@univ-lille.fr>
Date: Mon, 17 Mar 2025 08:41:22 +0100
Subject: [PATCH] refacto tabulation
---
WEB-INF/classes/controleurs/Authent.class | Bin 1490 -> 0 bytes
WEB-INF/classes/controleurs/Create.class | Bin 1952 -> 0 bytes
WEB-INF/classes/dao/DS.class | Bin 1601 -> 0 bytes
WEB-INF/classes/dao/UtilisateurDAO.class | Bin 5274 -> 0 bytes
WEB-INF/classes/dto/Utilisateur.class | Bin 1065 -> 0 bytes
WEB-INF/src/controleurs/APIRest.java | 26 ++++++------
WEB-INF/src/controleurs/FilLeave.java | 2 +-
WEB-INF/src/controleurs/JwtManager.java | 12 +++---
WEB-INF/src/controleurs/LikeControler.java | 3 +-
WEB-INF/src/controleurs/MessageSend.java | 9 ++---
WEB-INF/src/controleurs/UserInfo.java | 1 +
WEB-INF/src/dao/DS.java | 13 +++---
WEB-INF/src/dao/FilDAO.java | 5 ++-
WEB-INF/src/dao/LikeDAO.java | 11 ++---
WEB-INF/src/dao/MessageDAO.java | 14 +++----
WEB-INF/src/dao/ParticipantFilDAO.java | 30 +++++++-------
WEB-INF/src/dao/UtilisateurDAO.java | 12 +++---
WEB-INF/src/dto/Fil.java | 22 +++++++---
WEB-INF/src/dto/Message.java | 35 ++++++++++++----
WEB-INF/src/dto/PartFil.java | 31 ++++++++++----
WEB-INF/src/dto/QuiLike.java | 21 +++++++---
WEB-INF/src/dto/Utilisateur.java | 15 +++++--
css/style.css | 31 ++++++++++----
css/styleMenu.css | 45 ++++++++-------------
menu.jsp | 24 ++++++-----
25 files changed, 223 insertions(+), 139 deletions(-)
delete mode 100644 WEB-INF/classes/controleurs/Authent.class
delete mode 100644 WEB-INF/classes/controleurs/Create.class
delete mode 100644 WEB-INF/classes/dao/DS.class
delete mode 100644 WEB-INF/classes/dao/UtilisateurDAO.class
delete mode 100644 WEB-INF/classes/dto/Utilisateur.class
diff --git a/WEB-INF/classes/controleurs/Authent.class b/WEB-INF/classes/controleurs/Authent.class
deleted file mode 100644
index 3be564f09e79e6598960e34c8956bf4b8bd9ba9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1490
zcmX^0Z`VEs1_oOOUoHkF24;2!79Ivx1~x_pg{;Kv#G;Z!{o>T3vYgZs{fv^50)3B?
zl7e7}03!pNO=ezZi5(*Yvxa6EI|BzJgHTFhzJ6#)W=>{tVo7Rgk&B~07Xv#3GbaN#
z0}nd`FAoDB13x2!aB_ZLNl|`IYH3lizGG=gMrvLOBLiP4ibh5T5g$zBthpHk8HCsw
zgn1Z57(^Kv)CoB=D7COOwYY?lfh#?=BsjIWI5R(wkwH}>O4A3AR<JT_4hC^X2G*SX
z^vpbvwURsxQVi0J3_R(nB>{;=iMgpIsYQ$oY8pOSiDilUIf;4c`oSednR)5fAj8pw
zxEN#^<k%VHc^DKxhFIqprRygaBqnF1>X+o_CMTBYL*0{_s-K*no133k3^vjjYNl&(
za$-R$C~%7z8MsryJdcvx91{)(B}NA3+>`=PP^<7Ts4}QAGH@nmq$X#F7K0pUj>Uo4
zoSagE5_#4f3>u6K+(@y)&7j4g&Ca01!=THchd+sc1CWt{r#Q95v81FZGpV#Bm61Um
zzf1g+vQm>vtTn?p7z`L0SbS6SO1T+~7>wB&On4Yf8O#_NG@xOGGgStq78m5_6{mu&
z&PxeOP01`uO)g<%5XE9O$RZ0y1_^zi%$%H5=ls09)Z`L<aD3}!l;q|xGO#%3r=&76
z@cU%urTUfTCZ!gIBqrsgGBU7(vPEWcDkDP}$YA_g1)2t}@ufI$CWE=&S~HB1fj77$
zF*(~eu>fo(JA*wVg8+I$V`p$=WZ*}OI7S98*NWuSf|AVqykd3+7c4Oa&BJhI><n&<
z48ma3GxPO5{oxXf3|ztarA5i9ZkZr&^FVW}9!M!8gJe)?UP)$dYFK7*W>QY7V_sf<
zNg~)<Mh0~Z-zLJP^}|z>piZ!6WMC~z%qdM}WDtPGsxH(P21N#L1||ju21W)3P|3l-
zz`(@72r8c#7#S=X7#MUIn89)aTH6^IwRSVGM{Z}}+{(bU5v<3Gfq?;3sxdI|GO#f4
zGq5mNGuSXNfpxBDU}j)vU|<N+X4%Ogz{KFEEhM&+L4t{42ZM|ii?)y=oWrWMg@H?w
zMUr(JgR&KyB-=3t30)y|Nw%E~n#>G3Li#%y44D{~GjQt&nS+@iyO|h3cB?UPGB7ZR
zFmN!4GKeyWF(@%eFz7Q#F_<t&GuSc6FnBV^F$6LwFxWCMFvv47{b%rGU}tCGW@iv&
zXE0)C&|+t>10x3p26hG~1_lN;1||k)23H0q26u2!crbW^1BQ{oi-D2BJDP#9n861C
DLxPPo
diff --git a/WEB-INF/classes/controleurs/Create.class b/WEB-INF/classes/controleurs/Create.class
deleted file mode 100644
index 966311437ac925bff2069c902821b237c7b96b4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1952
zcmX^0Z`VEs1_oP(Y%T^S24;2!79Ivx1~x_pg{;Kv#G;Z!{o>T3vYgZs{fv^50)3B?
zl7e7}03!pNO=ezZi5(*Yvxa6EI|BzJgHTFhzJ6#)W=>{tVo7Rgk&B~07Xv#3GbaN#
z0}nd`FAoDB13x2!P;!1=Nl|`IYH3lizH?D(Vo53^179hMK1K!+A57D%IT!>P8N^Fc
zD?kp)&9P3-NGvK&EwK#^anrTnW)Nl&VP_EKVGv^wXJpVI<b|Nr;)49VVvyy<sU^<&
zc_pcNB_Wjssf-Mw8a`QxWr_MZiFxVz!6ikRdFj@gVcZOo3{vb2(mV_@46=+2>Vz#Q
zEKMygVPxP+Pb~>fEiTT?&tqgz)rivc!J`$d%$kEio{@pApeQvjKNn=LA`gQSgEAun
zPkL%eKw?p1ZfZ$t5hH^dHiu%mor^)0L5-b3orggKWQcWsQM!I&L1J=7s(wj+ZgOIY
zKGZ>}srt$Jxw-jy#bCc1Lp|?WoSayY3X0ldMh5OwFwdhTH^+p7L5q=rIWIq#gF%Op
zfh9LFGlzpgkCA~nH>H4!!GOV#oxzBQ!I;5>kwE}GL>U>_GmBkw3rZ@%X()<=!HkiC
zBQLdFFQX(k2NatYJPekgsN^Y5%}WVNP01`uO)dc?DQg}E8wOiO2F}vr)FRi4Oi&<W
zjk73r275*Z{*)4wgvrHV$KVJ`=}wFcmRLd%GXOC~G{Zm+ap7TbWpHC;U{6d*2`z@k
z2%2rySTsk0G<)zccrth~G6<xnmVh*SrZ`o)f`Sl70`vsA+lPn2m%)#bfwefb#50AF
zfknepGmL{FfRTY4DGPBk1Th4&GlcLkgffKT&(7fV#>l`^oLb^oQc{$eR0_(E>iC1j
zKPf9Uxx^Y|a|9y;i*IUPDF;IoBLi1XetKpeI06|NSe)}yQW+WeeKPY>{YrC_Qj0<o
zlX6lS8Q4LkN@j8@BSRR-8vG?qP%1bVfkKgxLP&nL)(m50;0-QGOwRUAEPz_c<yw)P
zT2PXipI6Mzkc1^fpye7|89PG?BZDwF&1UB7d-}sA7#X;N^Gl18Q{6H_e&L3cV0s{x
zj0}=NrFkWpxv629#hFPtsg8Mh`6Y>9TNxSDF>-w(Tv|UoH3{khYeojvvc#NHP&h%0
zM+QX(ZU!a>1_nk322dHwz`(%7zz8a-85kL&85kIJ7?{Cw0$SS{7`1jYut#oZ;M~f<
zwGpf*hJk?rRK7DX@G`J4@G-D3#4^M&FoAS37BjFia56A3+}9Bj*vTNo#GuWxlR<)s
z!B1OAZYP5R6T=P$6)P5PAx$`kRa;0K&SBFQ(uH%_C0UL!7)i1oW6+gkJI0_P$$pGM
zS(0TNgZ?ZAX-QTvEiB0frnx2Aw=w9?WZ=;eGTq5w&cv`$YYPJxNYV;fa5sZpq$Hap
zt0c>I1_vt+uo@1KR_B=vYLXB>+cpOGZ4BPJLjIB*I~f9*8FYlg!A34;;MNg}1T#Sa
z!NdRxh#&?L1_lNp1`Y;c1_1_923ZC%1}z4026F}p1{Ve?hA0MUh6)B5h6V;%hDHVj
zhF%6mhN%on4AU4?7?v`qGHhm0V>rm5&TyJRgW(#37Q;OT9fo)Y1_mt#*8dC@3>@qX
z-0TdJ><q%}3_<J+25`i{z#;O7!JeJLj-4Tafq{XIfr%lJA(?@RAr%~*X$<M$$Yo^6
PU|?j(jAmdgX2=2nRrvVJ
diff --git a/WEB-INF/classes/dao/DS.class b/WEB-INF/classes/dao/DS.class
deleted file mode 100644
index ea8b81ae114f2026463b7d95aea04956195bb671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1601
zcmX^0Z`VEs1_oP(C@uyj24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00Sb_Nbc1`)8L(vr*^{eYtUg4Cjt%+z8o26hH!4hC*U2DX%<%(B!XE(Tr(
zK6VCv9tHshK}H6Fl*D{}=ls01%yggp#FW$`Mh5Qm)Doxxm5dB(8a`li!IlS?6lLb6
zTWewpaWV)qh_Ew=@-T2Sh=D9i%-44bW@He;RLaF5!63=bAjQKV%^<_bz>hHAIVZ8W
zn2~`!Ex*VwF*lWwL6v~zU=7wB404PN%%w#+AV(<hFvu~8aWE(`GO*_4r)TDY1XXw#
zlt6-Nj10`VDFq-Q4ITzfkV`oV5{rw=^NUj08MGN0gb|K$tw>HSD9Oyv<7Cif&|_!N
z=V35lFhq%q;L75X)Lcde=KRtUMg~!cS2OeV1Bx>9N`gy@QWJBnxfrw<jCmML7)%)%
zxYAQgd{c{y6Vp=}8ALR&1S1!NIfDf|gC!4x6@xX*IjANwGO!nb%+JYVWDvy`K4Dx8
zwhVUc4E8(>4h)Wr3}RqE6&L2{yMR-GZ(?3zIw+!f(^E^F^YijjlR@5OWbnme8pKb?
zk&h_?^#{lXgmKnF3=9m;JPa<NR3@IAn4RjJpO>6i5}sL-;hdjWT#}eqQq0J};+&t7
z%E-X)lbM(5SDKrYS`?C)l#|NHz#CkWn4ImKSODdV!-5OV8b$`L;QZ2}<W#pzkT!Og
zU_Fq385sne^7BiIONtT;d{av@@>7cW*%*Ae82lLg*%<;r?h0gNPys20<g3iQvi$5+
zeMkz2IMppNxg@`+l96Esa=<_pLJajt%uC5hEmrZ#&(AI`u*M7<BoP#iA(aKGSd>R2
zsfXlrl*|S-!Z|S~Cpfbt)tZALn2|x-Ge@CPAyJ_;FI6G6s3^6xNFgV`s8}H-RUs!)
zAsHUQ3RVh?j0`-Ud3mWt;Ea=6%+3(T$e@Z52-y6_&Je-KActQmBLf>GAQ%)Ggc+C^
z7#LU>m_P*r0|NsSC|iPQB?d7ttqG+WL1i2RBZDgg1H%eXxyQi3;I6fufpIqjd*pTo
zP9H5Ht{n_KTN#A3wlE0oU=R=25|RZA$ZH8Hf*HzMLaJbf`f>(7-%SiUI@=hGwlSD(
zWME|AVX$DZX3%0_VsK+%V9;aWW?*38VPIk4W#D1pXAor&V31`HWKd%eV$f$0X0Tuo
zW3XlrVX$EkWpHB<XK-g=0D0v<gEa#aJA*Jg13LpFJA)P%10#b2g9p^r2@K3&->PVB
zVUX9_!l10Rg+YA>gN={&2A@p~I@;S9jCL_NF)(anFk{@nz{tSBAjlvDcaj(bD+2?A
zG=l(x41*AZEQ2tE9D@>rJlJYB2F4(E1}z3=22XI9c`<l1Ffed1Ff#ZsFfs%&gfK8L
OfZP(w5Y7<EAPE50g^alX
diff --git a/WEB-INF/classes/dao/UtilisateurDAO.class b/WEB-INF/classes/dao/UtilisateurDAO.class
deleted file mode 100644
index 835d862924a4d135d653ceb6191de24ef12c1220..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5274
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
diff --git a/WEB-INF/classes/dto/Utilisateur.class b/WEB-INF/classes/dto/Utilisateur.class
deleted file mode 100644
index a71b683cdb265925591456bce2ba70b2d61eaabd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1065
zcmX^0Z`VEs1_oOOO)dr|24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00SP6iGJPId+^9tLg(9!3WKl#+b?(2~rY%;Ln7)Y2kG2BypuMg~StkUBmd
z27U$sMh3QmqSU<nTt)^VAB5?_B}JKe>DC~1LOcw@Aa%@n`MDszC=Y`eh|ijuo0yry
z$Y7=6iK&qo5zR101{UZ1lvG9rexJ;|RKL>Pq|~C2#H5^5Mg~g_VvN9412U8&J+;IY
z;y4ivO-wb63~cGCC4L}3bEc=31VH`IQ4H56ip6%2$!x_ieZ>fUtm&yGo+;o6@ML6Q
zEr#$|G(15%xPtRbi;`2_GC`gaK#B`JP+&7CGH@_3F)%Q&Fff6ljDdlH2^6|uT9`oq
zO!I?jE(S&hRt9kfMg|E61_n0<CI(gp1_mju?F@`s(pwqWwIo@#GVp5YZe<YE(%H%&
zvXOy-fssKHq=tcwfq{XOfrWvKfs=uofuDhgL4<*qL6U(FY^D^{OdAF!1{MYe1`)8C
z+FKb!Kn4kdjO0a_CI+@wfPsZUkb#pyh=Gqmm_e99gn^Mknn4C?k}Lxw10w?i1FO~+
z29XVLhp>SK#TXbFWU(q0L{|#(tsGXRyy!|L7#JDk85E!nP-0*L2P>Nv$Qua9gR&C?
zgERvx*ic36>IKo&%QLWoRVsl=Q1GLej}$l%^OYG`8B`b;8I-{!NIi0Zu&+T25OoGd
c22}<%45x!)72PRX46F>=42%rw;FO^O0Nv838UO$Q
diff --git a/WEB-INF/src/controleurs/APIRest.java b/WEB-INF/src/controleurs/APIRest.java
index 1ff6e04..5010a47 100644
--- a/WEB-INF/src/controleurs/APIRest.java
+++ b/WEB-INF/src/controleurs/APIRest.java
@@ -19,11 +19,10 @@ import dto.Fil;
import dto.Message;
import dto.Utilisateur;
-
@WebServlet("/filUser")
public class APIRest extends HttpServlet {
- private boolean verifToken(HttpServletRequest req){
+ private boolean verifToken(HttpServletRequest req) {
String authorization = req.getHeader("Authorization");
if (authorization == null || !authorization.startsWith("Bearer")) {
@@ -38,22 +37,20 @@ public class APIRest extends HttpServlet {
System.out.println("Le login est : " + claims.getSubject());
req.setAttribute("login", claims.getSubject());
return true;
- }catch (Exception e){
+ } catch (Exception e) {
System.err.println("Token pas valide ! : " + e.getMessage());
return false;
}
}
-
-
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
res.setContentType("application/json;charset=UTF-8");
PrintWriter out = res.getWriter();
- if(!verifToken(req)){
+ if (!verifToken(req)) {
res.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
out.println("Erreur !! Le token n'est pas reconnu");
- }else{
+ } else {
FilDAO filDAO = new FilDAO();
MessageDAO messageDAO = new MessageDAO();
UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
@@ -70,7 +67,7 @@ public class APIRest extends HttpServlet {
for (Fil fil : fils) {
List<Message> messages = messageDAO.getLastMessages(fil.getFid());
- // Construction du JSON
+ // Construction du JSON
Map<String, Object> filData = new HashMap<>();
filData.put("id", fil.getFid());
filData.put("titre", fil.getTitre());
@@ -82,10 +79,12 @@ public class APIRest extends HttpServlet {
msgData.put("auteurId", msg.getUid());
if (msg.isImage()) {
- // Encodage en Base64 pour les images
- //msgData.put("message", Base64.getEncoder().encodeToString(msg.getMessageData()));
+ // Encodage en Base64 pour les images
+ // msgData.put("message",
+ // Base64.getEncoder().encodeToString(msg.getMessageData()));
Utilisateur user = utilisateurDAO.getUserById(msg.getUid());
- msgData.put("message", "Ceci est une image envoyé par " + user.getPrenom() + " " + user.getNom());
+ msgData.put("message",
+ "Ceci est une image envoyé par " + user.getPrenom() + " " + user.getNom());
} else {
// Texte classique (UTF-8)
msgData.put("message", new String(msg.getMessageData(), StandardCharsets.UTF_8));
@@ -100,7 +99,10 @@ public class APIRest extends HttpServlet {
filsList.add(filData);
}
- String jsonstring = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(filsList); // Convertit la liste des fils en JSON
+ String jsonstring = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(filsList); // Convertit
+ // la liste
+ // des fils
+ // en JSON
out.println(jsonstring); // Envoie la réponse en JSON au client
return;
diff --git a/WEB-INF/src/controleurs/FilLeave.java b/WEB-INF/src/controleurs/FilLeave.java
index 4355aeb..e940e07 100644
--- a/WEB-INF/src/controleurs/FilLeave.java
+++ b/WEB-INF/src/controleurs/FilLeave.java
@@ -23,7 +23,7 @@ public class FilLeave extends HttpServlet {
int filId = Integer.parseInt(StringEscapeUtils.escapeHtml4(req.getParameter("filId")));
ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
- participantFilDAO.deleteUserById(uid,filId);
+ participantFilDAO.deleteUserById(uid, filId);
res.sendRedirect("Menu");
}
diff --git a/WEB-INF/src/controleurs/JwtManager.java b/WEB-INF/src/controleurs/JwtManager.java
index 2763cf2..3b5c0d6 100644
--- a/WEB-INF/src/controleurs/JwtManager.java
+++ b/WEB-INF/src/controleurs/JwtManager.java
@@ -60,12 +60,12 @@ public class JwtManager {
System.out.println(JwtManager.SECRET_KEY);
String token = JwtManager.createJWT("Toto");
/*
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- */
+ * try {
+ * Thread.sleep(10000);
+ * } catch (InterruptedException e) {
+ * e.printStackTrace();
+ * }
+ */
System.out.println(token);
Claims claims = null;
diff --git a/WEB-INF/src/controleurs/LikeControler.java b/WEB-INF/src/controleurs/LikeControler.java
index 1dd2300..9e898b0 100644
--- a/WEB-INF/src/controleurs/LikeControler.java
+++ b/WEB-INF/src/controleurs/LikeControler.java
@@ -26,7 +26,8 @@ public class LikeControler extends HttpServlet {
messageDAO = new MessageDAO();
}
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
response.setContentType("text/html;charset=UTF-8");
HttpSession session = request.getSession(true);
diff --git a/WEB-INF/src/controleurs/MessageSend.java b/WEB-INF/src/controleurs/MessageSend.java
index 7c51f9f..a7f4c35 100644
--- a/WEB-INF/src/controleurs/MessageSend.java
+++ b/WEB-INF/src/controleurs/MessageSend.java
@@ -11,11 +11,7 @@ import jakarta.servlet.http.*;
import jakarta.servlet.annotation.WebServlet;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
-@MultipartConfig(
- fileSizeThreshold = 1024 * 1024,
- maxFileSize = 1024 * 1024 * 10,
- maxRequestSize = 1024 * 1024 * 50
-)
+@MultipartConfig(fileSizeThreshold = 1024 * 1024, maxFileSize = 1024 * 1024 * 10, maxRequestSize = 1024 * 1024 * 50)
@WebServlet("/EnvoyerMessage")
public class MessageSend extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -27,7 +23,8 @@ public class MessageSend extends HttpServlet {
messageDAO = new MessageDAO();
}
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
int fid = Integer.parseInt(request.getParameter("fid"));
int uid = Integer.parseInt(request.getParameter("uid"));
diff --git a/WEB-INF/src/controleurs/UserInfo.java b/WEB-INF/src/controleurs/UserInfo.java
index ba50554..fc7b9c4 100644
--- a/WEB-INF/src/controleurs/UserInfo.java
+++ b/WEB-INF/src/controleurs/UserInfo.java
@@ -8,6 +8,7 @@ import jakarta.servlet.http.*;
import jakarta.servlet.annotation.WebServlet;
import dto.Utilisateur;
import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
+
@WebServlet("/UserInfo")
public class UserInfo extends HttpServlet {
diff --git a/WEB-INF/src/dao/DS.java b/WEB-INF/src/dao/DS.java
index 9d52383..a1cd076 100644
--- a/WEB-INF/src/dao/DS.java
+++ b/WEB-INF/src/dao/DS.java
@@ -9,24 +9,25 @@ public class DS {
private String url;
private String login;
private String password;
- public DS(){
+
+ public DS() {
Properties p = new Properties();
- try{
+ try {
this.driver = ConfigLoader.getProperty("driver");
Class.forName(driver);
this.url = ConfigLoader.getProperty("url");
this.login = ConfigLoader.getProperty("login");
this.password = ConfigLoader.getProperty("mdp");
- }catch (Exception e) {
+ } catch (Exception e) {
System.out.println(e.getMessage());
}
}
- public Connection getConnection(){
- try{
+ public Connection getConnection() {
+ try {
Connection con = DriverManager.getConnection(url, login, password);
return con;
- }catch (Exception e){
+ } catch (Exception e) {
System.out.println("Il y a une erreur lors de la connection : " + e.getMessage());
return null;
}
diff --git a/WEB-INF/src/dao/FilDAO.java b/WEB-INF/src/dao/FilDAO.java
index 74d3f2c..34e1466 100644
--- a/WEB-INF/src/dao/FilDAO.java
+++ b/WEB-INF/src/dao/FilDAO.java
@@ -16,7 +16,8 @@ public class FilDAO {
this.ds = new DS();
}
- //Méthode qui rerourne une Liste des fils de l'utilisateur, dont l'identifiant à été passé en paramètre
+ // Méthode qui rerourne une Liste des fils de l'utilisateur, dont l'identifiant
+ // à été passé en paramètre
public List<Fil> getFilsByUser(int id) {
List<Fil> fils = new ArrayList<>();
String query = "SELECT F.F_ID, F.TITRE FROM FIL AS F JOIN PARTICIPANT_FIL AS P ON F.F_ID = P.FP_ID WHERE P.UP_ID = ?";
@@ -44,7 +45,7 @@ public class FilDAO {
UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
try (Connection con = ds.getConnection();
- PreparedStatement psFil = con.prepareStatement(insertFilQuery)) {
+ PreparedStatement psFil = con.prepareStatement(insertFilQuery)) {
psFil.setString(1, titre);
ResultSet rs = psFil.executeQuery();
diff --git a/WEB-INF/src/dao/LikeDAO.java b/WEB-INF/src/dao/LikeDAO.java
index 84ec886..c8e7036 100644
--- a/WEB-INF/src/dao/LikeDAO.java
+++ b/WEB-INF/src/dao/LikeDAO.java
@@ -16,7 +16,7 @@ public class LikeDAO {
public boolean hasLiked(int mid, int user) {
String checkLikeQuery = "SELECT COUNT(*) FROM LIKES WHERE M_ID = ? AND U_ID = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(checkLikeQuery)) {
+ PreparedStatement ps = con.prepareStatement(checkLikeQuery)) {
ps.setInt(1, mid);
ps.setInt(2, user);
@@ -31,7 +31,7 @@ public class LikeDAO {
public void addLike(int mid, int user) {
String insertLikeQuery = "INSERT INTO LIKES (M_ID, U_ID) VALUES (?, ?)";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(insertLikeQuery)) {
+ PreparedStatement ps = con.prepareStatement(insertLikeQuery)) {
ps.setInt(1, mid);
ps.setInt(2, user);
@@ -44,7 +44,7 @@ public class LikeDAO {
public void removeLike(int mid, int user) {
String deleteLikeQuery = "DELETE FROM LIKES WHERE M_ID = ? AND U_ID = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(deleteLikeQuery)) {
+ PreparedStatement ps = con.prepareStatement(deleteLikeQuery)) {
ps.setInt(1, mid);
ps.setInt(2, user);
@@ -58,10 +58,11 @@ public class LikeDAO {
String query = "SELECT count(*) FROM LIKES WHERE m_id = ?";
int nbLikes = 0;
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setInt(1, mid);
try (ResultSet rs = ps.executeQuery()) {
- if (rs.next()) nbLikes = rs.getInt(1);
+ if (rs.next())
+ nbLikes = rs.getInt(1);
}
} catch (SQLException e) {
System.err.println(e.getMessage());
diff --git a/WEB-INF/src/dao/MessageDAO.java b/WEB-INF/src/dao/MessageDAO.java
index 827abdf..516711e 100644
--- a/WEB-INF/src/dao/MessageDAO.java
+++ b/WEB-INF/src/dao/MessageDAO.java
@@ -23,7 +23,7 @@ public class MessageDAO {
String query = "SELECT * FROM message WHERE f_id = ? ORDER BY DateMessage ASC";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setInt(1, id_fil);
ResultSet rs = ps.executeQuery();
@@ -35,8 +35,7 @@ public class MessageDAO {
rs.getBytes("message_data"), // Récupère les données sous forme de bytes
rs.getBoolean("is_image"), // Vérifie si c'est une image
rs.getInt("d_vie"),
- rs.getTimestamp("DateMessage")
- );
+ rs.getTimestamp("DateMessage"));
messages.add(mess);
}
} catch (SQLException e) {
@@ -50,7 +49,7 @@ public class MessageDAO {
boolean success = false;
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setInt(1, fid);
ps.setInt(2, uid);
ps.setBytes(3, data); // Stocke l'image ou le texte
@@ -69,10 +68,11 @@ public class MessageDAO {
public void checkTimeMessage() {
String query = "SELECT * FROM message";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ResultSet rs = ps.executeQuery();
while (rs.next()) {
- LocalDate dateMessage = rs.getTimestamp("datemessage").toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(rs.getInt("d_vie"));
+ LocalDate dateMessage = rs.getTimestamp("datemessage").toInstant().atZone(ZoneId.systemDefault())
+ .toLocalDate().plusDays(rs.getInt("d_vie"));
LocalDate dateLimite = LocalDate.now();
if (dateMessage.isBefore(dateLimite)) {
deleteMessage(rs.getInt("m_id"));
@@ -87,7 +87,7 @@ public class MessageDAO {
public void deleteMessage(int mId) {
String query = "DELETE from message where m_id = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setInt(1, mId);
ps.executeUpdate();
} catch (Exception e) {
diff --git a/WEB-INF/src/dao/ParticipantFilDAO.java b/WEB-INF/src/dao/ParticipantFilDAO.java
index af165a0..b2f04d3 100644
--- a/WEB-INF/src/dao/ParticipantFilDAO.java
+++ b/WEB-INF/src/dao/ParticipantFilDAO.java
@@ -20,7 +20,7 @@ public class ParticipantFilDAO {
String insertParticipantQuery = "INSERT INTO participant_fil (up_id, fp_id, administrateur) VALUES (?, ?, ?);";
try (Connection con = ds.getConnection();
- PreparedStatement psParticipant = con.prepareStatement(insertParticipantQuery)) {
+ PreparedStatement psParticipant = con.prepareStatement(insertParticipantQuery)) {
psParticipant.setInt(1, userId);
psParticipant.setInt(2, filId);
psParticipant.setBoolean(3, administrateur);
@@ -29,12 +29,13 @@ public class ParticipantFilDAO {
System.err.println(e.getMessage());
}
}
+
public boolean isAdmin(dto.Utilisateur u, int filId) {
int userId = u.getId();
String query = "SELECT administrateur FROM participant_fil WHERE up_id = ? AND fp_id = ?";
try (Connection conn = ds.getConnection();
- PreparedStatement stmt = conn.prepareStatement(query)) {
+ PreparedStatement stmt = conn.prepareStatement(query)) {
stmt.setInt(1, userId);
stmt.setInt(2, filId);
try (ResultSet rs = stmt.executeQuery()) {
@@ -50,18 +51,19 @@ public class ParticipantFilDAO {
}
}
- public List<dto.Utilisateur> getUsersByFilId(int filId){
+ public List<dto.Utilisateur> getUsersByFilId(int filId) {
String query = "SELECT u.* FROM UTILISATEUR AS u JOIN PARTICIPANT_FIL AS participant ON u.U_ID = participant.UP_ID WHERE participant.FP_ID = ?";
- try (Connection con = ds.getConnection();){
- PreparedStatement ps = con.prepareStatement(query);
- ps.setInt(1, filId);
- ResultSet rs = ps.executeQuery();
- List<dto.Utilisateur> liste = new ArrayList<>();
- while (rs.next()){
- liste.add(new Utilisateur(rs.getInt("u_id"), rs.getString("mail"), rs.getString("nom"), rs.getString("prenom")));
- }
- return liste;
- }catch (Exception e){
+ try (Connection con = ds.getConnection();) {
+ PreparedStatement ps = con.prepareStatement(query);
+ ps.setInt(1, filId);
+ ResultSet rs = ps.executeQuery();
+ List<dto.Utilisateur> liste = new ArrayList<>();
+ while (rs.next()) {
+ liste.add(new Utilisateur(rs.getInt("u_id"), rs.getString("mail"), rs.getString("nom"),
+ rs.getString("prenom")));
+ }
+ return liste;
+ } catch (Exception e) {
System.err.println(e.getMessage());
return null;
}
@@ -83,7 +85,7 @@ public class ParticipantFilDAO {
public boolean partFil(int fid, int uid) {
String query = "SELECT 1 FROM participant_fil WHERE fp_id = ? AND up_id = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setInt(1, fid);
ps.setInt(2, uid);
ResultSet rs = ps.executeQuery();
diff --git a/WEB-INF/src/dao/UtilisateurDAO.java b/WEB-INF/src/dao/UtilisateurDAO.java
index 5d62170..042f682 100644
--- a/WEB-INF/src/dao/UtilisateurDAO.java
+++ b/WEB-INF/src/dao/UtilisateurDAO.java
@@ -17,7 +17,7 @@ public class UtilisateurDAO {
public Utilisateur editUser(dto.Utilisateur user, String email, String nom, String prenom, String mdp) {
String query = "UPDATE utilisateur SET mail = ?, nom = ?, prenom = ?, mdp = MD5(?) WHERE u_id = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setString(1, email);
ps.setString(2, nom);
ps.setString(3, prenom);
@@ -39,11 +39,10 @@ public class UtilisateurDAO {
return user;
}
-
public boolean userExist(String mail) {
String query = "SELECT mail FROM utilisateur WHERE mail = ?";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setString(1, mail);
ResultSet rs = ps.executeQuery();
return rs.next();
@@ -56,7 +55,7 @@ public class UtilisateurDAO {
public boolean addUser(Utilisateur utilisateur, String mdp) {
String query = "INSERT INTO utilisateur(prenom, nom, mail, mdp) VALUES(?, ?, ?, MD5(?))";
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(query)) {
+ PreparedStatement ps = con.prepareStatement(query)) {
ps.setString(1, utilisateur.getPrenom());
ps.setString(2, utilisateur.getNom());
ps.setString(3, utilisateur.getEmail());
@@ -77,7 +76,8 @@ public class UtilisateurDAO {
ps.setString(2, mdp);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
- utilisateur = new Utilisateur(rs.getInt("U_ID"), rs.getString("mail"), rs.getString("nom"), rs.getString("prenom"));
+ utilisateur = new Utilisateur(rs.getInt("U_ID"), rs.getString("mail"), rs.getString("nom"),
+ rs.getString("prenom"));
}
} catch (Exception e) {
System.err.println(e.getMessage());
@@ -105,7 +105,7 @@ public class UtilisateurDAO {
String getUserIdQuery = "SELECT u_id FROM utilisateur WHERE mail = ?;";
int userId = -1;
try (Connection con = ds.getConnection();
- PreparedStatement ps = con.prepareStatement(getUserIdQuery)) {
+ PreparedStatement ps = con.prepareStatement(getUserIdQuery)) {
ps.setString(1, email);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
diff --git a/WEB-INF/src/dto/Fil.java b/WEB-INF/src/dto/Fil.java
index 0f02ac3..f61c26d 100644
--- a/WEB-INF/src/dto/Fil.java
+++ b/WEB-INF/src/dto/Fil.java
@@ -4,15 +4,27 @@ public class Fil {
private int fid;
private String titre;
- public Fil(){}
+ public Fil() {
+ }
public Fil(int fid, String titre) {
this.fid = fid;
this.titre = titre;
}
- public int getFid() {return fid;}
- public void setFid(int fid) {this.fid = fid;}
- public String getTitre() {return titre;}
- public void setTitre(String titre) {this.titre = titre;}
+ public int getFid() {
+ return fid;
+ }
+
+ public void setFid(int fid) {
+ this.fid = fid;
+ }
+
+ public String getTitre() {
+ return titre;
+ }
+
+ public void setTitre(String titre) {
+ this.titre = titre;
+ }
}
\ No newline at end of file
diff --git a/WEB-INF/src/dto/Message.java b/WEB-INF/src/dto/Message.java
index 6909545..69a18f1 100644
--- a/WEB-INF/src/dto/Message.java
+++ b/WEB-INF/src/dto/Message.java
@@ -1,4 +1,5 @@
package dto;
+
import java.sql.Timestamp;
public class Message {
@@ -20,11 +21,31 @@ public class Message {
this.dateMessage = dateMessage;
}
- public int getMid() { return mId; }
- public int getFid() { return fId; }
- public int getUid() { return uId; }
- public byte[] getMessageData() { return messageData; }
- public boolean isImage() { return isImage; }
- public int getDVie() { return dVie; }
- public Timestamp getDateMessage() { return dateMessage; }
+ public int getMid() {
+ return mId;
+ }
+
+ public int getFid() {
+ return fId;
+ }
+
+ public int getUid() {
+ return uId;
+ }
+
+ public byte[] getMessageData() {
+ return messageData;
+ }
+
+ public boolean isImage() {
+ return isImage;
+ }
+
+ public int getDVie() {
+ return dVie;
+ }
+
+ public Timestamp getDateMessage() {
+ return dateMessage;
+ }
}
diff --git a/WEB-INF/src/dto/PartFil.java b/WEB-INF/src/dto/PartFil.java
index 4a3f119..3b1ff0e 100644
--- a/WEB-INF/src/dto/PartFil.java
+++ b/WEB-INF/src/dto/PartFil.java
@@ -4,17 +4,34 @@ public class PartFil {
private int uid;
private int fid;
private boolean admin;
-
+
public PartFil(int uid, int fid, boolean admin) {
this.uid = uid;
this.fid = fid;
this.admin = admin;
}
- public int getUid() {return uid;}
- public void setUid(int uid) {this.uid = uid;}
- public int getFid() {return fid;}
- public void setFid(int fid) {this.fid = fid;}
- public boolean isAdmin() {return admin;}
- public void setAdmin(boolean admin) {this.admin = admin;}
+ public int getUid() {
+ return uid;
+ }
+
+ public void setUid(int uid) {
+ this.uid = uid;
+ }
+
+ public int getFid() {
+ return fid;
+ }
+
+ public void setFid(int fid) {
+ this.fid = fid;
+ }
+
+ public boolean isAdmin() {
+ return admin;
+ }
+
+ public void setAdmin(boolean admin) {
+ this.admin = admin;
+ }
}
\ No newline at end of file
diff --git a/WEB-INF/src/dto/QuiLike.java b/WEB-INF/src/dto/QuiLike.java
index d4373be..aff8b9f 100644
--- a/WEB-INF/src/dto/QuiLike.java
+++ b/WEB-INF/src/dto/QuiLike.java
@@ -3,14 +3,25 @@ package dto;
public class QuiLike {
private int mid;
private int uid;
-
+
public QuiLike(int mid, int uid) {
this.mid = mid;
this.uid = uid;
}
- public int getMid() {return mid;}
- public void setMid(int mid) {this.mid = mid;}
- public int getUid() {return uid;}
- public void setUid(int uid) {this.uid = uid;}
+ public int getMid() {
+ return mid;
+ }
+
+ public void setMid(int mid) {
+ this.mid = mid;
+ }
+
+ public int getUid() {
+ return uid;
+ }
+
+ public void setUid(int uid) {
+ this.uid = uid;
+ }
}
\ No newline at end of file
diff --git a/WEB-INF/src/dto/Utilisateur.java b/WEB-INF/src/dto/Utilisateur.java
index c8754b3..420fbc0 100644
--- a/WEB-INF/src/dto/Utilisateur.java
+++ b/WEB-INF/src/dto/Utilisateur.java
@@ -19,9 +19,17 @@ public class Utilisateur {
this.prenom = prenom;
}
- public String getEmail() { return email; }
- public String getNom() { return nom; }
- public String getPrenom() { return prenom; }
+ public String getEmail() {
+ return email;
+ }
+
+ public String getNom() {
+ return nom;
+ }
+
+ public String getPrenom() {
+ return prenom;
+ }
public void setEmail(String email) {
this.email = email;
@@ -38,6 +46,7 @@ public class Utilisateur {
public int getId() {
return id;
}
+
public void setId(int id) {
this.id = id;
}
diff --git a/css/style.css b/css/style.css
index 250e85d..3bf1c0c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -27,13 +27,23 @@ body::before {
}
@keyframes fadeIn {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+
+ to {
+ opacity: 1;
+ }
}
@keyframes blurFadeIn {
- from { backdrop-filter: blur(0px); }
- to { backdrop-filter: blur(3px); }
+ from {
+ backdrop-filter: blur(0px);
+ }
+
+ to {
+ backdrop-filter: blur(3px);
+ }
}
.container {
@@ -50,8 +60,15 @@ body::before {
}
@keyframes slideIn {
- from { transform: translateY(-20px); opacity: 0; }
- to { transform: translateY(0); opacity: 1; }
+ from {
+ transform: translateY(-20px);
+ opacity: 0;
+ }
+
+ to {
+ transform: translateY(0);
+ opacity: 1;
+ }
}
h2 {
@@ -108,4 +125,4 @@ a {
a:hover {
text-decoration: underline;
transform: scale(1.1);
-}
+}
\ No newline at end of file
diff --git a/css/styleMenu.css b/css/styleMenu.css
index 03dc037..06029f7 100644
--- a/css/styleMenu.css
+++ b/css/styleMenu.css
@@ -1,4 +1,5 @@
-.container, .container-fluid {
+.container,
+.container-fluid {
margin: 0 !important;
padding: 0 !important;
max-width: 100% !important;
@@ -131,40 +132,26 @@ body {
text-decoration: none;
}
-/* Pour la sidebar, en mode mobile (quand elle est ouverte) */
-#sidebar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background-color: #00072D;
- z-index: 1050; /* Assure que la sidebar sera au-dessus du contenu */
- padding-top: 50px; /* Pour laisser de l'espace sous le bouton hamburger */
- box-shadow: 2px 0 5px rgba(0, 0, 0, 0.2);
-}
-
-/* Pour la sidebar, en mode mobile (quand elle est ouverte) */
-#sidebar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background-color: #00072D;
- z-index: 1050; /* Assure que la sidebar sera au-dessus du contenu */
- padding-top: 50px; /* Pour laisser de l'espace sous le bouton hamburger */
- box-shadow: 2px 0 5px rgba(0, 0, 0, 0.2);
-}
-
-/* Pour ajuster la marge de la sidebar quand elle est affichée en mode mobile */
@media (max-width: 991px) {
+ #sidebar {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #00072D;
+ z-index: 1050;
+ padding-top: 50px;
+ box-shadow: 2px 0 5px rgba(0, 0, 0, 0.2);
+ }
+
.sidebar {
width: 250px;
height: 100%;
}
.main-content {
- display: none; !important
+ display: none;
+ !important
}
}
\ No newline at end of file
diff --git a/menu.jsp b/menu.jsp
index 11f69a6..c1fa6e5 100644
--- a/menu.jsp
+++ b/menu.jsp
@@ -30,7 +30,6 @@
<span class="navbar-toggler-icon"></span>
</button>
- <!-- Sidebar (visible sur PC et cachée sur mobile) -->
<div class="sidebar collapse d-lg-block col-12 col-md-3" id="sidebar">
<div class="d-flex align-items-center justify-content-between w-100">
<a href="UserInfo" class="d-flex align-items-center gap-3 fs-4 text-decoration-none text-light">
@@ -43,7 +42,7 @@
</a>
</div>
- <div class="border-top border-3 border-primary my-4"></div>
+ <div class="separator"></div>
<h3>Vos fils de discussion</h3>
<div class="separator"></div>
@@ -61,7 +60,11 @@
<% } %>
</ul>
<% } else { %>
- <p>Aucun fil de discussion trouvé.</p>
+ <ul class="list-group">
+ <li class="list-group-item d-flex justify-content-center align-items-center text-white border-0" style="background-color: #00072D;">
+ <p>Aucun fil de discussion trouvé.</p>
+ </li>
+ </ul>
<% } %>
<div class="separator"></div>
@@ -103,7 +106,7 @@
}
%>
<% if (isImage) { %>
- <img src="data:image/jpeg;base64,<%= encodedImage %>" alt="Message Image" class="contenu-img img-fluid" />
+ <img src="data:image/jpeg;base64,<%= encodedImage %>" alt="Message Image" class="contenu-img img-fluid" />
<% } else { %>
<p class="contenu"><%= new String(messageData, "UTF-8") %></p>
<% } %>
@@ -149,12 +152,13 @@ if(isAdmin){
</div>
</form>
<% } else { %>
- <div class="d-flex">
- <div class="text-center p-5 rounded-3 shadow-lg text-white" style="background-color: #291968;">
- <h1 class="display-4 mb-4">Bienvenue sur LilleConnect</h1>
- <p class="lead">Veuillez sélectionner un fil de discussion.</p>
- </div>
- </div>
+<div class="container d-flex justify-content-center">
+ <div class="text-center mx-auto align-self-start p-5 rounded-3 shadow-lg text-white"
+ style="background-color: #291968; width: fit-content;">
+ <h1 class="display-4 mb-4">Bienvenue sur LilleConnect</h1>
+ <p class="lead">Veuillez sélectionner un fil de discussion.</p>
+ </div>
+</div>
<% } %>
</div>
</div>
--
GitLab