diff --git a/sae/WEB-INF/src/controleur/CreerFil.java b/sae/WEB-INF/src/controleur/CreerFil.java index 098a0ff07a556fa86be32e522715658e079ec699..55a326b21b74717b16e7e290de12806e4b592be7 100644 --- a/sae/WEB-INF/src/controleur/CreerFil.java +++ b/sae/WEB-INF/src/controleur/CreerFil.java @@ -58,6 +58,8 @@ public class CreerFil extends HttpServlet { uploadDir.mkdir(); } filePart.write(uploadPath + File.separator + fileName); + } else { + fileName = "default.png"; } f.create(new FilDeDiscussion( diff --git a/sae/WEB-INF/src/controleur/DeleteFil.java b/sae/WEB-INF/src/controleur/DeleteFil.java index a119c57c6f55f187bc76765bc0debc4b89a94ae8..08d5ac64711a08868ee3745c22bb276383fe8f82 100644 --- a/sae/WEB-INF/src/controleur/DeleteFil.java +++ b/sae/WEB-INF/src/controleur/DeleteFil.java @@ -20,10 +20,10 @@ public class DeleteFil extends HttpServlet { int id = Integer.parseInt(req.getParameter("id")); FilDeDiscussionDAO filDao = new FilDeDiscussionDAO(); if (filDao.delete(id)) { - req.setAttribute("success", "Fil de discussion supprimé."); + req.getSession().setAttribute("deleteFil", "Le fil de discussion a bien été supprimé."); } else { - req.setAttribute("error", "Erreur lors de la suppression du fil de discussion."); + req.getSession().setAttribute("deleteFil", "Erreur lors de la suppression du fil de discussion."); } - res.sendRedirect(req.getContextPath() + "/listerFil"); + res.sendRedirect(req.getContextPath() + "/accueil"); } } diff --git a/sae/WEB-INF/vue/accueil.jsp b/sae/WEB-INF/vue/accueil.jsp index f2a7a0997c3d1b165805adb0c0c586cee74da989..fe9569f370e2c2d70b5a722f4603078cad554984 100644 --- a/sae/WEB-INF/vue/accueil.jsp +++ b/sae/WEB-INF/vue/accueil.jsp @@ -31,7 +31,15 @@ <a href="<%= request.getContextPath() %>/logout" class="block py-2.5 px-4 rounded transition duration-200 hover:bg-red-700">Se déconnecter</a> </nav> </aside> + <div class="flex-1 p-6"> + <% if (session.getAttribute("deleteFil") != null) { %> + <div class="max-w-2xl mx-auto mt-4 p-4 bg-green-100 text-green-700 rounded-lg"> + <p class="font-bold"><%= session.getAttribute("deleteFil") %></p> + <% session.removeAttribute("deleteFil"); %> + </div> + <% } %> + <% UtilisateurDao udao=new UtilisateurDao(); String email=(String) session.getAttribute("email"); String username=udao.findUtilisateur(email).getNom(); AbonnementDao adao=new AbonnementDao(); diff --git a/sae/WEB-INF/vue/listerFil.jsp b/sae/WEB-INF/vue/listerFil.jsp index 379797bf1bab32ff9b543f7729b2954c4a703cbe..40ce90496840bb61b6a834bd3ea0615b4c78e6f3 100644 --- a/sae/WEB-INF/vue/listerFil.jsp +++ b/sae/WEB-INF/vue/listerFil.jsp @@ -32,6 +32,7 @@ <div class="flex-1 p-6"> <div class="max-w-2xl mx-auto mt-8 p-6 bg-gray-800 rounded-lg shadow-md"> + <h2 class="text-2xl font-bold mb-4 text-center">Fils de Discussion</h2> <p class="text-gray-400 mb-4 text-center">(auxquels vous n'êtes pas abonné)</p> <% diff --git a/sae/WEB-INF/vue/menuFil.jsp b/sae/WEB-INF/vue/menuFil.jsp index 3c95d9fa491303302d98a0bd720baa001ba4f0ad..4cde7c2d794b0152ad5703267f85f3147f17c0fa 100644 --- a/sae/WEB-INF/vue/menuFil.jsp +++ b/sae/WEB-INF/vue/menuFil.jsp @@ -50,15 +50,13 @@ <img src="<%= request.getContextPath() %>/uploads/<%= fil.getLogo() %>" alt="Logo" class="mt-2 message-image"> <% } %> </div> - <div class="flex justify-between"> - <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded-lg shadow-md hover:bg-blue-600 transition-colors">Sauvegarder</button> - <form action="<%= request.getContextPath() %>/deleteFil" method="post"> - <input type="hidden" name="id" value="<%= fil.getId() %>"> - <button type="submit" class="bg-red-500 text-white px-4 py-2 rounded-lg shadow-md hover:bg-red-600 transition-colors">Supprimer</button> - </form> - </div> + <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded-lg shadow-md hover:bg-blue-600 transition-colors w-full">Sauvegarder</button> + </form> + <form action="<%= request.getContextPath() %>/deleteFil" method="post" class="mt-4"> + <input type="hidden" name="id" value="<%= fil.getId() %>"> + <button type="submit" class="bg-red-500 text-white px-4 py-2 rounded-lg shadow-md hover:bg-red-600 transition-colors w-full">Supprimer</button> </form> </div> </div> </body> -</html> +</html> \ No newline at end of file