Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] mutate 함수 이름 일부 변경 및 기타 사항 #64

Merged
merged 7 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/comment/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function Comment() {
refetchOnWindowFocus: false,
});

const { mutate: post } = useMutation(async () => postTodayComment(value), {
const { mutate: postComment } = useMutation(async () => postTodayComment(value), {
onMutate: () => {
setComments([
...comments,
Expand Down Expand Up @@ -74,9 +74,9 @@ function Comment() {
const onSubmit = useCallback(
async (event: FormEvent) => {
event.preventDefault();
post();
postComment();
},
[post],
[postComment],
);

return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/comment/CommentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function CommentList({
teamName={item.teamName}
comment={item.content}
createdAt={item.createdAt}
count={item.likeCount}
likeCount={item.likeCount}
replyId={item.replyId}
setComments={setComments}
queryClient={queryClient}
Expand Down
32 changes: 17 additions & 15 deletions src/components/comment/CommentListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface CommentListItemProps {
teamName: string;
comment: string;
createdAt?: string;
count?: number;
likeCount?: number;
replyId?: number;
setComments: Dispatch<SetStateAction<CommentData[]>>;
queryClient: QueryClient;
Expand All @@ -28,25 +28,17 @@ function CommentListItem({
teamName,
comment,
createdAt,
count,
likeCount,
replyId,
setComments,
}: CommentListItemProps) {
const [visibleReply, setVisibleReply] = useState(false);
const [visibleReplyList, setVisibleReplyList] = useState(false);
const [like, setLike] = useState(false);
// const [count = likeCount, setCount] = useState(0);
const [visibleBalloon, setVisibleBalloon] = useState(false);

const onVisible = () => {
setVisibleReply(!visibleReply);
setVisibleReplyList(!visibleReplyList);
};

const onLike = () => {
setLike(!like);
};

const { mutate: remove } = useMutation(
const { mutate: removeComment } = useMutation(
async () => removeTodayComment(replyId as number),
{
onMutate: (commentId: number) => {
Expand All @@ -58,14 +50,24 @@ function CommentListItem({
},
);

const onVisible = () => {
setVisibleReply(!visibleReply);
setVisibleReplyList(!visibleReplyList);
};

// 좋아요 기능 작업 중
const onLike = () => {
setLike(!like);
};

const onBalloon = useCallback(() => {
setVisibleBalloon(!visibleBalloon);
}, [visibleBalloon]);

const onRemove = useCallback(() => {
remove(replyId as number);
removeComment(replyId as number);
setVisibleBalloon(false);
}, [remove, replyId]);
}, [removeComment, replyId]);

return (
<>
Expand Down Expand Up @@ -101,7 +103,7 @@ function CommentListItem({
</div>
<div className="item-block__button__like">
<Text>좋아요</Text>
<span>{count}</span>
<span>{likeCount}</span>
<div
className={classNames(
`${like ? "active-like-btn" : "inactive-like-btn"}`,
Expand Down
1 change: 1 addition & 0 deletions src/components/today/ScoreList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function ScoreList({ game }: ScoreListProps) {
homeTeam={item.homeTeam}
awayTeam={item.awayTeam}
gameTime={item.gameTime}
gameId={item.gameId}
/>
))}
</ul>
Expand Down
73 changes: 62 additions & 11 deletions src/components/today/ScoreListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,75 @@ import Title from "../common/Title";
import { TodayMatchData } from "./Today";
import { getAwayLogo, getHomeLogo } from "@/lib/util/getLogo";
import { gameDate } from "@/lib/util/getGameTime";
import { deleteTodayGameVote, todayGameVote } from "@/lib/api/todayAPI";
import { useMutation } from "react-query";

// Interface
interface ScoreListItemProps extends TodayMatchData {}

// Component
function ScoreListItem({ homeTeam, awayTeam, gameTime }: ScoreListItemProps) {
function ScoreListItem({
homeTeam,
awayTeam,
gameTime,
gameId,
}: ScoreListItemProps) {
const [selectHome, setSelectHome] = useState(false);
const [selectAway, setSelectAway] = useState(false);
const [voteHome, setVoteHome] = useState(homeTeam.voteRatio);
const [voteAway, setVoteAway] = useState(awayTeam.voteRatio);

const onClickLeft = useCallback(() => {
const { mutate: home } = useMutation(
async () => todayGameVote(gameId as number, homeTeam.id),
{
onMutate: () => {
console.warn("홈 팀 선택 완료!");
},
},
);

const { mutate: homeDelete } = useMutation(
async () => deleteTodayGameVote(gameId as number),
{
onMutate: () => {
console.warn("홈 팀 삭제 완료");
},
},
);

const { mutate: away } = useMutation(
async () => todayGameVote(gameId as number, awayTeam.id),
{
onMutate: () => {
console.warn("원정 팀 선택 완료!");
},
},
);

const { mutate: awayDelete } = useMutation(
async () => deleteTodayGameVote(gameId as number),
{
onMutate: () => {
console.warn("원정 팀 삭제 완료");
},
},
);

const onClickHome = useCallback(() => {
// Toggle select home
setSelectHome(!selectHome);
setSelectAway(false);
}, [selectHome]);
!selectHome ? home() : homeDelete();
setVoteHome(homeTeam.voteRatio);
}, [home, homeDelete, selectHome, homeTeam.voteRatio]);

const onClickRight = useCallback(() => {
const onClickAway = useCallback(() => {
// Toggle select away
setSelectAway(!selectAway);
setSelectHome(false);
}, [selectAway]);
!selectAway ? away() : awayDelete();
setVoteAway(awayTeam.voteRatio);
}, [away, awayDelete, selectAway, awayTeam.voteRatio]);

return (
<>
Expand All @@ -38,12 +89,12 @@ function ScoreListItem({ homeTeam, awayTeam, gameTime }: ScoreListItemProps) {
className={classNames(
`score-item-block__left ${selectHome ? "active-left" : ""}`,
)}
onClick={onClickLeft}
onClick={onClickHome}
>
<div className="team-img">
<Image
src={getHomeLogo(homeTeam.teamName)}
alt="lions"
alt={homeTeam.teamName}
width={0}
height={0}
draggable={false}
Expand All @@ -55,19 +106,19 @@ function ScoreListItem({ homeTeam, awayTeam, gameTime }: ScoreListItemProps) {
) : (
<Text large>{homeTeam.teamName}</Text>
)}
<Title medium>{homeTeam.voteRatio}%</Title>
<Title medium>{voteHome}%</Title>
</div>
</div>
<div
className={classNames(
`score-item-block__right ${selectAway ? "active-right" : ""}`,
)}
onClick={onClickRight}
onClick={onClickAway}
>
<div className="team-img">
<Image
src={getAwayLogo(awayTeam.teamName)}
alt="lions"
alt={awayTeam.teamName}
width={0}
height={0}
draggable={false}
Expand All @@ -79,7 +130,7 @@ function ScoreListItem({ homeTeam, awayTeam, gameTime }: ScoreListItemProps) {
) : (
<Text large>{awayTeam.teamName}</Text>
)}
<Title medium>{awayTeam.voteRatio}%</Title>
<Title medium>{voteAway}%</Title>
</div>
</div>
</li>
Expand Down
6 changes: 4 additions & 2 deletions src/components/today/Today.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface TodayMatchData {

function Today() {
const [game, setGame] = useState<TodayMatchData[]>([]);
useQuery({
const { data: todayData = game } = useQuery({
queryKey: ["today"],
queryFn: () =>
todayGames()?.then((res) => {
Expand All @@ -39,10 +39,12 @@ function Today() {
refetchOnWindowFocus: false,
});

console.warn(todayData);

return (
<div className="today-block">
<DateSection />
<ScoreList game={game} />
<ScoreList game={todayData} />
<Comment />
</div>
);
Expand Down
18 changes: 18 additions & 0 deletions src/lib/api/todayAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,21 @@ export const removeTodayComment = (replyId: number) => {
console.error(e);
}
};

// 댓글 좋아요
export const likeTodayComment = (replyId: number) => {
try {
const requestBody = {
replyId: replyId,
};
const res = fetchData(
`games/daily-reply/${replyId}/like`,
"post",
requestBody,
);
console.warn(res);
return res;
} catch (e) {
console.error(e);
}
};