diff --git a/README.md b/README.md index c3cd2592a64844adc5ba37d5cfd6886b7dee7e20..5172f1c1fdfc4a1d81e4c4311a7e36ec44c38d62 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ - corriger bug followThread (la requête n'est pas effectuée lors de l'appel de la méthode) OK - gestion des réactions (like/unlike) **CHARLIE** - fonctionnalité poster un message texte **CHARLIE** OK +- gestion du compte **YANNIS** - durée de vie des messages - service web en GET qui récupère en JSON les threads du membre identifié et les messages postés sur ces threads - permettre de poster des images diff --git a/WEB-INF/src/controleurs/Account.java b/WEB-INF/src/controleurs/Account.java index 003cdd7d4ba0123ce36c3dbdb82450212c92fb1d..d015e8372e47ecee5094c74d58f09191913b87df 100644 --- a/WEB-INF/src/controleurs/Account.java +++ b/WEB-INF/src/controleurs/Account.java @@ -10,8 +10,8 @@ import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -@WebServlet("/SignUp") -public class SignUp extends HttpServlet { +@WebServlet("/Account") +public class Account extends HttpServlet { @Override public void service(HttpServletRequest req, HttpServletResponse res) throws IOException { PrintWriter out = res.getWriter(); @@ -21,7 +21,7 @@ public class SignUp extends HttpServlet { String pwd = req.getParameter("pwd"); out.println("<doctype>"); - +// à remplir out.println(PageGeneration.generateNavMenu()); if (!userdao.userExists(login, pwd)) { diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java index faafc66c9bbf2f4358cf3579cdf89046c196aaee..a31cea7043a98b6f13f100d2958eabfc3b45d6d9 100644 --- a/WEB-INF/src/controleurs/Feed.java +++ b/WEB-INF/src/controleurs/Feed.java @@ -57,9 +57,8 @@ public class Feed extends HttpServlet { out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>"); out.println("<p class=\"msgContent\">" + message.getContent() + "</p>"); - // le formulaire appelle une servlet qui poste le message et redirige vers cette page avec les messages updatés out.println("<form action=\"http://localhost:8080/s4a021-web-backend/PostMessage\" method=\"post\">"); - out.println("<textarea id=\"message\" name=\"message\" rows=\"3\" cols=\"45\" placeholder=\"Post a message in this thread\"></textarea>"); + out.println("<textarea name=\"message\" rows=\"2\" cols=\"30\" placeholder=\"Post a message in this thread\"></textarea>"); out.println("<input name=\"threadid\" type=\"hidden\" value=\"" + msgThread.getId() +"\">"); out.println("<button type=\"submit\">Post</button>"); out.println("</form>"); diff --git a/WEB-INF/src/controleurs/NewThread.java b/WEB-INF/src/controleurs/NewThread.java index e921bcb65cf5847f4e1334f86bf01a3c463b9d48..a2a86478e355ad9a40ff8db0dbe08dd81d90f32f 100644 --- a/WEB-INF/src/controleurs/NewThread.java +++ b/WEB-INF/src/controleurs/NewThread.java @@ -25,32 +25,29 @@ public class NewThread extends HttpServlet { String login = (String) req.getSession().getAttribute("login"); User user = (User) req.getSession().getAttribute("user"); String threadname = null; - //String message = null; + String message = null; boolean newThreadWasCreated = false; if (req.getParameter("threadname") != null) { threadname = req.getParameter("threadname"); } - // if (req.getParameter("first_message") != null) { - // message = req.getParameter("first_message"); - // } + if (req.getParameter("first_message") != null) { + message = req.getParameter("first_message"); + } - if (threadname != null - //&& message != null + if (threadname != null && message != null ) { try { threadDAO.createThread(user, threadname); List<MyThread> threadsCreated = userDAO.getThreadsCreatedByUser(user); MyThread newThread = null; for (MyThread t : threadsCreated) { - System.out.println("liste threads : " + t.getThreadName()); if (t.getThreadName().equals(threadname)) { newThread = t; newThreadWasCreated = true; } } - // PROBLEME ICI : Cannot invoke "dto.MyThread.getId()" because "<parameter2>" is null - //userDAO.postMessage(user, newThread, message); + userDAO.postMessage(user, newThread, message); } catch (SQLException sqle) { sqle.getStackTrace(); @@ -66,12 +63,12 @@ public class NewThread extends HttpServlet { out.println("<h3>Create a new thread</h3>"); 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=\"first_message\" type=\"text\" placeholder=\"Post the first message of your new thread!\">"); + out.println("<textarea name=\"first_message\" type=\"text\" rows=\"2\" cols=\"30\" placeholder=\"Post the first message of your new thread!\">"); out.println("<button type=\"submit\">Create</button>"); out.println("</form>"); if (newThreadWasCreated) { - out.println("<p class=\"information\">The thread " + threadname + " was successfully created</p>"); + out.println("<p class=\"information\">The thread <strong>\"" + threadname + "\"</strong> was successfully created</p>"); }