diff --git a/Projet/projet.sql b/Projet/projet.sql
index dcee547..e146c12 100644
--- a/Projet/projet.sql
+++ b/Projet/projet.sql
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS bloc;
 DROP TABLE IF EXISTS page;
+DROP TABLE IF EXISTS messages;
 DROP TABLE IF EXISTS utilisateur;
 
 CREATE TABLE utilisateur (
@@ -12,24 +13,54 @@ CREATE TABLE utilisateur (
 CREATE TABLE page (
     id INT PRIMARY KEY AUTO_INCREMENT,
     titre VARCHAR(200) NOT NULL,
-    date_creation DATETIME NOT NULL,
-    date_modification DATETIME NOT NULL,
+    date_creation DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    date_modification DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     auteur_id INT NOT NULL,
     droits ENUM('LECTURE', 'ECRITURE', 'ADMIN') NOT NULL,
-    FOREIGN KEY (auteur_id) REFERENCES utilisateur(id)
+    FOREIGN KEY (auteur_id) REFERENCES utilisateur(id) ON DELETE CASCADE
 );
 
 CREATE TABLE bloc (
     id INT PRIMARY KEY AUTO_INCREMENT,
     type ENUM('TEXTE', 'LISTE', 'TITRE', 'CODE', 'PAGE') NOT NULL,
     contenu TEXT,
-    date_creation DATETIME NOT NULL,
-    date_modification DATETIME NOT NULL,
+    date_creation DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    date_modification DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     page_id INT NOT NULL,
     ordre INT NOT NULL,
     auteur_id INT NOT NULL,
     metadata JSON,
-    FOREIGN KEY (page_id) REFERENCES page(id),
-    FOREIGN KEY (auteur_id) REFERENCES utilisateur(id)
+    FOREIGN KEY (page_id) REFERENCES page(id) ON DELETE CASCADE,
+    FOREIGN KEY (auteur_id) REFERENCES utilisateur(id) ON DELETE CASCADE
 );
 
+CREATE TABLE messages (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    login VARCHAR(100) NOT NULL,
+    contenu TEXT,
+    timestamp DATETIME DEFAULT CURRENT_TIMESTAMP
+);
+
+DELIMITER //
+
+CREATE TRIGGER trg_bloc_maj
+BEFORE UPDATE ON bloc
+FOR EACH ROW
+BEGIN
+    SET NEW.date_modification = NOW();
+END;
+//
+
+DELIMITER ;
+
+DELIMITER //
+
+CREATE TRIGGER trg_page_maj
+BEFORE UPDATE ON page
+FOR EACH ROW
+BEGIN
+    SET NEW.date_modification = NOW();
+END;
+//
+
+DELIMITER ;
diff --git a/Projet/src/main/java/projet/AfficherPage.java b/Projet/src/main/java/projet/AfficherPage.java
index a69f6bd..076e20f 100644
--- a/Projet/src/main/java/projet/AfficherPage.java
+++ b/Projet/src/main/java/projet/AfficherPage.java
@@ -25,13 +25,17 @@ public class AfficherPage extends HttpServlet {
 		if(u != null) {
 			u.chargerPages();
 			ArrayList<Page> listePages = u.getListePages();
+			ArrayList<Message> listeMessages = Message.getListeMessages();
 			
 			request.setAttribute("listePages", listePages);
+			request.setAttribute("listeMessages", listeMessages);
 			
 			if (idStr != null ) {
 				try {
 					int id = Integer.parseInt(idStr);
 					Page page = Page.getPageById(u.getId(), id);
+					
+					
 					if (page != null) {
 						request.setAttribute("page", page);
 						request.getRequestDispatcher("/WEB-INF/AfficherPage.jsp").forward(request, response);
diff --git a/Projet/src/main/java/projet/Message.java b/Projet/src/main/java/projet/Message.java
new file mode 100644
index 0000000..cc99a58
--- /dev/null
+++ b/Projet/src/main/java/projet/Message.java
@@ -0,0 +1,82 @@
+package projet;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+public class Message extends ParamBD{
+    private String login;
+    private String contenu;
+
+    public Message() {
+    }
+    
+    public Message(String login, String contenu) {
+        this.login = login;
+        this.contenu = contenu;
+    }
+
+	public String getLogin() {
+		return login;
+	}
+
+	public void setLogin(String auteur) {
+		this.login = auteur;
+	}
+
+	public String getContenu() {
+		return contenu;
+	}
+
+	public void setContenu(String contenu) {
+		this.contenu = contenu;
+	}
+	
+	protected static void ajouterMessage(String login,  String contenu) {
+		try {
+			Connection connexion = DriverManager.getConnection(bdURL, bdLogin, bdPassword);
+			String sql = " INSERT INTO messages(contenu, login)"
+					+ " VALUES (?, ?)"
+					+ ";";
+			PreparedStatement pst = connexion.prepareStatement(sql);
+			pst.setString(1, contenu);
+			pst.setString(2, login);
+			pst.executeUpdate();
+
+			pst.close();
+			connexion.close();
+        } catch (SQLException e) {
+			e.printStackTrace();
+		}	
+	}
+	
+	protected static ArrayList<Message> getListeMessages() {
+		ArrayList<Message> messages = new ArrayList<>();
+
+		try {
+			Connection connexion = DriverManager.getConnection(bdURL, bdLogin, bdPassword);
+			String sql = " SELECT login, contenu"
+					+ " FROM messages"
+					+ ";";
+			PreparedStatement pst = connexion.prepareStatement(sql);
+			ResultSet rs = pst.executeQuery();
+			while(rs.next()) {
+				String contenu = rs.getString("contenu");
+				String auteur = rs.getString("login");
+				
+				Message message = new Message(auteur, contenu);
+				messages.add(message);
+			}
+			rs.close();
+			pst.close();
+			connexion.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		
+		return messages;
+	}
+}
\ No newline at end of file
diff --git a/Projet/src/main/java/projet/NouvellePage.java b/Projet/src/main/java/projet/NouvellePage.java
index 064b6fc..06212eb 100644
--- a/Projet/src/main/java/projet/NouvellePage.java
+++ b/Projet/src/main/java/projet/NouvellePage.java
@@ -43,8 +43,9 @@ public class NouvellePage extends HttpServlet {
 			if (titre == null || titre.isEmpty()) {
 				response.sendRedirect("AfficherPage");
 			} else {
-				Page.ajouterPage(u.getId(), titre, LocalDate.now());
-				response.sendRedirect("AfficherPage");	
+				int id = Page.ajouterPage(u.getId(), titre, LocalDate.now());
+				if (id !=-1) response.sendRedirect("AfficherPage?id=" + id);
+				else response.sendRedirect("AfficherPage");
 			}	
 		} else {
 			response.sendRedirect("/Projet/");
diff --git a/Projet/src/main/java/projet/Page.java b/Projet/src/main/java/projet/Page.java
index ff3b54e..d3a42e4 100644
--- a/Projet/src/main/java/projet/Page.java
+++ b/Projet/src/main/java/projet/Page.java
@@ -5,6 +5,7 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.time.LocalDate;
 import java.sql.Date;
 import java.util.ArrayList;
@@ -97,25 +98,35 @@ public class Page extends ParamBD {
 	    return "Page{id=" + id + ", titre='" + titre + "', dateCreation=" + dateCreation + ", dateModification=" + dateModification + ", droits=" + droits + "}";
 	}
 	
-	protected static void ajouterPage(int idU, String t, LocalDate dl) {
+	protected static int ajouterPage(int idU, String t, LocalDate dl) {
+		int idGenere = -1;
+		
 		try {
 			Connection connexion = DriverManager.getConnection(bdURL, bdLogin, bdPassword);
 			String sql = " INSERT INTO page(titre, date_creation, date_modification, auteur_id, droits)"
 					+ " VALUES (?, ?, ?, ?, ?)"
 					+ ";";
-			PreparedStatement pst = connexion.prepareStatement(sql);
+			PreparedStatement pst = connexion.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
 			pst.setString(1, t);
 			pst.setDate(2, Date.valueOf(dl));
 			pst.setDate(3, Date.valueOf(dl));
 			pst.setInt(4, idU);
 			pst.setString(5, "ADMIN");
 			pst.executeUpdate();
+			
+			ResultSet rs = pst.getGeneratedKeys();
+	        if (rs.next()) {
+	            idGenere = rs.getInt(1);
+	        }
 
+	        rs.close();
 			pst.close();
 			connexion.close();
         } catch (SQLException e) {
 			e.printStackTrace();
-		}	
+		}
+		
+		return idGenere;
 	}
 	
 	protected static Page getPageById(int idU, int id) {
diff --git a/Projet/src/main/java/projet/Tchat.java b/Projet/src/main/java/projet/Tchat.java
new file mode 100644
index 0000000..ef4f84a
--- /dev/null
+++ b/Projet/src/main/java/projet/Tchat.java
@@ -0,0 +1,52 @@
+package projet;
+
+import jakarta.websocket.*;
+import jakarta.websocket.server.ServerEndpoint;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+@ServerEndpoint("/ws/tchat")
+public class Tchat {
+    private static final Set<Session> sessions = Collections.synchronizedSet(new HashSet<>());
+
+    @OnOpen
+    public void onOpen(Session session) {
+        sessions.add(session);
+    }
+
+    @OnMessage
+    public void onMessage(String message, Session senderSession) throws IOException {
+        System.out.println(message);
+        String[] parts = message.split(" : ", 2);
+        System.out.println(parts[0].trim());
+        System.out.println(parts[1].trim());
+        System.out.println("");
+        if (parts.length == 2) {
+            String login = parts[0].trim();
+            String contenu = parts[1].trim();
+            
+            Message.ajouterMessage(login, contenu);
+            
+	        synchronized (sessions) {
+	            for (Session session : sessions) {
+	                if (session.isOpen()) {
+	                	session.getBasicRemote().sendText(message);
+	                }
+	            }
+	        }
+        }
+    }
+
+    @OnClose
+    public void onClose(Session session) {
+        sessions.remove(session);
+    }
+
+    @OnError
+    public void onError(Session session, Throwable throwable) {
+    	sessions.remove(session);
+    	throwable.printStackTrace();
+    }
+}
diff --git a/Projet/src/main/java/projet/Utilisateur.java b/Projet/src/main/java/projet/Utilisateur.java
index 5d9be4e..652e9b4 100644
--- a/Projet/src/main/java/projet/Utilisateur.java
+++ b/Projet/src/main/java/projet/Utilisateur.java
@@ -9,7 +9,6 @@ import java.sql.Statement;
 import java.time.LocalDate;
 import java.util.ArrayList;
 
-import projet.Bloc.Type;
 import projet.Page.Droit;
 
 
diff --git a/Projet/src/main/webapp/WEB-INF/Accueil.jsp b/Projet/src/main/webapp/WEB-INF/Accueil.jsp
index 776bcc1..a1c1ec2 100644
--- a/Projet/src/main/webapp/WEB-INF/Accueil.jsp
+++ b/Projet/src/main/webapp/WEB-INF/Accueil.jsp
@@ -73,6 +73,5 @@
 	    </form>
 	  </div>
 	</div>
-</main>
 
 <jsp:include page="Footer.jsp" />
\ No newline at end of file
diff --git a/Projet/src/main/webapp/WEB-INF/AfficherPage.jsp b/Projet/src/main/webapp/WEB-INF/AfficherPage.jsp
index e2533d1..c60fd92 100644
--- a/Projet/src/main/webapp/WEB-INF/AfficherPage.jsp
+++ b/Projet/src/main/webapp/WEB-INF/AfficherPage.jsp
@@ -8,10 +8,14 @@
 
 
 <div class="columns">
+
+  <!-- La colonne pour le menu des pages -->
   <div class="column is-one-fifth">
 	<jsp:include page="MenuPages.jsp" />
   </div>
-  <div class="column">
+  
+  <!-- La colonne pour la page choisie -->
+  <div class="column is-half">
   <c:choose>
 	  <c:when test="${not empty page.titre}">
 	  	<h2 class="block">${page.titre}</h2>
@@ -41,7 +45,8 @@
 			        data-id="${bloc.id}"
 			        data-ordre="${bloc.ordre}"
 			        data-type="${bloc.type}"
-			      >${bloc.contenu}</textarea>
+			        placeholder = "Tapez ici...";
+			      ></textarea>
 			    </div>
 			    <div class="control">
 			      <button class="delete is-danger delete-bloc-btn" data-id="${bloc.id}"></button>
@@ -54,12 +59,22 @@
     </c:otherwise>
   </c:choose>
   </div>
-  <div class="column is-one-quarter">
+  
+  <!-- La colonne pour le Tchat -->
+  <div class="column is-one-quarter is-flex is-flex-direction-column">
 	<jsp:include page="Tchat.jsp" />
   </div>
 </div>
 
 <script>
+  // focus sur le dernier textarea quand la page s'ouvre
+  window.addEventListener('DOMContentLoaded', () => {
+    const textareas = document.querySelectorAll('textarea');
+    if (textareas.length > 0) {
+      textareas[textareas.length - 1].focus(); // focus sur le dernier
+    }
+  });
+  
   // Fonction pour ajouter un nouvel événement à chaque textarea
   function addTextareaEvent(textarea) {
     
@@ -152,7 +167,7 @@
 	    autoResize(t)
   });
   
-  function addDeleteEvent(button) {
+  function addDeleteBloc(button) {
 	button.addEventListener('click', function () {
       const blocId = button.dataset.id;
       const blocContainer = button.closest('.bloc-container');
@@ -184,8 +199,59 @@
   }
   
   document.querySelectorAll('.delete-bloc-btn').forEach(t => {
-	  addDeleteEvent(t);
+	  addDeleteBloc(t);
   });
+  
+  function addDeletePage(button) {
+	button.addEventListener('click', function () {
+      const pageId = button.dataset.id;
+
+      if (confirm("Voulez-vous vraiment supprimer cette page ?")) {
+        const params = new URLSearchParams();
+        params.append("pageId", pageId);
+
+        fetch("/Projet/SupprimerPage", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          body: params
+        }).then(response => {
+          if (response.ok) {
+        	  location.reload();
+          } else {
+            console.error("Erreur lors de la suppression du bloc.");
+          }
+        });
+      }
+	});
+  }
+  
+  document.querySelectorAll('.delete-page-btn').forEach(t => {
+	  addDeletePage(t);
+  });
+  
+  // Pour le Tchat 
+ 	const socket = new WebSocket("ws://" + window.location.host + "/Projet/ws/tchat");
+
+    socket.onmessage = function(event) {
+  	const container = document.querySelector(".messages-container");
+  	const p = document.createElement("p");
+  	p.textContent = event.data;
+  	container.appendChild(p);
+  	container.scrollTop = container.scrollHeight;
+    };
+
+    document.querySelector("input[name='contenu']").addEventListener("keydown", function(event) {
+    	const login = document.getElementById("user-login").textContent;
+	  	if (event.key === "Enter") {
+	  		const message = this.value;
+	  		if (message.trim() !== "") {
+	  			socket.send(login + " : " + message);
+	  			this.value = "";
+	  		}
+	  	}
+    }); 
 </script>
 <jsp:include page="Footer.jsp" />
 
diff --git a/Projet/src/main/webapp/WEB-INF/Footer.jsp b/Projet/src/main/webapp/WEB-INF/Footer.jsp
index 64cafbc..e9c7d88 100644
--- a/Projet/src/main/webapp/WEB-INF/Footer.jsp
+++ b/Projet/src/main/webapp/WEB-INF/Footer.jsp
@@ -1,12 +1,12 @@
-
-	<a href="https://bulma.io">
-	  <img
-	    src="https://bulma.io/assets/images/made-with-bulma.png"
-	    alt="Made with Bulma"
-	    width="128"
-	    height="24">
-	</a>
-
+	<footer class="footer">
+		<a href="https://bulma.io">
+		  <img
+		    src="https://bulma.io/assets/images/made-with-bulma.png"
+		    alt="Made with Bulma"
+		    width="128"
+		    height="24">
+		</a>
+	</footer>
 </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/Projet/src/main/webapp/WEB-INF/Header.jsp b/Projet/src/main/webapp/WEB-INF/Header.jsp
index db8da4a..1898956 100644
--- a/Projet/src/main/webapp/WEB-INF/Header.jsp
+++ b/Projet/src/main/webapp/WEB-INF/Header.jsp
@@ -13,6 +13,25 @@
     	border: none;
     	outline: none;
 	  }
+	  .tchat-container {
+	    flex-grow: 1;
+	    max-height: 100%;
+	    height: 100%;
+	    display: flex;
+	    flex-direction: column;
+	  }
+	  .messages-container {
+	    flex-grow: 1;
+	    overflow-y: auto;
+	    margin-bottom: 0.5rem;
+	    padding: 0.5rem;
+	    border: 1px solid #ddd;
+	    border-radius: 4px;
+	    background: #f9f9f9;
+	  }
+	  .tchat-container input[type="text"] {
+	    margin-top: auto;
+	  }
 	</style>
 </head>
 <body>
@@ -26,7 +45,7 @@
 			<div class="navbar-end">
 			<c:if test="${not empty utilisateur}">
                 <div class="navbar-item">
-                    <p>${utilisateur.login}</p> 
+                    <p id="user-login">${utilisateur.login}</p> 
                 </div>
             </c:if>
             <c:choose>
diff --git a/Projet/src/main/webapp/WEB-INF/MenuPages.jsp b/Projet/src/main/webapp/WEB-INF/MenuPages.jsp
index 02f8127..e207d24 100644
--- a/Projet/src/main/webapp/WEB-INF/MenuPages.jsp
+++ b/Projet/src/main/webapp/WEB-INF/MenuPages.jsp
@@ -7,8 +7,9 @@
 		<ul class="menu-list" id="menuPages">
 		    <c:forEach var="page" items="${listePages}">
 		      <li>
+		      	<button class="delete delete-page-btn is-pulled-right has-background-danger" data-id="${page.id}"></button>
 		      	<a href="AfficherPage?id=${page.id}">${page.titre}</a>
-		      	<button class="delete is-small delete-page-btn is-primary" data-id="${page.id}"></button>
+		      	
 		      </li>
 		    </c:forEach>
 		    <li>
diff --git a/Projet/src/main/webapp/WEB-INF/Tchat.jsp b/Projet/src/main/webapp/WEB-INF/Tchat.jsp
index 1ee4e7a..b5420a5 100644
--- a/Projet/src/main/webapp/WEB-INF/Tchat.jsp
+++ b/Projet/src/main/webapp/WEB-INF/Tchat.jsp
@@ -1,10 +1,22 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
+<div class="tchat-container is-flex is-flex-direction-column">
 	<h2 class="block">Tchat</h2>
+	<div class="messages-container" id="Messages" style="height: 60vh;">
+		<c:forEach var="message" items="${listeMessages}">
+		    <p>
+		        ${message.login} : ${message.contenu}
+		    </p>
+		</c:forEach>
+	</div>
   	<div class="block">
 	  	<input
 		  class="input is-primary is-small"
 		  type="text"
-		  placeholder="Ecrivez ici">
-	</div>
\ No newline at end of file
+		  id="tchat"
+		  placeholder="Tchatez ici"
+		  name="contenu">
+	</div>
+</div>
\ No newline at end of file