-
Notifications
You must be signed in to change notification settings - Fork 3
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
Feat/#301 best piickle API #304
Merged
Merged
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
74b6483
[ feat ] 베스트피클랭킹 api연동
ilmerry 8b68ef5
[ refactor ] St 컨벤션 적용
ilmerry b94643f
[ feat ] 최근 북마크된 카드 조회
ilmerry f4d7b30
[ fix ] button descent 오류
ilmerry 341f58d
[ feat ] 성별별 카드조회
ilmerry 937f53b
[ feat ] NavigateRecentCollection 추가
ilmerry 45fe4c3
[ refactor ] feat/#300 코드리뷰 반영
ilmerry 525b95c
[ refactor ] RecommendList 의존성 분리
ilmerry 2fafd03
[ fix ] isLast 로직 오류
ilmerry 6c38b76
[ feat ] male/female cards navigation
ilmerry 0cf4e16
[ fix ] 북마크 버튼 로그인모달
ilmerry 707ccc0
[ fix ] 파일명 styled -> style
ilmerry 479d924
[ refactor ] 코드리뷰 반영
ilmerry 7a3a137
[ feat ] 클릭 범위 수정
ilmerry edc8fb4
Merge branch 'feat/#300-best_piickle' into feat/#301-best_piickle
ilmerry File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,10 @@ | ||
import { LocationType } from "../../../types/cardCollection"; | ||
import { HeadingTitle } from "../../../util/main/headingTitles"; | ||
import HeadingTitleContainer from "../../@common/HeadingTitleContainer"; | ||
import useNavigateCardCollection, { | ||
NavigateCardCollectionBookMarkType, | ||
} from "../../@common/hooks/useNavigateCardCollection"; | ||
import { useBestPiickle } from "../../MainPage/hooks/useBestPiickle"; | ||
import RankItem from "./RankItem"; | ||
import * as St from "./style"; | ||
|
||
|
@@ -9,20 +14,21 @@ const rankTitles: HeadingTitle = { | |
}; | ||
|
||
export default function BestPiickleRank() { | ||
const { bestPiickle } = useBestPiickle(); | ||
|
||
const navigateRankCollection = useNavigateCardCollection(LocationType.BEST) as NavigateCardCollectionBookMarkType; | ||
return ( | ||
<St.RankContainer> | ||
{/* todo : rankitem id 수정*/} | ||
<HeadingTitleContainer headingTitles={rankTitles} paddingVerticalValue={1.6} /> | ||
<RankItem cardId="1" content="상대방의첫인상을기억하나요저는몰라요그냥해그냥해그냥해" rank={1} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={2} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={3} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={4} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={5} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={6} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={7} /> | ||
<RankItem cardId="1" content="상대방의 첫인상을 기억하나요?" rank={8} /> | ||
{bestPiickle && | ||
[...bestPiickle.data] | ||
.slice(0, 8) | ||
.map(({ _id, content, isBookmark }, idx) => ( | ||
<RankItem key={_id} cardId={_id} content={content} rank={idx} isBookmark={isBookmark} /> | ||
))} | ||
<St.ButtonWrapper> | ||
<St.ContinueButton>이어서 베스트 피클 카드 보기</St.ContinueButton> | ||
<St.ContinueButton onClick={() => navigateRankCollection(8)}>이어서 베스트 피클 카드 보기</St.ContinueButton> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이거 왜 8인지 몰라서 기능명세서 보고 왔쟈나~ 똑순이!👑👍 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 나도 처음에 이해안돼서 승헌오빠한테 물어봤어 ㅎㅎ |
||
</St.ButtonWrapper> | ||
</St.RankContainer> | ||
); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
8
이라는 숫자에 대해서const BEST_PIICKLE_TOTAL_COUNT = ~
처럼 정의해두면 읽기 좀 더 편하지 않을까 해요!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
좋은 의견이에요! 다른 브랜치에서 반영해보겠습니다:)