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

4조 과제 제출 (차동민, 박진영, 김성은, 김세연) #1

Open
wants to merge 222 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
a50a55c
[feat] 초기 개발 셋팅
cdm1263 Jul 5, 2023
63e68af
FEAT : antd, prettier, eslint 패키지 설치
cdm1263 Jul 6, 2023
d3effc7
FEAT : 공통 포맷 셋팅
cdm1263 Jul 6, 2023
d5a52c0
FEAT : GlobalStyle 적용
cdm1263 Jul 6, 2023
efd4f85
DOCS : title을 'Wallet Keeper' 로 수정
cdm1263 Jul 6, 2023
c5647e6
FEAT : 공용 API 호출 함수 파일 생성
cdm1263 Jul 6, 2023
9548534
FEAT : 기본 레이아웃 셋팅
cdm1263 Jul 6, 2023
261af9c
FEAT : 공통 함수 파일 생성 및 날짜 포맷 변경 함수 추가
cdm1263 Jul 6, 2023
25e10bc
FEAT : Right 컴포넌트 생성
cdm1263 Jul 6, 2023
5832292
FEAT : Middle 컴포넌트 생성
cdm1263 Jul 6, 2023
95176e4
FEAT : Left 컴포넌트 생성
cdm1263 Jul 6, 2023
ab9277c
FEAT : Chart 컴포넌트 생성
cdm1263 Jul 6, 2023
b53af9a
FEAT : Calendar 컴포넌트 생성
cdm1263 Jul 6, 2023
d7fb351
FEAT : Stats 컴포넌트 생성
cdm1263 Jul 6, 2023
c04a91c
FEAT : List 공용 컴포넌트 생성
cdm1263 Jul 6, 2023
eeeeda4
README.md 생성
cdm1263 Jul 6, 2023
80464c3
FEAT : #6 PostModal 컴포넌트 생성
cdm1263 Jul 6, 2023
d3d638c
FEAT : #6 공용 input 컴포넌트 생성
cdm1263 Jul 6, 2023
d2e535d
FEAT : #6 PostModal 기본 로직 구현 및 기초 스타일링
cdm1263 Jul 6, 2023
092cc61
FEAT : #10 Middle-Chart브랜치 생성
kse-seong-eun Jul 7, 2023
67abcff
STYLE : 공용스타일 theme작성
kse-seong-eun Jul 7, 2023
2d1fde8
STYLE : 공용 Input 스타일링 수정
cdm1263 Jul 7, 2023
0d6f101
STYLE : #6 Modal 스타일링
cdm1263 Jul 7, 2023
e855f3a
FIX : ViteJS 포트번호 5173 -> 3000 수정
cdm1263 Jul 7, 2023
acc141c
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 7, 2023
6f8fd9d
FEAT: #9 read부분 html,css 완료
saeyeonKim Jul 7, 2023
5487983
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 7, 2023
4918050
Merge remote-tracking branch 'origin/dev' into Middle-Chart
kse-seong-eun Jul 7, 2023
e0eb979
test: 원래대로 복원
saeyeonKim Jul 7, 2023
77bfb40
style: cursor, detail 수정
saeyeonKim Jul 7, 2023
e5e8af4
Merge pull request #11 from Toy2-Wallet-Keeper/right-read-style
cdm1263 Jul 7, 2023
1904e83
FEAT : #7 Calendar 라이브러리 적용 및 함수명 수정
cdm1263 Jul 7, 2023
4295ac8
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 7, 2023
dde5337
FEAT : #10 chartjs 설치
kse-seong-eun Jul 7, 2023
9a998f7
Merge remote-tracking branch 'origin/dev' into Middle-Chart
kse-seong-eun Jul 7, 2023
01896d0
Merge pull request #13 from Toy2-Wallet-Keeper/Middle-Chart
cdm1263 Jul 7, 2023
572d924
FIX : Conflict 해결
cdm1263 Jul 7, 2023
1c24228
FIX : Calendar 기본 형태로 복원
cdm1263 Jul 7, 2023
3960f9f
FEAT : #6 Modal On/Off 로직 추가
cdm1263 Jul 7, 2023
838cea1
FEAT : 추가하기 버튼에 Modal Open 로직 추가
cdm1263 Jul 7, 2023
6b15bda
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 7, 2023
a3b4a71
FIX : amount 타입 변경
cdm1263 Jul 7, 2023
9fe459f
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 7, 2023
f5d6751
Merge pull request #14 from Toy2-Wallet-Keeper/post
cdm1263 Jul 7, 2023
6812f5b
feat: right-search부분 html,css 완료
saeyeonKim Jul 7, 2023
14803ed
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 7, 2023
147a4cf
fix:amount 숫자로 수정
saeyeonKim Jul 7, 2023
8218364
Merge pull request #15 from Toy2-Wallet-Keeper/right-search-style
cdm1263 Jul 7, 2023
c1b2e27
test
saeyeonKim Jul 8, 2023
12db268
feat: 검색기능 완료
saeyeonKim Jul 8, 2023
6e29bdf
map함수 key 추가
saeyeonKim Jul 8, 2023
9a5849a
feat:조회 기능
saeyeonKim Jul 8, 2023
a80d779
FEAT : #6 userId, date 수정
cdm1263 Jul 8, 2023
bc4ad11
fix: map key값 추가
saeyeonKim Jul 8, 2023
692a893
Merge pull request #17 from Toy2-Wallet-Keeper/post
cdm1263 Jul 8, 2023
e54bf77
STYLE : styled파일 생성_색상타입지정
kse-seong-eun Jul 9, 2023
a7ce53c
Merge remote-tracking branch 'origin/dev' into Middle-Chart
kse-seong-eun Jul 9, 2023
6d26dc4
FIX : styles 폴더 위치 수정 root -> /src
cdm1263 Jul 9, 2023
40df0e1
Merge pull request #16 from Toy2-Wallet-Keeper/right-read-func
cdm1263 Jul 9, 2023
932f752
FIX : theme 참조 경로 변경
cdm1263 Jul 9, 2023
c6ac111
FEAT : #10 chartjs 구조구현
kse-seong-eun Jul 9, 2023
e761287
FEAT : #7 Calendar에서 받은 데이터를 담아둘 state 생성 후 set함수를 Middle로 전달
cdm1263 Jul 9, 2023
cbd1ad7
FEAT : #7 Calendar 에서 선택된 날짜의 데이터를 App에서 받은 set함수로 전달
cdm1263 Jul 9, 2023
3708a89
FEAT : Calendar 기본 형태 구현 및 선택 날짜 데이터 Middle 컴포넌트로 전달
cdm1263 Jul 9, 2023
3595717
FEAT : #7 selectedDate props drilling
cdm1263 Jul 9, 2023
86d0a84
FEAT : #7 선택한 날짜의 색 지정
cdm1263 Jul 9, 2023
ccd079d
Merge pull request #18 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 9, 2023
5b340e2
fix:버그수정
jinyoungpark231 Jul 9, 2023
99af2b9
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 9, 2023
eeb8d60
FEAT : Right에 선택한 날짜 데이터 전달
cdm1263 Jul 9, 2023
9561719
FEAT : Reat 컴포넌트로 선택한 날짜 데이터 전달
cdm1263 Jul 9, 2023
1690c1e
FEAT : PostModal 로 선택한 날짜 데이터 전달
cdm1263 Jul 9, 2023
0a6483e
FEAT : #6 날짜 데이터를 form으로 전달
cdm1263 Jul 9, 2023
24b60ad
FIX : #7 month값 +1 처리
cdm1263 Jul 9, 2023
925f838
Merge pull request #19 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 9, 2023
d11a3b2
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 9, 2023
c58b568
FEAT : #6 확인용 임시 날짜 표시 구현
cdm1263 Jul 9, 2023
d62ff79
Merge pull request #20 from Toy2-Wallet-Keeper/post
cdm1263 Jul 9, 2023
7148255
STYLE : #10 ReactChart2 보는중...
kse-seong-eun Jul 9, 2023
79b5218
Merge remote-tracking branch 'origin/dev' into Middle-Chart
kse-seong-eun Jul 9, 2023
7a19501
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 9, 2023
542d3ff
STYLE : #10 chart 구조 세팅_데이터 삽입형으로 수정 필요
kse-seong-eun Jul 9, 2023
a2da3be
STYLE : #10 arrow icon 추가
kse-seong-eun Jul 9, 2023
51818f3
🎉 :tada : 작업시작
kse-seong-eun Jul 9, 2023
f6b64b2
FEAT : 사이드바 구조 작업중_로고__토글버튼
kse-seong-eun Jul 9, 2023
b52910e
Merge pull request #23 from Toy2-Wallet-Keeper/left
cdm1263 Jul 10, 2023
c27aa49
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 10, 2023
c662c62
test: testing date
saeyeonKim Jul 10, 2023
5219551
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 10, 2023
4242852
FEAT: #21 사이드 네브바_토글버튼 기능추가
kse-seong-eun Jul 10, 2023
916e5e5
FEAT : Chart와 Calendar용 공용 레이아웃 컴포넌트 생성
cdm1263 Jul 10, 2023
7c17b5e
Merge pull request #26 from Toy2-Wallet-Keeper/left
cdm1263 Jul 10, 2023
b928ee3
Merge pull request #27 from Toy2-Wallet-Keeper/Middle-Layout
cdm1263 Jul 10, 2023
9beb1c2
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 10, 2023
f3b1af3
test
saeyeonKim Jul 10, 2023
d14bef5
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 10, 2023
9700a5d
FEAT : Calendar 컴포넌트에 props 연결
cdm1263 Jul 10, 2023
73511b8
FEAT : #7 MiddleLayout 적용
cdm1263 Jul 10, 2023
0ffff51
Merge pull request #28 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 10, 2023
ccf2bd8
Merge pull request #29 from Toy2-Wallet-Keeper/Middle-Layout
cdm1263 Jul 10, 2023
8c6e6b4
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 10, 2023
6dfd8ef
FIX : ContentWrapper width 추가
cdm1263 Jul 10, 2023
b3ece7d
Merge pull request #30 from Toy2-Wallet-Keeper/Middle-Layout
cdm1263 Jul 10, 2023
da44d4c
STYLE : #21 MddileLayout
kse-seong-eun Jul 10, 2023
941ae18
Merge remote-tracking branch 'origin/dev' into left
kse-seong-eun Jul 10, 2023
22305e4
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 10, 2023
1738813
FEAT : #6 Modal 외부 클릭시 blur, 금액 input에 숫자만 입력되도록 처리
cdm1263 Jul 10, 2023
fbe80ae
FEAT : #7 기본값으로 오늘 날짜 선택
cdm1263 Jul 10, 2023
6cbd406
FEAT : #7 선택한 날짜가 유일하도록 로직 변경, 세부 스타일링
cdm1263 Jul 10, 2023
6940aff
FIX : #7 styled-component의 prop 인식 문제 해결
cdm1263 Jul 10, 2023
eb58734
STYLE : #6 날짜 표시 위치 및 포맷 수정
cdm1263 Jul 11, 2023
8fd6e5c
style: container 가운데 정렬
saeyeonKim Jul 11, 2023
44b5cbb
feat: 달력 날짜 누를시 해당날짜 내역 조회 #32
saeyeonKim Jul 11, 2023
c1dd410
fix: 날짜변환방법 변경
saeyeonKim Jul 11, 2023
be97b0a
Merge pull request #35 from Toy2-Wallet-Keeper/right-read-func
cdm1263 Jul 11, 2023
6a300f7
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 11, 2023
253d53f
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 11, 2023
edced5f
FEAT : 한국 날짜 기준의 ISOstring으로 변환해주는 공용함수 추가
cdm1263 Jul 11, 2023
bb3e94c
FEAT : #6 공용함수 formatDateKrISO 사용
cdm1263 Jul 11, 2023
7b2ea22
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 11, 2023
e40009d
Merge pull request #36 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 11, 2023
80dd2e1
Merge pull request #37 from Toy2-Wallet-Keeper/post
cdm1263 Jul 11, 2023
fd22be0
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 11, 2023
a3917f3
STYLE : #21 글자 위치 조정
kse-seong-eun Jul 11, 2023
ffe55e5
FIX : #6 styled-component의 prop 인식 문제 해결
cdm1263 Jul 11, 2023
ff07cfb
FIX : value의 빈 값으로 null 대신 undefined로 수정, styled-component prop 수정
cdm1263 Jul 11, 2023
6d7a290
Merge remote-tracking branch 'origin/dev' into left
kse-seong-eun Jul 11, 2023
9584a48
style: size 수정
saeyeonKim Jul 11, 2023
b25c7a5
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 11, 2023
6958d60
FIX : #6 AmountInput에 있던 css값 옮김
cdm1263 Jul 11, 2023
7894522
FIX : #6 props가 적용되지 않는 문제 해결
cdm1263 Jul 11, 2023
8c97f96
FIX : undefined로 인한 오류 발생 수정
cdm1263 Jul 11, 2023
3cca2b9
FEAT : #21 토글 기본 노출_캘린더로 변경
kse-seong-eun Jul 11, 2023
e72f1b1
FIX : #7 초기값이 9시간 뒤의 날짜로 나오는 오류 수정
cdm1263 Jul 11, 2023
aad1483
Merge pull request #38 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 11, 2023
1bce701
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 11, 2023
c184d85
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 11, 2023
2f23fbb
Merge pull request #39 from Toy2-Wallet-Keeper/post
cdm1263 Jul 11, 2023
21e9960
Merge remote-tracking branch 'origin/dev' into left
kse-seong-eun Jul 11, 2023
77e8bdb
FEAT : #7 전달, 다음달 날짜 채우기
cdm1263 Jul 11, 2023
f4bd8cd
STYLE : #7 각 날짜의 height가 고정값이도록 수정
cdm1263 Jul 11, 2023
8ae1754
Merge pull request #40 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 11, 2023
8b2f816
feat: 수정창 모달 만들기 #32
saeyeonKim Jul 11, 2023
c3d6155
fix: props 타입 수정 #32
saeyeonKim Jul 11, 2023
8941571
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 11, 2023
eaf5975
STYLE : #21 로고 삽입_left_Middle 영역 재설정
kse-seong-eun Jul 11, 2023
2e8bf75
Merge remote-tracking branch 'origin/dev' into left
kse-seong-eun Jul 11, 2023
0a7c7c8
STYLE : #21 left바 로고 재수정
kse-seong-eun Jul 11, 2023
fb7cc56
fix: 삭제버튼 클릭시 바로 삭제되게 수정 #33
saeyeonKim Jul 11, 2023
f885dc6
Merge pull request #41 from Toy2-Wallet-Keeper/left
cdm1263 Jul 12, 2023
c058299
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 12, 2023
9ecf71c
Merge pull request #42 from Toy2-Wallet-Keeper/right-read-func
cdm1263 Jul 12, 2023
36d7646
fix:버그수정
jinyoungpark231 Jul 12, 2023
f1f6d46
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 12, 2023
0686512
FEAT : #6 PostModal 로 getContent 함수 전달
cdm1263 Jul 12, 2023
ab3ea5b
FEAT : #6 작성이 완료되면 alert와 함께 List 최신화
cdm1263 Jul 12, 2023
b5581e1
STYLE : #7 sat과 sun 색상 지정 및 폰트 굵기 수정
cdm1263 Jul 12, 2023
59f523d
STYLE : #6 Noto Sans KR font-family 적용
cdm1263 Jul 12, 2023
f31d877
STYLE : Noto Sans KR font-family 적용
cdm1263 Jul 12, 2023
796bbec
Merge pull request #43 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 12, 2023
7023a67
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 12, 2023
0b1c809
STYLE : #21 middle /right 전체 영영 스타일 수정
kse-seong-eun Jul 12, 2023
d5fd38d
Merge remote-tracking branch 'origin/dev' into left
kse-seong-eun Jul 12, 2023
019d9de
Merge pull request #44 from Toy2-Wallet-Keeper/left
cdm1263 Jul 12, 2023
2e21a2a
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 12, 2023
f007bbf
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 12, 2023
1bd9aa1
STYLE : #6 button, input 중앙 정렬
cdm1263 Jul 12, 2023
38acae3
STYLE : large prop 적용시 최대 너비를 갖도록 설정
cdm1263 Jul 12, 2023
342239d
Merge pull request #45 from Toy2-Wallet-Keeper/post
cdm1263 Jul 12, 2023
dce1a93
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 12, 2023
82bb4e4
STYLE : #21 전체 스타일 통일 1차
kse-seong-eun Jul 12, 2023
4a26f72
Merge pull request #46 from Toy2-Wallet-Keeper/left
cdm1263 Jul 12, 2023
35cf47f
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 12, 2023
fe472e3
style: 전체 사이즈 수정
saeyeonKim Jul 12, 2023
56a03c6
style: input 스타일 변경
saeyeonKim Jul 12, 2023
2cea151
Merge pull request #48 from Toy2-Wallet-Keeper/right-read-func
cdm1263 Jul 12, 2023
baffe68
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
jinyoungpark231 Jul 13, 2023
4a99458
FEAT: #8 월별 수입,지출,조회기능 추가
jinyoungpark231 Jul 13, 2023
0cbe716
STYLE : 세부 스타일링
cdm1263 Jul 13, 2023
5af888e
STYLE : 컴포넌트 간격 조정
cdm1263 Jul 13, 2023
1342a0f
STYLE : #7 위치 및 스타일 세부 조정
cdm1263 Jul 13, 2023
609b789
Merge pull request #49 from Toy2-Wallet-Keeper/Middle-Stats
cdm1263 Jul 13, 2023
4d951f1
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 13, 2023
1043a76
FIX : #47 let -> const 수정
cdm1263 Jul 13, 2023
9f98f91
style: fix
saeyeonKim Jul 13, 2023
adc39e2
Merge branch 'dev' of https://github.com/Toy2-Wallet-Keeper/Wallet-Ke…
saeyeonKim Jul 13, 2023
cb3292d
Merge pull request #50 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 13, 2023
cc1bda4
fix: console.log 제거
saeyeonKim Jul 13, 2023
9d154b2
Merge pull request #51 from Toy2-Wallet-Keeper/right-read-func
cdm1263 Jul 13, 2023
9868ec1
FEAT : 전월 대비 비교 로직 수정 및 코드 리팩토링
cdm1263 Jul 13, 2023
d29361b
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 13, 2023
9415a05
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 13, 2023
eab8c4a
Merge pull request #52 from Toy2-Wallet-Keeper/fix
cdm1263 Jul 13, 2023
de938eb
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 13, 2023
c01ee34
DOCS : #7 기능별 주석 추가
cdm1263 Jul 14, 2023
3cdadfc
DOCS : 주석 추가
cdm1263 Jul 14, 2023
e805f17
FIX : 이벤트 타입 지정 및 주석 추가
cdm1263 Jul 14, 2023
e0e2a4a
FIX : useCallback으로 의존성배열 처리
cdm1263 Jul 14, 2023
f0ad452
DOCS : 주석 추가
cdm1263 Jul 14, 2023
b83722d
Merge branch 'dev' of github.com:Toy2-Wallet-Keeper/Wallet-Keeper int…
cdm1263 Jul 14, 2023
2145662
FIX : 미사용 prop 제거 및 주석 추가
cdm1263 Jul 14, 2023
08baa64
FIX : 미사용 prop 제거 및 주석 추가
cdm1263 Jul 14, 2023
d83c2a6
FIX : 코드 리팩토링 및 주석 추가
cdm1263 Jul 14, 2023
6400c28
FEAT : EditModal과 PostModal Submit시 Stats 값 최신화 로직 구현
cdm1263 Jul 14, 2023
2125f86
Merge pull request #53 from Toy2-Wallet-Keeper/fix
cdm1263 Jul 14, 2023
e7712b7
Merge pull request #54 from Toy2-Wallet-Keeper/Middle-Calendar
cdm1263 Jul 14, 2023
fdc55b0
FEAT : #10 이번달 수입_지출 조회:챠트에 입력
kse-seong-eun Jul 14, 2023
fc9e25e
Merge remote-tracking branch 'origin/dev' into Middle-Chart
kse-seong-eun Jul 14, 2023
6677a8b
FEAT : #10 날짜 변경시 차트에 해당 날짜_월_데이터 들어오는 기능 추가
kse-seong-eun Jul 14, 2023
ffa3fec
Merge pull request #56 from Toy2-Wallet-Keeper/Middle-Chart
cdm1263 Jul 14, 2023
b9da16f
FEAT : #10 차트에러 수정 및 전역 스타일 다듬기
kse-seong-eun Jul 14, 2023
deacc0b
DOCS: Readme수정
jinyoungpark231 Jul 14, 2023
34c4c74
Merge pull request #58 from Toy2-Wallet-Keeper/Middle-Stats
cdm1263 Jul 14, 2023
08d47c9
Merge pull request #59 from Toy2-Wallet-Keeper/Middle-Chart
cdm1263 Jul 14, 2023
f0612b4
FIX : setChange prop 전달
cdm1263 Jul 14, 2023
368a06d
FIX : userId를 toy2_team4 로 변경
cdm1263 Jul 14, 2023
67a62e8
Merge pull request #60 from Toy2-Wallet-Keeper/fix
cdm1263 Jul 14, 2023
78f5882
STYLE:사이트 로고 수정
jinyoungpark231 Jul 14, 2023
01ec87a
DOCS: README수정 및 사용되는 이미지 추가
jinyoungpark231 Jul 14, 2023
d6a6f4b
Merge pull request #61 from Toy2-Wallet-Keeper/Middle-Stats
cdm1263 Jul 14, 2023
2868b7b
Merge pull request #62 from Toy2-Wallet-Keeper/dev
cdm1263 Jul 14, 2023
d772591
Merge branch 'KDT1-FE:main' into KDT5_Team4
cdm1263 Jul 14, 2023
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
16 changes: 16 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
env: { browser: true, es2020: true, node: true },
//node: true 추가, module is not defined에러가 떠서 해당 부분 수정했습니다.
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
'prettier'
],
parser: '@typescript-eslint/parser',
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': 'warn'
}
};
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"semi": true,
"singleQuote": true,
"trailingComma": "none"
}
122 changes: 122 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# <img src="src/assets/Logo_color.png" width="40" height="40" margin-top="100"> Wallet Keeper

