From 5c55de21e69c4a29cc2afece4c1e8e83b35ec7a8 Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Wed, 4 Jan 2023 15:07:47 +0100 Subject: [PATCH 01/14] notification --- Site Web/client/src/components/Notif.js | 26 ++++++++++++++ Site Web/client/src/pages/Trends.js | 11 +++++- .../client/src/styles/component/_notif.scss | 36 +++++++++++++++++++ Site Web/client/src/styles/index.scss | 2 ++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 Site Web/client/src/components/Notif.js create mode 100644 Site Web/client/src/styles/component/_notif.scss diff --git a/Site Web/client/src/components/Notif.js b/Site Web/client/src/components/Notif.js new file mode 100644 index 00000000..8fbd7a0b --- /dev/null +++ b/Site Web/client/src/components/Notif.js @@ -0,0 +1,26 @@ +import React, {useEffect} from 'react'; +import {isEmpty} from "./Utils"; +import {useSelector} from "react-redux"; + +const Notif = ({message} ) => { + const usersData = useSelector((state) => state.users.users); + + return ( +
+
+ +
+
+
+ bastien +
+
+
+ {message} +
+
+ + ); +}; + +export default Notif; \ No newline at end of file diff --git a/Site Web/client/src/pages/Trends.js b/Site Web/client/src/pages/Trends.js index f44acd36..bc62173c 100644 --- a/Site Web/client/src/pages/Trends.js +++ b/Site Web/client/src/pages/Trends.js @@ -1,9 +1,18 @@ import React from 'react'; import Navbar from '../components/Navbar'; +import Notif from '../components/Notif'; const Trends = () => { return ( - + <> + + + + + + + + ); }; diff --git a/Site Web/client/src/styles/component/_notif.scss b/Site Web/client/src/styles/component/_notif.scss new file mode 100644 index 00000000..3f40fc04 --- /dev/null +++ b/Site Web/client/src/styles/component/_notif.scss @@ -0,0 +1,36 @@ +/*.conteneur_notif{ + display: flex; + justify-content: center; + margin-top: 1%; + margin-bottom: 1%; + + display: flex; + alignItems: center; + +}*/ + +.conteneur_notif { + display: flex; + align-items:center; + justify-content: start; + + margin-left: 10%; + margin-top: 1%; + margin-bottom: 1%; +} + + +.contenue_notif:nth-child(2) { + margin-right: 10px; +} + +/* +.messageUserNotif{ + display: flex; + align-items: flex-start; +} + +.message_Notif{ + +} +*/ \ No newline at end of file diff --git a/Site Web/client/src/styles/index.scss b/Site Web/client/src/styles/index.scss index 60a15dd3..6b7b816d 100644 --- a/Site Web/client/src/styles/index.scss +++ b/Site Web/client/src/styles/index.scss @@ -8,3 +8,5 @@ @import'./component/ConfigurationDuProfil.scss'; @import './component/newPoste'; +@import './component/notif'; + From 74a114899de870d00720ae8eff2fcbfac77c530c Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Wed, 4 Jan 2023 15:08:10 +0100 Subject: [PATCH 02/14] notification --- .../client/src/styles/component/_notif.scss | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Site Web/client/src/styles/component/_notif.scss b/Site Web/client/src/styles/component/_notif.scss index 3f40fc04..6199be4e 100644 --- a/Site Web/client/src/styles/component/_notif.scss +++ b/Site Web/client/src/styles/component/_notif.scss @@ -1,14 +1,3 @@ -/*.conteneur_notif{ - display: flex; - justify-content: center; - margin-top: 1%; - margin-bottom: 1%; - - display: flex; - alignItems: center; - -}*/ - .conteneur_notif { display: flex; align-items:center; @@ -22,15 +11,4 @@ .contenue_notif:nth-child(2) { margin-right: 10px; -} - -/* -.messageUserNotif{ - display: flex; - align-items: flex-start; -} - -.message_Notif{ - -} -*/ \ No newline at end of file +} \ No newline at end of file From acf7cef19d962520562d25934940aad4b4eea6da Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:10:55 +0100 Subject: [PATCH 03/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/components/Configurations/ConfigurationDuCompte.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configurations/ConfigurationDuCompte.js | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js b/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js index 928e00d6..43ee6dc8 100644 --- a/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js +++ b/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js @@ -3,26 +3,21 @@ import { NavLink } from "react-router-dom"; -const ConfigurationDuCompte =()=>{ +const PolitiqueDeConfidentialite =()=>{ return( -
-

Modifucation information du compte

-
-
- adresse mail : mail - mot de passe : mdp - confirmer le mot de passe : mdp -
+
+

Cette politique de confidentialité s’applique au site : Designed By GG. + La présente politique de confidentialité a pour but d’exposer aux utilisateurs du site : + + La manière dont sont collectées et traitées leurs données à caractère + personnel. Doivent être considérées comme données personnelles toutes les données étant susceptibles d’identifier un utilisateur. Il s’agit notamment du prénom et du nom, de l’âge, de l’adresse postale, l’adresse mail, la localisation de l’utilisateur ou encore son adresse IP ; + Quels sont les droits des utilisateurs concernant ces données ; + Qui est responsable du traitement des données à caractère personnes + collectées et traitées ; + A qui ces données sont transmises ; + Eventuellement, la politique du site en matière de fichiers “cookies” +

-

Suppression du compte

-
-
- - gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg -
-
) } From 2b1dbb1066ff053c6cd24b9cdf79efc47bf7f2e5 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:15:46 +0100 Subject: [PATCH 04/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/components/Configurations/ConfigurationDuCompte.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configurations/ConfigurationDuCompte.js | 66 +++++++++++++++---- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js b/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js index 43ee6dc8..0b0c33e9 100644 --- a/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js +++ b/Site Web/client/src/components/Configurations/ConfigurationDuCompte.js @@ -3,26 +3,64 @@ import { NavLink } from "react-router-dom"; -const PolitiqueDeConfidentialite =()=>{ +const ConfigurationDuCompte =()=>{ + + const [email, setEmail] = useState(''); + const [password, setPassword] = useState(''); + const [controlPassword, setControlPassword] = useState(''); + return( -
-

Cette politique de confidentialité s’applique au site : Designed By GG. - La présente politique de confidentialité a pour but d’exposer aux utilisateurs du site : - - La manière dont sont collectées et traitées leurs données à caractère - personnel. Doivent être considérées comme données personnelles toutes les données étant susceptibles d’identifier un utilisateur. Il s’agit notamment du prénom et du nom, de l’âge, de l’adresse postale, l’adresse mail, la localisation de l’utilisateur ou encore son adresse IP ; - Quels sont les droits des utilisateurs concernant ces données ; - Qui est responsable du traitement des données à caractère personnes - collectées et traitées ; - A qui ces données sont transmises ; - Eventuellement, la politique du site en matière de fichiers “cookies” -

-
+
+

Modifucation information du compte

+ +
+ +
+ email + mot de passe + comfirmation mot de passe +
+ +
+ + setEmail(e.target.value)} + value={email}/> +
+
+ setPassword(e.target.value)} + value={password}/> +
+
+ setControlPassword(e.target.value)} + value={controlPassword}/> +
+
+
+
+

Suppression du compte

+
+ + + gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg +
+
) } + export default ConfigurationDuCompte; From e05d486dd928907e0c157e5349bf570826ece5e8 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:16:44 +0100 Subject: [PATCH 05/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/components/Configurations/ConfigurationDuProfil.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configurations/ConfigurationDuProfil.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js index b6b71f4e..874bd943 100644 --- a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js +++ b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js @@ -14,39 +14,39 @@ const ConfigurationDuProfil = ()=>{

Modifucation du Profil

- - Pseudo: -
-
- setPseudo (e.target.value)} - - /> + +
+ Pseudo: + Nom d'utilisateur:
-
- Nom d'utilisateur +
+ setNomUtilisateur (e.target.value)} - value={userData.pseudo} + value={pseudo} + /> + setPseudo (e.target.value)} />
-
+

