-
Notifications
You must be signed in to change notification settings - Fork 1
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
[#69] 쿠폰 수정 & 삭제 API , 쿠폰 배너 API 구현 #79
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
9f745a4
feat: 쿠폰 수정, 삭제, 토글 useMutation 작성
jinjoo-jung 3667817
feat: useMuation 추가
jinjoo-jung 0f45c6b
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jinjoo-jung 239c7dd
feat: 쿠폰 api 작성
jinjoo-jung 787a402
feat: 검색 쿼리키로 관리하도록 구현
jinjoo-jung 1a53114
design: 쿠폰 등록하기 버튼 디자인 수정
jinjoo-jung a715791
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jinjoo-jung 5713e0d
modify: 코드 수정
jinjoo-jung 7854967
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jinjoo-jung d73f371
feat: 배너 지역 & top3 api 연결
jinjoo-jung aa61a45
design: banner 디자인 수정
jinjoo-jung 10e1ca5
feat: 대기 쿠폰에서 수정, 삭제 클릭시 모달 생성 구현
jinjoo-jung d36d0e9
feat: 만료 쿠폰 삭제 모달 생성 구현
jinjoo-jung 187902d
design: 모달 버튼 호버시 색상 적용
jinjoo-jung 08765f4
feat: 숙소 조건 값 함수 lib로 분리
jinjoo-jung 7cede1c
feat: 쿠폰 삭제 api 연결
jinjoo-jung cf1ccd6
feat: 쿠폰 수정 버튼 클릭시 쿼리스트링으로 쿠폰번호 보내도록 구현
jinjoo-jung 18e84d6
feat: 쿠폰 수정 api 연결
jinjoo-jung eec7a81
modify: 빌드 오류 수정
jinjoo-jung 03bdf93
feat: 최근 등록일 기준 나열 (임시)
jinjoo-jung c871968
fix: 토글 on/off 버그 수정
jinjoo-jung 4037b54
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jinjoo-jung e077fed
modify: 배너 api 주석 처리 (임시)
jinjoo-jung 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
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 |
---|---|---|
|
@@ -2,8 +2,15 @@ import styled from '@emotion/styled'; | |
import theme from '@styles/theme'; | ||
|
||
import bannerIcon from '@assets/icons/ic-couponlist-speaker.svg'; | ||
import { useRecoilValue } from 'recoil'; | ||
import { headerAccommodationState } from '@recoil/index'; | ||
// import { useGetCouponRanking } from '@hooks/queries/useGetCouponRanking'; | ||
|
||
const CouponBanner = () => { | ||
const headerAccommodation = useRecoilValue(headerAccommodationState); | ||
const sigunguData = headerAccommodation.sigungu; | ||
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. 이거 API없이 잘되었네요 👍.. 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. 맞아요 다행입니다 ㅎㅎ |
||
// const { data } = useGetCouponRanking(headerAccommodation.id); | ||
|
||
return ( | ||
<BannerContainer> | ||
<TabBanner> | ||
|
@@ -14,7 +21,8 @@ const CouponBanner = () => { | |
<div> | ||
<TabBannerTitle>이번 달 우리 지역 인기 쿠폰</TabBannerTitle> | ||
<TabBannerContent> | ||
OO구에서 가장 많이 사용된 쿠폰은? 재방문 고객 20% 할인쿠폰 이에요! | ||
{sigunguData}에서 가장 많이 사용된 쿠폰은? | ||
{/* <span>{data.first_coupon_title}쿠폰</span>이에요! */} | ||
</TabBannerContent> | ||
</div> | ||
</TabBanner> | ||
|
@@ -46,9 +54,16 @@ const TabBanner = styled.div` | |
const TabBannerTitle = styled.div` | ||
font-size: 12px; | ||
font-style: normal; | ||
font-weight: 500; | ||
margin-bottom: 6px; | ||
`; | ||
const TabBannerContent = styled.div` | ||
font-size: 17px; | ||
font-style: normal; | ||
font-weight: 500; | ||
|
||
span { | ||
margin: 0px 5px; | ||
border-bottom: 1px solid; | ||
} | ||
`; |
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
Oops, something went wrong.
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.
위 import는 상단으로 위치 이동해주시면 좋을 것같습니다!