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
  • main
1 result

Target

Select target project
  • charlie.darques.etu/s4a021-web-backend
1 result
Select Git revision
  • main
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 31 deletions
WEB-INF/src/controleurs/Account.java
View file @ bda83feb
...@@ -38,12 +38,13 @@ public class Account extends HttpServlet { ...@@ -38,12 +38,13 @@ public class Account extends HttpServlet {
out.println("</body>"); out.println("</body>");
out.println("<section class=\"account_section\">");
out.println("<h2>CHANGE YOUR PASSWORD</h2>"); out.println("<h2>CHANGE YOUR PASSWORD</h2>");
out.println("<form class=\"changepwdForm\" action=\"/s4a021-web-backend/Account\">"); out.println("<form class=\"changepwdForm\" action=\"/s4a021-web-backend/Account\">");
out.println("<input name=\"newPwd\" type=\"password\" placeholder=\"New password\">"); out.println("<input name=\"newPwd\" type=\"password\" placeholder=\"New password\">");
out.println("<button type=\"submit\">Change it !</button>"); out.println("<button type=\"submit\">Change it !</button>");
out.println("</form>"); out.println("</form>");
out.println("</section>");
String npwd = req.getParameter("newPwd"); String npwd = req.getParameter("newPwd");
if (npwd != null){ if (npwd != null){
...@@ -51,6 +52,7 @@ public class Account extends HttpServlet { ...@@ -51,6 +52,7 @@ public class Account extends HttpServlet {
System.out.println(user.getPwd()); System.out.println(user.getPwd());
System.out.println(user.getId()); System.out.println(user.getId());
boolean b = userDao.updatePassword(user.getUserName(), user.getPwd(), npwd); boolean b = userDao.updatePassword(user.getUserName(), user.getPwd(), npwd);
req.getSession().setAttribute("user", userDao.getUserByLogs(user.getUserName(), npwd));
System.out.println(b); System.out.println(b);
if (b == true){ if (b == true){
out.println("<p style=\"color:lightgreen\">Your password was successfully changed"); out.println("<p style=\"color:lightgreen\">Your password was successfully changed");
...@@ -64,10 +66,12 @@ public class Account extends HttpServlet { ...@@ -64,10 +66,12 @@ public class Account extends HttpServlet {
// out.println("<button type=\"submit\">Delete Account</button>"); // out.println("<button type=\"submit\">Delete Account</button>");
// out.println("</form>"); // out.println("</form>");
out.println("<section class=\"account_section\">");
out.println("<h2>DELETE YOUR ACCOUNT</h2>"); out.println("<h2>DELETE YOUR ACCOUNT</h2>");
out.println("<form class=\"delForm\" action=\"/s4a021-web-backend/deletedAccount\" method=\"post\">"); out.println("<form class=\"delForm\" action=\"/s4a021-web-backend/deletedAccount\" method=\"post\">");
out.println("<button type=\"submit\">Delete Account</button>"); out.println("<button type=\"submit\">Delete Account</button>");
out.println("</form>"); out.println("</form>");
out.println("</section>");
out.println("<footer>"); out.println("<footer>");
out.println("Connected as " + login); out.println("Connected as " + login);
......
WEB-INF/src/controleurs/DeleteAccount.java
View file @ bda83feb
...@@ -23,7 +23,6 @@ public class DeleteAccount extends HttpServlet { ...@@ -23,7 +23,6 @@ public class DeleteAccount extends HttpServlet {
if (req.getSession().getAttribute("user") != null) { if (req.getSession().getAttribute("user") != null) {
UserDAO userDao = new UserDAO(); UserDAO userDao = new UserDAO();
PrintWriter out = res.getWriter(); PrintWriter out = res.getWriter();
String login = (String) req.getSession().getAttribute("login");
User user = (User) req.getSession().getAttribute("user"); User user = (User) req.getSession().getAttribute("user");
if (user != null) { if (user != null) {
...@@ -32,7 +31,7 @@ public class DeleteAccount extends HttpServlet { ...@@ -32,7 +31,7 @@ public class DeleteAccount extends HttpServlet {
out.println("<link rel=\"stylesheet\" href=\"css/account.css\">"); out.println("<link rel=\"stylesheet\" href=\"css/account.css\">");
out.println("<title>Account</title>"); out.println("<title>Account</title>");
out.println("</body>"); out.println("</body>");
if (userDao.deleteUser(user.getUserName(), user.getPwd())){ if (userDao.deleteUser(user)){
out.println("Your account was successfully deleted !"); out.println("Your account was successfully deleted !");
}else { }else {
out.println("A problem occurred while deleting your account..."); out.println("A problem occurred while deleting your account...");
......
WEB-INF/src/controleurs/Following.java
View file @ bda83feb
...@@ -42,16 +42,11 @@ public class Following extends HttpServlet { ...@@ -42,16 +42,11 @@ public class Following extends HttpServlet {
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("<link rel=\"stylesheet\" href=\"css/feed.css\">");
out.println("<title>Followed</title>"); out.println("<title>Followed</title>");
out.println("<nav>");
out.println("<ul class=\"menu\">");
out.println("<li class=\"menu_option\"><a href=\"http://localhost:8080/s4a021-web-backend/Welcome\">\uD83C\uDFE0 Home</a></li>");
out.println("<li class=\"menu_option\"><a href=\"http://localhost:8080/s4a021-web-backend/Followed\">\uD83E\uDDF5 Followed</a></li>");
out.println("<li class=\"menu_option\"><a href=\"http://localhost:8080/s4a021-web-backend/Account\">\uD83D\uDC64 Account</a></li>");
out.println("</ul></nav>");
out.println("<h1>Threads followed</h1>"); out.println("<h1>Threads followed</h1>");
out.println(PageGeneration.generateNavMenu());
if (!threadsFollowedByUser.isEmpty()) { if (!threadsFollowedByUser.isEmpty()) {
for (Integer t : threadsFollowedByUser) { for (Integer t : threadsFollowedByUser) {
MyThread thread = null; MyThread thread = null;
......
WEB-INF/src/controleurs/NewThread.java
View file @ bda83feb
...@@ -60,7 +60,8 @@ public class NewThread extends HttpServlet { ...@@ -60,7 +60,8 @@ public class NewThread extends HttpServlet {
out.println("<title>New thread</title>"); out.println("<title>New thread</title>");
out.println("<div class=\"write\">"); out.println("<div class=\"write\">");
out.println("<h3>Create a new thread</h3>"); out.println("<h1>Create a new thread</h1>");
out.println(PageGeneration.generateNavMenu());
out.println("<form action=\"http://localhost:8080/s4a021-web-backend/NewThread\" method=\"post\">"); out.println("<form action=\"http://localhost:8080/s4a021-web-backend/NewThread\" method=\"post\">");
out.println("<input name=\"threadname\" type=\"text\" placeholder=\"Name of new thread\">"); out.println("<input name=\"threadname\" type=\"text\" placeholder=\"Name of new thread\">");
out.println("<textarea name=\"first_message\" type=\"text\" rows=\"2\" cols=\"30\" placeholder=\"Post the first message of your new thread!\"></textarea>"); out.println("<textarea name=\"first_message\" type=\"text\" rows=\"2\" cols=\"30\" placeholder=\"Post the first message of your new thread!\"></textarea>");
......
WEB-INF/src/dao/UserDAO.java
View file @ bda83feb
...@@ -48,18 +48,19 @@ public class UserDAO { ...@@ -48,18 +48,19 @@ public class UserDAO {
return false; return false;
} }
public boolean deleteUser(String username, String password){ public boolean deleteUser(User user){
try{ try{
if (isDatabased(getUserByLogs(username, password))) { if (isDatabased(user)) {
PreparedStatement stmt = this.con.prepareStatement("DELETE FROM userAccount WHERE username=? AND password=?"); PreparedStatement stmt = this.con.prepareStatement("DELETE FROM userAccount WHERE userid=? AND username=?");
stmt.setString(1, username); stmt.setInt(1, user.getId());
stmt.setString(2, password); stmt.setString(2, user.getUserName());
stmt.executeUpdate(); stmt.executeUpdate();
return true; return true;
} }
}catch (SQLException sqle){ }catch (SQLException sqle){
sqle.getStackTrace(); sqle.printStackTrace();
} }
return false; return false;
} }
......
create.html
View file @ bda83feb
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
</head> </head>
<body> <body>
<div class="form"> <div class="form">
<h1>REGISTER</h1> <section>
<form action="http://localhost:8080/s4a021-web-backend/SignUp" method="post"> <h1>REGISTER</h1>
<input name="login" type="text" placeholder="username"> <form action="http://localhost:8080/s4a021-web-backend/SignUp" method="post">
<input name="pwd" type="password" placeholder="password"> <input name="login" type="text" placeholder="username">
<button type="submit">Create my Account !</button> <input name="pwd" type="password" placeholder="password">
</form> <button type="submit">Create my Account !</button>
</form>
</section>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
css/account.css
View file @ bda83feb
...@@ -2,4 +2,15 @@ ...@@ -2,4 +2,15 @@
background-color : red; background-color : red;
border-color : red; border-color : red;
color : white; color : white;
}
.account_section{
background-color : #333333;
border-radius : 15px;
margin-right : auto;
margin-left : auto;
padding : 1%;
width : 50%;
margin-top : 5%;
text-align : center;
} }
\ No newline at end of file
css/form.css
View file @ bda83feb
...@@ -7,7 +7,7 @@ body{ ...@@ -7,7 +7,7 @@ body{
background-color: #232323; background-color: #232323;
} }
body{ section{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
......
index.html
View file @ bda83feb
...@@ -10,13 +10,15 @@ ...@@ -10,13 +10,15 @@
</head> </head>
<body> <body>
<div class="form"> <div class="form">
<h1>LOGIN</h1> <section>
<form action="http://localhost:8080/s4a021-web-backend/LogIn" method="post"> <h1>LOGIN</h1>
<input name="login" type="text" placeholder="username"> <form action="http://localhost:8080/s4a021-web-backend/LogIn" method="post">
<input name="pwd" type="password" placeholder="password"> <input name="login" type="text" placeholder="username">
<button type="submit">Let's go !</button> <input name="pwd" type="password" placeholder="password">
<p><i>New user ? Click <a href="./create.html">here</a> to create an account</i></p> <button type="submit">Let's go !</button>
</form> <p><i>New user ? Click <a href="./create.html">here</a> to create an account</i></p>
</form>
</section>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file