This repository has been archived by the owner on Mar 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/feature/friends' into feature/fr…
…iends
- Loading branch information
Showing
20 changed files
with
281 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
client/src/entities/session/api/useGetFriendshipStatus.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| 'use client'; | ||
| import { useQuery } from '@tanstack/react-query'; | ||
| import { API } from '@/shared/api'; | ||
| import { API_FRIENDSHIP } from '@/shared/constant'; | ||
|
|
||
| interface IFriendshipStatus { | ||
| status: 'none' | 'friends' | 'requested' | 'toRespond'; | ||
| } | ||
|
|
||
| export const useGetFriendshipStatus = (id: number) => { | ||
| return useQuery({ | ||
| queryKey: ['useGetFriendshipStatus', id], | ||
| queryFn: async () => { | ||
| const { data } = await API.get<IFriendshipStatus>(`${API_FRIENDSHIP}/status/${id}`); | ||
| return data; | ||
| }, | ||
| refetchOnMount: false, | ||
| refetchOnWindowFocus: false, | ||
| retry: 1, | ||
| retryDelay: 5000, | ||
| }); | ||
| }; |
30 changes: 30 additions & 0 deletions
30
client/src/entities/session/api/useHandleFriendshipRequest.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import { useMutation, useQueryClient } from '@tanstack/react-query'; | ||
| import { API } from '@/shared/api'; | ||
| import { API_FRIENDSHIP } from '@/shared/constant'; | ||
| import { toast } from 'sonner'; | ||
|
|
||
| export const useHandleFriendshipRequest = ( | ||
| userId: number | undefined, | ||
| receiverId: number, | ||
| status: 'rejected' | 'accepted' | ||
| ) => { | ||
| const queryClient = useQueryClient(); | ||
| return useMutation({ | ||
| mutationFn: async () => | ||
| await API.patch(`${API_FRIENDSHIP}/${receiverId}?user={"id":"${userId}"}`, { | ||
| status, | ||
| }), | ||
| onSuccess: () => { | ||
| queryClient.invalidateQueries({ queryKey: ['useGetFriends'] }); | ||
| queryClient.invalidateQueries({ queryKey: ['useGetFriendshipStatus', receiverId] }); | ||
| if (status === 'accepted') { | ||
| toast('New friend added'); | ||
| } else { | ||
| toast('Friend request declined'); | ||
| } | ||
| }, | ||
| onError: err => { | ||
| toast(`Error occurred: ${err}`); | ||
| }, | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import { useAddFriend } from '@/entities/session/api/useAddFriend'; | ||
| import { useRemoveFriend } from '@/entities/session/api/useRemoveFriend'; | ||
| import { Button } from '@/shared/ui'; | ||
| import { UserPlusIcon } from '@/shared/assets'; | ||
| import { useHandleFriendshipRequest } from '@/entities/session/api/useHandleFriendshipRequest'; | ||
| import { useGetFriendshipStatus } from '@/entities/session/api/useGetFriendshipStatus'; | ||
|
|
||
| interface FriendButtonProps { | ||
| myId?: number; | ||
| userId: number; | ||
| short?: boolean; | ||
| size?: 'm' | 'l' | 's'; | ||
| width?: string; | ||
| } | ||
|
|
||
| function getText(text: string, short: boolean) { | ||
| if (short) return text; | ||
| return text + ' friend'; | ||
| } | ||
|
|
||
| export const FriendButton = ({ | ||
| myId, | ||
| userId, | ||
| short = false, | ||
| size = 'm', | ||
| width, | ||
| }: FriendButtonProps) => { | ||
| const { mutate: addFriend } = useAddFriend(myId, userId); | ||
| const { mutate: removeFriend } = useRemoveFriend(userId); | ||
| const { mutate: declineFriend } = useHandleFriendshipRequest(myId, userId, 'rejected'); | ||
| const { mutate: acceptFriend } = useHandleFriendshipRequest(myId, userId, 'accepted'); | ||
| const isMyProfile = myId === userId; | ||
| const { data } = useGetFriendshipStatus(userId); | ||
|
|
||
| const friendStatus = data?.status; | ||
|
|
||
| if (!myId || isMyProfile) { | ||
| return null; // Hide friend button if user not logged in or it's their profile | ||
| } | ||
|
|
||
| switch (friendStatus) { | ||
| case 'none': { | ||
| return ( | ||
| <Button width={width} onClick={() => addFriend()} size={size}> | ||
| {getText('Add', short)} | ||
| <UserPlusIcon /> | ||
| </Button> | ||
| ); | ||
| } | ||
| case 'requested': { | ||
| return ( | ||
| <Button width={width} size={size} typeBtn='secondary'> | ||
| Pending | ||
| </Button> | ||
| ); | ||
| } | ||
| case 'toRespond': { | ||
| return ( | ||
| <> | ||
| <Button width={width} onClick={() => acceptFriend()} size={size} typeBtn='primary'> | ||
| {getText('Accept', short)} | ||
| </Button> | ||
| <Button width={width} onClick={() => declineFriend()} size={size} typeBtn='danger'> | ||
| {getText('Reject', short)} | ||
| </Button> | ||
| </> | ||
| ); | ||
| } | ||
| case 'friends': { | ||
| return ( | ||
| <Button width={width} onClick={() => removeFriend()} size={size} typeBtn='danger'> | ||
| {getText('Remove', short)} | ||
| </Button> | ||
| ); | ||
| } | ||
| default: | ||
| return null; | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { FriendButton } from './friend-button'; |
Oops, something went wrong.