diff --git a/WEB-INF/classes/res/config.prop b/WEB-INF/classes/res/config.prop index d020b437593dac1f29625647e278238a2976daf9..686154efc80ba4884de87420a99af3dab5e63c5f 100644 --- a/WEB-INF/classes/res/config.prop +++ b/WEB-INF/classes/res/config.prop @@ -1,5 +1,5 @@ nbday=7 driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/sae -login=admin -mdp=admin \ No newline at end of file +url=jdbc:postgresql://psqlserv/but2 +login=giorgioutzerietu +mdp=moi \ No newline at end of file diff --git a/menu.jsp b/menu.jsp index 5dd5b5ef4ed7e53cb66cc47fbfd3574723fff2f3..1b802ff3e2b8f708aa8c979e177cecdac4978024 100644 --- a/menu.jsp +++ b/menu.jsp @@ -27,7 +27,7 @@ boolean isUserInFil = fils != null && !fils.isEmpty(); %> - <div class="sidebar col-3"> + <div class="sidebar col-12 col-md-3"> <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"> <i class="bi bi-person"></i> @@ -78,7 +78,7 @@ List<Message> messages = (List<Message>) request.getAttribute("message"); if (messages != null && isUserInFil) { %> - <div class="message-container"> + <div class="message-container w-100"> <% for (Message mess : messages) { boolean utilisateurConnecte = mess.getUid() == utilisateur.getId(); %> @@ -92,14 +92,14 @@ <% byte[] messageData = mess.getMessageData(); String encodedImage = null; - boolean isImage = mess.isImage(); // Assure-toi que cette méthode est correctement définie dans ton objet Message + boolean isImage = mess.isImage(); if (isImage) { encodedImage = java.util.Base64.getEncoder().encodeToString(messageData); } %> <% if (isImage) { %> -<img src="data:image/jpeg;base64,<%= encodedImage %>" alt="Message Image" class="contenu-img w-auto h-auto" style="max-width: 60%;"/> + <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> <% } %> @@ -119,7 +119,7 @@ <% Boolean isAdmin = (Boolean) request.getAttribute("isAdmin"); %> -<form action="EnvoyerMessage" method="POST" class="w-100 mt-auto" enctype="multipart/form-data"> + <form action="EnvoyerMessage" method="POST" class="w-100 mt-auto d-flex flex-column" enctype="multipart/form-data"> <input type="hidden" name="fid" value="<%= request.getAttribute("filId") %>"> <input type="hidden" name="uid" value="<%= utilisateur.getId() %>"> <div class="input-group p-1 rounded border d-flex align-items-center bg-white">