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.

Sign up for GitHub

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

Jump to bottom

안내면진다 버튼 문제 해결 (중복 추첨) #667

Merged
merged 2 commits into from
Oct 17, 2024
Merged

안내면진다 버튼 문제 해결 (중복 추첨) #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be4c73b
fix: 모이머) 참여자 없을 때 버튼 비활성화
cys4585 Oct 16, 2024
f565d71
fix: 안내면진다 디테일 페이지의 버튼 따닥 문제 해결 (useRef)
cys4585 Oct 16, 2024
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
8 changes: 6 additions & 2 deletions frontend/src/hooks/queries/useBet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import QUERY_KEYS from '@_constants/queryKeys';
import { useQuery } from '@tanstack/react-query';

export default function useBet(betId: number) {
const { data: bet, isLoading } = useQuery({
const {
data: bet,
isLoading,
isFetching,
} = useQuery({
queryKey: [
QUERY_KEYS.darakbang,
getLastDarakbangId(),
Expand All @@ -14,5 +18,5 @@ export default function useBet(betId: number) {
queryFn: () => getBet(betId),
});

return { bet, isLoading };
return { bet, isLoading, isFetching };
}
132 changes: 68 additions & 64 deletions frontend/src/pages/Bet/BetDetailPage/BetDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Tag from '../components/Tag/Tag';
import useBet from '@_hooks/queries/useBet';
import useCompleteBet from '@_hooks/mutaions/useCompleteBet';
import useJoinBet from '@_hooks/mutaions/useJoinBet';
import { useState } from 'react';
import { useRef } from 'react';
import { useTheme } from '@emotion/react';

export default function BetDetailPage() {
Expand All @@ -22,76 +22,50 @@ export default function BetDetailPage() {

const betId = Number(params.betId);

const { bet, isLoading } = useBet(betId);
const { bet, isLoading, isFetching } = useBet(betId);
const { mutateAsync: completeBet } = useCompleteBet();
const { mutateAsync: joinBet } = useJoinBet();

const { mutate: completeBet } = useCompleteBet();

const { mutate: joinBet } = useJoinBet();

const [isRouletteOpen, setIsRouletteOpen] = useState(false);
const isButtonActionLoadingRef = useRef(false);

if (isLoading || !bet) {
return null;
}

const bottomButton = (() => {
if (bet.myRole === 'MOIMER') {
return (
<Button
shape="bar"
onClick={() => {
if (bet.isAnnounced) {
setIsRouletteOpen(true);
if (bet.chatroomId === null) return;
navigate(GET_ROUTES.nowDarakbang.chattingRoom(bet.chatroomId));
// setTimeout(() => {
// navigate(GET_ROUTES.nowDarakbang.betResult(betId));
// }, 2500);
} else {
completeBet(betId);
}
}}
>
{bet.isAnnounced ? '결과 보러가기' : '모집 마감하기'}
</Button>
);
const goToCheckResult = () => {
if (bet.chatroomId === null) {
return;
}
if (bet.myRole === 'MOIMEE') {
return (
<Button
shape="bar"
disabled={!bet.isAnnounced}
onClick={() => {
if (bet.isAnnounced) {
setIsRouletteOpen(true);
if (bet.chatroomId === null) return;
navigate(GET_ROUTES.nowDarakbang.chattingRoom(bet.chatroomId));
// setTimeout(() => {
// navigate(GET_ROUTES.nowDarakbang.betResult(betId));
// }, 2500);
}
}}
>
{bet.isAnnounced ? '결과 보러가기' : '이미 참여했어요'}
</Button>
);
navigate(GET_ROUTES.nowDarakbang.chattingRoom(bet.chatroomId));
};

const handleMoimerButtonClick = async () => {
if (isButtonActionLoadingRef.current) {
return;
}
if (bet.myRole === 'NON_MOIMEE') {
return (
<Button
shape="bar"
disabled={bet.isAnnounced}
onClick={() => {
if (!bet.isAnnounced) {
joinBet(betId);
}
}}
>
{bet.isAnnounced ? '마감되었어요' : '참여하기'}
</Button>
);
isButtonActionLoadingRef.current = true;
if (bet.isAnnounced) {
goToCheckResult();
} else {
await completeBet(betId);
}
})();
isButtonActionLoadingRef.current = false;
};

const handleMoimeeButtonClick = () => {
goToCheckResult();
};

const handleJoinButtonClick = async () => {
if (isButtonActionLoadingRef.current) {
return;
}
isButtonActionLoadingRef.current = true;
if (!bet.isAnnounced) {
await joinBet(betId);
}
isButtonActionLoadingRef.current = false;
};

return (
<InformationLayout>
Expand All @@ -114,12 +88,42 @@ export default function BetDetailPage() {
<ProfileList participants={bet.participants} />

{bet.participants.length > 1 && (
<Roulette isFast={isRouletteOpen} participants={bet.participants} />
<Roulette isFast={false} participants={bet.participants} />
)}
</InformationLayout.ContentContainer>

<InformationLayout.BottomButtonWrapper>
{bottomButton}
{bet.myRole === 'MOIMER' ? (
<Button
shape="bar"
disabled={
isButtonActionLoadingRef.current ||
isFetching ||
bet.participants.length < 2
}
onClick={handleMoimerButtonClick}
>
{bet.isAnnounced ? '결과 보러가기' : '모집 마감하기'}
</Button>
) : bet.myRole === 'MOIMEE' ? (
<Button
shape="bar"
disabled={!bet.isAnnounced}
onClick={handleMoimeeButtonClick}
>
{bet.isAnnounced ? '결과 보러가기' : '이미 참여했어요'}
</Button>
) : (
<Button
shape="bar"
disabled={
isButtonActionLoadingRef.current || isFetching || bet.isAnnounced
}
onClick={handleJoinButtonClick}
>
{bet.isAnnounced ? '마감되었어요' : '참여하기'}
</Button>
)}
</InformationLayout.BottomButtonWrapper>
</InformationLayout>
);
Expand Down
Loading