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 = () => {
-

Nom :

- +
+

Nom :

+

Prénom :

+

Rôle :

+

Identifiant :

+

Mot de passe :

+
-

Prénom :

+ - - -

Rôle dans l'entreprise :

- - -

Identifiant :

- - -

Mot de passe (par défaut) :

- -
- - -
-
+ + + + ); 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 (
- {/* Create a page to delete an user in the admin page*/} - -
+ + {/* Create a admin page */} +

Admin

-
- - -

Nom :

- - - -

Prénom :

- - - -

Rôle dans l'entreprise :

- - - -

Identifiant :

- - - -

Mot de passe (par défaut) :

- - - - - - -
-
+
+
+ + +
+

Nom :

+

Prénom :

+

Rôle :

+

Identifiant :

+

Mot de passe :

+
+ + +
+ +
+ + + + + + + + +
+
+
+ + + +
); diff --git a/src/pages/Compte.js b/src/pages/Compte.js index 0f1c7f9..00015cc 100644 --- a/src/pages/Compte.js +++ b/src/pages/Compte.js @@ -59,18 +59,44 @@ const Compte = () => {
-

Nom Complet :

-

Mateo Centeno

+
+

Nom Complet :

+

Mateo Centeno

+
-

infoPerso

+

Informations personnel

+
+

Mail :

+

coucou@gmail.com

+
+
+

Pays ou Région :

+

France

+
+
+

Tel :

+

0745632114

+
-

infoEntreprise

+

Informations entreprise

+
+

Nom de l'entreprise

+

entreprise name

+
+
+

Secteur d'activité :

+

Coiffure

+
+
+

Nombre clients :

+

200

+
diff --git a/src/styles/components/_admin.scss b/src/styles/components/_admin.scss index 6fc842b..dce2825 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,48 @@ margin-right: 10px; } + .Formulaire_de_connexion { + + 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); + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(15px);*/ + + .texte_côté { + display:flex; + flex-direction: column; + justify-content: space-around; + height: 100%; + } + + input { + display: flex; + flex-direction: column; + 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 { align-self: center; - font-weight: bold; - font-size: 30px; + font-size: 15px; padding: 10px 10px 10px 0; } @@ -123,21 +161,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; + justify-content: space-around; + 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 +201,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 +236,6 @@ backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px);*/ margin: 10px; - padding: 10px; .Titre { display: flex; @@ -205,7 +244,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 +258,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 { diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss index 2e6c0d5..929b4a5 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,27 @@ 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; + font-weight: bold; + } + + .nom { + display: flex; + margin-left: 125px;; + } } .bouton_submit { display: flex; - justify-content: right; } } } @@ -202,8 +214,9 @@ body { .infoPerso { display: flex; flex-direction: column; - margin-left: 30px; - margin-right: 30px; + justify-content: space-evenly; + margin-left: 13px; + margin-right: 13px; width: auto; height: 30%; @@ -212,12 +225,73 @@ 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 { display: flex; - flex-direction: column; - margin: 30px; + flex-direction: column; + justify-content: space-evenly; + margin: 13px; width: auto; height: 30%; @@ -226,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; + } + } } } }