Merge branch 'master' of https://codefirst.iut.uca.fr/git/noan.randon/Favor

Site Web/client/src/components/Post/ActionComment.js

@@ -7,7 +7,8 @@ import { UidContext } from '../AppContext';
 const ActionComment = ( { commentaire , postId}) => {
     const [createur, setCreateur] = useState(false);
     const [edit, setEdit] = useState(false);
-    const [message,setMessage] = useState('');
+    const [message,setMessage] = useState(commentaire.text);
+
     const uid = useContext(UidContext);
     const dispatch = useDispatch();
     
@@ -15,13 +16,14 @@ const ActionComment = ( { commentaire , postId}) => {
         e.preventDefault();
         if(message){
             dispatch(editComment(postId, commentaire._id, message));
-            setMessage('');
             setEdit(false);
         }
     };
 
     const handleDelete = () => {
         dispatch(deleteComment(postId, commentaire._id));
+        setMessage('commantaire suprimer');
+        setEdit(false);
     };
 
     useEffect(() => {
@@ -36,6 +38,9 @@ const ActionComment = ( { commentaire , postId}) => {
     }, [uid, commentaire.commenterId]);
 
     return (
+        <>
+            <p>{message}</p>
+
         <div className="edit-comment">
             {createur && edit === false && (
                 <span onClick={() => setEdit(!edit)}>
@@ -66,6 +71,7 @@ const ActionComment = ( { commentaire , postId}) => {
 
             )}
         </div>
+        </>
     );
 };
 

Site Web/client/src/components/Post/Comment.js

@@ -50,7 +50,6 @@ const Comment = ({ post }) => {
                     <span>{timestampParser(comment.timestamp)}</span>
                   </div>
                   <div className="content-com">
-                    <p>{comment.text}</p>
                       <ActionComment commentaire={comment} postId={post._id} />
                     </div>
                   

Site Web/client/src/components/Post/PostNouvelleAffichage.js

@@ -46,7 +46,12 @@ const PostNouvelleAffichage = ( { post } ) => {
 
 
     useEffect(() => {
+        try {
             !isEmpty(usersData[0]) && setIsLoading(false)
+        }
+        catch (error){
+
+        }
     })
 
     

Site Web/client/src/components/UserProfil/SuggestFriends.js

@@ -66,6 +66,7 @@ const SuggestFriends = () => {
         }
     }, [userData, usersData, change])
 
+    try {
         return (
             <div className="recoDiv">
                 <div className="reco">
@@ -74,10 +75,10 @@ const SuggestFriends = () => {
                     {chargement ? (
                         <i className='fas fa-spinner fa-pulse'></i>
                     ) : (
-                        <div className="ListReco" >
+                        <div className="ListReco">
                             {friends && friends.map((user) => {
-                                for(let i = 0; i < usersData.length; i++){
-                                    if(user === usersData[i]._id){
+                                for (let i = 0; i < usersData.length; i++) {
+                                    if (user === usersData[i]._id) {
                                         return (
                                             <div className="UtiReco" key={user}>
                                                 <div>
@@ -97,6 +98,10 @@ const SuggestFriends = () => {
                 </div>
             </div>
         );
+    }
+    catch (error){
+        return <div>Loading...</div>
+    }
 };
 
 export default SuggestFriends;