Skip to content
Snippets Groups Projects
Commit 08059335 authored by Alexandre Dehaine's avatar Alexandre Dehaine
Browse files

v1.1 : ajout du css

parent 1de65d2e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
WEB-INF/classes/dao/Message.class
+ 0
− 0
View file @ 08059335
No preview for this file type
WEB-INF/src/dao/Message.java
+ 1
− 1
View file @ 08059335
...@@ -20,7 +20,7 @@ public class Message { ...@@ -20,7 +20,7 @@ public class Message {
} }
@Override @Override
public String toString(){ public String toString(){
return "<span style=\"font-style: italic;\">"+heure+"</span> " + utilisateur.getPseudo() + " : " + message; return "<span class=\"message\">"+ utilisateur.getPseudo() + " : " + message + "</span><span class=\"time\"> le "+ jour +" à "+heure+"</span>";
} }
public int getIdMessage() { public int getIdMessage() {
......
accueil.jsp
+ 22
− 33
View file @ 08059335
...@@ -8,19 +8,20 @@ ...@@ -8,19 +8,20 @@
<head> <head>
<title> Accueil </title> <title> Accueil </title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
<% response.setIntHeader("Refresh", 5); %> <% response.setIntHeader("Refresh", 5); %>
</head> </head>
<body> <body style="background-color: rgb(244, 245, 241);">
<% <%
String UserEmail = (String) session.getAttribute("token"); String UserEmail = (String) session.getAttribute("token");
if (UserEmail == null || UserEmail.isEmpty() || UserEmail == "err") { if (UserEmail == null || UserEmail.isEmpty() || UserEmail == "err") {
out.println("null"); out.println("null");
response.sendRedirect("login.html"); response.sendRedirect("login.html");
} }
UtilisateurJdbcDao jdbcUser = new UtilisateurJdbcDao(); UtilisateurJdbcDao jdbcUser = new UtilisateurJdbcDao();
Utilisateur utilisateur = jdbcUser.findByEmail(UserEmail); Utilisateur utilisateur = jdbcUser.findByEmail(UserEmail);
out.println(utilisateur); out.println("<br><div class=\"container btn-container\"> <div class=\"btn btn-primary\">Accueil</div> <a href=\"http://localhost:8080/sae-r4.01/rejoindre.jsp\" class=\"btn btn-primary\">Rejoindre / créer une conversation</a> <a href=\"http://localhost:8080/sae-r4.01/rejoindre.jsp?deconnection=true\" class=\"btn btn-primary\">Se déconnecter de " + utilisateur.getPseudo() + "</a> </div>");
ConversationJdbcDao jdbcConv = new ConversationJdbcDao(); ConversationJdbcDao jdbcConv = new ConversationJdbcDao();
List<Conversation> conv = jdbcConv.findByUser(utilisateur.getEmail()); List<Conversation> conv = jdbcConv.findByUser(utilisateur.getEmail());
String stringConv = request.getParameter("idConv"); String stringConv = request.getParameter("idConv");
...@@ -41,12 +42,10 @@ ...@@ -41,12 +42,10 @@
} }
} }
if(request.getParameter("param") != null && request.getParameter("param").equals("create")){ if(request.getParameter("param") != null && request.getParameter("param").equals("create")){
System.out.println("suce");
selectedConvId = jdbcConv.createConversation(request.getParameter("nomConv") ,utilisateur, request.getParameter("pwd")); selectedConvId = jdbcConv.createConversation(request.getParameter("nomConv") ,utilisateur, request.getParameter("pwd"));
jdbcMessage.createMessage(utilisateur, request.getParameter("Message"), selectedConvId); jdbcMessage.createMessage(utilisateur, request.getParameter("Message"), selectedConvId);
response.sendRedirect("http://localhost:8080/sae-r4.01/accueil.jsp?idConv=" + selectedConvId); response.sendRedirect("http://localhost:8080/sae-r4.01/accueil.jsp?idConv=" + selectedConvId);
} }
System.out.println("bite");
%> %>
<br> <br>
...@@ -54,8 +53,22 @@ ...@@ -54,8 +53,22 @@
table, th, td { table, th, td {
border: 1px solid black; border: 1px solid black;
} }
.btn-container {
display: flex;
justify-content: space-between;
width: 50%;
}
.time{
display: none;
}
.message:hover + .time{
display: inline;
font-size:x-small;
font-style: italic;
}
</style> </style>
<br> <br>
<div class="container">
<table> <table>
<tr> <tr>
<th>Identifiant</th> <th>Identifiant</th>
...@@ -78,7 +91,9 @@ ...@@ -78,7 +91,9 @@
} }
%> %>
</table> </table>
</div>
<br><br>
<div class="container">
<% <%
if (selectedConvId > 0 && conv.contains(jdbcConv.findById(selectedConvId))) { if (selectedConvId > 0 && conv.contains(jdbcConv.findById(selectedConvId))) {
List<Message> selectedConv = jdbcConv.findAllMessages(selectedConvId); List<Message> selectedConv = jdbcConv.findAllMessages(selectedConvId);
...@@ -95,33 +110,7 @@ ...@@ -95,33 +110,7 @@
out.println("<p>Aucune conversation sélectionnée.</p>"); out.println("<p>Aucune conversation sélectionnée.</p>");
} }
%> %>
</div>
<h3>Rejoindre une conversation :</h3>
<%
out.println("<form action='accueil.jsp' method='POST'>");
out.println("<label for=\"idConv,\">Identifiant de la conversation:</label>");
out.println("<input type=\"text\" id=\"idConv\" name=\"idConv\">");
out.println("<label for=\"pwd\">Mot de passe:</label>");
out.println("<input type=\"password\" id=\"pwd\" name=\"pwd\">");
out.println("<label for=\"Message\">Message:</label>");
out.println("<input type=\"text\" id=\"Message\" name=\"Message\">");
out.println("<button type=\"submit\" name=\"param\" value = \"join\" class=\"btn btn-primary\">Rejoindre</button>");
out.println("</form>");
%>
<h3>Créer une conversation :</h3>
<%
out.println("<form action='accueil.jsp' method='get'>");
out.println("<label for=\"nomConv\">Nom de la conversation:</label>");
out.println("<input type=\"text\" id=\"nomConv\" name=\"nomConv\">");
out.println("<label for=\"pwd\">Mot de passe:</label>");
out.println("<input type=\"password\" id=\"pwd\" name=\"pwd\">");
out.println("<label for=\"Message\">Message:</label>");
out.println("<input type=\"text\" id=\"Message\" name=\"Message\">");
out.println("<button type=\"submit\" name=\"param\" value =\"create\" class=\"btn btn-primary\">Créer</button>");
out.println("</form>");
%>
</body> </body>
</html> </html>
login.html
+ 22
− 16
View file @ 08059335
...@@ -3,31 +3,37 @@ ...@@ -3,31 +3,37 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
<title>Log In</title> <title>Log In</title>
</head> </head>
<BODY> <body style="background-color: rgb(244, 245, 241);">
<div> <br>
<div class="container">
<form method='get' action='Authent'> <form method='get' action='Authent'>
<label for="email">Email:</label> <div class="mb-3">
<input type="text" id="email" name="email"> <label class="form-label"for="email">Email:</label>
<br> <input type="text" id="email" name="email" class="form-control">
<label for="pwd">Mot de passe:</label> </div>
<input type="password" id="pwd" name="pwd"> <div class="mb-3">
<button type="submit" name="action" value="login">Se connecter</button> <label class="form-label"for="pwd">Mot de passe:</label>
<input type="password" id="pwd" name="pwd" class="form-control">
</div>
<button type="submit" name="action" value="login" class="btn btn-primary">Se connecter</button>
</form> </form>
<br><br><br> <br><br><br>
<form method='get' action='Authent'> <form method='get' action='Authent'>
<label for="pseudo">Pseudo :</label> <label class="form-label"for="pseudo">Pseudo :</label>
<input type="text" id="pseudo" name="pseudo"> <input type="text" id="pseudo" name="pseudo" class="form-control">
<br> <br>
<label for="pwd">Mot de passe :</label> <label class="form-label"for="pwd">Mot de passe :</label>
<input type="password" id="pwd" name="pwd"> <input type="password" id="pwd" name="pwd" class="form-control">
<br> <br>
<label for="email">Email :</label> <label class="form-label"for="email">Email :</label>
<input type="text" id="email" name="email"> <input type="text" id="email" name="email" class="form-control">
<br> <br>
<button type="submit" name="action" value="creer">Créer le compte</button> <button type="submit" name="action" value="creer" class="btn btn-primary">Créer le compte</button>
</form> </form>
</BODY> </div>
</body>
</HTML> </HTML>
\ No newline at end of file
package-lock.json 0 → 100644
+ 42
− 0
View file @ 08059335
{
"name": "sae-r4.01",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"dependencies": {
"bootstrap": "^5.3.3"
}
},
"node_modules/@popperjs/core": {
"version": "2.11.8",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
"license": "MIT",
"peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
}
},
"node_modules/bootstrap": {
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/twbs"
},
{
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
}
],
"license": "MIT",
"peerDependencies": {
"@popperjs/core": "^2.11.8"
}
}
}
}
package.json 0 → 100644
+ 5
− 0
View file @ 08059335
{
"dependencies": {
"bootstrap": "^5.3.3"
}
}
rejoindre.jsp 0 → 100644
+ 79
− 0
View file @ 08059335
<%@ page pageEncoding="UTF-8" %>
<%@ page import="dao.*" %>
<%@ page import="java.util.List" %>
<%@ page import="java.sql.*" %>
<%@ page import="jakarta.servlet.*" %>
<!DOCTYPE html>
<html>
<head>
<title> Rejoindre </title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
</head>
<body style="background-color: rgb(244, 245, 241);">
<style>
.btn-container {
display: flex;
justify-content: space-between;
width: 50%;
}
</style>
<%
String UserEmail = (String) session.getAttribute("token");
if (UserEmail == null || UserEmail.isEmpty() || UserEmail == "err") {
out.println("null");
response.sendRedirect("login.html");
}
String deco = request.getParameter("deconnection");
if(deco != null && deco.equals("true")){
session.removeAttribute("token");
response.sendRedirect("login.html");
}
UtilisateurJdbcDao jdbcUser = new UtilisateurJdbcDao();
Utilisateur utilisateur = jdbcUser.findByEmail(UserEmail);
out.println("<br><div class=\"container btn-container\"> <a href=\"http://localhost:8080/sae-r4.01/accueil.jsp\" class=\"btn btn-primary\">Accueil</a> <div class=\"btn btn-primary\">Rejoindre / créer une conversation</div> <a href=\"http://localhost:8080/sae-r4.01/rejoindre.jsp?deconnection=true\" class=\"btn btn-primary\">Se déconnecter de " + utilisateur.getPseudo() + "</a> </div>");
ConversationJdbcDao jdbcConv = new ConversationJdbcDao();
List<Conversation> conv = jdbcConv.findByUser(utilisateur.getEmail());
String stringConv = request.getParameter("idConv");
int selectedConvId;
try {
selectedConvId = Integer.parseInt(stringConv);
} catch (NumberFormatException e) {
selectedConvId = 0;
}
%>
<br>
<br>
<div class="container">
<h3>Rejoindre une conversation :</h3>
<%
out.println("<form action='accueil.jsp' method='POST'>");
out.println("<label for=\"idConv,\">Identifiant de la conversation:</label>");
out.println("<input type=\"text\" id=\"idConv\" name=\"idConv\">");
out.println("<label for=\"pwd\">Mot de passe:</label>");
out.println("<input type=\"password\" id=\"pwd\" name=\"pwd\">");
out.println("<label for=\"Message\">Message:</label>");
out.println("<input type=\"text\" id=\"Message\" name=\"Message\">");
out.println("<button type=\"submit\" name=\"param\" value = \"join\" class=\"btn btn-primary\">Rejoindre</button>");
out.println("</form>");
%>
</div>
<br><br>
<div class="container">
<h3>Créer une conversation :</h3>
<%
out.println("<form action='accueil.jsp' method='get'>");
out.println("<label for=\"nomConv\">Nom de la conversation:</label>");
out.println("<input type=\"text\" id=\"nomConv\" name=\"nomConv\">");
out.println("<label for=\"pwd\">Mot de passe:</label>");
out.println("<input type=\"password\" id=\"pwd\" name=\"pwd\">");
out.println("<label for=\"Message\">Message:</label>");
out.println("<input type=\"text\" id=\"Message\" name=\"Message\">");
out.println("<button type=\"submit\" name=\"param\" value =\"create\" class=\"btn btn-primary\">Créer</button>");
out.println("</form>");
%>
</div>
</body>
</html>
util.txt
+ 2
− 1
View file @ 08059335
Url d'appel : http://localhost:8080/sae-r4.01/accueil.jsp Url d'appel :
http://localhost:8080/sae-r4.01/accueil.jsp
Pour compiler : dans rep src : Pour compiler : dans rep src :
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment