Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • charlie.darques.etu/s4a021-web-backend
1 result
Select Git revision
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
WEB-INF/src/controleurs/Account.java
View file @ 0a1a24ab
...@@ -38,13 +38,15 @@ public class Account extends HttpServlet { ...@@ -38,13 +38,15 @@ public class Account extends HttpServlet {
out.println(PageGeneration.generateNavMenu()); out.println(PageGeneration.generateNavMenu());
out.println("</body>"); out.println("</body>");
out.println("<form action=\"/AccountSettings\" method=\"post\"></form>");
out.println("<button type=\"submit\">test</button>");
out.println("<footer>"); out.println("<footer>");
out.println("Connected as " + login); out.println("Connected as " + login);
out.println("</footer>"); out.println("</footer>");
out.println("</html>"); out.println("</html>");
} }
} else { } else {
res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html"); res.sendRedirect("/index.html");
} }
} }
} }
WEB-INF/src/controleurs/Feed.java
View file @ 0a1a24ab
...@@ -27,8 +27,9 @@ public class Feed extends HttpServlet { ...@@ -27,8 +27,9 @@ public class Feed extends HttpServlet {
if (req.getSession().getAttribute("user") != null) { if (req.getSession().getAttribute("user") != null) {
PrintWriter out = res.getWriter(); PrintWriter out = res.getWriter();
String login = (String) req.getSession().getAttribute("login"); 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); List<Integer> liked_messages = getLikedMessages(req);
......
WEB-INF/src/controleurs/Following.java
View file @ 0a1a24ab
...@@ -29,16 +29,18 @@ public class Following extends HttpServlet { ...@@ -29,16 +29,18 @@ public class Following extends HttpServlet {
if (!userDAO.isDatabased(user)) res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html"); if (!userDAO.isDatabased(user)) res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html");
List<MyThread> threadsFollowedByUser = null; List<MyThread> threadsFollowedByUser = null;
try { // try {
threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user); // threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user);
} // }
catch (SQLException sqle) { // catch (SQLException sqle) {
sqle.getStackTrace(); // sqle.getStackTrace();
} // }
// TODO : à décommenter
System.out.println(threadsFollowedByUser.size()); System.out.println(threadsFollowedByUser.size());
out.println("<html><body><meta charset=\"utf-8\">"); out.println("<html><body><meta charset=\"utf-8\">");
out.println("<link rel=\"stylesheet\" href=\"css/feed.css\">");
out.println("<title>Followed</title>"); out.println("<title>Followed</title>");
out.println("<nav>"); out.println("<nav>");
......
WEB-INF/src/controleurs/LikeMessage.java
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; // TODO : à décommenter
import java.sql.SQLException; \ No newline at end of file
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");
}
}
}
css/feed.css
View file @ 0a1a24ab
...@@ -15,6 +15,16 @@ body{ ...@@ -15,6 +15,16 @@ body{
h1{ h1{
text-align : center; text-align : center;
margin-bottom : 3%;
}
footer{
position : static;
text-align : center;
width : 100%;
bottom : 0;
margin-top : 3%;
margin-bottom : 3%;
} }
ul{ ul{
......