diff --git a/client/src/components/Like.tsx b/client/src/components/Like.tsx index 6ef8807..018079a 100644 --- a/client/src/components/Like.tsx +++ b/client/src/components/Like.tsx @@ -5,7 +5,7 @@ import { toastError, toastSuccess } from '@controllers/Toasts'; import { useEffect, useState } from 'react'; import { getMeInfo } from '@controllers/UserController'; -const Like = ({ message }: { message: any}) => { +const Like = ({ message }: { message: any }) => { const queryClient = useQueryClient(); const [liked, setLiked] = useState(false); const me = useQuery(['me'], getMeInfo, { @@ -20,7 +20,7 @@ const Like = ({ message }: { message: any}) => { useEffect(() => { if (message.likedBy.some((like: any) => like.userId === me.data?.id)) { setLiked(true); - } + } }, [message]); const mutateLike = useMutation(liked ? unlikePost : likePost, { @@ -28,10 +28,11 @@ const Like = ({ message }: { message: any}) => { queryClient.invalidateQueries(['messages']); if (data.message === 'Post liked') { setLiked(true); - toastSuccess('Message aimé'); - } else { + toastSuccess('Message liké'); + } else if (data.message === 'Post unliked') { setLiked(false); - toastSuccess('Message non aimé'); + } else { + toastError(data.message); } }, onError: (error) => { @@ -50,7 +51,11 @@ const Like = ({ message }: { message: any}) => { name="like" > - {message.likedBy.length > 0 && {message.likedBy.length}} + {message.likes > 0 && ( + + {message.likes} + + )} Aimer ); diff --git a/src/api/posts/unlikePost.ts b/src/api/posts/unlikePost.ts index 6a88fb6..5289f3a 100644 --- a/src/api/posts/unlikePost.ts +++ b/src/api/posts/unlikePost.ts @@ -10,8 +10,6 @@ export default async (req: Request, res: Response) => { } return res.status(200).send({ message: 'Post unliked' }); } catch (error) { - console.log(error); - return res.status(500).send(error); } }; diff --git a/src/controller/PostController.ts b/src/controller/PostController.ts index 3962ad7..f03ce75 100644 --- a/src/controller/PostController.ts +++ b/src/controller/PostController.ts @@ -190,11 +190,6 @@ const likePost = async (id: number, userId: number): Promise id, }, data: { - likedBy: { - connect: { - id: newLike.id, - }, - }, likes: { increment: 1, },