diff --git a/S2/DevWeb/Projet/pom.xml b/S2/DevWeb/Projet/pom.xml
index da36ff7..1a486c5 100644
--- a/S2/DevWeb/Projet/pom.xml
+++ b/S2/DevWeb/Projet/pom.xml
@@ -46,6 +46,14 @@
       <artifactId>mysql-connector-java</artifactId>
       <version>8.0.27</version>
     </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <version>2.3.3</version>
+      <scope>provided</scope>
+  </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java b/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java
index 5ceacfc..72543a9 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java
@@ -1,12 +1,8 @@
 package uppa.project;
 
-import java.util.Calendar;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
-import uppa.project.pojo.Card;
-import uppa.project.pojo.Deck;
-import uppa.project.pojo.User;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.pojo.Card;
+import uppa.project.database.pojo.Deck;
 
 public class Main {
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/LoginBean.java b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/LoginBean.java
new file mode 100644
index 0000000..f62777b
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/LoginBean.java
@@ -0,0 +1,58 @@
+package uppa.project.bean;
+
+import java.io.Serializable;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.User;
+
+public class LoginBean implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private String username;
+  private String password;
+  private User user;
+
+  public LoginBean() {
+  }
+
+  public LoginBean(String username, String password) {
+    this.username = username;
+    this.password = password;
+  }
+
+  public boolean validate() {
+    Game_JPA_DAO_Factory factory = new Game_JPA_DAO_Factory();
+
+    try {
+      DAO<User> userDao = factory.getDAOUser();
+      User[] user = userDao.findByField("username", username);
+
+      for (User u : user) {
+        if (u.getUsername().equals(username)) {
+          this.user = u;
+          return true;
+        }
+      }
+
+    } catch (DAOException e) {
+      throw new RuntimeException(e);
+    }
+    return false;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public LoginBean setUsername(String username) {
+    this.username = username;
+    return this;
+  }
+
+  public LoginBean setPassword(String password) {
+    this.password = password;
+    return this;
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java
new file mode 100644
index 0000000..25d5d8f
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java
@@ -0,0 +1,127 @@
+package uppa.project.bean;
+
+import jakarta.persistence.EntityManager;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.EntityManagerProvider;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.User;
+
+public class RegisterBean implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private String username;
+  private String email;
+  private String password;
+  private String birth;
+  private String gender;
+  private String errorMessage;
+
+  public RegisterBean() {
+  }
+
+  public RegisterBean(String username, String email, String password, String birth, String gender) {
+    this.username = username;
+    this.email = email;
+    this.password = password;
+    this.birth = birth;
+    this.gender = gender;
+  }
+
+  public boolean validate() {
+    Game_JPA_DAO_Factory jpaDaoFactory = new Game_JPA_DAO_Factory();
+    DAO<User> userDAO;
+
+    // Check if the user is valid
+    try {
+      userDAO = jpaDaoFactory.getDAOUser();
+
+      // Check if the username is already taken
+      User[] users = userDAO.findByField("username", username);
+      if (users.length > 0) {
+        errorMessage = "Ce nom d'utilisateur est déjà pris";
+        return false;
+      }
+
+      // Check if the email is already taken
+      users = userDAO.findByField("email", email);
+      if (users.length > 0) {
+        errorMessage = "Cet email est déjà utilisé";
+        return false;
+      }
+    } catch(DAOException e) {
+      errorMessage = "Une erreur est survenue (DB_CONNECTION_ERROR)";
+      return false;
+    }
+
+    // Create a new User
+    User user = new User();
+    user.setUsername(username);
+    user.setPassword(password);
+    user.setEmail(email);
+    try {
+      user.setGender(User.Gender.valueOf(gender));
+    } catch (IllegalArgumentException e) {
+      errorMessage = "Le genre n'est pas valide";
+      return false;
+    }
+
+    // convert the birthdate from String as YYYY-MM-DD to Date object
+    try {
+      LocalDate localDate = LocalDate.parse(birth);
+      ZoneId defaultZoneId = ZoneId.systemDefault();
+      Date date = Date.from(localDate.atStartOfDay(defaultZoneId).toInstant());
+      user.setBirth(date);
+    } catch (Exception e) {
+      errorMessage = "La date de naissance n'est pas valide";
+      return false;
+    }
+
+    // Send the user to the database
+    EntityManager entityManager = EntityManagerProvider.getInstance();
+    entityManager.getTransaction().begin();
+    try {
+      userDAO = jpaDaoFactory.getDAOUser();
+      userDAO.create(user);
+      entityManager.getTransaction().commit();
+      return true;
+    } catch(DAOException e) {
+      entityManager.getTransaction().rollback();
+    }
+    return false;
+  }
+
+  public RegisterBean setUsername(String username) {
+    this.username = username;
+    return this;
+  }
+
+  public RegisterBean setPassword(String password) {
+    this.password = password;
+    return this;
+  }
+
+  public RegisterBean setEmail(String email) {
+    this.email = email;
+    return this;
+  }
+
+  public RegisterBean setBirth(String birth) {
+    this.birth = birth;
+    return this;
+  }
+
+  public RegisterBean setGender(String gender) {
+    this.gender = gender;
+    return this;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/AbstractDAOFactory.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java
similarity index 87%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/AbstractDAOFactory.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java
index 2337c4d..7d19acc 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/AbstractDAOFactory.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java
@@ -4,9 +4,9 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.database.dao;
 
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
 
 /**
  * Factory renvoyant une factory de DAO en fonction du support de persistance choisi
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAO.java
similarity index 98%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAO.java
index 5033597..3360e69 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAO.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAO.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.database.dao;
 
 /**
  * DAO abstrait et générique pour tout type de données
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAOException.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAOException.java
similarity index 93%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAOException.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAOException.java
index 2bdc028..8d6f8f3 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/DAOException.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAOException.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.database.dao;
 
 /**
  * Exception spécifique aux problèmes d'accès aux données via un DAO
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/EntityManagerProvider.java
similarity index 96%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/EntityManagerProvider.java
index c9e428a..bf29418 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/EntityManagerProvider.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.provider;
+package uppa.project.database.dao;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/GameDAOFactory.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/GameDAOFactory.java
similarity index 85%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/GameDAOFactory.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/GameDAOFactory.java
index 51faef7..68abea3 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/GameDAOFactory.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/GameDAOFactory.java
@@ -4,12 +4,12 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.database.dao;
 
-import uppa.project.pojo.Game;
-import uppa.project.pojo.Player;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.pojo.User;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
 
 /**
  * Fabrique abstraite de DAO pour le schéma du jeu
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/PersistenceKind.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/PersistenceKind.java
similarity index 89%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/PersistenceKind.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/PersistenceKind.java
index 4efcb28..585ed62 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/PersistenceKind.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/PersistenceKind.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao;
+package uppa.project.database.dao;
 
 /**
  * Type de support de persistance pour les données
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java
similarity index 89%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java
index 4ef7fd3..baad0a0 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Game.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java
@@ -4,17 +4,16 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao.jpa;
+package uppa.project.database.dao.jpa;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Objects;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.Game;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.dao.EntityManagerProvider;
 
 /**
  * DAO pour les parties de jeu
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java
similarity index 88%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java
index e1cce19..673846f 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_Player.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java
@@ -4,16 +4,16 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao.jpa;
+package uppa.project.database.dao.jpa;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.Player;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.EntityManagerProvider;
+import uppa.project.database.pojo.Player;
 
 /**
  * DAO pour les joueurs
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordToken.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java
similarity index 89%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordToken.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java
index 2ee6e7b..c07c920 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordToken.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java
@@ -4,16 +4,16 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao.jpa;
+package uppa.project.database.dao.jpa;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.EntityManagerProvider;
+import uppa.project.database.pojo.RecoveryPasswordToken;
 
 /**
  * DAO pour les tokens de récupération de mot de passe
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java
similarity index 88%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java
index 34289f2..fb3ede3 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/DAO_JPA_User.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java
@@ -4,16 +4,16 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao.jpa;
+package uppa.project.database.dao.jpa;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.List;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.User;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.EntityManagerProvider;
 
 /**
  * DAO pour les utilisateurs
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/Game_JPA_DAO_Factory.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java
similarity index 74%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/Game_JPA_DAO_Factory.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java
index 3e80654..6286b90 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/dao/jpa/Game_JPA_DAO_Factory.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java
@@ -4,12 +4,15 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.dao.jpa;
+package uppa.project.database.dao.jpa;
 
-import uppa.project.dao.DAO;
-import uppa.project.pojo.*;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.GameDAOFactory;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.GameDAOFactory;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.DAOException;
 
 /**
  * Fabrique concrète de DAO pour le schéma relationnel sports avec une implémentation en JDBC.
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Card.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Card.java
similarity index 97%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Card.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Card.java
index 4907a66..05f67f4 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Card.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Card.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
 import jakarta.persistence.Transient;
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
similarity index 97%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
index 0e4917e..3278729 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
@@ -4,9 +4,8 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
-import jakarta.persistence.Transient;
 import java.util.ArrayList;
 import java.util.Collections;
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
similarity index 99%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
index d18e146..97454b6 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -25,8 +25,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Objects;
-import java.util.Timer;
-import java.util.TimerTask;
 
 /**
  * Représentation d'une partie de jeu
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Player.java
similarity index 99%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Player.java
index 04aed00..c9602bc 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Player.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java
similarity index 99%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java
index 3811501..8e7043e 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/RecoveryPasswordToken.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java
@@ -1,4 +1,4 @@
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
similarity index 99%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
index 8cccbb4..fe3a59d 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.pojo;
+package uppa.project.database.pojo;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -23,8 +23,6 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.time.LocalDate;
-import java.time.Period;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Objects;
@@ -195,6 +193,7 @@ public class User implements Serializable {
 
   /**
    * Modifie le mot de passe de l'utilisateur
+   * Le mot de passe est hashé avant d'être stocké
    *
    * @param password le nouveau mot de passe
    */
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponse.java b/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponse.java
new file mode 100644
index 0000000..44c3862
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponse.java
@@ -0,0 +1,37 @@
+/*
+ * HttpResponse.java, 20/03/2024
+ * UPPA M1 TI 2023-2024
+ * Pas de copyright, aucun droits
+ */
+
+package uppa.project.json;
+
+/**
+ * Classe représentant une réponse HTTP
+ *
+ * @author Kevin Mitresse
+ * @author Lucàs Vabre
+ */
+public class  HttpResponse {
+
+  /**
+   * Défini si la réponse est un succès
+   */
+  protected final int code;
+
+  /**
+   * Message de la réponse
+   */
+  protected final String message;
+
+  /**
+   * Constructeur
+   *
+   * @param code code HTTP de l'erreur
+   * @param message message d'erreur
+   */
+  public HttpResponse(HttpResponseCode code, String message) {
+    this.code = code.getCode();
+    this.message = message;
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponseCode.java b/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponseCode.java
new file mode 100644
index 0000000..c7d1378
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponseCode.java
@@ -0,0 +1,23 @@
+package uppa.project.json;
+
+public enum HttpResponseCode {
+  OK(200),
+  CREATED(201),
+  NO_CONTENT(204),
+  BAD_REQUEST(400),
+  UNAUTHORIZED(401),
+  FORBIDDEN(403),
+  NOT_FOUND(404),
+  CONFLICT(409),
+  INTERNAL_SERVER_ERROR(500);
+
+  private final int code;
+
+  HttpResponseCode(int code) {
+    this.code = code;
+  }
+
+  public int getCode() {
+    return code;
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/websocket/Message.java b/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/Message.java
similarity index 90%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/websocket/Message.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/Message.java
index 9bf16c4..6c7b6fa 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/websocket/Message.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/Message.java
@@ -1,4 +1,4 @@
-package uppa.project.pojo.json.websocket;
+package uppa.project.json.websocket;
 
 public class Message {
   private final String type;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/ErrorResponse.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/ErrorResponse.java
deleted file mode 100644
index 849789c..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/ErrorResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * ErrorResponse.java, 20/03/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.pojo.json;
-
-/**
- * Classe représentant une erreur
- *
- * @author Kevin Mitresse
- * @author Lucàs Vabre
- */
-public class ErrorResponse extends HttpResponse{
-
-  /**
-   * Type de l'erreur
-   */
-  private final String error;
-
-  /**
-   * Message d'erreur
-   */
-  private final String message;
-
-  /**
-   * Constructeur
-   *
-   * @param status code HTTP de l'erreur
-   * @param error type de l'erreur
-   * @param message message d'erreur
-   */
-  public ErrorResponse(int status, String error, String message) {
-    super(status);
-    this.error = error;
-    this.message = message;
-  }
-
-  /**
-   * @return le type de l'erreur
-   */
-  public String getError() {
-    return error;
-  }
-
-  /**
-   * @return le message d'erreur
-   */
-  public String getMessage() {
-    return message;
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/HttpResponse.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/HttpResponse.java
deleted file mode 100644
index 51c71d5..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/json/HttpResponse.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * HttpResponse.java, 20/03/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.pojo.json;
-
-/**
- * Classe représentant une réponse HTTP
- *
- * @author Kevin Mitresse
- * @author Lucàs Vabre
- */
-public abstract class  HttpResponse {
-
-  /**
-   * Code HTTP de la réponse
-   */
-  protected final int status;
-
-  /**
-   * Constructeur
-   *
-   * @param status code HTTP de l'erreur
-   */
-  public HttpResponse(int status) {
-    this.status = status;
-  }
-
-  /**
-   * @return le code HTTP de la réponse
-   */
-  public int getStatus() {
-    return status;
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java
deleted file mode 100644
index e08fbf4..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * LoginServlet.java, 20/03/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.servlet;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(name = "loginServlet", value = "/login")
-public class LoginServlet extends HttpServlet {
-
-  public void init() {
-  }
-
-  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-    if (request.getSession().getAttribute("user") != null) {
-      response.sendRedirect(request.getContextPath() + "/main-menu");
-      return;
-    }
-    request.setAttribute("current", "login");
-    request.getRequestDispatcher("/WEB-INF/views/login.jsp").forward(request, response);
-  }
-
-  public void destroy() {
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java
deleted file mode 100644
index 564574a..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * RegisterServlet.java, 20/03/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.servlet;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(name = "registerServlet", value = "/register")
-public class RegisterServlet extends HttpServlet {
-
-  public void init() {
-  }
-
-  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-    if (request.getSession().getAttribute("user") != null) {
-      response.sendRedirect(request.getContextPath() + "/main-menu");
-      return;
-    }
-
-    request.setAttribute("current", "register");
-    request.getRequestDispatcher("/WEB-INF/views/register.jsp").forward(request, response);
-  }
-
-  public void destroy() {
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthLoginServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthLoginServlet.java
deleted file mode 100644
index 636c469..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthLoginServlet.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * LoginServlet.java, 20/03/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.servlet.api.auth;
-
-import com.google.gson.Gson;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
-import uppa.project.listener.SessionServletContextListener;
-import uppa.project.pojo.User;
-
-@WebServlet(name = "authLoginServlet", value = "/api/auth/login")
-public class AuthLoginServlet extends HttpServlet {
-
-  private static class JsonRequest {
-    private String username;
-    private String password;
-  }
-
-  private final Gson gson = new Gson();
-
-  public void init() {
-  }
-
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    response.setContentType("application/json");
-    response.setCharacterEncoding("UTF-8");
-    PrintWriter out = response.getWriter();
-
-    // Get the json in the request body
-    StringBuilder sb = new StringBuilder();
-    BufferedReader reader = request.getReader();
-    String line;
-    while((line = reader.readLine()) != null) {
-      sb.append(line);
-    }
-    String requestBody = sb.toString();
-    JsonRequest jsonRequest = gson.fromJson(requestBody, JsonRequest.class);
-
-    // Login User
-    User user = loginUser(jsonRequest);
-
-    // Set user in session
-    request.getSession().setAttribute("user", user);
-    SessionServletContextListener.addSession(request.getSession());
-
-    out.println(gson.toJson(user));
-    out.flush();
-  }
-
-  private static User loginUser(JsonRequest jsonRequest) {
-    String username = jsonRequest.username;
-    String password = jsonRequest.password;
-
-    Game_JPA_DAO_Factory factory = new Game_JPA_DAO_Factory();
-    try {
-      DAO<User> userDao = factory.getDAOUser();
-      User[] users = userDao.findByField("username", username);
-
-      for (User user : users) {
-        if (user.verifyPassword(password)) return user;
-      }
-    } catch (DAOException e) {
-      throw new RuntimeException(e);
-    }
-    return null;
-  }
-
-  public void destroy() {
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthRegisterServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthRegisterServlet.java
deleted file mode 100644
index 7d3b8f1..0000000
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/auth/AuthRegisterServlet.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * RegisterApiServlet.java, 03/04/2024
- * UPPA M1 TI 2023-2024
- * Pas de copyright, aucun droits
- */
-
-package uppa.project.servlet.api.auth;
-
-import com.google.gson.Gson;
-import jakarta.persistence.EntityManager;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.User;
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
-import uppa.project.provider.EntityManagerProvider;
-
-@WebServlet(name = "authRegisterServlet", value = "/api/auth/register")
-public class AuthRegisterServlet extends HttpServlet {
-
-  private class JsonRequest {
-    private String username;
-    private String password;
-    private String email;
-    private String birthdate;
-
-    private String gender;
-  }
-
-  private final Gson gson = new Gson();
-
-  public void init() {}
-
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    response.setContentType("application/json");
-    response.setCharacterEncoding("UTF-8");
-    PrintWriter out = response.getWriter();
-
-    // Get the json in the request body
-    StringBuilder sb = new StringBuilder();
-    BufferedReader reader = request.getReader();
-    String line;
-    while((line = reader.readLine()) != null) {
-      sb.append(line);
-    }
-    String requestBody = sb.toString();
-    JsonRequest jsonRequest = gson.fromJson(requestBody, JsonRequest.class);
-
-    // Create the user
-    User user = this.createUser(jsonRequest);
-    if (user == null) {
-      // TODO send error
-      return;
-    }
-
-    out.println(gson.toJson(user));
-    out.flush();
-  }
-
-  private User createUser(JsonRequest jsonRequest) {
-
-    // Create a new User
-    User user = new User();
-    user.setUsername(jsonRequest.username);
-    user.setPassword(jsonRequest.password);
-    user.setEmail(jsonRequest.email);
-    user.setGender(User.Gender.valueOf(jsonRequest.gender));
-
-    // convert the birthdate from String as YYYY-MM-DD to Date object)
-    LocalDate localDate = LocalDate.parse(jsonRequest.birthdate);
-    ZoneId defaultZoneId = ZoneId.systemDefault();
-    Date date = Date.from(localDate.atStartOfDay(defaultZoneId).toInstant());
-    user.setBirth(date);
-
-    // Send the user to the database
-    EntityManager entityManager = EntityManagerProvider.getInstance();
-
-    entityManager.getTransaction().begin();
-    try {
-      Game_JPA_DAO_Factory jpaDaoFactory = new Game_JPA_DAO_Factory();
-      DAO<User> userDAO = jpaDaoFactory.getDAOUser();
-
-      User newUser = userDAO.create(user);
-      entityManager.getTransaction().commit();
-      return newUser;
-    } catch(DAOException e) {
-      entityManager.getTransaction().rollback();
-      return null;
-    }
-  }
-
-  public void destroy() {
-  }
-}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java
new file mode 100644
index 0000000..7ac566d
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java
@@ -0,0 +1,31 @@
+package uppa.project.web.filter;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.io.IOException;
+
+public class AlreadyLoggedFilter implements Filter {
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    HttpServletRequest httpRequest = (HttpServletRequest) request;
+    HttpServletResponse httpResponse = (HttpServletResponse) response;
+    HttpSession session = httpRequest.getSession(false);
+
+    // Vérifier si l'utilisateur est connecté en vérifiant la présence d'une session
+    boolean isLoggedIn = (session != null && session.getAttribute("user") != null);
+
+    // Si l'utilisateur n'est pas connecté, laisser passer la requête
+    if (!isLoggedIn) {
+      chain.doFilter(request, response);
+    } else {
+      // Sinon, rediriger vers la page du menu principal
+      httpResponse.sendRedirect(httpRequest.getContextPath() + "/main-menu");
+    }
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AuthenticationFilter.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AuthenticationFilter.java
new file mode 100644
index 0000000..7e73182
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AuthenticationFilter.java
@@ -0,0 +1,32 @@
+package uppa.project.web.filter;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.io.IOException;
+
+public class AuthenticationFilter  implements Filter {
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    HttpServletRequest httpRequest = (HttpServletRequest) request;
+    HttpServletResponse httpResponse = (HttpServletResponse) response;
+    HttpSession session = httpRequest.getSession(false);
+
+    // Vérifier si l'utilisateur est connecté en vérifiant la présence d'une session
+    boolean isLoggedIn = (session != null && session.getAttribute("user") != null);
+
+    // Si l'utilisateur est connecté, laisser passer la requête
+    if (isLoggedIn) {
+      chain.doFilter(request, response);
+    } else {
+      // Sinon, rediriger vers la page de connexion
+      httpResponse.sendRedirect(httpRequest.getContextPath() + "/login");
+    }
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java
similarity index 92%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java
index 150726c..42eaeb3 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.servlet;
+package uppa.project.web.servlet;
 
 import jakarta.persistence.EntityManager;
 import jakarta.servlet.ServletException;
@@ -16,16 +16,16 @@ import java.io.IOException;
 import java.util.UUID;
 import javax.mail.Message;
 import uppa.project.Global;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.DAO_JPA_User;
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.pojo.User;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_User;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
 import java.util.Properties;
 import javax.mail.*;
 import javax.mail.internet.*;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.EntityManagerProvider;
 
 
 @WebServlet(name = "forgottenPasswordServlet", value = "/forgotten-password")
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/IndexServlet.java
similarity index 74%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/IndexServlet.java
index de9656b..80ee750 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/IndexServlet.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.servlet;
+package uppa.project.web.servlet;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
@@ -20,13 +20,8 @@ public class IndexServlet extends HttpServlet {
   }
 
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-    if (request.getSession().getAttribute("user") != null) {
-      response.sendRedirect(request.getContextPath() + "/main-menu");
-      return;
-    }
-
     request.setAttribute("current", "index");
-    request.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(request, response);
+    request.getRequestDispatcher("/WEB-INF/pages/index.jsp").forward(request, response);
   }
 
   public void destroy() {
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java
new file mode 100644
index 0000000..2674e2c
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java
@@ -0,0 +1,59 @@
+/*
+ * LoginServlet.java, 20/03/2024
+ * UPPA M1 TI 2023-2024
+ * Pas de copyright, aucun droits
+ */
+
+package uppa.project.web.servlet;
+
+import com.google.gson.Gson;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import uppa.project.bean.LoginBean;
+import uppa.project.json.HttpResponse;
+import uppa.project.json.HttpResponseCode;
+
+@WebServlet(name = "loginServlet", value = "/login")
+public class LoginServlet extends HttpServlet {
+
+  public void init() {
+  }
+
+  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+    request.setAttribute("current", "login");
+    request.getRequestDispatcher("/WEB-INF/pages/login.jsp").forward(request, response);
+  }
+
+  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    response.setContentType("application/json");
+    response.setCharacterEncoding("UTF-8");
+    PrintWriter out = response.getWriter();
+
+    LoginBean loginBean = new LoginBean()
+      .setUsername(request.getParameter("username"))
+      .setPassword(request.getParameter("password"))
+    ;
+
+    Gson gson = new Gson();
+    HttpResponse httpResponse;
+    if (loginBean.validate()) {
+      request.getSession().setAttribute("user", loginBean.getUser());
+
+      httpResponse = new HttpResponse(HttpResponseCode.OK, "Login success");
+    } else {
+      httpResponse = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "<strong>Erreur de connexion:</strong> Le nom d'utilisateur ou le " +
+        "mot de passe est incorrect.");
+    }
+
+    out.println(gson.toJson(httpResponse));
+    out.flush();
+  }
+
+  public void destroy() {
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LogoutServlet.java
similarity index 77%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LogoutServlet.java
index 27ceff6..38c4aa1 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LogoutServlet.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.servlet;
+package uppa.project.web.servlet;
 
 import com.google.gson.Gson;
 import jakarta.servlet.annotation.WebServlet;
@@ -23,11 +23,8 @@ public class LogoutServlet extends HttpServlet {
   }
 
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    if (request.getSession().getAttribute("user") != null) {
-      SessionServletContextListener.removeSession(request.getSession());
-      request.getSession().removeAttribute("user");
-    }
-
+    SessionServletContextListener.removeSession(request.getSession());
+    request.getSession().removeAttribute("user");
     response.sendRedirect(request.getContextPath() + "/login");
   }
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/MainMenuServlet.java
similarity index 84%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/MainMenuServlet.java
index 8f36411..e95a786 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/MainMenuServlet.java
@@ -4,7 +4,7 @@
  * Pas de copyright, aucun droits
  */
 
-package uppa.project.servlet;
+package uppa.project.web.servlet;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
@@ -16,9 +16,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import uppa.project.pojo.Game;
-import uppa.project.pojo.Player;
-import uppa.project.pojo.User;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.User;
 
 @WebServlet(name = "mainMenuServlet", value = "/main-menu")
 public class MainMenuServlet extends HttpServlet {
@@ -34,8 +34,8 @@ public class MainMenuServlet extends HttpServlet {
 //    }
     request.setAttribute("current", "main-menu");
     manageNewGame(request, response, user);
-    manageStatistiques(request, response, user);
-    request.getRequestDispatcher("/WEB-INF/views/main-menu.jsp").forward(request, response);
+    manageStatistics(request, response, user);
+    request.getRequestDispatcher("/WEB-INF/pages/main-menu.jsp").forward(request, response);
   }
 
   public void destroy() {
@@ -44,6 +44,7 @@ public class MainMenuServlet extends HttpServlet {
   private void manageNewGame(HttpServletRequest request, HttpServletResponse response, User sessionUser) throws IOException, ServletException {
     List<User> connectedUsers = new ArrayList<>();
     Set<HttpSession> loginsSessions = (Set<HttpSession>) request.getServletContext().getAttribute("loginSession");
+
     if (loginsSessions == null) {
       throw new RuntimeException("No login sessions found");
     }
@@ -57,7 +58,7 @@ public class MainMenuServlet extends HttpServlet {
     request.setAttribute("connectedUsers", connectedUsers);
   }
 
-  private void manageStatistiques(HttpServletRequest request, HttpServletResponse response, User sessionUser) throws IOException, ServletException {
+  private void manageStatistics(HttpServletRequest request, HttpServletResponse response, User sessionUser) throws IOException, ServletException {
     List<Game> games = new ArrayList<>();
     if (sessionUser != null && sessionUser.getPlayedGames() != null) {
       for (Player player : sessionUser.getPlayedGames()) {
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RegisterServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RegisterServlet.java
new file mode 100644
index 0000000..a1688dd
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RegisterServlet.java
@@ -0,0 +1,63 @@
+/*
+ * RegisterServlet.java, 20/03/2024
+ * UPPA M1 TI 2023-2024
+ * Pas de copyright, aucun droits
+ */
+
+package uppa.project.web.servlet;
+
+import com.google.gson.Gson;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import uppa.project.bean.LoginBean;
+import uppa.project.bean.RegisterBean;
+import uppa.project.json.HttpResponse;
+import uppa.project.json.HttpResponseCode;
+
+@WebServlet(name = "registerServlet", value = "/register")
+public class RegisterServlet extends HttpServlet {
+
+  public void init() {
+  }
+
+  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+    request.setAttribute("current", "register");
+    request.getRequestDispatcher("/WEB-INF/pages/register.jsp").forward(request, response);
+  }
+
+  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    response.setContentType("application/json");
+    response.setCharacterEncoding("UTF-8");
+    PrintWriter out = response.getWriter();
+
+    RegisterBean registerBean = new RegisterBean()
+      .setUsername(request.getParameter("username"))
+      .setEmail(request.getParameter("email"))
+      .setPassword(request.getParameter("password"))
+      .setBirth(request.getParameter("birth"))
+      .setGender(request.getParameter("gender"))
+      ;
+
+    Gson gson = new Gson();
+    HttpResponse httpResponse;
+    if (registerBean.validate()) {
+      httpResponse = new HttpResponse(
+        HttpResponseCode.OK,
+        "Register success"
+      );
+    } else {
+      httpResponse = new HttpResponse(HttpResponseCode.UNAUTHORIZED, registerBean.getErrorMessage());
+    }
+
+    out.println(gson.toJson(httpResponse));
+    out.flush();
+  }
+
+  public void destroy() {
+  }
+}
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java
similarity index 89%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java
index 782298d..2e384ef 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java
@@ -1,4 +1,4 @@
-package uppa.project.servlet;
+package uppa.project.web.servlet;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
@@ -6,11 +6,11 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.DAO_JPA_RecoveryPasswordToken;
-import uppa.project.dao.jpa.DAO_JPA_User;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.pojo.User;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_RecoveryPasswordToken;
+import uppa.project.database.dao.jpa.DAO_JPA_User;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
 
 @WebServlet(name = "resetPasswordServlet", value = "/reset-password")
 public class ResetPasswordServlet extends HttpServlet {
@@ -28,7 +28,7 @@ public class ResetPasswordServlet extends HttpServlet {
         return;
       }
       request.setAttribute("current", "reset-password");
-      request.getRequestDispatcher("/WEB-INF/views/reset-password.jsp").forward(request, response);
+      request.getRequestDispatcher("/WEB-INF/pages/reset-password.jsp").forward(request, response);
     }
 
     /**
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/websocket/MainMenuWS.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java
similarity index 72%
rename from S2/DevWeb/Projet/src/main/java/uppa/project/websocket/MainMenuWS.java
rename to S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java
index 998ebc7..d1da64f 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/websocket/MainMenuWS.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java
@@ -1,4 +1,4 @@
-package uppa.project.websocket;
+package uppa.project.web.websocket;
 
 import com.google.gson.Gson;
 import jakarta.websocket.OnClose;
@@ -10,18 +10,16 @@ import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.HashMap;
-import uppa.project.pojo.User;
-import uppa.project.pojo.json.websocket.Message;
+import uppa.project.database.pojo.User;
+import uppa.project.json.websocket.Message;
 
-@ServerEndpoint(value = "/main-menu")
-public class MainMenuWS {
+@ServerEndpoint(value = "/ws/connected-users")
+public class ConnectedUsersWS {
 
   private static final HashMap<Session, User> connections = new HashMap<>();
 
   @OnOpen
-  public void onOpen(Session session) {
-    System.out.println("Connexion WebSocket ouverte : " + session.getId());
-  }
+  public void onOpen(Session session) {}
 
   private void broadcastConnectedUsers() {
     Gson gson = new Gson();
@@ -30,8 +28,6 @@ public class MainMenuWS {
     Message websocketObject = new Message("userList", gson.toJson(connectedUsers));
     String message = gson.toJson(websocketObject);
 
-    System.out.println("Broadcasting connected users : " + message);
-
     for (Session session : connections.keySet()) {
       RemoteEndpoint.Basic remote = session.getBasicRemote();
       try {
@@ -44,7 +40,6 @@ public class MainMenuWS {
 
   @OnClose
   public void onClose(Session session) {
-    System.out.println("Connexion WebSocket fermée : " + session.getId());
     connections.remove(session);
 
     // Update connected users list
@@ -53,7 +48,6 @@ public class MainMenuWS {
 
   @OnError
   public void onError(Throwable throwable) {
-    System.out.println("Erreur WebSocket : " + throwable.getMessage());
     throwable.printStackTrace();
   }
 
@@ -62,12 +56,8 @@ public class MainMenuWS {
     Gson gson = new Gson();
     Message websocketMessage = gson.fromJson(message, Message.class);
 
-    System.out.println("Message reçu : " + websocketMessage);
-
     if (websocketMessage.getType().equals("linkUserSession")) {
       User user = gson.fromJson(websocketMessage.getData(), User.class);
-      System.out.println(user);
-
       connections.put(session, user);
       broadcastConnectedUsers();
     }
diff --git a/S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml b/S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml
index 715a4d5..f381173 100644
--- a/S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml
+++ b/S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml
@@ -5,10 +5,10 @@
              version="3.0">
 
   <persistence-unit name="prod">
-    <class>uppa.project.pojo.User</class>
-    <class>uppa.project.pojo.Game</class>
-    <class>uppa.project.pojo.Player</class>
-    <class>uppa.project.pojo.RecoveryPasswordToken</class>
+    <class>uppa.project.database.pojo.User</class>
+    <class>uppa.project.database.pojo.Game</class>
+    <class>uppa.project.database.pojo.Player</class>
+    <class>uppa.project.database.pojo.RecoveryPasswordToken</class>
     <properties>
       <property name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
       <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/db_prod?useSSL=false&amp;allowPublicKeyRetrieval=true"/>
@@ -19,10 +19,10 @@
   </persistence-unit>
 
   <persistence-unit name="test">
-    <class>uppa.project.pojo.User</class>
-    <class>uppa.project.pojo.Game</class>
-    <class>uppa.project.pojo.Player</class>
-    <class>uppa.project.pojo.RecoveryPasswordToken</class>
+    <class>uppa.project.database.pojo.User</class>
+    <class>uppa.project.database.pojo.Game</class>
+    <class>uppa.project.database.pojo.Player</class>
+    <class>uppa.project.database.pojo.RecoveryPasswordToken</class>
     <properties>
       <property name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
       <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/db_test?useSSL=false&amp;allowPublicKeyRetrieval=true"/>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
index 719ebcf..bdaae67 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
@@ -1,4 +1,4 @@
-<%@ page import="uppa.project.pojo.User" %>
+<%@ page import="uppa.project.database.pojo.User" %>
 <%@ page pageEncoding="UTF-8" %>
 <%--
   Created by IntelliJ IDEA.
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/new-game.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/new-game.jsp
index 176420e..469fb90 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/new-game.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/new-game.jsp
@@ -1,6 +1,6 @@
-<%@ page import="uppa.project.pojo.User" %>
-<%@ page import="uppa.project.pojo.Game" %>
-<%@ page import="uppa.project.pojo.Deck" %>
+<%@ page import="uppa.project.database.pojo.User" %>
+<%@ page import="uppa.project.database.pojo.Game" %>
+<%@ page import="uppa.project.database.pojo.Deck" %>
 <%@ page pageEncoding="UTF-8" %>
 
 <div id="newGameModal" class="modal-wrapper" style="display: none">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
index 102e73b..227c58b 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
@@ -1,13 +1,13 @@
-<%@ page import="uppa.project.pojo.User" %>
-<%@ page import="uppa.project.pojo.Game" %>
+<%@ page import="uppa.project.database.pojo.User" %>
+<%@ page import="uppa.project.database.pojo.Game" %>
 <%@ page import="java.util.ArrayList" %>
-<%@ page import="uppa.project.pojo.Player" %>
+<%@ page import="uppa.project.database.pojo.Player" %>
 <%@ page import="java.util.Date" %>
 <%@ page pageEncoding="UTF-8" %>
 
 
 <%--TODO: adapter les deux lignes suivante pour ne pas vérifier la valeur nulle--%>
-<% User user = (User) session.getAttribute("user") != null ? (User) session.getAttribute("user") : new User("toto", "toto@gmail.com", "totopassword", new Date(), User.Gender.MALE); %>
+<% User user = session.getAttribute("user") != null ? (User) session.getAttribute("user") : new User("toto", "toto@gmail.com", "totopassword", new Date(), User.Gender.MALE); %>
 <% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games") != null ? (ArrayList<Game>) request.getAttribute("games") : new ArrayList<>() ; %>
 <div id="statisticsModal" class="modal-wrapper" style="display: none">
     <div class="modal">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp
similarity index 100%
rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp
rename to S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/index.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
similarity index 95%
rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/index.jsp
rename to S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
index 1bc398e..2940bf8 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/index.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
@@ -19,7 +19,7 @@
 <body>
 <%@include file="../components/navbar.jsp" %>
 <div class="content">
-    <h1>Plongez dans l'excitation de cardRush!</h1>
+    <h1>Plongez dans l'excitation de CardRush!</h1>
     <p>Défiez votre réactivité et dominez le jeu avec des amis dans cette course effrénée aux cartes ! Rejoignez maintenant pour vivre l'adrénaline.</p>
     <div class="buttons">
         <a class="button" href="${pageContext.request.contextPath}/register">S'inscrire</a>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp
new file mode 100644
index 0000000..7696063
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp
@@ -0,0 +1,24 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
+<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
+<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
+
+<layout:base>
+    <jsp:attribute name="title">Cards Rush - Connexion</jsp:attribute>
+    <jsp:body>
+        <div class="hero is-light is-fullheight-with-navbar">
+            <div class="hero-body">
+                <div class="container">
+                    <div class="columns is-centered">
+                        <div class="column is-5-tablet is-5-desktop is-5-widescreen">
+                            <div class="box">
+                                <h1 class="title has-text-centered">Se connecter</h1>
+                                <form:login/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </jsp:body>
+</layout:base>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/main-menu.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/main-menu.jsp
new file mode 100644
index 0000000..be81ea7
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/main-menu.jsp
@@ -0,0 +1,61 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
+<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
+<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
+
+<layout:base>
+    <jsp:attribute name="title">Menu principal</jsp:attribute>
+    <jsp:body>
+        <div class="hero is-light is-fullheight-with-navbar">
+            <div class="hero-body">
+                <div class="container">
+                    <div class="columns is-centered">
+                        <div class="column is-5-tablet is-5-desktop is-5-widescreen">
+                            <component:card>
+                                <jsp:attribute name="card_head">
+
+                                </jsp:attribute>
+                                <jsp:attribute name="card_content">
+<%--                                    <form:newGame/>--%>
+                                </jsp:attribute>
+                            </component:card>
+                        </div>
+                        <div class="column is-5-tablet is-5-desktop is-5-widescreen">
+                            <component:connectedUserList/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </jsp:body>
+</layout:base>
+
+<%--<!DOCTYPE html>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--    <title>Cards Rush</title>--%>
+<%--    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap">--%>
+<%--    <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">--%>
+<%--    <link href="${pageContext.request.contextPath}/static/css/main-menu.css" rel="stylesheet">--%>
+<%--    <link href="${pageContext.request.contextPath}/static/css/new-game.css" rel="stylesheet">--%>
+<%--    <link href="${pageContext.request.contextPath}/static/css/modal.css" rel="stylesheet">--%>
+<%--    <script src="${pageContext.request.contextPath}/static/js/modal.js" defer></script>--%>
+<%--    <script src="${pageContext.request.contextPath}/static/js/new-game.js" defer></script>--%>
+<%--    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">--%>
+<%--    <script defer src="${pageContext.request.contextPath}/static/js/main-menu.js"></script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--<%@include file="../components/navbar.jsp" %>--%>
+<%--<main>--%>
+<%--    <section id="main">--%>
+<%--        <h1 id="title">Cards Rush!</h1>--%>
+<%--        <div class="main-button">--%>
+<%--            <button class="modal-toggle button" data-target="#newGameModal">Nouvelle Partie</button>--%>
+<%--            <button class="modal-toggle button" data-target="#statisticsModal">Statistiques</button>--%>
+<%--        </div>--%>
+<%--    </section>--%>
+<%--    <%@include file="../components/new-game.jsp" %>--%>
+<%--    <%@include file="../components/statistics.jsp" %>--%>
+<%--</main>--%>
+<%--</body>--%>
+<%--</html>--%>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp
new file mode 100644
index 0000000..4708510
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp
@@ -0,0 +1,76 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
+<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
+<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
+
+<layout:base>
+  <jsp:attribute name="title">Cards Rush - Inscription</jsp:attribute>
+  <jsp:body>
+    <div class="hero is-light is-fullheight-with-navbar">
+      <div class="hero-body">
+        <div class="container">
+          <div class="columns is-centered">
+            <div class="column is-5-tablet is-5-desktop is-5-widescreen">
+              <div class="box">
+                <h1 class="title has-text-centered">S'inscrire</h1>
+                <form:register/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </jsp:body>
+</layout:base>
+
+<%--<!DOCTYPE html>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--  <title>Register</title>--%>
+<%--  <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">--%>
+<%--  <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">--%>
+<%--  <script src="${pageContext.request.contextPath}/static/js/register.js" defer></script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--<%@include file="../components/navbar.jsp"%>--%>
+<%--<main>--%>
+<%--    <div class="flex-column register-gap">--%>
+<%--      <div>--%>
+<%--        <h1>S'inscrire</h1>--%>
+<%--        <form id="register-form" action="${pageContext.request.contextPath}/api/auth/register" method="POST">--%>
+
+<%--          <label for="email">Email :</label>--%>
+<%--          <input type="email" id="email" name="email" required>--%>
+
+<%--          <label for="username">Nom d'utilisateur :</label>--%>
+<%--          <input type="text" id="username" name="username" required>--%>
+
+<%--          <label for="password">Mot de passe :</label>--%>
+<%--          <input type="password" id="password" name="password" required>--%>
+
+<%--          <label for="confirmPassword">Confirmez le mot de passe :</label>--%>
+<%--          <input type="password" id="confirmPassword" name="confirmPassword" required>--%>
+
+<%--          <label for="birthdate">Date de naissance :</label>--%>
+<%--          <input type="date" id="birthdate" name="birthdate" required>--%>
+
+<%--          <label for="gender">Genre :</label>--%>
+<%--          <select name="gender" id="gender" required>--%>
+<%--            <option value="">--Choisissez une option--</option>--%>
+<%--            <option value="MALE">Homme</option>--%>
+<%--            <option value="FEMALE">Femme</option>--%>
+<%--            <option value="OTHER">Autre</option>--%>
+<%--          </select>--%>
+
+<%--          <input class="button" id="register-submit" type="submit" value="Register">--%>
+<%--        </form>--%>
+<%--      </div>--%>
+<%--      <div>--%>
+<%--        <hr>--%>
+<%--        <p>Déjà un compte ? <a href="${pageContext.request.contextPath}/login">Se connecter</a></p>--%>
+<%--      </div>--%>
+<%--    </div>--%>
+<%--</main>--%>
+
+<%--</body>--%>
+<%--</html>--%>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp
similarity index 100%
rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp
rename to S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/card.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/card.tag
new file mode 100644
index 0000000..822acee
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/card.tag
@@ -0,0 +1,12 @@
+<%@tag description="component/card" pageEncoding="UTF-8" %>
+<%@attribute name="card_head" fragment="true" %>
+<%@attribute name="card_content" fragment="true" %>
+
+<div class="card">
+    <div class="card-head">
+        <jsp:invoke fragment="card_head"/>
+    </div>
+    <div class="card-content">
+        <jsp:invoke fragment="card_content"/>
+    </div>
+</div>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connectedUserList.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connectedUserList.tag
new file mode 100644
index 0000000..0f65e9a
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connectedUserList.tag
@@ -0,0 +1,85 @@
+<%@ tag import="com.google.gson.Gson" %>
+<%@ tag import="uppa.project.database.pojo.User" %>
+<%@tag description="component/connectedUserList" pageEncoding="UTF-8" %>
+<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
+
+<component:card>
+    <jsp:attribute name="card_head">
+        <div class="card-header-title">Utilisateurs connectés</div>
+    </jsp:attribute>
+    <jsp:attribute name="card_content">
+        <table id="connectedUserList" class="table is-fullwidth">
+            <thead>
+                <tr>
+                    <th>Utilisateur</th>
+                    <th>Action</th>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+    </jsp:attribute>
+</component:card>
+
+<script defer type="module">
+    const tbodyElement = document.querySelector('#connectedUserList tbody');
+
+    // effacer ce qu'il y a apres /project_war_exploded
+    const url = new URL(window.location.href);
+    url.pathname = "${pageContext.request.contextPath}/ws/connected-users";
+    url.protocol = "ws:"
+
+    const websocket = new WebSocket(url);
+
+    <%
+    Gson gson = new Gson();
+    User user = (User) request.getSession().getAttribute("user");
+    %>
+    websocket.onopen = () => {
+        const linkUserSession = {
+            type: 'linkUserSession',
+            data: JSON.stringify(<%= gson.toJson(user) %>)
+        }
+        websocket.send(JSON.stringify(linkUserSession));
+    }
+
+    websocket.onmessage = (event) => {
+        const data = JSON.parse(event.data);
+
+        if (data.type === 'userList') {
+            const users = JSON.parse(data.data);
+            updateUserList(users);
+        }
+    }
+
+    websocket.onclose = () => {}
+    websocket.onerror = (error) => {}
+
+    function updateUserList(users) {
+        tbodyElement.innerHTML = '';
+        users.forEach(user => {
+            const trElement = document.createElement('tr');
+            const tdElement = [
+                document.createElement('td'),
+                document.createElement('td')
+            ];
+            const buttonElement = document.createElement('button');
+
+            tdElement[0].textContent = user.username;
+
+            // If it's not the current user, we can display the button
+            if (user.id !== <%= user.getId() %>) {
+                buttonElement.classList.add('button', 'is-light');
+                buttonElement.textContent = 'Inviter';
+
+                // TODO Ajouter l'événement click
+            }
+
+            tdElement[1].appendChild(buttonElement);
+            trElement.appendChild(tdElement[0]);
+            trElement.appendChild(tdElement[1]);
+
+            tbodyElement.appendChild(trElement);
+        });
+    }
+</script>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/footer.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/footer.tag
new file mode 100644
index 0000000..0e061b2
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/footer.tag
@@ -0,0 +1,9 @@
+<%@tag description="component/footer" pageEncoding="UTF-8" %>
+
+<footer class="footer">
+    <div class="content has-text-centered">
+        <p>
+            <strong>Cards Rush</strong> par Kevin Mitressé & Lucàs Vabre. UPPA M1-TI 2024
+        </p>
+    </div>
+</footer>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/navbar.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/navbar.tag
new file mode 100644
index 0000000..058c42e
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/navbar.tag
@@ -0,0 +1,35 @@
+<%@tag description="component/navbar" pageEncoding="UTF-8" %>
+
+<nav class="navbar" role="navigation" aria-label="main navigation">
+    <div class="navbar-brand">
+        <a class="navbar-item" href="${pageContext.request.contextPath}/">
+            <img src="${pageContext.request.contextPath}/static/img/CardsRushLogoBlack.svg" height="260">
+        </a>
+
+        <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarMenu">
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+        </a>
+    </div>
+
+    <div id="navbarMenu" class="navbar-menu">
+
+        <div class="navbar-end">
+            <div class="navbar-item">
+                <div class="buttons">
+
+                    <%if (session.getAttribute("user") != null) {%>
+<%--                    TODO: Profil de l'utilisateur--%>
+                        <a href="${pageContext.request.contextPath}/profile" class="button is-primary"><strong>Profil</strong></a>
+                        <a href="${pageContext.request.contextPath}/logout" class="button is-danger is-light">Déconnexion</a>
+                    <% } else {%>
+                        <a href="${pageContext.request.contextPath}/register" class="button is-primary"><strong>Inscription</strong></a>
+                        <a href="${pageContext.request.contextPath}/login" class="button is-light">Connexion</a>
+                    <% } %>
+                </div>
+            </div>
+        </div>
+    </div>
+</nav>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag
new file mode 100644
index 0000000..087801a
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag
@@ -0,0 +1,123 @@
+<%@tag description="form/login" pageEncoding="UTF-8" %>
+
+<form id="login-form" action="${pageContext.request.contextPath}/login" method="post">
+    <div class="field"> <!-- Field Username -->
+        <label class="label" for="username">Nom d'utilisateur</label>
+        <input id="username" placeholder="John Doe" class="input is-fullwidth" required/>
+    </div>
+    <div class="field"> <!-- Field Password -->
+        <label class="label" for="password">Mot de passe</label>
+        <input id="password" class="input is-fullwidth" type="password" required/>
+    </div>
+    <p class="content has-text-right"><a href="${pageContext.request.contextPath}/forgotten-password" class="link">Mot de passe oublié ?</a>
+    </p>
+    <input type="submit" class="button is-primary is-fullwidth" value="Connexion">
+    <hr/>
+    <p class="content has-text-centered"><a href="${pageContext.request.contextPath}/register">S'inscrire</a></p>
+
+</form>
+
+<style>
+    .notification {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        margin: 1em !important;
+
+        transform: translateY(100%);
+        opacity: 0;
+        animation: toast 5s ease forwards;
+    }
+
+    @keyframes toast {
+        0% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+        5% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        95% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        100% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+    }
+
+    @keyframes shake {
+        0%, 100% {
+            transform: translateX(0);
+        }
+        10%, 30%, 50%, 70%, 90% {
+            transform: translateX(-5px);
+        }
+        20%, 40%, 60%, 80% {
+            transform: translateX(5px);
+        }
+    }
+</style>
+
+<script defer type="module">
+    const loginForm = document.querySelector("form#login-form");
+
+    // Form fields
+    const usernameInput = document.querySelector("input#username");
+    const passwordInput = document.querySelector("input#password");
+
+    // Add event listener to the form submission
+    loginForm.addEventListener("submit", onSubmit)
+
+    /**
+     * Handle the form submission with Ajax request
+     * @param event {Event} - Event of the form submission
+     */
+    function onSubmit(event) {
+        event.preventDefault();
+
+        const {action, method} = loginForm;
+
+        const url = new URL(action);
+        url.searchParams.append("username", usernameInput.value);
+        url.searchParams.append("password", passwordInput.value);
+
+        fetch(url, {headers: {"Content-Type": "application/json"}, method})
+            .then(res => res.json())
+            .then(data => {
+                if (data.code !== 200) throw new Error(data.message);
+            })
+            .then(() => window.location.href = "${pageContext.request.contextPath}/main-menu")
+            .catch(onError);
+    }
+
+    /**
+     * Handle the error of the form submission
+     * @param error {Error} - Error of the form submission
+     */
+    function onError(error) {
+        console.error("Error:", error)
+
+        // Input fields in red
+        usernameInput.classList.add("is-danger");
+        passwordInput.classList.add("is-danger");
+
+        // Shake the inputs
+        usernameInput.style.animation = "shake 0.5s ease-in-out";
+        passwordInput.style.animation = "shake 0.5s ease-in-out";
+
+        // Notification
+        const notification = document.createElement("div");
+        notification.classList.add("notification", "is-danger");
+        notification.innerHTML = error.message;
+        document.body.appendChild(notification);
+        setTimeout(() => notification.remove(), 5010);
+    }
+
+    // Remove the shake animation at the end of animation
+    usernameInput.addEventListener("animationend", () => usernameInput.style.animation = "");
+    passwordInput.addEventListener("animationend", () => passwordInput.style.animation = "");
+</script>
+
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/newGame.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/newGame.tag
new file mode 100644
index 0000000..412aef9
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/newGame.tag
@@ -0,0 +1,56 @@
+<%@tag description="form/newGame" pageEncoding="UTF-8" %>
+
+<form id="newGame-form" action="${pageContext.request.contextPath}/main-menu" method="post">
+    <div>
+
+    </div>
+</form>
+
+<style>
+    .notification {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        margin: 1em !important;
+
+        transform: translateY(100%);
+        opacity: 0;
+        animation: toast 5s ease forwards;
+    }
+
+    @keyframes toast {
+        0% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+        5% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        95% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        100% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+    }
+
+    @keyframes shake {
+        0%, 100% {
+            transform: translateX(0);
+        }
+        10%, 30%, 50%, 70%, 90% {
+            transform: translateX(-5px);
+        }
+        20%, 40%, 60%, 80% {
+            transform: translateX(5px);
+        }
+    }
+</style>
+
+<script defer type="module">
+
+</script>
+
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/register.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/register.tag
new file mode 100644
index 0000000..852f30e
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/register.tag
@@ -0,0 +1,150 @@
+<%@tag description="form/register" pageEncoding="UTF-8" %>
+
+<form id="register-form" action="${pageContext.request.contextPath}/register" method="post">
+    <div class="field">
+        <label class="label" for="username">Nom d'utilisateur</label>
+        <input id="username" name="username" placeholder="John Doe" type="text" class="input is-fullwidth" required>
+    </div>
+
+    <div class="field">
+        <label class="label" for="email">Email</label>
+        <input id="email" name="email" type="email" placeholder="john.doe@mail.com" class="input is-fullwidth" required>
+    </div>
+
+    <div class="field">
+        <label class="label" for="password">Mot de passe</label>
+        <input id="password" name="password" type="password" class="input is-fullwidth" required>
+    </div>
+
+    <div class="field">
+        <label class="label" for="repassword">Confirmez le mot de passe</label>
+        <input id="repassword" name="repassword" type="password" class="input is-fullwidth" required>
+    </div>
+
+    <div class="field">
+        <label class="label" for="birth">Date de naissance</label>
+        <input class="input is-fullwidth" type="date" id="birth" name="birth" required>
+    </div>
+
+    <div class="field">
+        <label class="label" for="gender">Genre</label>
+        <div class="select is-fullwidth">
+            <select name="gender" id="gender" required>
+                <option selected value="">--Choisissez une option--</option>
+                <option value="MALE">Homme</option>
+                <option value="FEMALE">Femme</option>
+                <option value="OTHER">Autre</option>
+            </select>
+        </div>
+    </div>
+
+    <input type="submit" class="button is-primary is-fullwidth" value="S'inscrire">
+    <hr/>
+    <p class="content has-text-centered">Déjà inscrit ? <a href="${pageContext.request.contextPath}/login">Se connecter</a></p>
+</form>
+
+<style>
+    .notification {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        margin: 1em !important;
+        max-width: 40em;
+
+        transform: translateY(100%);
+        opacity: 0;
+        animation: toast 5s ease forwards;
+    }
+
+    @keyframes toast {
+        0% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+        5% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        95% {
+            opacity: 1;
+            transform: translateY(0);
+        }
+        100% {
+            opacity: 0;
+            transform: translateY(100%);
+        }
+    }
+</style>
+
+<script defer type="module">
+    const registerForm = document.querySelector("form#register-form");
+
+    // Form fields
+    const usernameInput = document.querySelector("input#username");
+    const emailInput = document.querySelector("input#email");
+    const passwordInput = document.querySelector("input#password");
+    const repasswordInput = document.querySelector("input#repassword");
+    const birthInput = document.querySelector("input#birth");
+    const genderInput = document.querySelector("select#gender");
+    const submitButton = document.querySelector("input[type=submit]");
+
+    // Add event listener to the form submission
+    registerForm.addEventListener("submit", onSubmit)
+
+    /**
+     * Handle the form submission with Ajax request
+     * @param event {Event} - Event of the form submission
+     */
+    function onSubmit(event) {
+        event.preventDefault();
+
+        // Check if the password and the confirmation password are the same
+        if (passwordInput.value !== repasswordInput.value) {
+            onError(new Error("Les mots de passe ne correspondent pas"));
+            return;
+        }
+
+        const {action, method} = registerForm;
+
+        const url = new URL(action);
+        url.searchParams.append("username", usernameInput.value);
+        url.searchParams.append("email", emailInput.value);
+        url.searchParams.append("password", passwordInput.value);
+        url.searchParams.append("birth", birthInput.value);
+        url.searchParams.append("gender", genderInput.value);
+
+        submitButton.classList.add("is-loading");
+        fetch(url, {headers: {"Content-Type": "application/json"}, method})
+            .then(res => res.json())
+            .then(data => {
+                if (data.code !== 200) throw new Error(data.message);
+            })
+            .then(() => window.location.href = "${pageContext.request.contextPath}/login")
+            .catch(onError)
+            .finally(() => submitButton.classList.remove("is-loading"));
+    }
+
+    /**
+     * Handle the error of the form submission
+     * @param error {Error} - Error of the form submission
+     */
+    function onError(error) {
+        console.error("Error:", error)
+
+        // Input fields in red
+        usernameInput.classList.add("is-danger");
+        emailInput.classList.add("is-danger");
+        passwordInput.classList.add("is-danger");
+        repasswordInput.classList.add("is-danger");
+        birthInput.classList.add("is-danger");
+        genderInput.classList.add("is-danger");
+
+        // Notification
+        const notification = document.createElement("div");
+        notification.classList.add("notification", "is-danger");
+        notification.innerHTML = error.message;
+        document.body.appendChild(notification);
+        setTimeout(() => notification.remove(), 5010);
+    }
+</script>
+
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag
new file mode 100644
index 0000000..69fe227
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag
@@ -0,0 +1,26 @@
+<%@tag description="Base page layout" pageEncoding="UTF-8" %>
+<%@attribute name="title" fragment="true" %>
+<%@attribute name="head" fragment="true" %>
+
+<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title><jsp:invoke fragment="title"/></title>
+
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.0/css/bulma.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css">
+
+    <jsp:invoke fragment="head"/>
+</head>
+<body>
+<component:navbar/>
+
+<jsp:doBody/>
+
+<component:footer/>
+</body>
+</html>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp
deleted file mode 100644
index a66b3e8..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <title> Cards Rush - Connexion</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap">
-    <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">
-    <script src="${pageContext.request.contextPath}/static/js/login.js" defer></script>
-    <meta charset="utf-8">
-</head>
-<body>
-<%@include file="../components/navbar.jsp"%>
-<main>
-    <div class="flex-column login-gap">
-        <div>
-            <h1>Se connecter</h1>
-            <form id="login-form" action="${pageContext.request.contextPath}/api/auth/login" method="POST">
-
-                <label id="username-label" for="username">Username:</label>
-                <input type="text" id="username" name="username" required>
-
-                <label id="password-label" for="password">Password:</label>
-                <input type="password" id="password" name="password" required>
-
-                <input class="button" id="login-submit" type="submit" value="Login">
-
-            </form>
-        </div>
-        <div>
-            <p><a href="${pageContext.request.contextPath}/forgotten-password">Forgotten password?</a></p>
-            <hr>
-            <p>Don't have an account? <a href="${pageContext.request.contextPath}/register">Register</a></p>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/main-menu.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/main-menu.jsp
deleted file mode 100644
index cf647f9..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/main-menu.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ page import="java.util.List" %>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<% List<User> connectedUsers = (List<User>) request.getAttribute("connectedUsers"); %>
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Cards Rush</title>
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap">
-  <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">
-  <link href="${pageContext.request.contextPath}/static/css/main-menu.css" rel="stylesheet">
-  <link href="${pageContext.request.contextPath}/static/css/new-game.css" rel="stylesheet">
-  <link href="${pageContext.request.contextPath}/static/css/modal.css" rel="stylesheet">
-  <script src="${pageContext.request.contextPath}/static/js/modal.js" defer></script>
-  <script src="${pageContext.request.contextPath}/static/js/new-game.js" defer></script>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <script defer src="${pageContext.request.contextPath}/static/js/main-menu.js"></script>
-</head>
-<body>
-<%@include file="../components/navbar.jsp"%>
-  <main>
-    <section id="main">
-      <h1 id="title">Cards Rush!</h1>
-      <div class="main-button">
-        <button class="modal-toggle button" data-target="#newGameModal" >Nouvelle Partie</button>
-        <button class="modal-toggle button" data-target="#statisticsModal" >Statistiques</button>
-      </div>
-    </section>
-    <%@include file="../components/new-game.jsp"%>
-    <%@include file="../components/statistics.jsp"%>
-  </main>
-</body>
-</html>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/register.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/register.jsp
deleted file mode 100644
index 9acfced..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/register.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Register</title>
-  <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">
-  <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">
-  <script src="${pageContext.request.contextPath}/static/js/register.js" defer></script>
-</head>
-<body>
-<%@include file="../components/navbar.jsp"%>
-<main>
-    <div class="flex-column register-gap">
-      <div>
-        <h1>S'inscrire</h1>
-        <form id="register-form" action="${pageContext.request.contextPath}/api/auth/register" method="POST">
-
-          <label for="email">Email :</label>
-          <input type="email" id="email" name="email" required>
-
-          <label for="username">Nom d'utilisateur :</label>
-          <input type="text" id="username" name="username" required>
-
-          <label for="password">Mot de passe :</label>
-          <input type="password" id="password" name="password" required>
-
-          <label for="confirmPassword">Confirmez le mot de passe :</label>
-          <input type="password" id="confirmPassword" name="confirmPassword" required>
-
-          <label for="birthdate">Date de naissance :</label>
-          <input type="date" id="birthdate" name="birthdate" required>
-
-          <label for="gender">Genre :</label>
-          <select name="gender" id="gender" required>
-            <option value="">--Choisissez une option--</option>
-            <option value="MALE">Homme</option>
-            <option value="FEMALE">Femme</option>
-            <option value="OTHER">Autre</option>
-          </select>
-
-          <input class="button" id="register-submit" type="submit" value="Register">
-        </form>
-      </div>
-      <div>
-        <hr>
-        <p>Déjà un compte ? <a href="${pageContext.request.contextPath}/login">Se connecter</a></p>
-      </div>
-    </div>
-</main>
-
-</body>
-</html>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml
index 05b6ff2..7ceab50 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml
@@ -8,4 +8,27 @@
       uppa.project.listener.SessionServletContextListener
     </listener-class>
   </listener>
+  
+  <filter>
+    <filter-name>AuthenticationFilter</filter-name>
+    <filter-class>uppa.project.web.filter.AuthenticationFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>AuthenticationFilter</filter-name>
+    <url-pattern>/main-menu</url-pattern>
+    <url-pattern>/profile</url-pattern>
+    <url-pattern>/game</url-pattern>
+    <url-pattern>/logout</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>AlreadyLoggedFilter</filter-name>
+    <filter-class>uppa.project.web.filter.AlreadyLoggedFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>AlreadyLoggedFilter</filter-name>
+    <url-pattern>/login</url-pattern>
+    <url-pattern>/register</url-pattern>
+    <url-pattern>/forgotten-password</url-pattern>
+  </filter-mapping>
 </web-app>
diff --git a/S2/DevWeb/Projet/src/main/webapp/components/navbar.jsp b/S2/DevWeb/Projet/src/main/webapp/components/navbar.jsp
new file mode 100644
index 0000000..c9de63b
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/components/navbar.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: lucas
+  Date: 16/04/2024
+  Time: 14:15
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg b/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg
index 5ae8532..e26f0cb 100644
--- a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg
+++ b/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg
@@ -8,10 +8,14 @@
 </mask>
 <g mask="url(#mask0_24_4401)">
 <g id="Group">
-<path id="Vector_2" fill-rule="evenodd" clip-rule="evenodd" d="M73.1585 35.2812C74.6857 36.7722 74.6857 39.2279 73.1585 40.7189L65.7889 47.9151C65.0455 48.6409 64.6318 49.6399 64.6442 50.6792L64.7667 60.9786C64.7924 63.1128 63.0558 64.8489 60.9216 64.8237L50.6222 64.7012C49.5829 64.6888 48.5839 65.1026 47.8581 65.8459L40.6619 73.2155C39.171 74.7427 36.7153 74.7427 35.2243 73.2155L28.0281 65.8459C27.302 65.1026 26.3032 64.6888 25.264 64.7012L14.9644 64.8237C12.8304 64.8489 11.0939 63.1128 11.1194 60.9786L11.2421 50.6792C11.2544 49.6399 10.8407 48.6409 10.0972 47.9151L2.72746 40.7188C1.20055 39.2279 1.20055 36.7722 2.72746 35.2812L10.0972 28.085C10.8407 27.359 11.2544 26.3601 11.2421 25.3209L11.1194 15.0213C11.0939 12.8873 12.8304 11.1509 14.9644 11.1763L25.264 11.299C26.3032 11.3114 27.302 10.8976 28.0281 10.1541L35.2243 2.78438C36.7153 1.25746 39.171 1.25746 40.6619 2.78438L47.8581 10.1541C48.5839 10.8976 49.5829 11.3114 50.6222 11.299L60.9216 11.1763C63.0558 11.1509 64.7924 12.8873 64.7667 15.0213L64.6442 25.3209C64.6318 26.3601 65.0455 27.359 65.7889 28.085L73.1585 35.2812ZM15.1431 37.24C15.1431 35.1413 16.8444 33.44 18.9431 33.44H38.7031C40.8018 33.44 42.5031 35.1413 42.5031 37.24V57C42.5031 59.0985 40.8018 60.8 38.7031 60.8H18.9431C16.8444 60.8 15.1431 59.0985 15.1431 57V37.24ZM45.5431 15.2C43.4444 15.2 41.7431 16.9013 41.7431 19V30.4C41.7431 32.4987 43.4444 34.2 45.5431 34.2H56.943C59.0415 34.2 60.743 32.4987 60.743 30.4V19C60.743 16.9013 59.0415 15.2 56.943 15.2H45.5431Z" fill="white"/>
+<path id="Vector_2" fill-rule="evenodd" clip-rule="evenodd"
+      d="M73.1585 35.2812C74.6857 36.7722 74.6857 39.2279 73.1585 40.7189L65.7889 47.9151C65.0455 48.6409 64.6318 49.6399 64.6442 50.6792L64.7667 60.9786C64.7924 63.1128 63.0558 64.8489 60.9216 64.8237L50.6222 64.7012C49.5829 64.6888 48.5839 65.1026 47.8581 65.8459L40.6619 73.2155C39.171 74.7427 36.7153 74.7427 35.2243 73.2155L28.0281 65.8459C27.302 65.1026 26.3032 64.6888 25.264 64.7012L14.9644 64.8237C12.8304 64.8489 11.0939 63.1128 11.1194 60.9786L11.2421 50.6792C11.2544 49.6399 10.8407 48.6409 10.0972 47.9151L2.72746 40.7188C1.20055 39.2279 1.20055 36.7722 2.72746 35.2812L10.0972 28.085C10.8407 27.359 11.2544 26.3601 11.2421 25.3209L11.1194 15.0213C11.0939 12.8873 12.8304 11.1509 14.9644 11.1763L25.264 11.299C26.3032 11.3114 27.302 10.8976 28.0281 10.1541L35.2243 2.78438C36.7153 1.25746 39.171 1.25746 40.6619 2.78438L47.8581 10.1541C48.5839 10.8976 49.5829 11.3114 50.6222 11.299L60.9216 11.1763C63.0558 11.1509 64.7924 12.8873 64.7667 15.0213L64.6442 25.3209C64.6318 26.3601 65.0455 27.359 65.7889 28.085L73.1585 35.2812ZM15.1431 37.24C15.1431 35.1413 16.8444 33.44 18.9431 33.44H38.7031C40.8018 33.44 42.5031 35.1413 42.5031 37.24V57C42.5031 59.0985 40.8018 60.8 38.7031 60.8H18.9431C16.8444 60.8 15.1431 59.0985 15.1431 57V37.24ZM45.5431 15.2C43.4444 15.2 41.7431 16.9013 41.7431 19V30.4C41.7431 32.4987 43.4444 34.2 45.5431 34.2H56.943C59.0415 34.2 60.743 32.4987 60.743 30.4V19C60.743 16.9013 59.0415 15.2 56.943 15.2H45.5431Z"
+      fill="white"/>
 </g>
 </g>
 </g>
-<path id="Vector_3" d="M103.625 13.0435C103.625 13.5533 103.492 14.0078 103.226 14.4068C102.96 14.7836 102.65 15.0828 102.295 15.3045C101.719 14.9277 101.087 14.5952 100.4 14.307C99.7348 14.0188 98.9367 13.8748 98.0057 13.8748C96.2326 13.8748 94.847 14.44 93.8495 15.5705C92.852 16.6788 92.3533 18.2638 92.3533 20.3253C92.3533 22.4533 92.8743 24.0603 93.916 25.1465C94.98 26.2105 96.4321 26.7425 98.2718 26.7425C99.2251 26.7425 100.034 26.6206 100.699 26.3768C101.386 26.1108 102.018 25.8004 102.594 25.4458C102.927 25.7118 103.193 26.0553 103.392 26.4765C103.614 26.8755 103.725 27.3299 103.725 27.8398C103.725 28.2831 103.603 28.7043 103.359 29.1033C103.137 29.4801 102.738 29.8015 102.162 30.0675C101.719 30.2892 101.12 30.4887 100.367 30.666C99.6127 30.8655 98.6817 30.9653 97.5735 30.9653C96.0882 30.9653 94.7031 30.7547 93.4173 30.3335C92.1314 29.9123 91.0123 29.2695 90.059 28.405C89.1057 27.5405 88.3523 26.4433 87.798 25.1133C87.266 23.7611 87 22.1651 87 20.3253C87 18.5963 87.266 17.0668 87.798 15.7368C88.3523 14.4068 89.0948 13.2984 90.0258 12.4118C90.9568 11.5029 92.0431 10.8158 93.2843 10.3503C94.5254 9.88475 95.8554 9.652 97.2743 9.652C99.2916 9.652 100.854 9.97343 101.963 10.6163C103.071 11.2591 103.625 12.0682 103.625 13.0435ZM113.308 27.1748C113.796 27.1748 114.272 27.1304 114.738 27.0418C115.225 26.9309 115.591 26.7979 115.835 26.6428V23.5838L113.108 23.8165C112.399 23.883 111.823 24.0493 111.379 24.3153C110.959 24.5591 110.748 24.9359 110.748 25.4458C110.748 25.9778 110.947 26.3989 111.346 26.7093C111.745 27.0196 112.399 27.1748 113.308 27.1748ZM113.108 13.908C114.261 13.908 115.303 14.0299 116.234 14.2738C117.187 14.4954 117.996 14.8501 118.661 15.3378C119.326 15.8254 119.836 16.4461 120.191 17.1998C120.568 17.9534 120.756 18.8401 120.756 19.8598V27.3743C120.756 27.9506 120.601 28.4161 120.29 28.7708C120.003 29.1033 119.648 29.3914 119.226 29.6353C118.54 30.0564 117.697 30.3778 116.699 30.5995C115.702 30.8212 114.571 30.932 113.308 30.932C111.025 30.932 109.207 30.4998 107.855 29.6353C106.503 28.7486 105.827 27.4075 105.827 25.612C105.827 24.0825 106.281 22.9188 107.19 22.1208C108.099 21.3228 109.496 20.824 111.379 20.6245L115.802 20.159V19.7933C115.802 19.0839 115.514 18.563 114.937 18.2305C114.361 17.898 113.53 17.7318 112.443 17.7318C111.601 17.7318 110.77 17.8315 109.95 18.031C109.152 18.2305 108.432 18.4633 107.788 18.7293C107.522 18.5519 107.29 18.2859 107.09 17.9313C106.913 17.5544 106.824 17.1554 106.824 16.7343C106.824 15.7589 107.334 15.0607 108.354 14.6395C108.997 14.3957 109.739 14.2183 110.581 14.1075C111.446 13.9745 112.289 13.908 113.108 13.908ZM129.539 30.3668C129.318 30.4333 129.007 30.4887 128.608 30.533C128.209 30.5995 127.766 30.6328 127.278 30.6328C126.281 30.6328 125.561 30.4776 125.117 30.1673C124.674 29.8348 124.452 29.203 124.452 28.272V18.1308C124.452 17.5101 124.607 16.9781 124.917 16.5348C125.228 16.0914 125.66 15.7035 126.214 15.371C126.946 14.9277 127.822 14.5841 128.841 14.3403C129.883 14.0743 130.969 13.9413 132.099 13.9413C134.405 13.9413 135.557 14.7171 135.557 16.2688C135.557 16.6456 135.502 16.9892 135.391 17.2995C135.28 17.6098 135.158 17.8758 135.025 18.0975C134.516 17.9867 133.895 17.9313 133.163 17.9313C132.521 17.9313 131.878 18.0088 131.235 18.164C130.592 18.3192 130.027 18.5298 129.539 18.7958V30.3668ZM145.023 13.908C145.533 13.908 146.009 13.9523 146.452 14.041C146.918 14.1075 147.339 14.2073 147.716 14.3403V8.75425C147.96 8.68775 148.281 8.62125 148.68 8.55475C149.079 8.48825 149.523 8.455 150.01 8.455C151.008 8.455 151.717 8.62125 152.138 8.95375C152.582 9.28625 152.803 9.918 152.803 10.849V27.0418C152.803 27.5738 152.692 28.0282 152.471 28.405C152.249 28.7597 151.895 29.0922 151.407 29.4025C150.786 29.7793 149.988 30.1229 149.013 30.4333C148.037 30.7436 146.918 30.8988 145.654 30.8988C142.861 30.8988 140.656 30.2005 139.038 28.804C137.442 27.3853 136.644 25.2684 136.644 22.4533C136.644 20.9903 136.855 19.7268 137.275 18.6628C137.719 17.5988 138.318 16.7121 139.071 16.0028C139.825 15.2934 140.712 14.7725 141.731 14.44C142.751 14.0853 143.848 13.908 145.023 13.908ZM147.749 18.3968C147.461 18.2638 147.14 18.1529 146.785 18.0643C146.452 17.9534 146.098 17.898 145.721 17.898C144.524 17.898 143.571 18.2638 142.861 18.9953C142.152 19.7268 141.797 20.8905 141.797 22.4865C141.797 24.016 142.13 25.1354 142.795 25.8448C143.482 26.5319 144.424 26.8755 145.621 26.8755C146.087 26.8755 146.497 26.8312 146.851 26.7425C147.229 26.6317 147.528 26.5098 147.749 26.3768V18.3968ZM169.731 25.7118C169.731 27.3521 169.121 28.6378 167.902 29.5688C166.683 30.4776 164.888 30.932 162.516 30.932C161.585 30.932 160.731 30.8655 159.955 30.7325C159.202 30.5995 158.548 30.4 157.994 30.134C157.44 29.868 157.007 29.5355 156.697 29.1365C156.387 28.7375 156.231 28.272 156.231 27.74C156.231 27.2523 156.331 26.8423 156.531 26.5098C156.73 26.1551 156.985 25.8669 157.295 25.6453C157.938 26.0221 158.67 26.3546 159.49 26.6428C160.31 26.9309 161.263 27.075 162.349 27.075C163.923 27.075 164.71 26.6317 164.71 25.745C164.71 25.3682 164.566 25.08 164.278 24.8805C164.012 24.681 163.546 24.5037 162.881 24.3485L161.551 24.0493C159.734 23.6724 158.382 23.0961 157.495 22.3203C156.608 21.5223 156.165 20.4139 156.165 18.9953C156.165 17.4214 156.797 16.1801 158.06 15.2713C159.346 14.3403 161.064 13.8748 163.214 13.8748C164.012 13.8748 164.766 13.9413 165.475 14.0743C166.184 14.1851 166.794 14.3624 167.304 14.6063C167.814 14.8501 168.213 15.1604 168.501 15.5373C168.811 15.8919 168.966 16.3131 168.966 16.8008C168.966 17.2441 168.878 17.6431 168.7 17.9978C168.523 18.3303 168.29 18.6073 168.002 18.829C167.825 18.7182 167.559 18.5963 167.204 18.4633C166.871 18.3303 166.506 18.2083 166.106 18.0975C165.708 17.9867 165.287 17.898 164.843 17.8315C164.4 17.765 163.99 17.7318 163.613 17.7318C162.837 17.7318 162.228 17.8426 161.784 18.0643C161.363 18.2638 161.152 18.5741 161.152 18.9953C161.152 19.3056 161.274 19.5494 161.518 19.7268C161.762 19.9041 162.205 20.0703 162.848 20.2255L164.112 20.5248C166.129 20.9681 167.57 21.6109 168.434 22.4533C169.299 23.2956 169.731 24.3818 169.731 25.7118ZM104.124 49.9843C104.124 51.2701 103.78 52.4224 103.093 53.4423C102.428 54.4621 101.519 55.271 100.367 55.8695C101.275 57.0665 102.14 58.197 102.96 59.261C103.802 60.3027 104.423 61.1453 104.822 61.788C104.623 62.4972 104.246 63.0406 103.691 63.4173C103.16 63.7721 102.572 63.9493 101.929 63.9493C101.087 63.9493 100.444 63.7721 100.001 63.4173C99.5576 63.0406 99.1363 62.5304 98.7373 61.8877L95.5453 56.9335H93.251V63.6167C93.0073 63.6833 92.6634 63.7388 92.2203 63.783C91.7771 63.8495 91.3116 63.8828 90.8238 63.8828C89.7821 63.8828 89.0506 63.7056 88.6293 63.3507C88.2303 62.9959 88.0307 62.3533 88.0307 61.4223V45.296C88.0307 44.8527 88.1414 44.5091 88.3633 44.2653C88.6069 44.0214 88.9508 43.833 89.394 43.7C90.1032 43.434 90.9568 43.2456 91.9543 43.1348C92.9518 43.0239 93.9934 42.9685 95.0798 42.9685C98.0946 42.9685 100.356 43.6003 101.863 44.8638C103.37 46.1051 104.124 47.8121 104.124 49.9843ZM95.246 52.9103C96.31 52.9103 97.1745 52.6775 97.8395 52.212C98.5045 51.7242 98.837 50.9927 98.837 50.0175C98.837 48.1113 97.5626 47.158 95.0133 47.158C94.6584 47.158 94.3373 47.1802 94.049 47.2245C93.7607 47.2467 93.4728 47.2799 93.1845 47.3243V52.9103H95.246ZM122.865 60.325C122.865 61.3667 122.411 62.1647 121.502 62.719C120.793 63.1622 119.917 63.5061 118.875 63.7498C117.834 64.0158 116.681 64.1488 115.417 64.1488C114.22 64.1488 113.134 64.0158 112.159 63.7498C111.184 63.5061 110.341 63.1071 109.632 62.5528C108.945 61.9984 108.402 61.3002 108.003 60.458C107.626 59.6158 107.437 58.596 107.437 57.399V47.7233C107.681 47.6568 108.003 47.5903 108.402 47.5238C108.801 47.4573 109.244 47.424 109.732 47.424C110.729 47.424 111.438 47.5903 111.86 47.9228C112.303 48.2553 112.525 48.887 112.525 49.818V57.3658C112.525 58.3633 112.78 59.0838 113.289 59.527C113.799 59.9483 114.52 60.1588 115.451 60.1588C116.027 60.1588 116.504 60.1146 116.88 60.0258C117.279 59.9151 117.579 59.8039 117.778 59.6933V47.7233C118 47.6568 118.31 47.5903 118.709 47.5238C119.108 47.4573 119.551 47.424 120.039 47.424C121.037 47.424 121.757 47.5903 122.2 47.9228C122.644 48.2553 122.865 48.887 122.865 49.818V60.325ZM139.696 58.9618C139.696 60.6019 139.086 61.8878 137.867 62.8188C136.647 63.7274 134.852 64.182 132.48 64.182C131.549 64.182 130.696 64.1155 129.92 63.9825C129.166 63.8495 128.513 63.65 127.958 63.384C127.404 63.118 126.972 62.7855 126.662 62.3865C126.351 61.9875 126.196 61.522 126.196 60.99C126.196 60.5022 126.296 60.0923 126.495 59.7598C126.695 59.4049 126.95 59.1171 127.26 58.8953C127.903 59.2719 128.634 59.6044 129.455 59.8927C130.275 60.1811 131.228 60.325 132.314 60.325C133.888 60.325 134.675 59.8818 134.675 58.995C134.675 58.6183 134.531 58.33 134.243 58.1305C133.977 57.931 133.511 57.7538 132.846 57.5985L131.516 57.2993C129.698 56.9226 128.346 56.3459 127.46 55.5703C126.573 54.7723 126.13 53.6641 126.13 52.2453C126.13 50.6716 126.761 49.4299 128.025 48.5213C129.311 47.5903 131.028 47.1248 133.179 47.1248C133.977 47.1248 134.73 47.1913 135.44 47.3243C136.149 47.4351 136.759 47.6126 137.268 47.8563C137.778 48.0999 138.177 48.4106 138.465 48.7873C138.775 49.1421 138.931 49.5629 138.931 50.0508C138.931 50.4939 138.842 50.8929 138.665 51.2478C138.488 51.5803 138.255 51.8572 137.967 52.079C137.789 51.9683 137.523 51.8463 137.169 51.7133C136.836 51.5803 136.47 51.4582 136.071 51.3475C135.672 51.2368 135.251 51.148 134.808 51.0815C134.365 51.015 133.954 50.9818 133.578 50.9818C132.802 50.9818 132.192 51.0924 131.749 51.3143C131.327 51.5138 131.117 51.8239 131.117 52.2453C131.117 52.5554 131.239 52.7996 131.483 52.9768C131.726 53.1539 132.17 53.3202 132.813 53.4755L134.076 53.7748C136.094 54.2179 137.534 54.8611 138.399 55.7033C139.263 56.5454 139.696 57.6318 139.696 58.9618ZM147.822 63.6167C147.6 63.6833 147.29 63.7388 146.891 63.783C146.492 63.8495 146.049 63.8828 145.561 63.8828C144.563 63.8828 143.843 63.7274 143.4 63.4173C142.956 63.0848 142.735 62.453 142.735 61.522V42.0043C142.978 41.9378 143.3 41.8713 143.699 41.8048C144.098 41.7383 144.541 41.705 145.029 41.705C146.026 41.705 146.736 41.8713 147.157 42.2038C147.6 42.5363 147.822 43.168 147.822 44.099V47.9228C148.287 47.7009 148.808 47.5238 149.385 47.3908C149.983 47.2356 150.626 47.158 151.313 47.158C153.441 47.158 155.104 47.7009 156.301 48.7873C157.52 49.8513 158.129 51.4582 158.129 53.6085V63.6167C157.908 63.6833 157.597 63.7388 157.198 63.783C156.799 63.8495 156.356 63.8828 155.868 63.8828C154.871 63.8828 154.15 63.7274 153.707 63.4173C153.264 63.0848 153.042 62.453 153.042 61.522V53.9078C153.042 52.9103 152.787 52.2011 152.277 51.7798C151.79 51.3584 151.158 51.148 150.382 51.148C149.872 51.148 149.407 51.2254 148.986 51.3808C148.564 51.5138 148.177 51.68 147.822 51.8795V63.6167Z" fill="white"/>
+<path id="Vector_3"
+      d="M103.625 13.0435C103.625 13.5533 103.492 14.0078 103.226 14.4068C102.96 14.7836 102.65 15.0828 102.295 15.3045C101.719 14.9277 101.087 14.5952 100.4 14.307C99.7348 14.0188 98.9367 13.8748 98.0057 13.8748C96.2326 13.8748 94.847 14.44 93.8495 15.5705C92.852 16.6788 92.3533 18.2638 92.3533 20.3253C92.3533 22.4533 92.8743 24.0603 93.916 25.1465C94.98 26.2105 96.4321 26.7425 98.2718 26.7425C99.2251 26.7425 100.034 26.6206 100.699 26.3768C101.386 26.1108 102.018 25.8004 102.594 25.4458C102.927 25.7118 103.193 26.0553 103.392 26.4765C103.614 26.8755 103.725 27.3299 103.725 27.8398C103.725 28.2831 103.603 28.7043 103.359 29.1033C103.137 29.4801 102.738 29.8015 102.162 30.0675C101.719 30.2892 101.12 30.4887 100.367 30.666C99.6127 30.8655 98.6817 30.9653 97.5735 30.9653C96.0882 30.9653 94.7031 30.7547 93.4173 30.3335C92.1314 29.9123 91.0123 29.2695 90.059 28.405C89.1057 27.5405 88.3523 26.4433 87.798 25.1133C87.266 23.7611 87 22.1651 87 20.3253C87 18.5963 87.266 17.0668 87.798 15.7368C88.3523 14.4068 89.0948 13.2984 90.0258 12.4118C90.9568 11.5029 92.0431 10.8158 93.2843 10.3503C94.5254 9.88475 95.8554 9.652 97.2743 9.652C99.2916 9.652 100.854 9.97343 101.963 10.6163C103.071 11.2591 103.625 12.0682 103.625 13.0435ZM113.308 27.1748C113.796 27.1748 114.272 27.1304 114.738 27.0418C115.225 26.9309 115.591 26.7979 115.835 26.6428V23.5838L113.108 23.8165C112.399 23.883 111.823 24.0493 111.379 24.3153C110.959 24.5591 110.748 24.9359 110.748 25.4458C110.748 25.9778 110.947 26.3989 111.346 26.7093C111.745 27.0196 112.399 27.1748 113.308 27.1748ZM113.108 13.908C114.261 13.908 115.303 14.0299 116.234 14.2738C117.187 14.4954 117.996 14.8501 118.661 15.3378C119.326 15.8254 119.836 16.4461 120.191 17.1998C120.568 17.9534 120.756 18.8401 120.756 19.8598V27.3743C120.756 27.9506 120.601 28.4161 120.29 28.7708C120.003 29.1033 119.648 29.3914 119.226 29.6353C118.54 30.0564 117.697 30.3778 116.699 30.5995C115.702 30.8212 114.571 30.932 113.308 30.932C111.025 30.932 109.207 30.4998 107.855 29.6353C106.503 28.7486 105.827 27.4075 105.827 25.612C105.827 24.0825 106.281 22.9188 107.19 22.1208C108.099 21.3228 109.496 20.824 111.379 20.6245L115.802 20.159V19.7933C115.802 19.0839 115.514 18.563 114.937 18.2305C114.361 17.898 113.53 17.7318 112.443 17.7318C111.601 17.7318 110.77 17.8315 109.95 18.031C109.152 18.2305 108.432 18.4633 107.788 18.7293C107.522 18.5519 107.29 18.2859 107.09 17.9313C106.913 17.5544 106.824 17.1554 106.824 16.7343C106.824 15.7589 107.334 15.0607 108.354 14.6395C108.997 14.3957 109.739 14.2183 110.581 14.1075C111.446 13.9745 112.289 13.908 113.108 13.908ZM129.539 30.3668C129.318 30.4333 129.007 30.4887 128.608 30.533C128.209 30.5995 127.766 30.6328 127.278 30.6328C126.281 30.6328 125.561 30.4776 125.117 30.1673C124.674 29.8348 124.452 29.203 124.452 28.272V18.1308C124.452 17.5101 124.607 16.9781 124.917 16.5348C125.228 16.0914 125.66 15.7035 126.214 15.371C126.946 14.9277 127.822 14.5841 128.841 14.3403C129.883 14.0743 130.969 13.9413 132.099 13.9413C134.405 13.9413 135.557 14.7171 135.557 16.2688C135.557 16.6456 135.502 16.9892 135.391 17.2995C135.28 17.6098 135.158 17.8758 135.025 18.0975C134.516 17.9867 133.895 17.9313 133.163 17.9313C132.521 17.9313 131.878 18.0088 131.235 18.164C130.592 18.3192 130.027 18.5298 129.539 18.7958V30.3668ZM145.023 13.908C145.533 13.908 146.009 13.9523 146.452 14.041C146.918 14.1075 147.339 14.2073 147.716 14.3403V8.75425C147.96 8.68775 148.281 8.62125 148.68 8.55475C149.079 8.48825 149.523 8.455 150.01 8.455C151.008 8.455 151.717 8.62125 152.138 8.95375C152.582 9.28625 152.803 9.918 152.803 10.849V27.0418C152.803 27.5738 152.692 28.0282 152.471 28.405C152.249 28.7597 151.895 29.0922 151.407 29.4025C150.786 29.7793 149.988 30.1229 149.013 30.4333C148.037 30.7436 146.918 30.8988 145.654 30.8988C142.861 30.8988 140.656 30.2005 139.038 28.804C137.442 27.3853 136.644 25.2684 136.644 22.4533C136.644 20.9903 136.855 19.7268 137.275 18.6628C137.719 17.5988 138.318 16.7121 139.071 16.0028C139.825 15.2934 140.712 14.7725 141.731 14.44C142.751 14.0853 143.848 13.908 145.023 13.908ZM147.749 18.3968C147.461 18.2638 147.14 18.1529 146.785 18.0643C146.452 17.9534 146.098 17.898 145.721 17.898C144.524 17.898 143.571 18.2638 142.861 18.9953C142.152 19.7268 141.797 20.8905 141.797 22.4865C141.797 24.016 142.13 25.1354 142.795 25.8448C143.482 26.5319 144.424 26.8755 145.621 26.8755C146.087 26.8755 146.497 26.8312 146.851 26.7425C147.229 26.6317 147.528 26.5098 147.749 26.3768V18.3968ZM169.731 25.7118C169.731 27.3521 169.121 28.6378 167.902 29.5688C166.683 30.4776 164.888 30.932 162.516 30.932C161.585 30.932 160.731 30.8655 159.955 30.7325C159.202 30.5995 158.548 30.4 157.994 30.134C157.44 29.868 157.007 29.5355 156.697 29.1365C156.387 28.7375 156.231 28.272 156.231 27.74C156.231 27.2523 156.331 26.8423 156.531 26.5098C156.73 26.1551 156.985 25.8669 157.295 25.6453C157.938 26.0221 158.67 26.3546 159.49 26.6428C160.31 26.9309 161.263 27.075 162.349 27.075C163.923 27.075 164.71 26.6317 164.71 25.745C164.71 25.3682 164.566 25.08 164.278 24.8805C164.012 24.681 163.546 24.5037 162.881 24.3485L161.551 24.0493C159.734 23.6724 158.382 23.0961 157.495 22.3203C156.608 21.5223 156.165 20.4139 156.165 18.9953C156.165 17.4214 156.797 16.1801 158.06 15.2713C159.346 14.3403 161.064 13.8748 163.214 13.8748C164.012 13.8748 164.766 13.9413 165.475 14.0743C166.184 14.1851 166.794 14.3624 167.304 14.6063C167.814 14.8501 168.213 15.1604 168.501 15.5373C168.811 15.8919 168.966 16.3131 168.966 16.8008C168.966 17.2441 168.878 17.6431 168.7 17.9978C168.523 18.3303 168.29 18.6073 168.002 18.829C167.825 18.7182 167.559 18.5963 167.204 18.4633C166.871 18.3303 166.506 18.2083 166.106 18.0975C165.708 17.9867 165.287 17.898 164.843 17.8315C164.4 17.765 163.99 17.7318 163.613 17.7318C162.837 17.7318 162.228 17.8426 161.784 18.0643C161.363 18.2638 161.152 18.5741 161.152 18.9953C161.152 19.3056 161.274 19.5494 161.518 19.7268C161.762 19.9041 162.205 20.0703 162.848 20.2255L164.112 20.5248C166.129 20.9681 167.57 21.6109 168.434 22.4533C169.299 23.2956 169.731 24.3818 169.731 25.7118ZM104.124 49.9843C104.124 51.2701 103.78 52.4224 103.093 53.4423C102.428 54.4621 101.519 55.271 100.367 55.8695C101.275 57.0665 102.14 58.197 102.96 59.261C103.802 60.3027 104.423 61.1453 104.822 61.788C104.623 62.4972 104.246 63.0406 103.691 63.4173C103.16 63.7721 102.572 63.9493 101.929 63.9493C101.087 63.9493 100.444 63.7721 100.001 63.4173C99.5576 63.0406 99.1363 62.5304 98.7373 61.8877L95.5453 56.9335H93.251V63.6167C93.0073 63.6833 92.6634 63.7388 92.2203 63.783C91.7771 63.8495 91.3116 63.8828 90.8238 63.8828C89.7821 63.8828 89.0506 63.7056 88.6293 63.3507C88.2303 62.9959 88.0307 62.3533 88.0307 61.4223V45.296C88.0307 44.8527 88.1414 44.5091 88.3633 44.2653C88.6069 44.0214 88.9508 43.833 89.394 43.7C90.1032 43.434 90.9568 43.2456 91.9543 43.1348C92.9518 43.0239 93.9934 42.9685 95.0798 42.9685C98.0946 42.9685 100.356 43.6003 101.863 44.8638C103.37 46.1051 104.124 47.8121 104.124 49.9843ZM95.246 52.9103C96.31 52.9103 97.1745 52.6775 97.8395 52.212C98.5045 51.7242 98.837 50.9927 98.837 50.0175C98.837 48.1113 97.5626 47.158 95.0133 47.158C94.6584 47.158 94.3373 47.1802 94.049 47.2245C93.7607 47.2467 93.4728 47.2799 93.1845 47.3243V52.9103H95.246ZM122.865 60.325C122.865 61.3667 122.411 62.1647 121.502 62.719C120.793 63.1622 119.917 63.5061 118.875 63.7498C117.834 64.0158 116.681 64.1488 115.417 64.1488C114.22 64.1488 113.134 64.0158 112.159 63.7498C111.184 63.5061 110.341 63.1071 109.632 62.5528C108.945 61.9984 108.402 61.3002 108.003 60.458C107.626 59.6158 107.437 58.596 107.437 57.399V47.7233C107.681 47.6568 108.003 47.5903 108.402 47.5238C108.801 47.4573 109.244 47.424 109.732 47.424C110.729 47.424 111.438 47.5903 111.86 47.9228C112.303 48.2553 112.525 48.887 112.525 49.818V57.3658C112.525 58.3633 112.78 59.0838 113.289 59.527C113.799 59.9483 114.52 60.1588 115.451 60.1588C116.027 60.1588 116.504 60.1146 116.88 60.0258C117.279 59.9151 117.579 59.8039 117.778 59.6933V47.7233C118 47.6568 118.31 47.5903 118.709 47.5238C119.108 47.4573 119.551 47.424 120.039 47.424C121.037 47.424 121.757 47.5903 122.2 47.9228C122.644 48.2553 122.865 48.887 122.865 49.818V60.325ZM139.696 58.9618C139.696 60.6019 139.086 61.8878 137.867 62.8188C136.647 63.7274 134.852 64.182 132.48 64.182C131.549 64.182 130.696 64.1155 129.92 63.9825C129.166 63.8495 128.513 63.65 127.958 63.384C127.404 63.118 126.972 62.7855 126.662 62.3865C126.351 61.9875 126.196 61.522 126.196 60.99C126.196 60.5022 126.296 60.0923 126.495 59.7598C126.695 59.4049 126.95 59.1171 127.26 58.8953C127.903 59.2719 128.634 59.6044 129.455 59.8927C130.275 60.1811 131.228 60.325 132.314 60.325C133.888 60.325 134.675 59.8818 134.675 58.995C134.675 58.6183 134.531 58.33 134.243 58.1305C133.977 57.931 133.511 57.7538 132.846 57.5985L131.516 57.2993C129.698 56.9226 128.346 56.3459 127.46 55.5703C126.573 54.7723 126.13 53.6641 126.13 52.2453C126.13 50.6716 126.761 49.4299 128.025 48.5213C129.311 47.5903 131.028 47.1248 133.179 47.1248C133.977 47.1248 134.73 47.1913 135.44 47.3243C136.149 47.4351 136.759 47.6126 137.268 47.8563C137.778 48.0999 138.177 48.4106 138.465 48.7873C138.775 49.1421 138.931 49.5629 138.931 50.0508C138.931 50.4939 138.842 50.8929 138.665 51.2478C138.488 51.5803 138.255 51.8572 137.967 52.079C137.789 51.9683 137.523 51.8463 137.169 51.7133C136.836 51.5803 136.47 51.4582 136.071 51.3475C135.672 51.2368 135.251 51.148 134.808 51.0815C134.365 51.015 133.954 50.9818 133.578 50.9818C132.802 50.9818 132.192 51.0924 131.749 51.3143C131.327 51.5138 131.117 51.8239 131.117 52.2453C131.117 52.5554 131.239 52.7996 131.483 52.9768C131.726 53.1539 132.17 53.3202 132.813 53.4755L134.076 53.7748C136.094 54.2179 137.534 54.8611 138.399 55.7033C139.263 56.5454 139.696 57.6318 139.696 58.9618ZM147.822 63.6167C147.6 63.6833 147.29 63.7388 146.891 63.783C146.492 63.8495 146.049 63.8828 145.561 63.8828C144.563 63.8828 143.843 63.7274 143.4 63.4173C142.956 63.0848 142.735 62.453 142.735 61.522V42.0043C142.978 41.9378 143.3 41.8713 143.699 41.8048C144.098 41.7383 144.541 41.705 145.029 41.705C146.026 41.705 146.736 41.8713 147.157 42.2038C147.6 42.5363 147.822 43.168 147.822 44.099V47.9228C148.287 47.7009 148.808 47.5238 149.385 47.3908C149.983 47.2356 150.626 47.158 151.313 47.158C153.441 47.158 155.104 47.7009 156.301 48.7873C157.52 49.8513 158.129 51.4582 158.129 53.6085V63.6167C157.908 63.6833 157.597 63.7388 157.198 63.783C156.799 63.8495 156.356 63.8828 155.868 63.8828C154.871 63.8828 154.15 63.7274 153.707 63.4173C153.264 63.0848 153.042 62.453 153.042 61.522V53.9078C153.042 52.9103 152.787 52.2011 152.277 51.7798C151.79 51.3584 151.158 51.148 150.382 51.148C149.872 51.148 149.407 51.2254 148.986 51.3808C148.564 51.5138 148.177 51.68 147.822 51.8795V63.6167Z"
+      fill="white"/>
 </g>
 </svg>
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogoBlack.svg b/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogoBlack.svg
new file mode 100644
index 0000000..84649dc
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogoBlack.svg
@@ -0,0 +1,21 @@
+<svg width="171" height="76" viewBox="0 0 171 76" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g id="Logo Light + Texte 1">
+    <g id="Clip path group">
+      <mask id="mask0_24_4401" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="76" height="76">
+        <g id="clip0_32_748">
+          <path id="Vector" d="M76 0H0V76H76V0Z" fill="white"/>
+        </g>
+      </mask>
+      <g mask="url(#mask0_24_4401)">
+        <g id="Group">
+          <path id="Vector_2" fill-rule="evenodd" clip-rule="evenodd"
+                d="M73.1585 35.2812C74.6857 36.7722 74.6857 39.2279 73.1585 40.7189L65.7889 47.9151C65.0455 48.6409 64.6318 49.6399 64.6442 50.6792L64.7667 60.9786C64.7924 63.1128 63.0558 64.8489 60.9216 64.8237L50.6222 64.7012C49.5829 64.6888 48.5839 65.1026 47.8581 65.8459L40.6619 73.2155C39.171 74.7427 36.7153 74.7427 35.2243 73.2155L28.0281 65.8459C27.302 65.1026 26.3032 64.6888 25.264 64.7012L14.9644 64.8237C12.8304 64.8489 11.0939 63.1128 11.1194 60.9786L11.2421 50.6792C11.2544 49.6399 10.8407 48.6409 10.0972 47.9151L2.72746 40.7188C1.20055 39.2279 1.20055 36.7722 2.72746 35.2812L10.0972 28.085C10.8407 27.359 11.2544 26.3601 11.2421 25.3209L11.1194 15.0213C11.0939 12.8873 12.8304 11.1509 14.9644 11.1763L25.264 11.299C26.3032 11.3114 27.302 10.8976 28.0281 10.1541L35.2243 2.78438C36.7153 1.25746 39.171 1.25746 40.6619 2.78438L47.8581 10.1541C48.5839 10.8976 49.5829 11.3114 50.6222 11.299L60.9216 11.1763C63.0558 11.1509 64.7924 12.8873 64.7667 15.0213L64.6442 25.3209C64.6318 26.3601 65.0455 27.359 65.7889 28.085L73.1585 35.2812ZM15.1431 37.24C15.1431 35.1413 16.8444 33.44 18.9431 33.44H38.7031C40.8018 33.44 42.5031 35.1413 42.5031 37.24V57C42.5031 59.0985 40.8018 60.8 38.7031 60.8H18.9431C16.8444 60.8 15.1431 59.0985 15.1431 57V37.24ZM45.5431 15.2C43.4444 15.2 41.7431 16.9013 41.7431 19V30.4C41.7431 32.4987 43.4444 34.2 45.5431 34.2H56.943C59.0415 34.2 60.743 32.4987 60.743 30.4V19C60.743 16.9013 59.0415 15.2 56.943 15.2H45.5431Z"
+                fill="black"/>
+        </g>
+      </g>
+    </g>
+    <path id="Vector_3"
+          d="M103.625 13.0435C103.625 13.5533 103.492 14.0078 103.226 14.4068C102.96 14.7836 102.65 15.0828 102.295 15.3045C101.719 14.9277 101.087 14.5952 100.4 14.307C99.7348 14.0188 98.9367 13.8748 98.0057 13.8748C96.2326 13.8748 94.847 14.44 93.8495 15.5705C92.852 16.6788 92.3533 18.2638 92.3533 20.3253C92.3533 22.4533 92.8743 24.0603 93.916 25.1465C94.98 26.2105 96.4321 26.7425 98.2718 26.7425C99.2251 26.7425 100.034 26.6206 100.699 26.3768C101.386 26.1108 102.018 25.8004 102.594 25.4458C102.927 25.7118 103.193 26.0553 103.392 26.4765C103.614 26.8755 103.725 27.3299 103.725 27.8398C103.725 28.2831 103.603 28.7043 103.359 29.1033C103.137 29.4801 102.738 29.8015 102.162 30.0675C101.719 30.2892 101.12 30.4887 100.367 30.666C99.6127 30.8655 98.6817 30.9653 97.5735 30.9653C96.0882 30.9653 94.7031 30.7547 93.4173 30.3335C92.1314 29.9123 91.0123 29.2695 90.059 28.405C89.1057 27.5405 88.3523 26.4433 87.798 25.1133C87.266 23.7611 87 22.1651 87 20.3253C87 18.5963 87.266 17.0668 87.798 15.7368C88.3523 14.4068 89.0948 13.2984 90.0258 12.4118C90.9568 11.5029 92.0431 10.8158 93.2843 10.3503C94.5254 9.88475 95.8554 9.652 97.2743 9.652C99.2916 9.652 100.854 9.97343 101.963 10.6163C103.071 11.2591 103.625 12.0682 103.625 13.0435ZM113.308 27.1748C113.796 27.1748 114.272 27.1304 114.738 27.0418C115.225 26.9309 115.591 26.7979 115.835 26.6428V23.5838L113.108 23.8165C112.399 23.883 111.823 24.0493 111.379 24.3153C110.959 24.5591 110.748 24.9359 110.748 25.4458C110.748 25.9778 110.947 26.3989 111.346 26.7093C111.745 27.0196 112.399 27.1748 113.308 27.1748ZM113.108 13.908C114.261 13.908 115.303 14.0299 116.234 14.2738C117.187 14.4954 117.996 14.8501 118.661 15.3378C119.326 15.8254 119.836 16.4461 120.191 17.1998C120.568 17.9534 120.756 18.8401 120.756 19.8598V27.3743C120.756 27.9506 120.601 28.4161 120.29 28.7708C120.003 29.1033 119.648 29.3914 119.226 29.6353C118.54 30.0564 117.697 30.3778 116.699 30.5995C115.702 30.8212 114.571 30.932 113.308 30.932C111.025 30.932 109.207 30.4998 107.855 29.6353C106.503 28.7486 105.827 27.4075 105.827 25.612C105.827 24.0825 106.281 22.9188 107.19 22.1208C108.099 21.3228 109.496 20.824 111.379 20.6245L115.802 20.159V19.7933C115.802 19.0839 115.514 18.563 114.937 18.2305C114.361 17.898 113.53 17.7318 112.443 17.7318C111.601 17.7318 110.77 17.8315 109.95 18.031C109.152 18.2305 108.432 18.4633 107.788 18.7293C107.522 18.5519 107.29 18.2859 107.09 17.9313C106.913 17.5544 106.824 17.1554 106.824 16.7343C106.824 15.7589 107.334 15.0607 108.354 14.6395C108.997 14.3957 109.739 14.2183 110.581 14.1075C111.446 13.9745 112.289 13.908 113.108 13.908ZM129.539 30.3668C129.318 30.4333 129.007 30.4887 128.608 30.533C128.209 30.5995 127.766 30.6328 127.278 30.6328C126.281 30.6328 125.561 30.4776 125.117 30.1673C124.674 29.8348 124.452 29.203 124.452 28.272V18.1308C124.452 17.5101 124.607 16.9781 124.917 16.5348C125.228 16.0914 125.66 15.7035 126.214 15.371C126.946 14.9277 127.822 14.5841 128.841 14.3403C129.883 14.0743 130.969 13.9413 132.099 13.9413C134.405 13.9413 135.557 14.7171 135.557 16.2688C135.557 16.6456 135.502 16.9892 135.391 17.2995C135.28 17.6098 135.158 17.8758 135.025 18.0975C134.516 17.9867 133.895 17.9313 133.163 17.9313C132.521 17.9313 131.878 18.0088 131.235 18.164C130.592 18.3192 130.027 18.5298 129.539 18.7958V30.3668ZM145.023 13.908C145.533 13.908 146.009 13.9523 146.452 14.041C146.918 14.1075 147.339 14.2073 147.716 14.3403V8.75425C147.96 8.68775 148.281 8.62125 148.68 8.55475C149.079 8.48825 149.523 8.455 150.01 8.455C151.008 8.455 151.717 8.62125 152.138 8.95375C152.582 9.28625 152.803 9.918 152.803 10.849V27.0418C152.803 27.5738 152.692 28.0282 152.471 28.405C152.249 28.7597 151.895 29.0922 151.407 29.4025C150.786 29.7793 149.988 30.1229 149.013 30.4333C148.037 30.7436 146.918 30.8988 145.654 30.8988C142.861 30.8988 140.656 30.2005 139.038 28.804C137.442 27.3853 136.644 25.2684 136.644 22.4533C136.644 20.9903 136.855 19.7268 137.275 18.6628C137.719 17.5988 138.318 16.7121 139.071 16.0028C139.825 15.2934 140.712 14.7725 141.731 14.44C142.751 14.0853 143.848 13.908 145.023 13.908ZM147.749 18.3968C147.461 18.2638 147.14 18.1529 146.785 18.0643C146.452 17.9534 146.098 17.898 145.721 17.898C144.524 17.898 143.571 18.2638 142.861 18.9953C142.152 19.7268 141.797 20.8905 141.797 22.4865C141.797 24.016 142.13 25.1354 142.795 25.8448C143.482 26.5319 144.424 26.8755 145.621 26.8755C146.087 26.8755 146.497 26.8312 146.851 26.7425C147.229 26.6317 147.528 26.5098 147.749 26.3768V18.3968ZM169.731 25.7118C169.731 27.3521 169.121 28.6378 167.902 29.5688C166.683 30.4776 164.888 30.932 162.516 30.932C161.585 30.932 160.731 30.8655 159.955 30.7325C159.202 30.5995 158.548 30.4 157.994 30.134C157.44 29.868 157.007 29.5355 156.697 29.1365C156.387 28.7375 156.231 28.272 156.231 27.74C156.231 27.2523 156.331 26.8423 156.531 26.5098C156.73 26.1551 156.985 25.8669 157.295 25.6453C157.938 26.0221 158.67 26.3546 159.49 26.6428C160.31 26.9309 161.263 27.075 162.349 27.075C163.923 27.075 164.71 26.6317 164.71 25.745C164.71 25.3682 164.566 25.08 164.278 24.8805C164.012 24.681 163.546 24.5037 162.881 24.3485L161.551 24.0493C159.734 23.6724 158.382 23.0961 157.495 22.3203C156.608 21.5223 156.165 20.4139 156.165 18.9953C156.165 17.4214 156.797 16.1801 158.06 15.2713C159.346 14.3403 161.064 13.8748 163.214 13.8748C164.012 13.8748 164.766 13.9413 165.475 14.0743C166.184 14.1851 166.794 14.3624 167.304 14.6063C167.814 14.8501 168.213 15.1604 168.501 15.5373C168.811 15.8919 168.966 16.3131 168.966 16.8008C168.966 17.2441 168.878 17.6431 168.7 17.9978C168.523 18.3303 168.29 18.6073 168.002 18.829C167.825 18.7182 167.559 18.5963 167.204 18.4633C166.871 18.3303 166.506 18.2083 166.106 18.0975C165.708 17.9867 165.287 17.898 164.843 17.8315C164.4 17.765 163.99 17.7318 163.613 17.7318C162.837 17.7318 162.228 17.8426 161.784 18.0643C161.363 18.2638 161.152 18.5741 161.152 18.9953C161.152 19.3056 161.274 19.5494 161.518 19.7268C161.762 19.9041 162.205 20.0703 162.848 20.2255L164.112 20.5248C166.129 20.9681 167.57 21.6109 168.434 22.4533C169.299 23.2956 169.731 24.3818 169.731 25.7118ZM104.124 49.9843C104.124 51.2701 103.78 52.4224 103.093 53.4423C102.428 54.4621 101.519 55.271 100.367 55.8695C101.275 57.0665 102.14 58.197 102.96 59.261C103.802 60.3027 104.423 61.1453 104.822 61.788C104.623 62.4972 104.246 63.0406 103.691 63.4173C103.16 63.7721 102.572 63.9493 101.929 63.9493C101.087 63.9493 100.444 63.7721 100.001 63.4173C99.5576 63.0406 99.1363 62.5304 98.7373 61.8877L95.5453 56.9335H93.251V63.6167C93.0073 63.6833 92.6634 63.7388 92.2203 63.783C91.7771 63.8495 91.3116 63.8828 90.8238 63.8828C89.7821 63.8828 89.0506 63.7056 88.6293 63.3507C88.2303 62.9959 88.0307 62.3533 88.0307 61.4223V45.296C88.0307 44.8527 88.1414 44.5091 88.3633 44.2653C88.6069 44.0214 88.9508 43.833 89.394 43.7C90.1032 43.434 90.9568 43.2456 91.9543 43.1348C92.9518 43.0239 93.9934 42.9685 95.0798 42.9685C98.0946 42.9685 100.356 43.6003 101.863 44.8638C103.37 46.1051 104.124 47.8121 104.124 49.9843ZM95.246 52.9103C96.31 52.9103 97.1745 52.6775 97.8395 52.212C98.5045 51.7242 98.837 50.9927 98.837 50.0175C98.837 48.1113 97.5626 47.158 95.0133 47.158C94.6584 47.158 94.3373 47.1802 94.049 47.2245C93.7607 47.2467 93.4728 47.2799 93.1845 47.3243V52.9103H95.246ZM122.865 60.325C122.865 61.3667 122.411 62.1647 121.502 62.719C120.793 63.1622 119.917 63.5061 118.875 63.7498C117.834 64.0158 116.681 64.1488 115.417 64.1488C114.22 64.1488 113.134 64.0158 112.159 63.7498C111.184 63.5061 110.341 63.1071 109.632 62.5528C108.945 61.9984 108.402 61.3002 108.003 60.458C107.626 59.6158 107.437 58.596 107.437 57.399V47.7233C107.681 47.6568 108.003 47.5903 108.402 47.5238C108.801 47.4573 109.244 47.424 109.732 47.424C110.729 47.424 111.438 47.5903 111.86 47.9228C112.303 48.2553 112.525 48.887 112.525 49.818V57.3658C112.525 58.3633 112.78 59.0838 113.289 59.527C113.799 59.9483 114.52 60.1588 115.451 60.1588C116.027 60.1588 116.504 60.1146 116.88 60.0258C117.279 59.9151 117.579 59.8039 117.778 59.6933V47.7233C118 47.6568 118.31 47.5903 118.709 47.5238C119.108 47.4573 119.551 47.424 120.039 47.424C121.037 47.424 121.757 47.5903 122.2 47.9228C122.644 48.2553 122.865 48.887 122.865 49.818V60.325ZM139.696 58.9618C139.696 60.6019 139.086 61.8878 137.867 62.8188C136.647 63.7274 134.852 64.182 132.48 64.182C131.549 64.182 130.696 64.1155 129.92 63.9825C129.166 63.8495 128.513 63.65 127.958 63.384C127.404 63.118 126.972 62.7855 126.662 62.3865C126.351 61.9875 126.196 61.522 126.196 60.99C126.196 60.5022 126.296 60.0923 126.495 59.7598C126.695 59.4049 126.95 59.1171 127.26 58.8953C127.903 59.2719 128.634 59.6044 129.455 59.8927C130.275 60.1811 131.228 60.325 132.314 60.325C133.888 60.325 134.675 59.8818 134.675 58.995C134.675 58.6183 134.531 58.33 134.243 58.1305C133.977 57.931 133.511 57.7538 132.846 57.5985L131.516 57.2993C129.698 56.9226 128.346 56.3459 127.46 55.5703C126.573 54.7723 126.13 53.6641 126.13 52.2453C126.13 50.6716 126.761 49.4299 128.025 48.5213C129.311 47.5903 131.028 47.1248 133.179 47.1248C133.977 47.1248 134.73 47.1913 135.44 47.3243C136.149 47.4351 136.759 47.6126 137.268 47.8563C137.778 48.0999 138.177 48.4106 138.465 48.7873C138.775 49.1421 138.931 49.5629 138.931 50.0508C138.931 50.4939 138.842 50.8929 138.665 51.2478C138.488 51.5803 138.255 51.8572 137.967 52.079C137.789 51.9683 137.523 51.8463 137.169 51.7133C136.836 51.5803 136.47 51.4582 136.071 51.3475C135.672 51.2368 135.251 51.148 134.808 51.0815C134.365 51.015 133.954 50.9818 133.578 50.9818C132.802 50.9818 132.192 51.0924 131.749 51.3143C131.327 51.5138 131.117 51.8239 131.117 52.2453C131.117 52.5554 131.239 52.7996 131.483 52.9768C131.726 53.1539 132.17 53.3202 132.813 53.4755L134.076 53.7748C136.094 54.2179 137.534 54.8611 138.399 55.7033C139.263 56.5454 139.696 57.6318 139.696 58.9618ZM147.822 63.6167C147.6 63.6833 147.29 63.7388 146.891 63.783C146.492 63.8495 146.049 63.8828 145.561 63.8828C144.563 63.8828 143.843 63.7274 143.4 63.4173C142.956 63.0848 142.735 62.453 142.735 61.522V42.0043C142.978 41.9378 143.3 41.8713 143.699 41.8048C144.098 41.7383 144.541 41.705 145.029 41.705C146.026 41.705 146.736 41.8713 147.157 42.2038C147.6 42.5363 147.822 43.168 147.822 44.099V47.9228C148.287 47.7009 148.808 47.5238 149.385 47.3908C149.983 47.2356 150.626 47.158 151.313 47.158C153.441 47.158 155.104 47.7009 156.301 48.7873C157.52 49.8513 158.129 51.4582 158.129 53.6085V63.6167C157.908 63.6833 157.597 63.7388 157.198 63.783C156.799 63.8495 156.356 63.8828 155.868 63.8828C154.871 63.8828 154.15 63.7274 153.707 63.4173C153.264 63.0848 153.042 62.453 153.042 61.522V53.9078C153.042 52.9103 152.787 52.2011 152.277 51.7798C151.79 51.3584 151.158 51.148 150.382 51.148C149.872 51.148 149.407 51.2254 148.986 51.3808C148.564 51.5138 148.177 51.68 147.822 51.8795V63.6167Z"
+          fill="black"/>
+  </g>
+</svg>
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/login.js b/S2/DevWeb/Projet/src/main/webapp/static/js/login.js
deleted file mode 100644
index a4d1e8e..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/static/js/login.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const loginForm = document.getElementById("login-form");
-
-loginForm.addEventListener("submit", (event) => {
-    event.preventDefault();
-
-    const formData = new FormData(loginForm);
-    const data = {};
-    formData.forEach((value, key) => data[key] = value);
-
-    fetch(loginForm.getAttribute("action"), {
-        headers: {"Content-Type": "application/json"}, body: JSON.stringify(data), method: loginForm.getAttribute("method"),
-    })
-        .then(res => res.json())
-        .then(user => sessionStorage.setItem("user", JSON.stringify(user)))
-        .then(() => window.location.href = "./main-menu")
-        .catch(error => console.error("Error:", error));
-});
-
-
-const urlParams = new URLSearchParams(window.location.search);
-if (urlParams.has('success')) {
-    if (urlParams.get('success') === "account-created") {
-        window.alert("Compte créé avec succès.");
-    }
-    if (urlParams.get('success') === "password-reseted") {
-        window.alert("Mot de passe réinitialisé avec succès.");
-    }
-}
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/main-menu.js b/S2/DevWeb/Projet/src/main/webapp/static/js/main-menu.js
deleted file mode 100644
index 29cb19c..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/static/js/main-menu.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const session = JSON.parse(sessionStorage.getItem('session'));
-
-url = new URL(window.location.href);
-url.protocol = 'ws:';
-
-const websocket = new WebSocket(url);
-
-websocket.onopen = () => {
-    const linkUserSession = {
-        type: 'linkUserSession',
-        data: sessionStorage.getItem('user')
-    }
-    websocket.send(JSON.stringify(linkUserSession));
-}
-
-websocket.onmessage = (event) => {
-    const data = JSON.parse(event.data);
-
-    if (data.type === 'userList') {
-        console.log(JSON.parse(data.data));
-    }
-}
-
-websocket.onclose = () => {}
-websocket.onerror = (error) => {}
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/register.js b/S2/DevWeb/Projet/src/main/webapp/static/js/register.js
deleted file mode 100644
index 6b14500..0000000
--- a/S2/DevWeb/Projet/src/main/webapp/static/js/register.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const registerForm = document.getElementById("register-form");
-const confirmPassword = document.getElementById("confirmPassword");
-
-registerForm.addEventListener("submit", (event) => {
-    event.preventDefault();
-    const formData = new FormData(registerForm);
-
-    const data = {};
-    formData.forEach((value, key) => data[key] = value);
-
-    fetch(registerForm.getAttribute("action"), {
-        method: registerForm.getAttribute("method"),
-        headers: {"Content-Type": "application/json"},
-        body: JSON.stringify(data)
-    })
-        .then(res => res.json())
-        .then(_ => {
-            window.location.href = "./login"
-        })
-        .catch(error => console.error("Error: " + error))
-});
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/AbstractDAOFactoryTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/AbstractDAOFactoryTest.java
index 0fe1706..42eb4bc 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/AbstractDAOFactoryTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/AbstractDAOFactoryTest.java
@@ -4,8 +4,10 @@ import java.util.HashMap;
 import java.util.Objects;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.AbstractDAOFactory;
+import uppa.project.database.dao.PersistenceKind;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 class AbstractDAOFactoryTest {
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_GameTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_GameTest.java
index a1c2832..70cb316 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_GameTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_GameTest.java
@@ -9,10 +9,12 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.Game;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_Game;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_PlayerTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_PlayerTest.java
index 4096800..1a1f9a1 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_PlayerTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_PlayerTest.java
@@ -9,13 +9,14 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.Game;
-import uppa.project.pojo.Player;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.pojo.User;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_Player;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordTokenTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordTokenTest.java
index 02ab189..a9b535c 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordTokenTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_RecoveryPasswordTokenTest.java
@@ -8,11 +8,13 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.RecoveryPasswordToken;
-import uppa.project.pojo.User;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_RecoveryPasswordToken;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_UserTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_UserTest.java
index dbf03ba..84637ca 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_UserTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/DAO_JPA_UserTest.java
@@ -6,10 +6,12 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.User;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.DAO_JPA_User;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/Game_JPA_DAO_FactoryTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/Game_JPA_DAO_FactoryTest.java
index 5cbf529..83cb73f 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/Game_JPA_DAO_FactoryTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/dao/jpa/Game_JPA_DAO_FactoryTest.java
@@ -2,10 +2,11 @@ package uppa.project.dao.jpa;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import uppa.project.dao.DAO;
-import uppa.project.dao.DAOException;
-import uppa.project.pojo.User;
-import uppa.project.provider.EntityManagerProvider;
+import uppa.project.database.dao.DAO;
+import uppa.project.database.dao.DAOException;
+import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory;
+import uppa.project.database.pojo.User;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/CardTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/CardTest.java
index 16645b0..8ded9bc 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/CardTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/CardTest.java
@@ -2,6 +2,7 @@ package uppa.project.pojo;
 
 import java.util.HashMap;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.Card;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/DeckTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/DeckTest.java
index ffa3b6a..7c1779e 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/DeckTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/DeckTest.java
@@ -2,6 +2,8 @@ package uppa.project.pojo;
 
 import java.util.HashMap;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.Card;
+import uppa.project.database.pojo.Deck;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java
index d9f1bc5..9a22719 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java
@@ -8,6 +8,10 @@ import java.util.HashMap;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.Deck;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.User;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java
index f632a99..5591a02 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java
@@ -6,6 +6,10 @@ import java.util.HashMap;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.Deck;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.User;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
index d8cf4e9..2520cf1 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java
@@ -7,6 +7,8 @@ import java.util.HashMap;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.RecoveryPasswordToken;
+import uppa.project.database.pojo.User;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
index 49c12f9..6f44b6b 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/UserTest.java
@@ -9,6 +9,9 @@ import java.util.HashMap;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.pojo.Game;
+import uppa.project.database.pojo.Player;
+import uppa.project.database.pojo.User;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/provider/EntityManagerProviderTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/provider/EntityManagerProviderTest.java
index 96ae43c..a2cf3b7 100644
--- a/S2/DevWeb/Projet/src/test/java/uppa/project/provider/EntityManagerProviderTest.java
+++ b/S2/DevWeb/Projet/src/test/java/uppa/project/provider/EntityManagerProviderTest.java
@@ -3,6 +3,7 @@ package uppa.project.provider;
 import jakarta.persistence.EntityManager;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import uppa.project.database.dao.EntityManagerProvider;
 
 import static org.junit.jupiter.api.Assertions.*;