From 2482ca622e7256b2d0c21376bb009d85b27e005a Mon Sep 17 00:00:00 2001
From: clverdoire <Clement.verdoire@etu.uca.fr>
Date: Thu, 20 Oct 2022 13:03:01 +0200
Subject: [PATCH 1/5] modification page compte

---
 src/pages/Compte.js                |  6 +++--
 src/styles/components/_compte.scss | 35 ++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/pages/Compte.js b/src/pages/Compte.js
index 0f1c7f9..2e255c9 100644
--- a/src/pages/Compte.js
+++ b/src/pages/Compte.js
@@ -59,8 +59,10 @@ const Compte = () => {
                                 </div>
                             </div>
                             <div className="name">
-                                <p className="def">Nom Complet :</p>
-                                <p className="nom">Mateo Centeno</p>
+                                <div className="presentationNom">
+                                    <p className="def">Nom Complet :</p>
+                                    <p className="nom">Mateo Centeno</p>
+                                </div>
                                 <div className='bouton_submit'>
                                     <button className="bouton_modifierNom" type="submit">Modifier le nom</button>
                                 </div>
diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss
index 2e6c0d5..74b30b7 100644
--- a/src/styles/components/_compte.scss
+++ b/src/styles/components/_compte.scss
@@ -124,6 +124,7 @@ body {
             .Compte {
                 display: flex;
                 flex-direction: column;
+                justify-content: space-evenly;
                 width: 94.3%;
                 height: auto;
                 margin: 5px 10px 10px 5px;
@@ -138,7 +139,7 @@ body {
                     display: flex;
                     flex-direction: column;
                     justify-content: space-evenly;
-                    margin: 30px;
+                    margin: 13px;
                     width: auto;
                     height: 30%;
 
@@ -152,12 +153,14 @@ body {
                         display: flex;
                         flex-direction: row;
                         justify-content: left;
+                        margin-right: 25px;
                         margin-left: 25px;
+                        border-bottom: 1px solid grey;
 
                         .photo_profil {
                             display: flex;
-                            height: 150px;
-                            width: 150px;
+                            height: 135px;
+                            width: 135px;
                         }
 
                         .bouton_submit {
@@ -168,7 +171,7 @@ body {
                             .bouton_ajoutPhoto {
                                 height: 40px;
                                 width: 150px;
-                                background-color: grey;
+                                background-color: rgb(190, 189, 189);
                                 border-radius: 5px;
                                 border: 1px solid black;
                                 box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
@@ -183,18 +186,26 @@ body {
                     .name {
                         display: flex;
                         flex-direction: row;
+                        justify-content: space-between;
+                        margin: 0 25px;
 
-                        .def {
+                        .presentationNom {
                             display: flex;
-                        }
+                            flex-direction: row;
+                            justify-content: space-evenly;                         
 
-                        .nom {
-                            display: flex;
+                            .def {
+                                display: flex;
+                            }
+
+                            .nom {
+                                display: flex;
+                                margin-left: 125px;
+                            }
                         }
 
                         .bouton_submit {
                             display: flex;
-                            justify-content: right;
                         }
                     }
                 }
@@ -202,8 +213,8 @@ body {
                 .infoPerso {
                     display: flex;
                     flex-direction: column;
-                    margin-left: 30px;
-                    margin-right: 30px;
+                    margin-left: 13px;
+                    margin-right: 13px;
                     width: auto;
                     height: 30%;
 
@@ -217,7 +228,7 @@ body {
                 .infoEntreprise {
                     display: flex;
                     flex-direction: column;    
-                    margin: 30px;
+                    margin: 13px;
                     width: auto;
                     height: 30%;
 

From 6433913af273db3688e2ea64652642c99918103d Mon Sep 17 00:00:00 2001
From: Theo DUPIN <Theo.DUPIN@etu.uca.fr>
Date: Thu, 20 Oct 2022 16:56:07 +0200
Subject: [PATCH 2/5] Finalisation Page Admin

---
 src/pages/Admin.js                | 30 +++++++---------
 src/styles/components/_admin.scss | 60 ++++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/src/pages/Admin.js b/src/pages/Admin.js
index fc36e33..33cc982 100644
--- a/src/pages/Admin.js
+++ b/src/pages/Admin.js
@@ -13,34 +13,28 @@ const Admin = () => {
                     <form className="form">
                         <table className="Formulaire_de_connexion">
                             <tr>
-                                <p className="texte">Nom :</p>
-                                <input id="nom" className="texte_zone" type="text" placeholder="Nom..."/>
+                                <div className="texte_côté">
+                                    <p>Nom :</p>
+                                    <p>Prénom :</p>
+                                    <p>Rôle :</p>
+                                    <p>Identifiant :</p>
+                                    <p>Mot de passe :</p>
+                                </div>
                             </tr>
                             <tr>
-                                <p className="texte">Prénom :</p>
+                                <input id="nom" className="texte_zone" type="text" placeholder="Nom..."/>
                                 <input id="prénom" className="texte_zone" type="text" placeholder="Prénom..."/>
-                            </tr>
-                            <tr>
-                                <p className="texte">Rôle dans l'entreprise :</p>
                                 <input id="rôle" className="texte_zone" type="text" placeholder="Rôle..."/>
-                            </tr>
-                            <tr>
-                                <p className="texte">Identifiant :</p>
                                 <input id="identifiant" className="texte_zone" type="text" placeholder="Identifiant..."/>
-                            </tr>
-                            <tr>
-                                <p className="texte">Mot de passe (par défaut) :</p>
                                 <input id="password" className="texte_zone" type="password" placeholder="Mot de passe (par default)..."/>
                             </tr>
-                            <tr>
-                                <div className='bouton_submit'>
-                                    <button className="bouton_val" type="submit">Valider</button>
-                                    <button className="bouton_ann" type="submit">Annuler</button>
-                                </div>
-                            </tr>
                         </table>
                     </form>
                 </div>
+                <tr className="bouton_submit">
+                    <button className="bouton_val" type="submit">Valider</button>
+                    <button className="bouton_ann" type="submit">Annuler</button>
+                </tr>
             </div>
         </div>
     );
diff --git a/src/styles/components/_admin.scss b/src/styles/components/_admin.scss
index 6fc842b..a2a4126 100644
--- a/src/styles/components/_admin.scss
+++ b/src/styles/components/_admin.scss
@@ -76,11 +76,11 @@
         display: flex;
         flex-direction: column;
         flex-basis: 100%;
-        /*background: rgba(255, 255, 255, 0.3);
+        background: rgba(255, 255, 255, 0.3);
         border-radius: 15px;
         box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
         backdrop-filter: blur(3px);
-        -webkit-backdrop-filter: blur(15px);*/
+        -webkit-backdrop-filter: blur(15px);
         margin: 10px;
         padding: 10px;
 
@@ -110,10 +110,43 @@
             margin-right: 10px;
         }
 
+        .Formulaire_de_connexion {
+
+            display: flex;
+            flex-direction: row;
+            /*background: rgba(255, 255, 255, 0.3);
+            border-radius: 15px;
+            box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
+            backdrop-filter: blur(3px);
+            -webkit-backdrop-filter: blur(15px);*/
+
+            .texte_côté {
+                display:flex;
+                flex-direction: column;
+                justify-content: space-around;
+                height: 100%;
+                /*background: rgba(255, 255, 255, 0.3);
+                border-radius: 15px;
+                box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
+                backdrop-filter: blur(3px);
+                -webkit-backdrop-filter: blur(15px);*/
+            }
+
+            input {
+                display: flex;
+                flex-direction: column;
+                /*background: rgba(255, 255, 255, 0.3);
+                border-radius: 15px;
+                box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
+                backdrop-filter: blur(3px);
+                -webkit-backdrop-filter: blur(15px);*/
+                margin: 10px;
+            }
+        }
+
         .texte {
             align-self: center;
-            font-weight: bold;
-            font-size: 30px;
+            font-size: 15px;
             padding: 10px 10px 10px 0;
         }
 
@@ -123,21 +156,23 @@
             background-color: transparent;
             border-radius: 5px;
             border: 0.5px solid;
+            justify-content: center;
             padding: 0 10px 0 15px;
-            //padding-left: 10px;
-            //padding-right: 10px;
+            padding-left: 10px;
+            padding-right: 10px;
         }
 
         .bouton_submit {
             display: flex;
             flex-direction: row;
             justify-content: space-between;
+            align-self: center;
             width: 600px;
             height: 30px;
-            margin: 5px 5px 5px 0;
+            margin-top: 5%;
 
             .bouton_val{
-                display: flex;
+                //display: flex;
                 background-color: grey;
                 border: 1px solid rgba(255, 255, 255, 0.1);
                 backdrop-filter: blur(30px);
@@ -161,7 +196,7 @@
             }
 
             .bouton_ann{
-                display: flex;
+                //display: flex;
                 background-color: grey;
                 border: 1px solid rgba(255, 255, 255, 0.1);
                 backdrop-filter: blur(30px);
@@ -196,7 +231,6 @@
         backdrop-filter: blur(3px);
         -webkit-backdrop-filter: blur(15px);*/
         margin: 10px;
-        padding: 10px;
 
         .Titre {
             display: flex;
@@ -205,7 +239,7 @@
             box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
             backdrop-filter: blur(3px);
             -webkit-backdrop-filter: blur(15px);
-            margin: 10px;
+            //margin: 10px;
             font-size: 70px;
             font-weight: bold;
         }
@@ -219,8 +253,8 @@
             box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
             backdrop-filter: blur(3px);
             -webkit-backdrop-filter: blur(15px);
-            margin: 10px;
-            padding: 10px;
+            //margin: 10px;
+            //padding: 10px;
             align-items: center;
 
             .input_box {

From 146f14f33b929fa126292fbb663c1d8d84faa0fa Mon Sep 17 00:00:00 2001
From: clverdoire <Clement.verdoire@etu.uca.fr>
Date: Thu, 20 Oct 2022 16:56:41 +0200
Subject: [PATCH 3/5] =?UTF-8?q?ajout=20deuxi=C3=A8me=20parti=20compte=20de?=
 =?UTF-8?q?=20la=20page=20compte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Compte.js                | 14 ++++++-
 src/styles/components/_compte.scss | 64 +++++++++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/pages/Compte.js b/src/pages/Compte.js
index 2e255c9..db19284 100644
--- a/src/pages/Compte.js
+++ b/src/pages/Compte.js
@@ -69,7 +69,19 @@ const Compte = () => {
                             </div>
                         </div>
                         <div className="infoPerso">
-                            <p>infoPerso</p>
+                            <p className="description">Informations personnels</p>
+                            <div className="parti_mail">   
+                                <p className="def">Mail :</p>
+                                <p className="mail">coucou@gmail.com</p>
+                            </div>
+                            <div className="parti_pays">                                
+                                <p className="def">Pays ou Région :</p>
+                                <p className="pays_region">France</p>
+                            </div>
+                            <div className="parti_tel">                       
+                                <p className="def">Tel :</p>
+                                <p className="tel">0745632114</p>
+                            </div>
                         </div>
                         <div className="infoEntreprise">
                             <p>infoEntreprise</p>
diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss
index 74b30b7..7f85635 100644
--- a/src/styles/components/_compte.scss
+++ b/src/styles/components/_compte.scss
@@ -196,11 +196,12 @@ body {
 
                             .def {
                                 display: flex;
+                                font-weight: bold;
                             }
 
                             .nom {
                                 display: flex;
-                                margin-left: 125px;
+                                margin-left: 125px;;
                             }
                         }
 
@@ -213,6 +214,7 @@ body {
                 .infoPerso {
                     display: flex;
                     flex-direction: column;
+                    justify-content: space-evenly;
                     margin-left: 13px;
                     margin-right: 13px;
                     width: auto;
@@ -223,6 +225,66 @@ body {
                     box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
                     backdrop-filter: blur(3px);
                     -webkit-backdrop-filter: blur(15px);
+
+                    .description {
+                        display: flex;
+                        margin: 0 25px;
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 10px 0;
+                        font-weight: bold;
+                    }
+
+                    .parti_mail {
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;                        
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 15px 0;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .mail {
+                            display: flex;
+                            margin-left: 199px;
+                        }
+                    }
+
+                    .parti_pays {
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;                        
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 15px 0;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .pays_region {
+                            display: flex;
+                            margin-left: 110px;
+                        }
+                    }
+
+                    .parti_tel {
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .tel {
+                            display: flex;
+                            margin-left: 207px;
+                        }
+                    }
                 }
 
                 .infoEntreprise {

From 7c94596821bb3d54b96b690377c4eb6cc35f1f0f Mon Sep 17 00:00:00 2001
From: clverdoire <Clement.verdoire@etu.uca.fr>
Date: Thu, 20 Oct 2022 17:17:33 +0200
Subject: [PATCH 4/5] finalisation page compte

---
 src/pages/Compte.js                | 16 +++++++-
 src/styles/components/_compte.scss | 63 +++++++++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/pages/Compte.js b/src/pages/Compte.js
index db19284..00015cc 100644
--- a/src/pages/Compte.js
+++ b/src/pages/Compte.js
@@ -69,7 +69,7 @@ const Compte = () => {
                             </div>
                         </div>
                         <div className="infoPerso">
-                            <p className="description">Informations personnels</p>
+                            <p className="description">Informations personnel</p>
                             <div className="parti_mail">   
                                 <p className="def">Mail :</p>
                                 <p className="mail">coucou@gmail.com</p>
@@ -84,7 +84,19 @@ const Compte = () => {
                             </div>
                         </div>
                         <div className="infoEntreprise">
-                            <p>infoEntreprise</p>
+                            <p className="description">Informations entreprise</p>
+                            <div className="parti_name">   
+                                <p className="def">Nom de l'entreprise</p>
+                                <p className="name">entreprise name</p>
+                            </div>
+                            <div className="parti_secteurAct">                                
+                                <p className="def">Secteur d'activité :</p>
+                                <p className="secteurAct">Coiffure</p>
+                            </div>
+                            <div className="parti_nbClient">                       
+                                <p className="def">Nombre clients :</p>
+                                <p className="nbClient">200</p>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss
index 7f85635..929b4a5 100644
--- a/src/styles/components/_compte.scss
+++ b/src/styles/components/_compte.scss
@@ -289,7 +289,8 @@ body {
 
                 .infoEntreprise {
                     display: flex;
-                    flex-direction: column;    
+                    flex-direction: column;
+                    justify-content: space-evenly;    
                     margin: 13px;
                     width: auto;
                     height: 30%;
@@ -299,6 +300,66 @@ body {
                     box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
                     backdrop-filter: blur(3px);
                     -webkit-backdrop-filter: blur(15px);
+
+                    .description {
+                        display: flex;
+                        margin: 0 25px;
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 10px 0;
+                        font-weight: bold;
+                    }
+
+                    .parti_name {
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;                        
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 15px 0;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .name {
+                            display: flex;
+                            margin-left: 92px;
+                        }
+                    }
+
+                    .parti_secteurAct{
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;                        
+                        border-bottom: 1px solid grey;
+                        padding: 0 0 15px 0;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .secteurAct {
+                            display: flex;
+                            margin-left: 98px;
+                        }
+                    }
+
+                    .parti_nbClient {
+                        display: flex;
+                        flex-direction: row;
+                        margin: 0 25px;
+
+                        .def {
+                            display: flex;
+                            font-weight: bold;
+                        }
+
+                        .nbClient {
+                            display: flex;
+                            margin-left: 115px;
+                        }
+                    }
                 }
             }
         }

From d636431861e6fa73cc7d2e9af14849b2216f68d1 Mon Sep 17 00:00:00 2001
From: Theo DUPIN <Theo.DUPIN@etu.uca.fr>
Date: Thu, 20 Oct 2022 18:42:13 +0200
Subject: [PATCH 5/5] Finalisation page Admin_modif

---
 src/pages/Admin_modif.js          | 66 ++++++++++++++++---------------
 src/styles/components/_admin.scss | 27 +++++++------
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/pages/Admin_modif.js b/src/pages/Admin_modif.js
index 10ba8f8..5d5b9c6 100644
--- a/src/pages/Admin_modif.js
+++ b/src/pages/Admin_modif.js
@@ -1,41 +1,45 @@
 import React from 'react';
 import NavigationAdmin from '../components/NavigationAdmin.js';
+import Admin from './Admin.js';
 
 const Admin_modif = () => {
     return (
         <div className="page_admin">
-            {/* Create a page to delete an user in the admin page*/}
-            <NavigationAdmin/>
-            <div className="Formulaire">
+            <NavigationAdmin />
+            {/* Create a admin page */}
+            <div className="Titre_Formulaire">
                 <p className="Titre">Admin</p>
-                <form className="form">
-                    <table className="Formulaire_de_connexion">
-                        <tr>
-                            <p className="texte">Nom :</p>
-                            <input id="nom" className="texte_zone" type="text"/>
-                        </tr>
-                        <tr>
-                            <p className="texte">Prénom :</p>
-                            <input id="prénom" className="texte_zone" type="text"/>
-                        </tr>
-                        <tr>
-                            <p className="texte">Rôle dans l'entreprise :</p>
-                            <input id="rôle" className="texte_zone" type="text"/>
-                        </tr>
-                        <tr>
-                            <p className="texte">Identifiant :</p>
-                            <input id="identifiant" className="texte_zone" type="text"/>
-                        </tr>
-                        <tr>
-                            <p className="texte">Mot de passe (par défaut) :</p>
-                            <input id="password" className="texte_zone" type="text"/>
-                        </tr>
-                        <tr>
-                            <button className="bouton_val_ann" type="submit">Valider</button>
-                            <button className="bouton_val_ann" type="submit">Annuler</button>
-                        </tr>
-                    </table>
-                </form>
+                <div className="Formulaire">
+                    <form className="form">
+                        <table className="Formulaire_de_connexion">
+                            <tr>
+                                <div className="texte_côté">
+                                    <p>Nom :</p>
+                                    <p>Prénom :</p>
+                                    <p>Rôle :</p>
+                                    <p>Identifiant :</p>
+                                    <p>Mot de passe :</p>
+                                </div>
+                            </tr>
+                            <tr>
+                                <div className="button_submit">
+                                    <button className="bouton_réini">Réinitialiser le mot de passe</button>
+                                </div>
+                            </tr>
+                            <tr>
+                                <input id="nom" className="texte_zone" type="text" placeholder="Nom..."/>
+                                <input id="prénom" className="texte_zone" type="text" placeholder="Prénom..."/>
+                                <input id="rôle" className="texte_zone" type="text" placeholder="Rôle..."/>
+                                <input id="identifiant" className="texte_zone" type="text" placeholder="Identifiant..."/>
+                                <input id="password" className="texte_zone" type="password" placeholder="Mot de passe (par default)..."/>
+                            </tr>
+                        </table>
+                    </form>
+                </div>
+                <tr className="bouton_submit">
+                    <button className="bouton_val" type="submit">Valider</button>
+                    <button className="bouton_ann" type="submit">Annuler</button>
+                </tr>
             </div>
         </div>
     );
diff --git a/src/styles/components/_admin.scss b/src/styles/components/_admin.scss
index a2a4126..dce2825 100644
--- a/src/styles/components/_admin.scss
+++ b/src/styles/components/_admin.scss
@@ -114,6 +114,7 @@
 
             display: flex;
             flex-direction: row;
+            margin-top: 10%;
             /*background: rgba(255, 255, 255, 0.3);
             border-radius: 15px;
             box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
@@ -125,23 +126,27 @@
                 flex-direction: column;
                 justify-content: space-around;
                 height: 100%;
-                /*background: rgba(255, 255, 255, 0.3);
-                border-radius: 15px;
-                box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
-                backdrop-filter: blur(3px);
-                -webkit-backdrop-filter: blur(15px);*/
             }
 
             input {
                 display: flex;
                 flex-direction: column;
-                /*background: rgba(255, 255, 255, 0.3);
-                border-radius: 15px;
-                box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
-                backdrop-filter: blur(3px);
-                -webkit-backdrop-filter: blur(15px);*/
                 margin: 10px;
             }
+
+            .button_submit {
+                display: flex;
+                margin-top: 150%;
+                margin-bottom: 2%;
+                padding-left: 10px;
+                
+                .bouton_réini{
+                background-color: rgb(190, 189, 189);
+                border-radius: 5px;
+                border: 1px solid black;
+                box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
+                }
+            }
         }
 
         .texte {
@@ -165,7 +170,7 @@
         .bouton_submit {
             display: flex;
             flex-direction: row;
-            justify-content: space-between;
+            justify-content: space-around;
             align-self: center;
             width: 600px;
             height: 30px;