-
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
[#12] 정산페이지 레이아웃 작업 및 더미 데이터를 사용한 기능 구현 #55
Merged
Merged
Changes from 41 commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
33195ed
design: Settlement 페이지 컴포넌트 분리 및 백그라운드 적용
jiohjung98 32153c4
design: 백그라운드 컬러 그라데이션 설정
jiohjung98 99612f6
design: 정산페이지 왼쪽 헤더 설정
jiohjung98 ebd3132
feat: 캘린더 컴포넌트 생성
jiohjung98 ef42296
design: 정산페이지 데이터 렌더링 및 엑셀다운로드 부분 디자인
jiohjung98 0963a29
design: 데이터 배경 svg 파일로 변경&달력 컴포넌트 스타일 지정
jiohjung98 ac01bf0
modify: 정산테이블 타입 추가
jiohjung98 71ddf39
design: 데이터 UI 부분 설정 및 fakeData 추가
jiohjung98 383b3d8
feat: 페이지네이션 기능 추가
jiohjung98 08e8093
design: 페이지네이션 디자인 작업
jiohjung98 b4dd19f
chore: 누락 라이브러리 설치
jiohjung98 08f77b9
design: 엑셀 다운로드 버튼 디자인
jiohjung98 328c801
design: 페이지네이션 보더값 처리 및 OptionContainer 위치 수정
jiohjung98 50daff0
design: 정산페이지 오른쪽 컴포넌트 배경 설정 및 로고 아이콘 적용
jiohjung98 69a8876
design: 정산예정금액 컴포넌트 디자인 작업
jiohjung98 30e2e7d
design: 지난달 정산금액 컴포넌트 디자인 작업
jiohjung98 fdda04e
feat: 정산페이지 날짜에 따른 로직 처리
jiohjung98 c4bfd97
design: 조회 버튼 및 월 표시 텍스트 디자인 작업
jiohjung98 330a5a8
design: 정산페이지 추가 디자인 작업
jiohjung98 cb55afa
modify: 정산 테이블 순서 변경
jiohjung98 25dab4b
modify: 타입 파일 컨벤션 변경
jiohjung98 1907785
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 27466f6
feat: recoil 사용 및 데이터 정렬(드롭다운) 구현
jiohjung98 31b2647
design: 드롭다운 및 조회하기 버튼 디자인
jiohjung98 93005d2
move: 정산페이지 컴포넌트 구조 변경
jiohjung98 d6d703e
feat: 기간 설정에 따른 데이터 렌더링 및 드롭다운 옵션값 쿠폰 적용일로 적용
jiohjung98 553f2b5
chore: xlsx 라이브러리 설치
jiohjung98 ed513de
feat: 엑셀 다운로드 기능 추가
jiohjung98 8e76f13
design: 헤더 고정
jiohjung98 ba3fe9e
design: 페이지네이션 버튼 디자인 처리
jiohjung98 7cad055
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 4a89796
design: 정산페이지 배경 블러 처리
jiohjung98 616ac8e
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 443281c
design: 최소너비 구현
jiohjung98 ea26a0e
design: 정산페이지 백그라운드 제거
jiohjung98 c006e3c
design: 드롭다운 커스텀디자인
jiohjung98 c4dce60
design: 정산팝업 디자인
jiohjung98 a6071fe
design: 배경 박스쉐도우 적용
jiohjung98 be8b731
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 70ae466
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 d1ea105
design: 페이지네이션 활성화 보더값 적용
jiohjung98 f37e5c7
design: 모바일 반응형 구현
jiohjung98 5d42548
design: 정산페이지 미디어쿼리 사용
jiohjung98 069e2a7
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 de67abd
design: 정산페이지 모바일버전 백그라운드 컬러 및 z-index 수정
jiohjung98 7e93753
design: 정산페이지 RightSection 미디어쿼리를 사용해 모바일 버전 구현
jiohjung98 c7f7077
design: 정산페이지 LeftSection 미디어쿼리를 사용해 모바일 버전 구현
jiohjung98 2c55422
design: 정산페이지 SettlementsExpected 컴포넌트 height 제거
jiohjung98 c7dbff1
modify: 컨벤션 규칙에 맞게 파일 경로 수정 및 타입 선언 변경
jiohjung98 60ef23d
feat: SettlementsPopup 컴포넌트 분리 및 타입 생성
jiohjung98 1b9ecaf
design: informainIcon pointer 지정
jiohjung98 31db78d
remove: 테스트 콘솔 코드 제거
jiohjung98 1b6877d
design: 정산페이지 모바일 버전 텍스트 크기 조정
jiohjung98 2da71a4
design: 캘린더 인풋 텍스트 사이즈 조정
jiohjung98 0b358f6
design: 엑셀 다운로드 텍스트 사이즈 조정
jiohjung98 4f8056e
chore: 캘린더 한글 라이브러리 설치
jiohjung98 0decf07
feat: 달력컴포넌트 한글 출력
jiohjung98 0b83fdc
design: 정산페이지 모바일버전 레이아웃 변경
jiohjung98 0f46a2a
design: 페이지네이션 미디어쿼리 적용
jiohjung98 d4ac247
design: 데이터 없을 시 렌더링되는 텍스트 위치, 색상 적용(웹, 모바일)
jiohjung98 7e68cf1
fix: 데이터 없을 시 페이지네이션 렌더링되는 문제 해결
jiohjung98 e5c677e
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 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
Large diffs are not rendered by default.
Oops, something went wrong.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 95 additions & 0 deletions
95
...ttlements/SettlementsLeft/SettlementsSetting/Settlemented/SettlementsPagination/index.tsx
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 |
---|---|---|
@@ -0,0 +1,95 @@ | ||
import React, { useEffect } from 'react'; | ||
import ReactPaginate from 'react-paginate'; | ||
import styled from '@emotion/styled'; | ||
|
||
interface SettlementsPaginationProps { | ||
currentPage: number; | ||
totalPages: number; | ||
onPageChange: (page: number) => void; | ||
} | ||
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. settlements 타입 파일로 이동시키면 좋을 것 같습니다! 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 SettlementsPagination: React.FC<SettlementsPaginationProps> = ({ | ||
currentPage, | ||
totalPages, | ||
onPageChange | ||
}) => { | ||
useEffect(() => { | ||
onPageChange(currentPage); | ||
}, [currentPage, onPageChange]); | ||
|
||
return ( | ||
<PaginationContainer> | ||
<ReactPaginate | ||
previousLabel={'<'} | ||
nextLabel={'>'} | ||
breakLabel={'...'} | ||
breakClassName={'hidden'} | ||
pageCount={totalPages} | ||
marginPagesDisplayed={2} | ||
pageRangeDisplayed={5} | ||
onPageChange={(selectedItem) => onPageChange(selectedItem.selected + 1)} | ||
containerClassName={'pagination'} | ||
activeClassName={'active'} | ||
pageClassName={'pagination-li'} | ||
pageLinkClassName={'pagination-link'} | ||
previousClassName={'pagination-previous'} | ||
nextClassName={'pagination-next'} | ||
/> | ||
</PaginationContainer> | ||
); | ||
}; | ||
|
||
export default SettlementsPagination; | ||
|
||
const PaginationContainer = styled.div` | ||
margin-top: 20px; | ||
margin-bottom: 20px; | ||
|
||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
|
||
.pagination { | ||
display: flex; | ||
align-items: center; | ||
} | ||
|
||
.pagination-li { | ||
margin: 5px; | ||
padding: 9.4px 0px; | ||
border: 1px solid #FFFFFF; | ||
border-radius: 4px; | ||
cursor: pointer; | ||
} | ||
|
||
.pagination-link { | ||
padding: 8px 12px; | ||
|
||
color: #FFFFFF; | ||
text-decoration: none; | ||
} | ||
|
||
.pagination-li.active { | ||
padding: 9.4px 0px; | ||
border: 3px solid #FFFFFF; | ||
border-radius: 4px; | ||
|
||
font-weight: bold; | ||
} | ||
|
||
.pagination-previous, | ||
.pagination-next { | ||
padding: 8px 12px; | ||
color: #FFFFFF !important; | ||
text-decoration: none; | ||
|
||
&:hover { | ||
cursor: pointer; | ||
} | ||
} | ||
|
||
.pagination-previous a, | ||
.pagination-next a { | ||
color: white !important; | ||
} | ||
`; |
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.
혹시 새로 추가된 라이브러리에 대해서 PR Description 부분에 설명 부탁드려도 될까요??
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.
넵 수정했습니다 !