From e026048a4b8e8885d83c33a233b2444a0b5fc4a1 Mon Sep 17 00:00:00 2001 From: clverdoire Date: Tue, 15 Nov 2022 09:12:29 +0100 Subject: [PATCH 1/5] Finalisation button page parametre --- src/styles/components/_parametre.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/components/_parametre.scss b/src/styles/components/_parametre.scss index e28b1a5..166cbbf 100644 --- a/src/styles/components/_parametre.scss +++ b/src/styles/components/_parametre.scss @@ -259,6 +259,7 @@ body { border-radius: 20px; box-shadow: inset 0 0 5px rgba(0,0,0,.5); transition: .5s; + cursor: pointer; } input:checked[type="checkbox"] { From 78b8b721df6c15efb7a5c2fd4885572a033b40e4 Mon Sep 17 00:00:00 2001 From: Jeremy DUCOURTHIAL Date: Tue, 15 Nov 2022 09:16:46 +0100 Subject: [PATCH 2/5] Ajout api update user --- server-api/api.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server-api/api.js b/server-api/api.js index 81d7076..e9eb6ba 100644 --- a/server-api/api.js +++ b/server-api/api.js @@ -148,4 +148,20 @@ app.post('/User/Add', (req, res) => { console.log(result); res.send('Post added...' + result.insertId); }); +}); + +app.post('/User/Update/:id', (req, res) => { + + const id = req.params.id; + + let form = req.body; + + console.log(form); + + const sql = `UPDATE users SET lastname = '${form.lastname}', firstname = '${form.lastname}', idrole = '${form.lastname}', login = '${form.lastname}', password = '${form.lastname}', phone = '${form.lastname}', mail = '${form.lastname}' WHERE (iduser = ?)`; + db.query(sql ,[id], (err, result) => { + if (err) throw err; + console.log(result); + res.send('Post added...' + result.insertId); + }); }); \ No newline at end of file From 8966df8c0ce1cdf6a3dffc70ff488cb0437f7b4c Mon Sep 17 00:00:00 2001 From: Jeremy DUCOURTHIAL Date: Tue, 15 Nov 2022 09:17:25 +0100 Subject: [PATCH 3/5] ajout import navlink + comment preview --- src/pages/Admin_modif.js | 27 ++++++++++++++++++++++----- src/pages/Compte.js | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/pages/Admin_modif.js b/src/pages/Admin_modif.js index f3243cf..447e073 100644 --- a/src/pages/Admin_modif.js +++ b/src/pages/Admin_modif.js @@ -5,6 +5,7 @@ import Admin from './Admin_create.js'; import { useLocation } from "react-router-dom" import Select, { SelectChangeEvent } from '@mui/material/Select'; import MenuItem from '@mui/material/MenuItem'; +import { NavLink } from 'react-router-dom'; const api = axios.create({ baseURL: 'http://localhost:8080' @@ -36,6 +37,21 @@ function Admin_modif() { setSelectedIdRole(event.target.value); }; + function checkModif(event){ + + event.preventDefault(); + + const formData = new FormData(event.currentTarget); + const values = Object.fromEntries(formData.entries()); + console.log(values.firstname); + + const apiString = '/User/Update/' + currentUser.iduser; + api.post(apiString).then (function(response) { + console.log(response.data); + }); + + } + return (
@@ -44,7 +60,7 @@ function Admin_modif() {

Admin

Modification d'utilisateur

-
+
@@ -79,12 +95,13 @@ function Admin_modif() {
+

{currentUser === true?"L'identifiant existe déja":''}

+
+ + Retour +
- - - -
); diff --git a/src/pages/Compte.js b/src/pages/Compte.js index 12fc9cd..b2c1c00 100644 --- a/src/pages/Compte.js +++ b/src/pages/Compte.js @@ -84,7 +84,7 @@ const Compte = () => { let fileUpload = document.getElementById("fileUpload"); let display_image = document.getElementById("display_image"); -preview(); +//preview(); function preview(){ display_image.innerHTML = ""; From 07a533dfbe27ef0d60a5bb3bd63fcab7ad6dbbe0 Mon Sep 17 00:00:00 2001 From: clverdoire Date: Tue, 15 Nov 2022 09:46:01 +0100 Subject: [PATCH 4/5] changement scss ensemble des pages --- src/styles/components/_admin.scss | 725 ++++++++++++------------- src/styles/components/_analyse.scss | 5 - src/styles/components/_calendrier.scss | 5 - src/styles/components/_compte.scss | 5 - src/styles/components/_connexion.scss | 144 ++--- src/styles/components/_dashboard.scss | 5 - src/styles/components/_parametre.scss | 22 +- 7 files changed, 444 insertions(+), 467 deletions(-) diff --git a/src/styles/components/_admin.scss b/src/styles/components/_admin.scss index d88568a..4907f7d 100644 --- a/src/styles/components/_admin.scss +++ b/src/styles/components/_admin.scss @@ -1,372 +1,204 @@ -.page_admin { - display: flex; - flex-direction: row; - height: 100vh; - - .nav_bar_verticale { +body { + + .page_admin { display: flex; - flex-direction: column; - width: 200px; - background: rgba(255, 255, 255, 0.143); - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - backdrop-filter: blur(3px); - -webkit-backdrop-filter: blur(1.5px); - border-radius: 15px; - border: 1px solid rgba(255, 255, 255, 0.18); - margin: 10px; - - - .create_user { - padding: 5px; - text-decoration: none; - align-self: center; - } - - .modify_user { - padding: 5px; - text-decoration: none; - align-self: center; - } - - .delete_user { - padding: 5px; - text-decoration: none; - align-self: center; - } - - - .bouton { - display: flex; - justify-content: center; - align-items: center; - position: relative; - width: 180px; - height: 100px; - border-radius: 10px; - font-size: 13.5px; - font-weight: bold; - transition: 1s box-shadow; - border: none; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); - background-color: rgb(163, 163, 163, 0.371); - border: 1px solid rgba(255,255,255,0.1); - backdrop-filter: blur(30px); - color: rgb(255, 255, 255); - cursor: pointer; - font-size: 17px; - - &:hover{ - box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); - color: white; - background-color: rgba(114, 114, 114, 0.371); - } + flex-direction: row; + height: 100vh; - &:active{ - background-color:rgba(68, 68, 68, 0.972); - } - } - } - - - - .Titre_Formulaire{ - display: flex; - flex-direction: column; - flex-basis: 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); - margin: 10px; - padding: 10px; - - .Titre { + .nav_bar_verticale { display: flex; - /*background: rgba(255, 255, 255, 0.3); - border-radius: 15px; + flex-direction: column; + width: 200px; + background: rgba(255, 255, 255, 0.143); box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); backdrop-filter: blur(3px); - -webkit-backdrop-filter: blur(15px);*/ - margin: 10px; - font-size: 70px; - font-weight: bold; - } - - .Sous-titre { - display: flex; - /*background: rgba(255, 255, 255, 0.3); + -webkit-backdrop-filter: blur(1.5px); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - backdrop-filter: blur(3px); - -webkit-backdrop-filter: blur(15px);*/ + border: 1px solid rgba(255, 255, 255, 0.18); margin: 10px; - font-size: 40px; - font-weight: bold; - } - - .Formulaire{ - display: flex; - flex-direction: column; - align-items: center; - /*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-left: 10px; - margin-right: 10px; - .form{ - display: flex; - flex-direction: column; + .create_user { + padding: 5px; + text-decoration: none; align-self: center; - font-size: 30px; - - .Formulaire_de_connexion { - - display: flex; - flex-direction: row; - 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); - 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); - cursor: pointer; - } - } - } } - } - + .modify_user { + padding: 5px; + text-decoration: none; + align-self: center; + } - .texte { - align-self: center; - font-size: 15px; - padding: 10px 10px 10px 0; - } + .delete_user { + padding: 5px; + text-decoration: none; + align-self: center; + } - .texte_zone { - width: 600px; - height: 50px; - background-color: transparent; - border-radius: 5px; - border: 0.5px solid; - justify-content: center; - padding: 0 10px 0 15px; - padding-left: 10px; - padding-right: 10px; - } - .bouton_submit { - display: flex; - flex-direction: row; - justify-content: space-around; - align-self: center; - width: 600px; - height: 30px; - margin-top: 5%; - - .bouton_val{ - //display: flex; - background-color: grey; - border: 1px solid rgba(255, 255, 255, 0.1); + .bouton { + display: flex; + justify-content: center; + align-items: center; + position: relative; + width: 180px; + height: 100px; + border-radius: 10px; + font-size: 13.5px; + font-weight: bold; + transition: 1s box-shadow; + border: none; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + background-color: rgb(163, 163, 163, 0.371); + border: 1px 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%; + font-size: 17px; - &:hover { + &:hover{ box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); color: white; - background-color: rgba(114, 114, 114, 0.371); + background-color: rgba(114, 114, 114, 0.371); } - - &:active { - background-color: rgba(68, 68, 68, 0.972); - } - } - - .bouton_ann{ - //display: flex; - background-color: grey; - 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%; - text-decoration: none; - text-align: center; - &:hover { - box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); - color: white; - background-color: rgba(114, 114, 114, 0.371); - } - - &:active { - background-color: rgba(68, 68, 68, 0.972); + &:active{ + background-color:rgba(68, 68, 68, 0.972); } } } - } - .Titre_Formulaire_Rech{ - display: flex; - flex-direction: column; - flex-basis: 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); - margin: 10px; - padding: 10px; - - .Titre { - display: flex; - /*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; - font-size: 70px; - font-weight: bold; - } - .Sous-titre { - display: flex; - /*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; - font-size: 40px; - font-weight: bold; - } - .rechLogo { + .Titre_Formulaire{ 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);*/ - //margin: 10px; - //padding: 10px; - align-items: center; - margin-top: 5%; + -webkit-backdrop-filter: blur(15px); + margin: 10px; + padding: 10px; - .input_box { + .Titre { display: flex; - justify-content: center; - align-items: center; - position: relative; - height: 40px; - max-width: 350px; - width: 100%; - //margin: 30px 30px; - border-radius: 25px; + /*background: rgba(255, 255, 255, 0.3); + border-radius: 15px; box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - - input { - position: relative; - width: 100%; - height: 100%; - padding: 0 15px 0 65px; - outline: none; - border: none; - border-radius: 25px; - font-size: 16px; - font-weight: 400; - color: #333; - } - - .search { - display: flex; - align-items: center; - justify-content: center; - position: absolute; - left: 0; - top: 0; - height: 100%; - width: 60px; - border-radius: 25px 0 0 25px; - - .search-icon { - font-size: 30px; - color: black; - } - } + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(15px);*/ + margin: 10px; + font-size: 70px; + font-weight: bold; } - } - .formulaire { - display: flex; - flex-direction: column; - flex-basis: 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);*/ + .Sous-titre { + display: flex; + /*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; + font-size: 40px; + font-weight: bold; + } + - .bouton_personnes { + .Formulaire{ display: flex; flex-direction: column; - justify-content: space-between; - width: 350px; - margin: 20px 0 0 0; + align-items: center; /*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-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: 5%; + /*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); + cursor: pointer; + } + } + } + } + } + + + + .texte { + align-self: center; + font-size: 15px; + padding: 10px 10px 10px 0; + } + + .texte_zone { + width: 600px; + height: 50px; + background-color: transparent; + border-radius: 5px; + border: 0.5px solid; + justify-content: center; + padding: 0 10px 0 15px; + padding-left: 10px; + padding-right: 10px; } .bouton_submit { display: flex; flex-direction: row; - justify-content: space-between; - padding: 30px 0 0 0; + justify-content: space-around; + align-self: center; + width: 600px; + height: 30px; + margin-top: 5%; - .bouton_sup{ - display: flex; + .bouton_val{ + //display: flex; background-color: grey; border: 1px solid rgba(255, 255, 255, 0.1); backdrop-filter: blur(30px); @@ -374,10 +206,8 @@ cursor: pointer; font-size: 15px; border-radius: 15px; - width: 30%; - align-items: center; - justify-content: center; - + width: 20%; + &:hover { box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); color: white; @@ -390,17 +220,18 @@ } .bouton_ann{ - display: flex; + //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: 30%; - align-items: center; - + width: 20%; + text-decoration: none; + text-align: center; + &:hover { box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); color: white; @@ -412,63 +243,231 @@ } } } + } + + .Titre_Formulaire_Rech{ + display: flex; + flex-direction: column; + flex-basis: 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); + margin: 10px; + padding: 10px; + + .Titre { + display: flex; + /*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; + font-size: 70px; + font-weight: bold; + } + + .Sous-titre { + display: flex; + /*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; + font-size: 40px; + font-weight: bold; + } - .tr_bouton { + .rechLogo { display: flex; flex-direction: column; - justify-content: center; + flex-basis: 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);*/ + //margin: 10px; + //padding: 10px; align-items: center; + margin-top: 5%; - .bouton_personne1 { + .input_box { display: flex; - flex-direction: row; - background-color: grey; - border: 1px solid rgba(255, 255, 255, 0.1); - backdrop-filter: blur(30px); - color: rgb(255, 255, 255); - cursor: pointer; - font-size: 15px; - align-items: center; justify-content: center; + align-items: center; + position: relative; + height: 40px; + max-width: 350px; + width: 100%; + //margin: 30px 30px; + border-radius: 25px; + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - &:hover { - box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); - color: white; - background-color: rgba(114, 114, 114, 0.371); + input { + position: relative; + width: 100%; + height: 100%; + padding: 0 15px 0 65px; + outline: none; + border: none; + border-radius: 25px; + font-size: 16px; + font-weight: 400; + color: #333; } - - &:active { - background-color: rgba(68, 68, 68, 0.972); + + .search { + display: flex; + align-items: center; + justify-content: center; + position: absolute; + left: 0; + top: 0; + height: 100%; + width: 60px; + border-radius: 25px 0 0 25px; + + .search-icon { + font-size: 30px; + color: black; + } } } + } + + .formulaire { + display: flex; + flex-direction: column; + flex-basis: 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);*/ + + .bouton_personnes { + display: flex; + flex-direction: column; + justify-content: space-between; + width: 350px; + margin: 20px 0 0 0; + /*background: rgba(255, 255, 255, 0.3); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(15px);*/ + } - .bouton_personne2 { + .bouton_submit { display: flex; flex-direction: row; - background-color: grey; - border: 1px solid rgba(255, 255, 255, 0.1); - backdrop-filter: blur(30px); - color: rgb(255, 255, 255); - cursor: pointer; - font-size: 15px; - align-items: center; - justify-content: center; + justify-content: space-between; + padding: 30px 0 0 0; - &:hover { - box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); - color: white; - background-color: rgba(114, 114, 114, 0.371); + .bouton_sup{ + display: flex; + background-color: grey; + border: 1px 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: 30%; + align-items: center; + justify-content: center; + + &:hover { + box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); + color: white; + background-color: rgba(114, 114, 114, 0.371); + } + + &:active { + background-color: rgba(68, 68, 68, 0.972); + } } + + .bouton_ann{ + display: flex; + background-color: grey; + border: 1px 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: 30%; + align-items: center; - &:active { - background-color: rgba(68, 68, 68, 0.972); + &:hover { + box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); + color: white; + background-color: rgba(114, 114, 114, 0.371); + } + + &:active { + background-color: rgba(68, 68, 68, 0.972); + } + } + } + + .tr_bouton { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + .bouton_personne1 { + display: flex; + flex-direction: row; + background-color: grey; + border: 1px solid rgba(255, 255, 255, 0.1); + backdrop-filter: blur(30px); + color: rgb(255, 255, 255); + cursor: pointer; + font-size: 15px; + align-items: center; + justify-content: center; + + &:hover { + box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); + color: white; + background-color: rgba(114, 114, 114, 0.371); + } + + &:active { + background-color: rgba(68, 68, 68, 0.972); + } + } + + .bouton_personne2 { + display: flex; + flex-direction: row; + background-color: grey; + border: 1px solid rgba(255, 255, 255, 0.1); + backdrop-filter: blur(30px); + color: rgb(255, 255, 255); + cursor: pointer; + font-size: 15px; + align-items: center; + justify-content: center; + + &:hover { + box-shadow: 0, 5px, 35px, 0 rgba(0, 0, 0, 1); + color: white; + background-color: rgba(114, 114, 114, 0.371); + } + + &:active { + background-color: rgba(68, 68, 68, 0.972); + } } } } } } -} - - - - \ No newline at end of file +} \ No newline at end of file diff --git a/src/styles/components/_analyse.scss b/src/styles/components/_analyse.scss index f66e375..5946fdf 100644 --- a/src/styles/components/_analyse.scss +++ b/src/styles/components/_analyse.scss @@ -1,9 +1,4 @@ body { - background-image: url("../../../public/fond_page_connexion.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - background-size: cover; .page_analyse { display: flex; diff --git a/src/styles/components/_calendrier.scss b/src/styles/components/_calendrier.scss index 4dbfaa2..2148bff 100644 --- a/src/styles/components/_calendrier.scss +++ b/src/styles/components/_calendrier.scss @@ -1,9 +1,4 @@ body { - background-image: url("../../../public/fond_page_connexion.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - background-size: cover; .page_calendrier { display: flex; diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss index 1dee73e..2df7ab4 100644 --- a/src/styles/components/_compte.scss +++ b/src/styles/components/_compte.scss @@ -1,9 +1,4 @@ body { - background-image: url("../../../public/fond_page_connexion.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - background-size: cover; .page_compte { display: flex; diff --git a/src/styles/components/_connexion.scss b/src/styles/components/_connexion.scss index 38031e0..a3c1944 100644 --- a/src/styles/components/_connexion.scss +++ b/src/styles/components/_connexion.scss @@ -1,95 +1,97 @@ -.page_connexion { - display: flex; - flex-direction: column; - align-items: center; - - .logo { - width: 200px; - height: 200px; - } - - .formulaire_de_connexion { - background: rgba(255, 255, 255, 0.143); - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - backdrop-filter: blur(3px); - -webkit-backdrop-filter: blur(1.5px); - border-radius: 15px; - border: 1px solid rgba(255, 255, 255, 0.18); - - padding: 40px; - padding-top: 100px; - width: 450px; - height: 470px; +body { + .page_connexion { display: flex; - align-items: center; flex-direction: column; - justify-content: space-between; - margin: 10px; + align-items: center; - .connexion_text { - font-size: 25px; + .logo { + width: 200px; + height: 200px; } - .text_zone { - width: 370px; - height: 50px; - background-color: transparent; - border-radius: 5px; - border: 0.5px solid; - padding-left: 10px; - padding-right: 10px; - } + .formulaire_de_connexion { + background: rgba(255, 255, 255, 0.143); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(1.5px); + border-radius: 15px; + border: 1px solid rgba(255, 255, 255, 0.18); - .envoyer { - width: 100%; + padding: 40px; + padding-top: 100px; + width: 450px; + height: 470px; display: flex; - justify-content: space-evenly; align-items: center; + flex-direction: column; + justify-content: space-between; + margin: 10px; + + .connexion_text { + font-size: 25px; + } - button { - width: 150px; - height: 40px; - border-radius: 10px; + .text_zone { + width: 370px; + height: 50px; + background-color: transparent; + border-radius: 5px; border: 0.5px solid; - color: $white; - border: 0; - background-color: rgba(163, 163, 163, 0.371); - border: 1px solid rgba(255,255,255,0.1); - backdrop-filter: blur(30px); - color: rgb(255, 255, 255); - cursor: pointer; - font-size: 15px; - &:hover{ - background-color: rgba(114, 114, 114, 0.371); - } - &:active{ - background-color:rgba(68, 68, 68, 0.972); - } + padding-left: 10px; + padding-right: 10px; } - .memory_me { + .envoyer { + width: 100%; display: flex; + justify-content: space-evenly; align-items: center; - label { - margin-right: 10px; - font-size: 12px; - color: rgb(59, 59, 59); - } - input{ + button { + width: 150px; + height: 40px; + border-radius: 10px; + border: 0.5px solid; + color: $white; + border: 0; + background-color: rgba(163, 163, 163, 0.371); + border: 1px solid rgba(255,255,255,0.1); + backdrop-filter: blur(30px); + color: rgb(255, 255, 255); cursor: pointer; + font-size: 15px; + &:hover{ + background-color: rgba(114, 114, 114, 0.371); + } + &:active{ + background-color:rgba(68, 68, 68, 0.972); + } + } + + .memory_me { + display: flex; + align-items: center; + + label { + margin-right: 10px; + font-size: 12px; + color: rgb(59, 59, 59); + } + input{ + cursor: pointer; + } } } } - } - .forgot_pw { - outline: none; - text-decoration: none; - color: rgb(159, 159, 159); + .forgot_pw { + outline: none; + text-decoration: none; + color: rgb(159, 159, 159); - &:hover { - color: rgba(53, 112, 206, 1); + &:hover { + color: rgba(53, 112, 206, 1); + } } } } \ No newline at end of file diff --git a/src/styles/components/_dashboard.scss b/src/styles/components/_dashboard.scss index 5016aa7..eb789f6 100644 --- a/src/styles/components/_dashboard.scss +++ b/src/styles/components/_dashboard.scss @@ -1,9 +1,4 @@ body { - background-image: url("../../../public/fond_page_connexion.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - background-size: cover; .page_dashboard { display: flex; diff --git a/src/styles/components/_parametre.scss b/src/styles/components/_parametre.scss index 166cbbf..da94453 100644 --- a/src/styles/components/_parametre.scss +++ b/src/styles/components/_parametre.scss @@ -1,9 +1,5 @@ body { - background-image: url("../../../public/fond_page_connexion.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - background-size: cover; + background-color: $alice-blue; .page_parametre { display: flex; @@ -24,7 +20,7 @@ body { background: rgba(255, 255, 255, 0.3); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px); @@ -47,7 +43,7 @@ body { width: 100%; margin: 30px 30px; border-radius: 25px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); input { position: relative; @@ -105,7 +101,7 @@ body { background: rgba(255, 255, 255, 0.3); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px); @@ -144,7 +140,7 @@ body { background: rgba(255, 255, 255, 0.3); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px); @@ -176,7 +172,7 @@ body { background-color: rgb(190, 189, 189); border-radius: 5px; border-radius: 5px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); cursor: pointer; &:hover{ @@ -205,7 +201,7 @@ body { background-color: rgb(190, 189, 189); border-radius: 5px; border-radius: 5px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); cursor: pointer; &:hover{ @@ -226,7 +222,7 @@ body { background: rgba(255, 255, 255, 0.3); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px); @@ -294,7 +290,7 @@ body { background: rgba(255, 255, 255, 0.3); border-radius: 15px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.25); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(15px); } From 4a42d3458fa068fd85862bb12c45dc4a46dd9188 Mon Sep 17 00:00:00 2001 From: clverdoire Date: Tue, 15 Nov 2022 10:22:57 +0100 Subject: [PATCH 5/5] Changements button page parametre --- src/styles/components/_parametre.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/components/_parametre.scss b/src/styles/components/_parametre.scss index da94453..f6070eb 100644 --- a/src/styles/components/_parametre.scss +++ b/src/styles/components/_parametre.scss @@ -259,7 +259,7 @@ body { } input:checked[type="checkbox"] { - background-color: rgb(41, 186, 41); + background-color: rgb(51, 75, 172); } input[type="checkbox"]:before {