# 배포사이트

<br/> <br/>

# 개발팀원

<table>
<tr>
<td align="center">
<a href="https://github.com/cdm1263">
<img src="https://avatars.githubusercontent.com/u/122417731?v=4" width="100px;" alt="dev-DongMin"/><br />
<sub><b>차동민</b><br></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/kse-seong-eun">
<img src="https://avatars.githubusercontent.com/u/66905959?v=4" width="100px;" alt="dev-SeongEun"/><br />
<sub><b>김성은</b><br></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/saeyeonKim">
<img src="https://avatars.githubusercontent.com/u/118176015?v=4" width="100px;" alt="dev-SaeYeon"/><br />
<sub><b>김세연</b><br></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/jinyoungpark231">
<img src="https://avatars.githubusercontent.com/u/76546374?v=4" width="100px;" alt="dev-JinYoung"/><br />
<sub><b>박진영</b><br></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<sub><b>역할</b><br>작성용 모달 구현,캘린더 구현,<br>깃허브 및 브랜치 관리</sub>
</td>
<td align="center">
<sub><b>역할</b><br>차트 구현, 디자인 구현</sub>
</td>
<td align="center">
<sub><b>역할</b><br>날짜별 조회,수정<br>삭제,검색기능 구현</sub>
</td>
<td align="center">
<sub><b>역할</b><br>날짜별 수입,지출,합계 구현 </sub>
</td>
</tr>

