diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java index f37d61e49aa9b429e451778285b4e2ea8914a324..90945fa41c39fd51da43d073237849c4c650e9a6 100644 --- a/WEB-INF/src/controleurs/Feed.java +++ b/WEB-INF/src/controleurs/Feed.java @@ -40,12 +40,15 @@ public class Feed extends HttpServlet { out.println("<html><body><meta charset=\"utf-8\">"); out.println("<title>Welcome</title>"); out.println("<h1>Welcome " + login + "</h1>"); - out.println(""); - System.out.println(messages.size()); + out.println("<nav class=\"option_menu\">"); + out.println("<ul class=\"options_list\">"); + out.println("<li class=\"option\">"); + + out.println("<h2>Recent messages</h2>"); + out.println("<h2>Discover</h2>"); for (Message message : messages) { - System.out.println("dans le for"); MyThread msgThread = null; try { msgThread = threadDao.getThreadById(message.getThreadId()); @@ -58,6 +61,8 @@ public class Feed extends HttpServlet { out.println("</div>"); } + + out.println("</body>"); out.println("<footer>"); out.println("Connecté en tant que " + login); diff --git a/WEB-INF/src/dao/UserDAO.java b/WEB-INF/src/dao/UserDAO.java index eaa30ac3166420285545adebc678e2a5c31f8bcb..0e6507117dc6cc2de9dedfe673e6214d3863c265 100644 --- a/WEB-INF/src/dao/UserDAO.java +++ b/WEB-INF/src/dao/UserDAO.java @@ -24,7 +24,6 @@ public class UserDAO { stmt.setString(2, password); stmt.executeUpdate(); - } catch (SQLException e) { throw new RuntimeException(e); } @@ -47,7 +46,7 @@ public class UserDAO { } catch (SQLException sqle) { sqle.getStackTrace(); } - + return users; } @@ -67,7 +66,6 @@ public class UserDAO { } catch (SQLException sqle) { sqle.printStackTrace(); } - return isIn; }