From bda83febe2e3bf59cc41c1db03295f735fbf85cc Mon Sep 17 00:00:00 2001
From: Yannis Devos <yannis.devos.etu@univ-lille.fr>
Date: Mon, 17 Mar 2025 12:03:43 +0100
Subject: [PATCH] Styles
---
WEB-INF/src/controleurs/Account.java | 5 ++++-
WEB-INF/src/controleurs/Following.java | 9 ++-------
WEB-INF/src/controleurs/NewThread.java | 3 ++-
create.html | 14 ++++++++------
css/account.css | 11 +++++++++++
css/form.css | 2 +-
index.html | 16 +++++++++-------
7 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/WEB-INF/src/controleurs/Account.java b/WEB-INF/src/controleurs/Account.java
index 3f72747..5dcefb0 100644
--- a/WEB-INF/src/controleurs/Account.java
+++ b/WEB-INF/src/controleurs/Account.java
@@ -38,12 +38,13 @@ public class Account extends HttpServlet {
out.println("</body>");
-
+ out.println("<section class=\"account_section\">");
out.println("<h2>CHANGE YOUR PASSWORD</h2>");
out.println("<form class=\"changepwdForm\" action=\"/s4a021-web-backend/Account\">");
out.println("<input name=\"newPwd\" type=\"password\" placeholder=\"New password\">");
out.println("<button type=\"submit\">Change it !</button>");
out.println("</form>");
+ out.println("</section>");
String npwd = req.getParameter("newPwd");
if (npwd != null){
@@ -65,10 +66,12 @@ public class Account extends HttpServlet {
// out.println("<button type=\"submit\">Delete Account</button>");
// out.println("</form>");
+ out.println("<section class=\"account_section\">");
out.println("<h2>DELETE YOUR ACCOUNT</h2>");
out.println("<form class=\"delForm\" action=\"/s4a021-web-backend/deletedAccount\" method=\"post\">");
out.println("<button type=\"submit\">Delete Account</button>");
out.println("</form>");
+ out.println("</section>");
out.println("<footer>");
out.println("Connected as " + login);
diff --git a/WEB-INF/src/controleurs/Following.java b/WEB-INF/src/controleurs/Following.java
index 2dee0a0..aec25ab 100644
--- a/WEB-INF/src/controleurs/Following.java
+++ b/WEB-INF/src/controleurs/Following.java
@@ -42,16 +42,11 @@ public class Following extends HttpServlet {
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>");
- 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(PageGeneration.generateNavMenu());
+
if (!threadsFollowedByUser.isEmpty()) {
for (Integer t : threadsFollowedByUser) {
MyThread thread = null;
diff --git a/WEB-INF/src/controleurs/NewThread.java b/WEB-INF/src/controleurs/NewThread.java
index d5d9102..4efafdc 100644
--- a/WEB-INF/src/controleurs/NewThread.java
+++ b/WEB-INF/src/controleurs/NewThread.java
@@ -60,7 +60,8 @@ public class NewThread extends HttpServlet {
out.println("<title>New thread</title>");
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("<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>");
diff --git a/create.html b/create.html
index 3223a90..fe77002 100644
--- a/create.html
+++ b/create.html
@@ -7,12 +7,14 @@
</head>
<body>
<div class="form">
- <h1>REGISTER</h1>
- <form action="http://localhost:8080/s4a021-web-backend/SignUp" method="post">
- <input name="login" type="text" placeholder="username">
- <input name="pwd" type="password" placeholder="password">
- <button type="submit">Create my Account !</button>
- </form>
+ <section>
+ <h1>REGISTER</h1>
+ <form action="http://localhost:8080/s4a021-web-backend/SignUp" method="post">
+ <input name="login" type="text" placeholder="username">
+ <input name="pwd" type="password" placeholder="password">
+ <button type="submit">Create my Account !</button>
+ </form>
+ </section>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/css/account.css b/css/account.css
index b06fd30..7e7ed35 100644
--- a/css/account.css
+++ b/css/account.css
@@ -2,4 +2,15 @@
background-color : red;
border-color : red;
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
diff --git a/css/form.css b/css/form.css
index c597176..3d03def 100644
--- a/css/form.css
+++ b/css/form.css
@@ -7,7 +7,7 @@ body{
background-color: #232323;
}
-body{
+section{
display: flex;
align-items: center;
justify-content: center;
diff --git a/index.html b/index.html
index f034766..77e3d55 100644
--- a/index.html
+++ b/index.html
@@ -10,13 +10,15 @@
</head>
<body>
<div class="form">
- <h1>LOGIN</h1>
- <form action="http://localhost:8080/s4a021-web-backend/LogIn" method="post">
- <input name="login" type="text" placeholder="username">
- <input name="pwd" type="password" placeholder="password">
- <button type="submit">Let's go !</button>
- <p><i>New user ? Click <a href="./create.html">here</a> to create an account</i></p>
- </form>
+ <section>
+ <h1>LOGIN</h1>
+ <form action="http://localhost:8080/s4a021-web-backend/LogIn" method="post">
+ <input name="login" type="text" placeholder="username">
+ <input name="pwd" type="password" placeholder="password">
+ <button type="submit">Let's go !</button>
+ <p><i>New user ? Click <a href="./create.html">here</a> to create an account</i></p>
+ </form>
+ </section>
</div>
</body>
</html>
\ No newline at end of file
--
GitLab