diff --git a/WEB-INF/src/controleurs/Account.java b/WEB-INF/src/controleurs/Account.java
index 85bc6da2cc741174fc7b250ae1e81f344d395954..bdf889de98a571a92dff240e156e7aa1640ba133 100644
--- a/WEB-INF/src/controleurs/Account.java
+++ b/WEB-INF/src/controleurs/Account.java
@@ -38,13 +38,15 @@ public class Account extends HttpServlet {
out.println(PageGeneration.generateNavMenu());
out.println("</body>");
+ out.println("<form action=\"/AccountSettings\" method=\"post\"></form>");
+ out.println("<button type=\"submit\">test</button>");
out.println("<footer>");
out.println("Connected as " + login);
out.println("</footer>");
out.println("</html>");
}
} else {
- res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html");
+ res.sendRedirect("/index.html");
}
}
}
diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java
index 82c24f8db0b1ec00b10496e877f5d8e2f361257c..c36d206afc74bc4b0bd77bdce1bcc73679a62d05 100644
--- a/WEB-INF/src/controleurs/Feed.java
+++ b/WEB-INF/src/controleurs/Feed.java
@@ -27,8 +27,9 @@ public class Feed extends HttpServlet {
if (req.getSession().getAttribute("user") != null) {
PrintWriter out = res.getWriter();
String login = (String) req.getSession().getAttribute("login");
+ String pwd = req.getSession().getAttribute("password").toString();
- user = userDao.getUserByLogs(login, req.getSession().getAttribute("password").toString());
+ user = userDao.getUserByLogs(login, pwd);
List<Integer> liked_messages = getLikedMessages(req);
diff --git a/WEB-INF/src/controleurs/Following.java b/WEB-INF/src/controleurs/Following.java
index 740dfc17a568ec55d3fb0ff1d63e8b086fe8f3b6..b0980aa9c0a680d1472378b74e726141693fb8c5 100644
--- a/WEB-INF/src/controleurs/Following.java
+++ b/WEB-INF/src/controleurs/Following.java
@@ -29,16 +29,18 @@ public class Following extends HttpServlet {
if (!userDAO.isDatabased(user)) res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html");
List<MyThread> threadsFollowedByUser = null;
- try {
- threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user);
- }
- catch (SQLException sqle) {
- sqle.getStackTrace();
- }
+// try {
+// threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user);
+// }
+// catch (SQLException sqle) {
+// sqle.getStackTrace();
+// }
+// TODO : à décommenter
System.out.println(threadsFollowedByUser.size());
out.println("<html><body><meta charset=\"utf-8\">");
+ out.println("<link rel=\"stylesheet\" href=\"css/feed.css\">");
out.println("<title>Followed</title>");
out.println("<nav>");
diff --git a/WEB-INF/src/controleurs/LikeMessage.java b/WEB-INF/src/controleurs/LikeMessage.java
index 31fc9218a23d576ae3419d431ae3854aa256a2cf..1da61e5558c3950a00a24e7e17213dbe7e071b00 100644
--- a/WEB-INF/src/controleurs/LikeMessage.java
+++ b/WEB-INF/src/controleurs/LikeMessage.java
@@ -1,51 +1,53 @@
-package controleurs;
+//package controleurs;
+//
+//import java.io.IOException;
+//import java.sql.SQLException;
+//
+//import dao.ThreadDAO;
+//import dao.UserDAO;
+//import dto.Message;
+//import dto.User;
+//import jakarta.servlet.annotation.WebServlet;
+//import jakarta.servlet.http.HttpServlet;
+//import jakarta.servlet.http.HttpServletRequest;
+//import jakarta.servlet.http.HttpServletResponse;
+//
+//@WebServlet("/LikeMessage")
+//public class LikeMessage extends HttpServlet {
+// public void service (HttpServletRequest req, HttpServletResponse res) throws IOException {
+// if (req.getSession().getAttribute("user") != null) {
+// User user = (User) req.getSession().getAttribute("user");
+//
+// UserDAO userDao = new UserDAO();
+// ThreadDAO threadDao = new ThreadDAO();
+//
+// Message msg = req.getParameter("messageid");
+//
+// // Ã modifier
+// boolean messageLiked = false;
+//
+// if (!messageLiked) {
+// try {
+// userDao.reactToMsg(user, msg);
+// }
+// catch (SQLException sqle) {
+// sqle.getStackTrace();
+// }
+// }
+// else {
+// try {
+// userDao.unreactToMsg(user, msg); // méthode à créer
+// }
+// catch (SQLException sqle) {
+// sqle.getStackTrace();
+// }
+// }
+// res.sendRedirect("http://localhost:8080/s4a021-web-backend/Welcome");
+// }
+// else {
+// res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html");
+// }
+// }
+//}
-import java.io.IOException;
-import java.sql.SQLException;
-
-import dao.ThreadDAO;
-import dao.UserDAO;
-import dto.Message;
-import dto.User;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-@WebServlet("/LikeMessage")
-public class LikeMessage extends HttpServlet {
- public void service (HttpServletRequest req, HttpServletResponse res) throws IOException {
- if (req.getSession().getAttribute("user") != null) {
- User user = (User) req.getSession().getAttribute("user");
-
- UserDAO userDao = new UserDAO();
- ThreadDAO threadDao = new ThreadDAO();
-
- Message msg = req.getParameter("messageid");
-
- // Ã modifier
- boolean messageLiked = false;
-
- if (!messageLiked) {
- try {
- userDao.reactToMsg(user, msg);
- }
- catch (SQLException sqle) {
- sqle.getStackTrace();
- }
- }
- else {
- try {
- userDao.unreactToMsg(user, msg); // méthode à créer
- }
- catch (SQLException sqle) {
- sqle.getStackTrace();
- }
- }
- res.sendRedirect("http://localhost:8080/s4a021-web-backend/Welcome");
- }
- else {
- res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html");
- }
- }
-}
+// TODO : à décommenter
\ No newline at end of file
diff --git a/css/feed.css b/css/feed.css
index e368f5b6709c622c36f33ced9ad402802c3659fd..ae25b33aa5a8f301b3dde860b0e3722de0cdb009 100644
--- a/css/feed.css
+++ b/css/feed.css
@@ -19,11 +19,12 @@ h1{
}
footer{
- position : fixed;
+ position : static;
text-align : center;
width : 100%;
bottom : 0;
- margin-bottom : 3%
+ margin-top : 3%;
+ margin-bottom : 3%;
}
ul{