diff --git a/dao/UserDAO.java b/dao/UserDAO.java
index 88858dae4657355208468c1569bd3f265831a8ab..c922852052a54487a5c851cbe947d711553027f6 100644
--- a/dao/UserDAO.java
+++ b/dao/UserDAO.java
@@ -8,47 +8,103 @@ import jakarta.servlet.http.*;
 import jakarta.servlet.annotation.WebServlet;
 
 @WebServlet("/sae-userDAO")
-public class UserDAO extends HttpServlet
-    private Connection con = DriverManager.getConnection("jdbc:postgresql://psqlserv/but2", "yannisdevosetu", "moi");
+public class UserDAO extends HttpServlet{
+    private Connection con;
 
-{
-    public void service( HttpServletRequest req, HttpServletResponse res )
-            throws ServletException, IOException
-    {
-        StringBuilder txt = new StringBuilder("<tr><th>nMatch</th><th>eq1</th><th>eq2</th><th>date</th><th>sc1</th><th>sc2</th></tr>");
+    public UserDAO(){
+        try{
+            Class.forName("org.postgresql.Driver");
+            this.con = DriverManager.getConnection("jdbc:postgresql://psqlserv/but2", "yannisdevosetu", "moi");
+        } catch (Exception e) {
+            e.getStackTrace();
+        }
+    }
 
-        try {
+    public String getAllUsers(){
+        StringBuilder txt = new StringBuilder();
+        try{
             Statement stmt = con.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM rencontres");
-
-            while (rs.next()) {
-                int nMatch = rs.getInt(1);
-                int eq1 = rs.getInt(2);
-                int eq2 = rs.getInt(3);
-                String date = rs.getString(4);
-                int sc1 = rs.getInt(5);
-                int sc2 = rs.getInt(6);
-
-                txt.append("<tr><td>").append(nMatch).append("</td><td>").append(eq1)
-                        .append("</td><td>").append(eq2)
-                        .append("</td><td>").append(date)
-                        .append("</td><td>").append(sc1)
-                        .append("</td><td>").append(sc2)
-                        .append("</td></tr>");
+            ResultSet rs = stmt.executeQuery("SELECT * FROM userAccount;");
+
+            while(rs.next()){
+                int userId = rs.getInt(1);
+                String username = rs.getString(2);
+                String pwd = rs.getString(3);
+
+                txt.append("Id : ").append(userId).append(" Username : ").append(username).append(" Password : ").append(pwd).append('\n');
             }
+        } catch (SQLException sqle) {
+            sqle.getStackTrace();
+        }
+
+        return txt.toString();
+    }
+
+    public String getUserById(int id){
+        StringBuilder txt = new StringBuilder();
+        try{
+            PreparedStatement stmt = con.prepareStatement("SELECT * FROM userAccount WHERE id=?");
+            stmt.setInt(1, id);
+            ResultSet rs = stmt.executeQuery();
 
-        } catch(ClassNotFoundException cnfe){
-            System.out.println(cnfe.getMessage());
+            if(rs.next()){
+                int userId = rs.getInt(1);
+                String username = rs.getString(2);
+                String pwd = rs.getString(3);
+
+                txt.append("Id : ").append(userId).append(" Username : ").append(username).append(" Password : ").append(pwd).append('\n');
+            }
+        } catch (SQLException sqle) {
+            sqle.getStackTrace();
         }
 
-        res.setContentType("text/html;charset=UTF-8");
-        PrintWriter out = res.getWriter();
-        out.println( "<head><title>servlet first</title>" );
-        out.print("<link href=\"css/styles.css\" rel=\"stylesheet\" />");
-        out.println( "<META content=\"charset=UTF-8\"></head><body><center>" );
-        out.println( "<h1>Test de ma Servlet</h1>" );
-        out.println( "<h2>Super ! ça marche</h2>" );
-        out.println("<table>" + txt + "</table>");
-        out.println( "</center> </body>" );
+        return txt.toString();
     }
-}
\ No newline at end of file
+
+}
+
+
+
+
+
+//{
+//    public void service( HttpServletRequest req, HttpServletResponse res )
+//            throws ServletException, IOException
+//    {
+//        StringBuilder txt = new StringBuilder("<tr><th>nMatch</th><th>eq1</th><th>eq2</th><th>date</th><th>sc1</th><th>sc2</th></tr>");
+//
+//        try {
+//            Statement stmt = con.createStatement();
+//            ResultSet rs = stmt.executeQuery("SELECT * FROM rencontres");
+//
+//            while (rs.next()) {
+//                int nMatch = rs.getInt(1);
+//                int eq1 = rs.getInt(2);
+//                int eq2 = rs.getInt(3);
+//                String date = rs.getString(4);
+//                int sc1 = rs.getInt(5);
+//                int sc2 = rs.getInt(6);
+//
+//                txt.append("<tr><td>").append(nMatch).append("</td><td>").append(eq1)
+//                        .append("</td><td>").append(eq2)
+//                        .append("</td><td>").append(date)
+//                        .append("</td><td>").append(sc1)
+//                        .append("</td><td>").append(sc2)
+//                        .append("</td></tr>");
+//            }
+//
+//        } catch(ClassNotFoundException cnfe){
+//            System.out.println(cnfe.getMessage());
+//        }
+//
+//        res.setContentType("text/html;charset=UTF-8");
+//        PrintWriter out = res.getWriter();
+//        out.println( "<head><title>servlet first</title>" );
+//        out.print("<link href=\"css/styles.css\" rel=\"stylesheet\" />");
+//        out.println( "<META content=\"charset=UTF-8\"></head><body><center>" );
+//        out.println( "<h1>Test de ma Servlet</h1>" );
+//        out.println( "<h2>Super ! ça marche</h2>" );
+//        out.println("<table>" + txt + "</table>");
+//        out.println( "</center> </body>" );
+//    }
+//}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..a25e09d51952e074f30cddfe66f09490978fcf12
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "s4a021-web-backend",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}