Merge branch 'master' of https://codefirst.iut.uca.fr/git/maxence.lanone/JTT_CrM

src/components/NavigationAdmin.js

@@ -11,28 +11,19 @@ const NavigationAdmin = (props) => {
                 <button id="bouton_créer" className="bouton" type="button" value="Créer un utilisateur" onClick={changeColor}>Créer utilisateur</button>
             </NavLink>
             <NavLink className="modify_user" to="/Admin_modif" state={{ iduser: props.iduser }}>
-                <button id="bouton_modif" className="bouton" type="button" value="Modifier un utilisateur" onClick={changeColor2}>Modifier utilisateur</button>
+                <button id="bouton_modif" className="bouton" type="button" value="Modifier un utilisateur" onClick={changeColor}>Modifier utilisateur</button>
             </NavLink>
             <NavLink className="delete_user" to="/Admin_supp">
-                <button id="bouton_sup" className="bouton" type="button" value="Supprimer un utilisateur" onClick={changeColor3}>Supprimer utilisateur</button>
+                <button id="bouton_sup" className="bouton" type="button" value="Supprimer un utilisateur" onClick={changeColor}>Supprimer utilisateur</button>
             </NavLink>
         </div>
     );
 };
 
-function changeColor() {
-    let button = document.getElementById("bouton_créer");
-    button.style.backgroundColor = "rgb(170,170,170)";
-}
 
-function changeColor2() {
-    let button = document.getElementById("bouton_modif");
-    button.style.backgroundColor = "rgb(170,170,170)";
-}
-
-function changeColor3() {
-    let button = document.getElementById("bouton_sup");
-    button.style.backgroundColor = "rgb(170,170,170)";
+function changeColor() {
+    let b1 = document.querySelector('button');
+    b1.style.backgroundColor = "rgb(170,170,170)";
 }
 
 export default NavigationAdmin;

src/pages/Admin_create.js

@@ -99,9 +99,7 @@ function Admin_create() {
                         <p>{loginError === true?"L'identifiant existe déja":''}</p>
                         <div className="bouton_submit">
                             <button className="bouton_val" type="submit">Valider</button>
-                            <NavLink className="bouton_ann" to="/Admin_list">
-                                <button className="bouton_ann" type="button">Retour</button>
-                            </NavLink>
+                            <NavLink className="bouton_ann" to="/Admin_list">Retour</NavLink>
                         </div>
                     </form>
                 </div>

src/pages/Calendrier.js

@@ -22,22 +22,7 @@ const locales = {
   });
   
   const events = [
-    {
-        title: "Big Meeting",
-        allDay: true,
-        start: new Date(2022, 10, 0),
-        end: new Date(2022, 10, 2)
-    },
-    {
-        title: "Vacation",
-        start: new Date(2022, 10, 7),
-        end: new Date(2022, 10, 9)
-    },
-    {
-        title: "Conference",
-        start: new Date(2022, 10, 14),
-        end: new Date(2022, 10, 16)
-    },
+    
   ];
 
     
@@ -45,11 +30,11 @@ const locales = {
 
 const Calendrier = () => {
 
-    const [newEvent, setNewEvent] = useState({Titre: "", Début: "", Fin:""});
+    const [newEvent, setNewEvent] = useState({title: "", start: "", end:""});
     const [allEvents, setAllEvents] = useState(events);
 
     function handleAddEvent() {
-        setAllEvents([...allEvents, newEvent])
+        setAllEvents([...allEvents, newEvent]);
     }
 
     return (
@@ -79,11 +64,11 @@ const Calendrier = () => {
                         <h2 className="Titre">Ajouter un évènement
                             <div className="mini_formulaire_evenement">
                                 <input className="ajout_input" type="text" placeholder="Ajoutez un titre" style={{height: "20px", width: "100%", marginRight: "10px"}} 
-                                value={newEvent.Titre} onChange={(e) => setNewEvent({...newEvent, Titre: e.target.value})}/>
+                                    value={newEvent.Titre} onChange={(e) => setNewEvent({...newEvent, title: e.target.value})}/>
                                 <DatePicker className="ajout_input" placeholderText="Date de début" style={{height: "20px", width: "100%", marginRight: "10px"}}
-                            selected={newEvent.Début} onChange={(Début) => setNewEvent({...newEvent, Début})} />
+                                selected={newEvent.start} onChange={(start) => setNewEvent({...newEvent, start})} />
                                 <DatePicker className="ajout_input" placeholderText="Date de fin" style={{height: "20px", width: "100%"}}
-                            selected={newEvent.Fin} onChange={(Fin) => setNewEvent({...newEvent, Fin})} />
+                                selected={newEvent.end} onChange={(end) => setNewEvent({...newEvent, end})} />
                             </div>
                             <button className="bouton_ajout" onClick={handleAddEvent}>
                                 <p>Ajouter l'évènement</p>

src/styles/components/_admin.scss

@@ -67,10 +67,7 @@
         }
     }
 
-    /*.form{
-        align-self: center;
-        font-size: 30px;
-    }*/
+
 
     .Titre_Formulaire{
         display: flex;
@@ -120,13 +117,18 @@
             -webkit-backdrop-filter: blur(15px);*/
             margin-left: 10px;
             margin-right: 10px;
-        }
+
+            .form{
+                display: flex;
+                flex-direction: column;
+                align-self: center;
+                font-size: 30px;
 
                 .Formulaire_de_connexion {
 
                     display: flex;
                     flex-direction: row;
-            margin-top: 10%;
+                    margin-top: 5%;
                     /*background: rgba(255, 255, 255, 0.3);
                     border-radius: 15px;
                     box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
@@ -161,6 +163,10 @@
                         }
                     }
                 }
+            }
+        }
+
+        
 
         .texte {
             align-self: center;
@@ -199,8 +205,6 @@
                 font-size: 15px;
                 border-radius: 15px;
                 width: 20%;
-                align-items: center;
-                justify-content: center;
 
                 &:hover {
                     box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1);
@@ -216,15 +220,15 @@
             .bouton_ann{
                 //display: flex;
                 background-color: grey;
-                border: 1px solid rgba(255, 255, 255, 0.1);
+                border: 0px solid rgba(255, 255, 255, 0.1);
                 backdrop-filter: blur(30px);
                 color: rgb(255, 255, 255);
                 cursor: pointer;
                 font-size: 15px;
                 border-radius: 15px;
                 width: 20%;
-                align-items: center;
-                justify-content: center;
+                text-decoration: none;
+                text-align: center;
 
                 &:hover {
                     box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1);
@@ -396,7 +400,6 @@
                     border-radius: 15px;
                     width: 30%;
                     align-items: center;
-                    justify-content: center;
     
                     &:hover {
                         box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1);