From cfb5a8854f0c708ce1dc2d82746eb44af30d65a4 Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Fri, 20 Jan 2023 08:29:57 +0100 Subject: [PATCH] crash --- .../Configurations/ConfigurationDuProfil.js | 2 +- Site Web/client/src/components/Log/index.js | 2 +- .../components/UserProfil/SuggestFriends.js | 2 +- Site Web/client/src/pages/Configuration.js | 9 +++--- Site Web/client/src/pages/Trends.js | 29 +++++++++++-------- Site Web/controllers/auth.controller.js | 3 +- Site Web/models/post.model.js | 2 +- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js index 29030412..77c60d19 100644 --- a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js +++ b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js @@ -70,7 +70,7 @@ const ConfigurationDuProfil = ()=>{ setMessage("Erreur lors de la mise à jour de l'image de profil"); } - setUserPicture(tmpAffichageImage); + userPicture(tmpAffichageImage); console.log(userPicture); setDisplayAdd(false); diff --git a/Site Web/client/src/components/Log/index.js b/Site Web/client/src/components/Log/index.js index 717296e0..f4ba9032 100644 --- a/Site Web/client/src/components/Log/index.js +++ b/Site Web/client/src/components/Log/index.js @@ -24,7 +24,7 @@ const Log = ( props ) => { Favor

Bienvenue!

Qu'est ce que Favor?

-

Un réseau social de partage de liens, dont vous pourrez partager vos liensfefezfefezfzefzfz

+

Un réseau social de partage de liens, Partagez vos coups de coeur en ligne

diff --git a/Site Web/client/src/components/UserProfil/SuggestFriends.js b/Site Web/client/src/components/UserProfil/SuggestFriends.js index 2a5c50b0..b6f8ec0a 100644 --- a/Site Web/client/src/components/UserProfil/SuggestFriends.js +++ b/Site Web/client/src/components/UserProfil/SuggestFriends.js @@ -55,7 +55,7 @@ const SuggestFriends = () => { setFriends(array); } - if(change && !isEmpty(usersData[0]) && userData!=null){ + if(change && !isEmpty(usersData) && userData!=null){ if(userData.followers.length === 0){ stateTopFollowers(); }else{ diff --git a/Site Web/client/src/pages/Configuration.js b/Site Web/client/src/pages/Configuration.js index 9c1aeed5..862ebc6e 100644 --- a/Site Web/client/src/pages/Configuration.js +++ b/Site Web/client/src/pages/Configuration.js @@ -26,7 +26,8 @@ const Configuration = () => { setConfigurationDuProfil(false); } - }; + }; + return( <> @@ -39,11 +40,11 @@ const Configuration = () => { Configuration du compte - Politique de confidentialite + Politique de confidentialité
- - + + {ConfigurationProfil &&} {ConfigurationCompte &&} {PolitiqueConfidentialite &&} diff --git a/Site Web/client/src/pages/Trends.js b/Site Web/client/src/pages/Trends.js index cdee3aa8..bf6f384c 100644 --- a/Site Web/client/src/pages/Trends.js +++ b/Site Web/client/src/pages/Trends.js @@ -8,20 +8,25 @@ const Trends = () => { const [setLoadNotif] = useState(true); const userData = useSelector((state) => state.user.user); - return ( -
- -

Notification

- { - userData.notif != null && userData.notif.map((notif) => { - return ( + try { + return ( +
+ +

Notification

+ { + userData.notif != null && userData.notif.map((notif) => { + return ( - ); - }) + ); + }) - } -
- ); + } +
+ ); + } + catch (error){ + return
Loading...
+ } }; export default Trends; \ No newline at end of file diff --git a/Site Web/controllers/auth.controller.js b/Site Web/controllers/auth.controller.js index 18a05a40..adf21397 100644 --- a/Site Web/controllers/auth.controller.js +++ b/Site Web/controllers/auth.controller.js @@ -187,8 +187,7 @@ module.exports.verifyEmail = async (req, res) => { //gestion des erreurs module.exports.signUp = async (req, res) => { - console.log(req.body); - + console.log("signUp: ",req.body); //Attention à enlever const {pseudo, email, password} = req.body diff --git a/Site Web/models/post.model.js b/Site Web/models/post.model.js index d9c41188..a9d8e061 100644 --- a/Site Web/models/post.model.js +++ b/Site Web/models/post.model.js @@ -20,7 +20,7 @@ const postSchema = new mongoose.Schema( likers: { type: [String], required: true - },- + }, tags: { type: [String], required: true