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.

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 62 commits into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
33195ed
design: Settlement 페이지 컴포넌트 분리 및 백그라운드 적용
jiohjung98 Jan 10, 2024
32153c4
design: 백그라운드 컬러 그라데이션 설정
jiohjung98 Jan 10, 2024
99612f6
design: 정산페이지 왼쪽 헤더 설정
jiohjung98 Jan 10, 2024
ebd3132
feat: 캘린더 컴포넌트 생성
jiohjung98 Jan 11, 2024
ef42296
design: 정산페이지 데이터 렌더링 및 엑셀다운로드 부분 디자인
jiohjung98 Jan 11, 2024
0963a29
design: 데이터 배경 svg 파일로 변경&달력 컴포넌트 스타일 지정
jiohjung98 Jan 12, 2024
ac01bf0
modify: 정산테이블 타입 추가
jiohjung98 Jan 12, 2024
71ddf39
design: 데이터 UI 부분 설정 및 fakeData 추가
jiohjung98 Jan 12, 2024
383b3d8
feat: 페이지네이션 기능 추가
jiohjung98 Jan 12, 2024
08e8093
design: 페이지네이션 디자인 작업
jiohjung98 Jan 12, 2024
b4dd19f
chore: 누락 라이브러리 설치
jiohjung98 Jan 12, 2024
08f77b9
design: 엑셀 다운로드 버튼 디자인
jiohjung98 Jan 12, 2024
328c801
design: 페이지네이션 보더값 처리 및 OptionContainer 위치 수정
jiohjung98 Jan 12, 2024
50daff0
design: 정산페이지 오른쪽 컴포넌트 배경 설정 및 로고 아이콘 적용
jiohjung98 Jan 12, 2024
69a8876
design: 정산예정금액 컴포넌트 디자인 작업
jiohjung98 Jan 15, 2024
30e2e7d
design: 지난달 정산금액 컴포넌트 디자인 작업
jiohjung98 Jan 15, 2024
fdda04e
feat: 정산페이지 날짜에 따른 로직 처리
jiohjung98 Jan 15, 2024
c4bfd97
design: 조회 버튼 및 월 표시 텍스트 디자인 작업
jiohjung98 Jan 15, 2024
330a5a8
design: 정산페이지 추가 디자인 작업
jiohjung98 Jan 15, 2024
cb55afa
modify: 정산 테이블 순서 변경
jiohjung98 Jan 15, 2024
25dab4b
modify: 타입 파일 컨벤션 변경
jiohjung98 Jan 15, 2024
1907785
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 15, 2024
27466f6
feat: recoil 사용 및 데이터 정렬(드롭다운) 구현
jiohjung98 Jan 15, 2024
31b2647
design: 드롭다운 및 조회하기 버튼 디자인
jiohjung98 Jan 16, 2024
93005d2
move: 정산페이지 컴포넌트 구조 변경
jiohjung98 Jan 16, 2024
d6d703e
feat: 기간 설정에 따른 데이터 렌더링 및 드롭다운 옵션값 쿠폰 적용일로 적용
jiohjung98 Jan 16, 2024
553f2b5
chore: xlsx 라이브러리 설치
jiohjung98 Jan 16, 2024
ed513de
feat: 엑셀 다운로드 기능 추가
jiohjung98 Jan 16, 2024
8e76f13
design: 헤더 고정
jiohjung98 Jan 16, 2024
ba3fe9e
design: 페이지네이션 버튼 디자인 처리
jiohjung98 Jan 17, 2024
7cad055
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 17, 2024
4a89796
design: 정산페이지 배경 블러 처리
jiohjung98 Jan 17, 2024
616ac8e
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 17, 2024
443281c
design: 최소너비 구현
jiohjung98 Jan 17, 2024
ea26a0e
design: 정산페이지 백그라운드 제거
jiohjung98 Jan 17, 2024
c006e3c
design: 드롭다운 커스텀디자인
jiohjung98 Jan 17, 2024
c4dce60
design: 정산팝업 디자인
jiohjung98 Jan 18, 2024
a6071fe
design: 배경 박스쉐도우 적용
jiohjung98 Jan 19, 2024
be8b731
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 19, 2024
70ae466
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 19, 2024
d1ea105
design: 페이지네이션 활성화 보더값 적용
jiohjung98 Jan 19, 2024
f37e5c7
design: 모바일 반응형 구현
jiohjung98 Jan 19, 2024
5d42548
design: 정산페이지 미디어쿼리 사용
jiohjung98 Jan 20, 2024
069e2a7
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 20, 2024
de67abd
design: 정산페이지 모바일버전 백그라운드 컬러 및 z-index 수정
jiohjung98 Jan 20, 2024
7e93753
design: 정산페이지 RightSection 미디어쿼리를 사용해 모바일 버전 구현
jiohjung98 Jan 20, 2024
c7f7077
design: 정산페이지 LeftSection 미디어쿼리를 사용해 모바일 버전 구현
jiohjung98 Jan 20, 2024
2c55422
design: 정산페이지 SettlementsExpected 컴포넌트 height 제거
jiohjung98 Jan 20, 2024
c7dbff1
modify: 컨벤션 규칙에 맞게 파일 경로 수정 및 타입 선언 변경
jiohjung98 Jan 20, 2024
60ef23d
feat: SettlementsPopup 컴포넌트 분리 및 타입 생성
jiohjung98 Jan 20, 2024
1b9ecaf
design: informainIcon pointer 지정
jiohjung98 Jan 20, 2024
31db78d
remove: 테스트 콘솔 코드 제거
jiohjung98 Jan 20, 2024
1b6877d
design: 정산페이지 모바일 버전 텍스트 크기 조정
jiohjung98 Jan 20, 2024
2da71a4
design: 캘린더 인풋 텍스트 사이즈 조정
jiohjung98 Jan 21, 2024
0b358f6
design: 엑셀 다운로드 텍스트 사이즈 조정
jiohjung98 Jan 21, 2024
4f8056e
chore: 캘린더 한글 라이브러리 설치
jiohjung98 Jan 21, 2024
0decf07
feat: 달력컴포넌트 한글 출력
jiohjung98 Jan 21, 2024
0b83fdc
design: 정산페이지 모바일버전 레이아웃 변경
jiohjung98 Jan 21, 2024
0f46a2a
design: 페이지네이션 미디어쿼리 적용
jiohjung98 Jan 21, 2024
d4ac247
design: 데이터 없을 시 렌더링되는 텍스트 위치, 색상 적용(웹, 모바일)
jiohjung98 Jan 21, 2024
7e68cf1
fix: 데이터 없을 시 페이지네이션 렌더링되는 문제 해결
jiohjung98 Jan 21, 2024
e5c677e
Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…
jiohjung98 Jan 21, 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
356 changes: 318 additions & 38 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,24 @@
"axios": "^1.6.5",
"react": "^18.2.0",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^4.25.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.12",
"react-paginate": "^8.2.0",
"react-router-dom": "^6.21.1",
"recoil": "^0.7.7",
"recoil-persist": "^5.1.0"
"recoil-persist": "^5.1.0",
"semantic-ui-css": "^2.5.0",
"semantic-ui-react": "^2.1.5",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@swc/core": "^1.3.102",
"@swc/jest": "^0.2.29",
"@tanstack/eslint-plugin-query": "^5.17.7",
"@types/jest": "^29.5.11",
"@types/react": "^18.2.43",
"@types/react-datepicker": "^4.19.5",
Comment on lines +23 to +40
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

혹시 새로 추가된 라이브러리에 대해서 PR Description 부분에 설명 부탁드려도 될까요??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 수정했습니다 !

"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
Expand Down
32 changes: 32 additions & 0 deletions src/assets/icons/calendar-number-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/icons/information-circle-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/assets/icons/receipt-sharp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/settlements-admin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/settlements-data-frame.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/icons/settlements-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/icons/sync-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

settlements 타입 파일로 이동시키면 좋을 것 같습니다!

Copy link
Member Author

Choose a reason for hiding this comment

The 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;
}
`;
Loading