Acces au dossiers personnel

- - + +
+ ) } From 760444f579f304a9fe248b16fcbc941f692272ed Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:17:29 +0100 Subject: [PATCH 06/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/components/Configurations/ConfigurationDuProfil.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Configurations/ConfigurationDuProfil.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js index 874bd943..6f0c730f 100644 --- a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js +++ b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js @@ -46,7 +46,6 @@ const ConfigurationDuProfil = ()=>{
- ) } From ed1ab8cdaa87a897a4c6c81a476e29c37e501cc4 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:19:24 +0100 Subject: [PATCH 07/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/components/Configurations/PolitiqueDeConfidentialite.?= =?UTF-8?q?js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Configurations/PolitiqueDeConfidentialite.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Site Web/client/src/components/Configurations/PolitiqueDeConfidentialite.js b/Site Web/client/src/components/Configurations/PolitiqueDeConfidentialite.js index 9c8c32a4..1d7df0b8 100644 --- a/Site Web/client/src/components/Configurations/PolitiqueDeConfidentialite.js +++ b/Site Web/client/src/components/Configurations/PolitiqueDeConfidentialite.js @@ -4,8 +4,8 @@ import { NavLink } from "react-router-dom"; const PolitiqueDeConfidentialite =()=>{ return( -
- Cette politique de confidentialité s’applique au site : Designed By GG. +
+

Cette politique de confidentialité s’applique au site : Designed By GG. La présente politique de confidentialité a pour but d’exposer aux utilisateurs du site : La manière dont sont collectées et traitées leurs données à caractère @@ -15,7 +15,7 @@ const PolitiqueDeConfidentialite =()=>{ collectées et traitées ; A qui ces données sont transmises ; Eventuellement, la politique du site en matière de fichiers “cookies” - +

) } From 894441837dc5fe87744c7fcbf8bc04d2ba94ff14 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:20:19 +0100 Subject: [PATCH 08/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/styles/=5Fsettings.scss'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Site Web/client/src/styles/_settings.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Site Web/client/src/styles/_settings.scss b/Site Web/client/src/styles/_settings.scss index 15c3b4e3..6d8e21d6 100644 --- a/Site Web/client/src/styles/_settings.scss +++ b/Site Web/client/src/styles/_settings.scss @@ -22,3 +22,10 @@ $color-5: #AABBCC; margin: 0; box-sizing: border-box; } + +.imageDeProfil{ + object-fit: none; + clip-path:circle(50%); + +} + From db353982889cca04a47c6e9dea37a3df5fdf3e92 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:21:43 +0100 Subject: [PATCH 09/14] Supprimer 'Site Web/client/src/styles/pages/configuration.scss' --- Site Web/client/src/styles/pages/configuration.scss | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Site Web/client/src/styles/pages/configuration.scss diff --git a/Site Web/client/src/styles/pages/configuration.scss b/Site Web/client/src/styles/pages/configuration.scss deleted file mode 100644 index 32e44e5f..00000000 --- a/Site Web/client/src/styles/pages/configuration.scss +++ /dev/null @@ -1,8 +0,0 @@ -.ligneVertical{ - border-right: thick solid #000; - height:85%; -} -.ligneHorizontal{ - border-top: thick solid #000; - width: 78%; -} \ No newline at end of file From e260d15ea988e5bf7dd73e10147dac50e23479ae Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:24:47 +0100 Subject: [PATCH 10/14] _configurationDuCompte.scss --- .../component/_configurationDuCompte.scss | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Site Web/client/src/styles/component/_configurationDuCompte.scss diff --git a/Site Web/client/src/styles/component/_configurationDuCompte.scss b/Site Web/client/src/styles/component/_configurationDuCompte.scss new file mode 100644 index 00000000..680974c5 --- /dev/null +++ b/Site Web/client/src/styles/component/_configurationDuCompte.scss @@ -0,0 +1,41 @@ + +.ModifucationInformationDuCompte{ + display: flex; + flex-direction: row; + align-items: center; + margin-left: 10%; +} + +.ModificationInformationDuCompteText{ + display: flex; + flex-direction: column; + padding-left:5%; + font-size: medium; + +} + +.buttonSuppressionCompte{ + display: flex; + flex-direction:row; + align-items:center; + button{ + padding: 1%; + margin-bottom: 1%; + margin-top: 2%; + margin-left: 6%; + width: 16%; + max-width: 160px; + background-color: $color-3; + border: 2px solid $color-4; + border-radius: 20px; + } + button:hover { + background-color: $color-1; + border-color: black; + + } + span{ + padding-left: 40px; + max-width: 100px; + } +} From ce0e361b3c1f51a0e3827dbae7de7de6207b12f1 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:26:01 +0100 Subject: [PATCH 11/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/styles/component/=5FconfigurationDuProfil.scss'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rofil.scss => _configurationDuProfil.scss} | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) rename Site Web/client/src/styles/component/{ConfigurationDuProfil.scss => _configurationDuProfil.scss} (65%) diff --git a/Site Web/client/src/styles/component/ConfigurationDuProfil.scss b/Site Web/client/src/styles/component/_configurationDuProfil.scss similarity index 65% rename from Site Web/client/src/styles/component/ConfigurationDuProfil.scss rename to Site Web/client/src/styles/component/_configurationDuProfil.scss index 57307a88..ee1c7b3f 100644 --- a/Site Web/client/src/styles/component/ConfigurationDuProfil.scss +++ b/Site Web/client/src/styles/component/_configurationDuProfil.scss @@ -15,19 +15,23 @@ display: flex; flex-direction: column; padding-left:5%; - width: 88%; font-size: medium; + } span{ - margin: 1%; + + margin-bottom: 4%; } -.imageDeProfil{ +.imageDeProfilConfiguration{ width: 15%; + +} +.imageDeProfilConfiguration:hover{ + filter: blur(1px); } - .accesDossiersPerso{ display: flex; align-items: row; @@ -39,5 +43,15 @@ span{ input{ - margin-right: 0.5%; + margin-bottom: 2%; +} + +.accesDossiersPerso{ + display: flex; + } + +.textAccesDossiersPerso{ + margin-left:18px; +} + From f2fffc78638feea00b955e5c99c3bcf2437e4156 Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Wed, 4 Jan 2023 15:27:10 +0100 Subject: [PATCH 12/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Site=20Web/c?= =?UTF-8?q?lient/src/styles/index.scss'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Site Web/client/src/styles/index.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Site Web/client/src/styles/index.scss b/Site Web/client/src/styles/index.scss index 6b7b816d..173c1048 100644 --- a/Site Web/client/src/styles/index.scss +++ b/Site Web/client/src/styles/index.scss @@ -5,8 +5,11 @@ @import './component/poste'; @import './pages/configuration'; @import './component/ajoutLien'; -@import'./component/ConfigurationDuProfil.scss'; +@import'./component/configurationDuProfil.scss'; +@import'./component/configurationDuCompte.scss'; +@import'./component/politiqueDeConfidentialite'; @import './component/newPoste'; + @import './component/notif'; From fdba7bea62706809133fa62e59fdcab165fdc6cf Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Wed, 4 Jan 2023 15:53:58 +0100 Subject: [PATCH 13/14] ajout titre a la page notification --- .idea/watcherTasks.xml | 25 +++++++++++++++++++ Site Web/client/src/pages/Trends.js | 6 ++--- .../client/src/styles/component/_notif.scss | 1 - .../client/src/styles/component/_trends.scss | 3 +++ Site Web/client/src/styles/index.scss | 3 ++- 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 .idea/watcherTasks.xml create mode 100644 Site Web/client/src/styles/component/_trends.scss diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 00000000..560ddd15 --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/Site Web/client/src/pages/Trends.js b/Site Web/client/src/pages/Trends.js index bc62173c..34376b44 100644 --- a/Site Web/client/src/pages/Trends.js +++ b/Site Web/client/src/pages/Trends.js @@ -4,16 +4,16 @@ import Notif from '../components/Notif'; const Trends = () => { return ( - <> +
+

Notification

- - ); +
); }; export default Trends; \ No newline at end of file diff --git a/Site Web/client/src/styles/component/_notif.scss b/Site Web/client/src/styles/component/_notif.scss index 6199be4e..13f32f2f 100644 --- a/Site Web/client/src/styles/component/_notif.scss +++ b/Site Web/client/src/styles/component/_notif.scss @@ -3,7 +3,6 @@ align-items:center; justify-content: start; - margin-left: 10%; margin-top: 1%; margin-bottom: 1%; } diff --git a/Site Web/client/src/styles/component/_trends.scss b/Site Web/client/src/styles/component/_trends.scss new file mode 100644 index 00000000..d0fa0bda --- /dev/null +++ b/Site Web/client/src/styles/component/_trends.scss @@ -0,0 +1,3 @@ +#listeNotif{ + margin-left: 10%; +} \ No newline at end of file diff --git a/Site Web/client/src/styles/index.scss b/Site Web/client/src/styles/index.scss index 6b7b816d..88d7c8fa 100644 --- a/Site Web/client/src/styles/index.scss +++ b/Site Web/client/src/styles/index.scss @@ -5,8 +5,9 @@ @import './component/poste'; @import './pages/configuration'; @import './component/ajoutLien'; -@import'./component/ConfigurationDuProfil.scss'; +@import './component/ConfigurationDuProfil.scss'; @import './component/newPoste'; @import './component/notif'; +@import './component/trends'; From 1d4d3043b86b665feb742d2bf43790e27900936c Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Wed, 4 Jan 2023 16:49:01 +0100 Subject: [PATCH 14/14] correction bug --- Site Web/client/src/styles/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Site Web/client/src/styles/index.scss b/Site Web/client/src/styles/index.scss index 88d7c8fa..77346d52 100644 --- a/Site Web/client/src/styles/index.scss +++ b/Site Web/client/src/styles/index.scss @@ -5,7 +5,7 @@ @import './component/poste'; @import './pages/configuration'; @import './component/ajoutLien'; -@import './component/ConfigurationDuProfil.scss'; +@import './component/configurationDuProfil'; @import './component/newPoste'; @import './component/notif';