diff --git a/.gitignore b/.gitignore index 742ccb85bfa764208e33e44a9057bb4d01b0ab50..3eb9c934b9cfad6efb262cbd95aea96f0ad290aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .idea/ -WEB-INF/classes/ +WEB-INF/classes/controleurs/ +WEB-INF/classes/dao/ +WEB-INF/classes/dto/ WEB-INF/.idea/ \ No newline at end of file diff --git a/WEB-INF/classes/controleurs/Authent.class b/WEB-INF/classes/controleurs/Authent.class index c5ab2b8294e2130c6ff94dc8c4c16be8765b5dd9..70e4ae01d614dcd2264422e58fcfaab851cbe112 100644 Binary files a/WEB-INF/classes/controleurs/Authent.class and b/WEB-INF/classes/controleurs/Authent.class differ diff --git a/WEB-INF/classes/controleurs/Create.class b/WEB-INF/classes/controleurs/Create.class index 981fcaab9db2caa91f4629c5d2f8020c14d51568..302e12d757210bc981c31fe572df8adcf94a7ac7 100644 Binary files a/WEB-INF/classes/controleurs/Create.class and b/WEB-INF/classes/controleurs/Create.class differ diff --git a/WEB-INF/classes/res/config.prop b/WEB-INF/classes/res/config.prop new file mode 100644 index 0000000000000000000000000000000000000000..b02128525588284a6618710b0b94f27d0a3908c8 --- /dev/null +++ b/WEB-INF/classes/res/config.prop @@ -0,0 +1 @@ +nbday=7 \ No newline at end of file diff --git a/WEB-INF/src/controleurs/Authent.java b/WEB-INF/src/controleurs/Authent.java index 1d6f1a3be6e3c0c67734bc9f7bc0db9d119025b2..fcf08eb19bfeb4ff1288bbe124be936d59ce7e58 100644 --- a/WEB-INF/src/controleurs/Authent.java +++ b/WEB-INF/src/controleurs/Authent.java @@ -26,7 +26,7 @@ public class Authent extends HttpServlet { session.setAttribute("utilisateur", utilisateur); res.sendRedirect("Menu"); } else { - res.sendRedirect("/sae4.01/login.html"); + res.sendRedirect("/LilleConnect/login.html"); } } } diff --git a/WEB-INF/src/controleurs/Create.java b/WEB-INF/src/controleurs/Create.java index 8a2e3fe76040861ba5047279e1ac09286bdbba6c..f686b63972a1e5487bfef7662c3e494e8b57c431 100644 --- a/WEB-INF/src/controleurs/Create.java +++ b/WEB-INF/src/controleurs/Create.java @@ -17,12 +17,6 @@ public class Create extends HttpServlet { res.setContentType("text/html;charset=UTF-8"); HttpSession session = req.getSession(true); - Utilisateur user = (Utilisateur) session.getAttribute("utilisateur"); - if (user == null || user.getId() == 0) { - res.sendRedirect("login.html"); - return; - } - String prenom = req.getParameter("prenom"); String nom = req.getParameter("nom"); String mail = req.getParameter("mail"); @@ -42,7 +36,7 @@ public class Create extends HttpServlet { if (utilisateurDAO.addUser(utilisateur, mdp)) { utilisateur.setId(utilisateurDAO.getUserIdByEmail(mail)); session.setAttribute("utilisateur", utilisateur); - res.sendRedirect("menu.jsp"); + res.sendRedirect("Menu"); } else { res.sendRedirect("login.html"); } diff --git a/menu.jsp b/menu.jsp index 58568872fb88ee14979e3aa44c583288b806951f..3c5126aac7e037fbc178a68795405a0812d2e1ec 100644 --- a/menu.jsp +++ b/menu.jsp @@ -96,7 +96,7 @@ } %> <% if (isImage) { %> - <img src="data:image/jpeg;base64,<%= encodedImage %>" alt="Message Image" class="contenu-img"/> +<img src="data:image/jpeg;base64,<%= encodedImage %>" alt="Message Image" class="contenu-img w-auto h-auto" style="max-width: 60%;"/> <% } else { %> <p class="contenu"><%= new String(messageData, "UTF-8") %></p> <% } %>