</table>

---

<br/><br/>

# 프로젝트기간

2023.07.05 ~ 2023.07.14

<br/>
<br/>

<br/>
<br/>

# 기술스택

### Develoment

<p>
<img src="https://img.shields.io/badge/html5-E34F26?stylestyle=flat&logo=html5&logoColor=white">
<img src="https://img.shields.io/badge/Axios-5A29E4?style=flat&logo=axios&logoColor=white">
<img src="https://img.shields.io/badge/react-61DAFB?style=flat&logo=react&logoColor=white">
<img src="https://img.shields.io/badge/typescript-3178C6?style=flat&logo=typescript&logoColor=white"> <br/>
<img src="https://img.shields.io/badge/styled components-DB7093?style=flat&logo=styledcomponents&logoColor=white">
<img src="https://img.shields.io/badge/Chart.js-FF6384?style=flat&logo=Chart.js&logoColor=white">
<img src="https://img.shields.io/badge/Ant Design-0170FE?style=flat&logo=Ant Design&logoColor=white">
</p>

### Config

<p>
<img src="https://img.shields.io/badge/Vite-646CFF?style=flat&logo=Vite&logoColor=white"/>
<img src="https://img.shields.io/badge/npm-CB3837?style=flat&logo=npm&logoColor=white"/>
</p>

