Skip to content
Snippets Groups Projects
Commit 0a1a24ab authored by Yannis Devos's avatar Yannis Devos
Browse files

t

parent a8a4de4d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
WEB-INF/src/controleurs/Account.java
+ 3
− 1
View file @ 0a1a24ab
......@@ -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");
}
}
}
WEB-INF/src/controleurs/Feed.java
+ 2
− 1
View file @ 0a1a24ab
......@@ -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);
......
WEB-INF/src/controleurs/Following.java
+ 8
− 6
View file @ 0a1a24ab
......@@ -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>");
......
WEB-INF/src/controleurs/LikeMessage.java
+ 52
− 50
View file @ 0a1a24ab
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
css/feed.css
+ 3
− 2
View file @ 0a1a24ab
......@@ -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{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment