From bda9ee44d725d3dbfc629c436e53b5a684b8eaa8 Mon Sep 17 00:00:00 2001
From: "lucie.goigoux2" <lucie.goigoux2@etu.uca.fr>
Date: Wed, 8 Nov 2023 14:42:54 +0100
Subject: [PATCH 1/3] formulaire ajout user

---
 Project/php/templates/login.html | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/Project/php/templates/login.html b/Project/php/templates/login.html
index 18edc4e..cc3b449 100755
--- a/Project/php/templates/login.html
+++ b/Project/php/templates/login.html
@@ -41,18 +41,34 @@
                                     <div class="center-wrap">
                                         <div class="section text-center">
                                             <h4 class="mb-4 pb-3">Sign Up</h4>
-                                            <div class="form-group">
-                                                <input type="text" name="logname" class="form-style" placeholder="Your Full Name" id="logname" autocomplete="off">
+
+                                            <div class="form-group mt-2">
+                                                <input type="text" name="logsurname" class="form-style" placeholder="Surname" id="logsurname" autocomplete="off">
                                                 <i class="input-icon uil uil-user"></i>
-                                            </div>	
+                                            </div>
+
+                                            <div class="form-group mt-2" >
+                                                <input type="text" name="logname" class="form-style" placeholder="Name" id="logname" autocomplete="off">
+                                                <i class="input-icon uil uil-user"></i>
+                                            </div>
+
                                             <div class="form-group mt-2">
-                                                <input type="email" name="logemail" class="form-style" placeholder="Your Email" id="logemail" autocomplete="off">
+                                                <input type="text" name="lognickname" class="form-style" placeholder="Nickname" id="lognickname" autocomplete="off">
+                                                <i class="input-icon uil uil-user"></i>
+                                            </div>
+
+                                            <div class="form-group mt-2">
+                                                <input type="email" name="logmail" class="form-style" placeholder="Your Email" id="logmail" autocomplete="off">
                                                 <i class="input-icon uil uil-at"></i>
-                                            </div>	
+                                            </div>
+
                                             <div class="form-group mt-2">
-                                                <input type="password" name="logpass" class="form-style" placeholder="Your Password" id="logpass" autocomplete="off">
+                                                <input type="password" name="logpasswd" class="form-style" placeholder="Your Password" id="logpasswd" autocomplete="off">
                                                 <i class="input-icon uil uil-lock-alt"></i>
                                             </div>
+
+
+
                                             <a href="#" class="btn mt-4">submit</a>
                                           </div>
                                       </div>

From 1c6a5c04d0aa28187ba2d69c5751dae33a9bc76e Mon Sep 17 00:00:00 2001
From: "lucie.goigoux2" <lucie.goigoux2@etu.uca.fr>
Date: Wed, 8 Nov 2023 14:43:03 +0100
Subject: [PATCH 2/3] formulaire ajout user

---
 Project/php/templates/css/login.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project/php/templates/css/login.css b/Project/php/templates/css/login.css
index 5fc2d1f..864b8c1 100755
--- a/Project/php/templates/css/login.css
+++ b/Project/php/templates/css/login.css
@@ -95,7 +95,7 @@ h6 span{
   position: relative;
   width: 440px;
   max-width: 100%;
-  height: 400px;
+  height: 500px;
   -webkit-transform-style: preserve-3d;
   transform-style: preserve-3d;
   perspective: 800px;

From 0df1644b62ebe34af80f1db0ed5d7ce192cb77e3 Mon Sep 17 00:00:00 2001
From: "antoine.jourdain" <antoine.jourdain@etu.uca.fr>
Date: Wed, 8 Nov 2023 14:46:54 +0100
Subject: [PATCH 3/3] Ajout id et affichage role, extra time

---
 Project/php/templates/usersView.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Project/php/templates/usersView.html b/Project/php/templates/usersView.html
index de764fe..2de6510 100755
--- a/Project/php/templates/usersView.html
+++ b/Project/php/templates/usersView.html
@@ -4,11 +4,12 @@
         <meta charset="UTF-8">
         <title>Users</title>
     </head>
-    
+
     <body>
         <section>
             <table>
                 <tr>
+                    <td>Id</td>
                     <td>Nickname</td>
                     <td>Name</td>
                     <td>Surname</td>
@@ -20,13 +21,14 @@
                     {% if users is defined %}
                         {% for row in users %}
                             <tr>
+                                <td>{{row.id}}</td>
                                 <td>{{row.nickname}}</td>
                                 <td>{{row.name}}</td>
                                 <td>{{row.surname}}</td>
                                 <td>{{row.email}}</td>
                                 <td>{{row.group}}</td>
-                                <td>{{row.role}}</td>
-                                <td>{{row.extraTime}}</td>
+                                <td>{{row.roles|join(', ')}}</td>
+                                <td>{{row.extraTime? 'yes' : 'no' }}</td>
                                 <td><input class="btn-black" type="button" value="Delete" /></td>
                             </tr>
                         {% endfor %}