### Enviroment

<p>
<img src="https://img.shields.io/badge/Visual Studio Code-007ACC?style=flat&logo=Visual Studio Code&logoColor=white"/>
<img src="https://img.shields.io/badge/Git-F05032?style=flat&logo=Git&logoColor=white"/>
<img src="https://img.shields.io/badge/GitHub-181717?style=flat&logo=GitHub&logoColor=white"/>
</p>
<br/>

### Cowork Tools

<p>
<img src="https://img.shields.io/badge/Slack-4A154B?style=flat&logo=Slack&logoColor=white" />
<img src="https://img.shields.io/badge/Notion-000000?style=flat&logo=Notion&logoColor=white" />
<img src="https://img.shields.io/badge/Figma-F24E1E?style=flat&logo=Figma&logoColor=white" />
<img src="https://img.shields.io/badge/Zoom-2D8CFF?style=flat&logo=Zoom&logoColor=white" />
</p>

## 전체 화면 구성

| **메인 페이지** | **수입 추가** |
| :-------------------------------------------------------: | :-------------------------------------------------------------: |
| <img src="public/imgs/main.png" width=460px alt="메인" /> | <img src="public/imgs/Income.png" width=460px alt="수입추가" /> |

| **지출 추가** | **전체 내역 검색(전체)** |
| :---------------------------------------------------------------: | :---------------------------------------------------------------------: |
| <img src="public/imgs/Spending.png" width=460px alt="지출추가" /> | <img src="public/imgs/All.png" width=460px alt="전체 내역 검색-전체" /> |

| **전체 내역 검색(수입)** | **전체 내역 검색(지출)** |
| :-----------------------------------------------------------------: | :-----------------------------------------------------------------: |
| <img src="public/imgs/All-Income.png" width=460px alt="지출추가" /> | <img src="public/imgs/All-Spending.png" width=460px alt="어바웃" /> |

**차트 부분**<br/><br/>

<img src="public/imgs/Chart.png" width=1678px alt="차트 부분" />
21 changes: 21 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!doctype html>
<html lang="ko">

<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="src/assets/Logo_color.png" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@100;400;500;700&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;400;500;700&display=swap"
rel="stylesheet" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Wallet Keeper</title>
</head>

<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>

</html>
Loading