Skip to content

bugfix(임귀태): VoteModal 이달의 남자 아이돌로 표기되지 않는 문제 수정 (#83) #84

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

Open
KorpoQ wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bugfix(임귀태): VoteModal 이달의 남자 아이돌로 표기되지 않는 문제 수정 (#83) #84

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
e4ce45c
bugfix: VoteModal 이달의 남자 아이돌로 표기되지 않는 문제 수정
KorpoQ Jul 25, 2024
3670816
refactor: 코드 리팩토링
KorpoQ Jul 25, 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
10 changes: 1 addition & 9 deletions src/components/Modal/PopupModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function PopupModal({ isOpen = false, onClose }) {
<ModalTopBar onClose={onClose} />
<StyledContainer>
<StyledCreditDiv />
<PopupLabel Description={modals?.PopupModal.data.message} />
<span>{modals?.PopupModal.data.message}</span>
<Button onClick={onClose}>확인</Button>
</StyledContainer>
</StyledPopupWindow>
Expand Down Expand Up @@ -68,11 +68,3 @@ const StyledCreditDiv = styled.div`
width: 118px;
height: 118px;
`;

const PopupLabel = ({ Description }) => {
return <span>{Description}</span>;
};

PopupLabel.propTypes = {
Description: PropTypes.node,
};
2 changes: 1 addition & 1 deletion src/components/Modal/Toast.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
StyledDivider,
} from '@styles/CommonStyles';

/** 팝업 모달 컴포넌트
/** Toast 컴포넌트
* @param {Object} props - 컴포넌트 props
* @param {boolean} props.isOpen - Toast가 열려 있는지 여부
* @param {function} props.onClose - Toast를 닫기 위한 함수
Expand Down
16 changes: 14 additions & 2 deletions src/components/Modal/VoteModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,15 @@ export default function VoteModal({ isOpen = false, onClose }) {
<Modal isOpen={isOpen} onClose={onClose}>
<StyledVoteModalWindow>
{responsiveStatus === 'PC' ? (
<ModalTopBar onClose={onClose}>이달의 여자 아이돌</ModalTopBar>
<ModalTopBar onClose={onClose}>
이달의 {selectedTab === 'female' ? '여자' : '남자'} 아이돌
</ModalTopBar>
) : (
<>
<LeftTopGradientDesign />
<MobileTopBar onClose={onClose}>이달의 여자 아이돌</MobileTopBar>
<MobileTopBar onClose={onClose}>
이달의 {selectedTab === 'female' ? '여자' : '남자'} 아이돌
</MobileTopBar>
</>
)}
<LoadingSpinner isLoading={isLoading} />
Expand Down Expand Up @@ -386,6 +390,14 @@ const StyledVotes = styled.span`
line-height: normal;
`;

/** 투표 대상 컴포넌트
* @param {Object} props - 컴포넌트 props
* @param {function} props.onClick - 해당 컴포넌트가 클릭되었을 때 사용할 함수
* @param {number} props.selectedIdol - 선택된 아이돌 ID
* @param {Object} props.idolData - 아이돌 데이터
* @param {boolean} props.disabled - 투표가 되었는지에 대한 값
* @return {JSX.Element} 투표 대상 컴포넌트
*/
const VoteOption = ({ onClick, selectedIdol, idolData, disabled }) => {
return (
<StyledVoteOption onClick={() => onClick(idolData?.id)} disabled={disabled}>
Expand Down