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

Upload/Main Merge #100 test 배포 #101

Merged
merged 311 commits into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
311 commits
Select commit Hold shift + click to select a range
19e653b
design #23 바텀네비게이션바 CSS 1차
haruharuganda Feb 16, 2023
368d621
tailwind 수정
Feb 16, 2023
fe21234
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 16, 2023
d418d78
Fix / tailwind 재설정
dong-fa Feb 16, 2023
d174e40
Fix / tailwind 재설정
dong-fa Feb 16, 2023
1e7e35f
tailwind 오류해결
Feb 16, 2023
706c457
Feat/ Schedule Add 페이지 - participants 입력안되는 문제 placeholder줄바꿈안되는문제 겪는 중.
AngelaChaejung Feb 16, 2023
f49e277
Feat/scheduleAdd #9 글자 20자까지 입력가능
AngelaChaejung Feb 16, 2023
4414cb9
Design/Schedule detail, navi bar
AngelaChaejung Feb 16, 2023
7ccab24
Feat/ScheduleDetail #29 기능구현
AngelaChaejung Feb 16, 2023
90fcf50
Feat/login & Singup #5 Singup 1차CSS 기능
Feb 17, 2023
0b28996
Merge branch 'dev' into dev
haruharuganda Feb 17, 2023
f2b203b
Feat/login & Singup Singup 1차CSS 기능 #5
dong-fa Feb 17, 2023
f7ad4ee
Feat #32 초대받은 스케줄리스트 GET 구현
dong-fa Feb 17, 2023
2c98505
Merge branch 'dev' into Feat/schedule-Invitation
haruharuganda Feb 17, 2023
d089c14
Feat #32 초대받은 스케줄리스트 GET 구현
haruharuganda Feb 17, 2023
85788d8
Axios instance 적용
AngelaChaejung Feb 17, 2023
c970852
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 17, 2023
47718b7
Dev- Detail page GET 기능구현, Schedule Add axios instance 적용
dong-fa Feb 17, 2023
667b014
Error debugging
AngelaChaejung Feb 17, 2023
de3d54e
Feat/Detail #29 서버와연결 후 디테일페이지 불러오기 완료.
AngelaChaejung Feb 17, 2023
dd81ee4
Feat #32 스케줄 수락, 거절 구현 완료
dong-fa Feb 17, 2023
803d410
Error tracking #29
AngelaChaejung Feb 17, 2023
8d68bc6
Design #32 카드 CSS 수정
dong-fa Feb 17, 2023
6c5e044
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 17, 2023
c54067d
Feat/ScheduleAdd, ScheduleDetail #29 Error tracking
AngelaChaejung Feb 17, 2023
74efd41
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 17, 2023
49aa76d
Feat/main #31. 1차 - main페이지, main detail연결, 백이랑 확인
Feb 18, 2023
2f28978
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 18, 2023
ea62288
Merge pull request #35 from 기능 구현 완료
haruharuganda Feb 18, 2023
20b5e97
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 18, 2023
8cf8029
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 18, 2023
f290ac9
Merge pull request #36 from haruharuganda/dev
AngelaChaejung Feb 18, 2023
e32655b
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 18, 2023
f1dd85c
Feat/main #31 error수정
Feb 18, 2023
8611b62
Merge pull request #37 from haruharuganda/dev
AngelaChaejung Feb 18, 2023
a305f1d
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 18, 2023
6ee2306
Feat/승주님과 연결 후 충돌 해결
AngelaChaejung Feb 18, 2023
7112cc0
Feat/ScheduleDetail/Error Debugging
AngelaChaejung Feb 18, 2023
0dd90d8
Feat/Notification 1차 작업 #38
AngelaChaejung Feb 20, 2023
02430a0
Design/Navigation Bar #22 화면 최하단으로수정
AngelaChaejung Feb 20, 2023
8b749e7
Feat/Schedule Add #9
AngelaChaejung Feb 20, 2023
68c134a
Fix/Schedule detail (error fixed) #29
AngelaChaejung Feb 20, 2023
3e9d438
Merge pull request #41 Fix/ Detail page 에러수정
haruharuganda Feb 20, 2023
766dd50
Feat #10 팔로우 팔로워 기능 구현 완료
dong-fa Feb 20, 2023
3aae218
Merge branch 'dev' into Feat/Follow
AngelaChaejung Feb 20, 2023
16c781f
Merge pull request #42 from dong-fa/Feat/Follow
AngelaChaejung Feb 20, 2023
edfa3ed
FIx import 에러 해결
dong-fa Feb 20, 2023
b0386ac
Merge pull request #43 from dong-fa/dev FIx import 에러 해결
dong-fa Feb 20, 2023
5a19d33
Feat/Chores
AngelaChaejung Feb 20, 2023
f5e0f2a
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 21, 2023
ad24886
Feat/main #31 무한스크롤 백이랑 연결까지 구현
Feb 21, 2023
ab6df0d
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 21, 2023
4ae8e3b
Merge pull request #44 from haruharuganda/dev
AngelaChaejung Feb 21, 2023
14a6d46
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 21, 2023
a11a395
Feat. Router 정리
Feb 21, 2023
fccc4af
Merge pull request #45 from haruharuganda/dev
AngelaChaejung Feb 21, 2023
ee2919c
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 21, 2023
93f6a67
Feat/Notification #38 SSE서버연결확인
AngelaChaejung Feb 21, 2023
ff2d1e7
Feat/ScheduleDetail #29 일정content없으면 아예 화면에 내용부분이 보이지 않게 수정
AngelaChaejung Feb 21, 2023
9134a3f
Feat/ScheduleDetail #29 삭제모달작업중
AngelaChaejung Feb 21, 2023
b141222
Disign #10 팔로우페이지 1차 CSS
dong-fa Feb 21, 2023
5648aec
Feat #10 프로필 페이지 팔로우 카운터 구현 완료
dong-fa Feb 21, 2023
7ed2fb9
Feat/notifications #38 서버연결후 데이터 구조 파악중.
AngelaChaejung Feb 21, 2023
1ce5e9e
Design/TopBar 변경디자인반영 #22
AngelaChaejung Feb 21, 2023
d843868
Disign #10 팔로우 버튼 조건부 스타일링 적용
dong-fa Feb 21, 2023
25e6ba6
Merge pull request #46 from dong-fa/Feat/Follow
AngelaChaejung Feb 21, 2023
ef32683
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 22, 2023
2ed8467
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 22, 2023
52f77f4
Feat/DeleteSchedule #47
AngelaChaejung Feb 22, 2023
423cc0c
Feat/ chores
AngelaChaejung Feb 22, 2023
e7bfdad
Feat/Notifications #38
AngelaChaejung Feb 22, 2023
663bf1a
Fix #10 팔로우 버튼 조건부 스타일링 수정
dong-fa Feb 22, 2023
34fa4c2
Merge pull request #48 Fix #10
haruharuganda Feb 22, 2023
1003f76
Feat/pastSchedlue #49 지난일정보기 기능 추가 및 전반적인 CSS수정
Feb 22, 2023
7bc2d30
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 22, 2023
a584626
Merge pull request #50 from haruharuganda/dev
dong-fa Feb 22, 2023
9a63c6e
Feat/Notification부분 재헌님과 데이터구조확인 후 수정
AngelaChaejung Feb 22, 2023
659adaa
Feat/Notifications 함수형업데이트적용
AngelaChaejung Feb 22, 2023
8b3b148
Feat/delete #47
AngelaChaejung Feb 22, 2023
ed42982
HotFix #23 바텀 네비바 버튼 활성화 및 레이아웃 대대적인 수정
dong-fa Feb 22, 2023
db11cba
Merge pull request #51 HotFix #23
haruharuganda Feb 22, 2023
723ac13
Feat/search #52 서치기능 구현중
Feb 22, 2023
1a6c97f
Merge branch 'dev/search' into dev/dev
Feb 22, 2023
47a7c3e
HotFix #23 레이아웃 1차 정리
Feb 22, 2023
490f2ed
Disign #32 레이아웃 변경으로 CSS 수정
dong-fa Feb 23, 2023
91db5bb
Feat/DeleteSchedule scheduleSlice수정 후 기능구현끝 #47
AngelaChaejung Feb 23, 2023
1d80942
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 23, 2023
b5483d2
Faet #32 API 변경에 따른 코드 수정
dong-fa Feb 23, 2023
349e61f
Merge pull request #53 from dong-fa/Feat/Invitation
AngelaChaejung Feb 23, 2023
3bc990f
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 23, 2023
be88aa9
Feat/ chores
AngelaChaejung Feb 23, 2023
e6c68d3
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 23, 2023
0a21c6c
Merge pull request #54 from Feat/Notification page
haruharuganda Feb 23, 2023
4a7acdc
Merge branch 'gnims-project:dev' into dev
haruharuganda Feb 23, 2023
1846070
Disign #32 레이아웃 변경으로 CSS 수정 및 정리
Feb 23, 2023
c04d63c
Merge pull request #55 from haruharuganda/dev
AngelaChaejung Feb 23, 2023
0a796f2
Disign #32 레이아웃 변경으로 CSS 수정 및 정리 2차
Feb 23, 2023
1fcaa02
Disign #32 레이아웃 변경으로 CSS 수정 및 정리 3차
Feb 23, 2023
efd7418
Merge pull request #56 from haruharuganda/dev
AngelaChaejung Feb 23, 2023
790711b
Design/Navigation #23
AngelaChaejung Feb 23, 2023
5f36e2e
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 23, 2023
89cb740
Merge pull request #57 from AngelaChaejung/dev
dong-fa Feb 23, 2023
39c4577
Design/Navigation bar #23 Final!
AngelaChaejung Feb 23, 2023
2fca734
Design/Navigation bar #23 Final!
haruharuganda Feb 23, 2023
290014a
Design/ Detail #29 -개인일정에 로고넣기, 탑네비 로고넣기
AngelaChaejung Feb 23, 2023
e666121
Feat/Detailpage #29 본인에게만 삭제,수정 버튼 보이게 구현
AngelaChaejung Feb 23, 2023
3fb987c
Feat/DeleteSchedule-서버와테스트완료
AngelaChaejung Feb 23, 2023
c2bd468
Feat/main #31 추가 후 main동작이 안 됨 수정
Feb 23, 2023
7766994
Merge pull request #59 from haruharuganda/mainPage
AngelaChaejung Feb 23, 2023
7bf7ea6
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 23, 2023
89c1b0e
Feat/ScheduleAdd-followList
AngelaChaejung Feb 23, 2023
6c992b8
Merge branch 'Feat/ScheduleAdd-followingList' into dev
AngelaChaejung Feb 23, 2023
5852c7d
Feat/Notification #38
AngelaChaejung Feb 23, 2023
fad864f
Merge pull request #60 from AngelaChaejung/dev
dong-fa Feb 23, 2023
2786556
Feat/main #31 추가 후 main동작이 안 됨 수정2
Feb 23, 2023
80d012e
Merge pull request #61 from haruharuganda/mainPage
dong-fa Feb 23, 2023
90ffb98
Feat/ScheduleAdd부분 참여자기능구현중
AngelaChaejung Feb 23, 2023
80efe00
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 23, 2023
6c47a6f
Feat/ScheduleAdd-Participants #9 배열로보내기 성공
AngelaChaejung Feb 23, 2023
52535c7
Disign #32 로그인 화면 로고추가 및 topnavbar 타이틀 넣음
Feb 23, 2023
f554d72
Merge pull request #62 from AngelaChaejung/dev
haruharuganda Feb 23, 2023
6c107d2
Merge branch 'gnims-project:dev' into dev
haruharuganda Feb 23, 2023
602bf62
Feat/search #52 유저검색 기능 및 CSS 완료
Feb 23, 2023
7489b23
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 23, 2023
3002643
Merge pull request #64 from haruharuganda/mainPage
AngelaChaejung Feb 23, 2023
26b6a45
Design/ScheduleEdit
AngelaChaejung Feb 23, 2023
7aa0608
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 23, 2023
576b353
Design/followList, Notification #38
AngelaChaejung Feb 24, 2023
b18060f
Merge pull request #65 from AngelaChaejung/dev
dong-fa Feb 24, 2023
d3249b4
Rename/Schedulefolder
AngelaChaejung Feb 24, 2023
7de6089
Merge pull request #6 from haruharuganda/dev
haruharuganda Feb 24, 2023
0bd13bd
Rename src/components/Schedule/ScheduleAdd.jsx to src/components/sche…
dong-fa Feb 24, 2023
f6f22b7
Merge pull request #67 from dong-fa/dev
haruharuganda Feb 24, 2023
6527dd5
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 24, 2023
0eeb4d0
Feat/search #52 팔로잉시 팔로잉 버튼이 나옴
Feb 24, 2023
e0856e1
Merge branch 'dev/search' into dev/dev
Feb 24, 2023
0c23e88
Merge pull request #7파일이름변경
haruharuganda Feb 24, 2023
2add8e4
ScheduleDetail 대소문자
Feb 24, 2023
dd79810
Feat/EditProfile-2
AngelaChaejung Feb 24, 2023
ff93ceb
Feat/login & Singup #5 회원가입 유효성검사 수정 및 InputBox 파일위치 변경
Feb 25, 2023
6832132
Feat/EditProfile 데이터잘보내지는거확인
AngelaChaejung Feb 25, 2023
cc94b4e
Design/ScheduleAdd
AngelaChaejung Feb 25, 2023
0b20931
만드는 중....
Feb 25, 2023
6552148
Merge pull request #68 Feat/EditProfileImage, Design/changed design css
haruharuganda Feb 25, 2023
4d4e5d7
Refactor #29 디테일 페이지 상태관리 변경
dong-fa Feb 25, 2023
25269b4
Feat #66 스케줄 수정 분기점 생성
dong-fa Feb 27, 2023
65faf83
Feat/EditProfile #66 axiosInstance적용완료
AngelaChaejung Feb 27, 2023
ac7e50e
Feat #66 반쪽짜리 수정 구현
dong-fa Feb 27, 2023
e007220
Merge branch 'dev' into Feat/ScheduleEdit
AngelaChaejung Feb 27, 2023
558b6d5
Merge pull request #70 from dong-fa/Feat/ScheduleEdit
AngelaChaejung Feb 27, 2023
aecfab1
chores
AngelaChaejung Feb 27, 2023
60b92ad
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Feb 27, 2023
8eb9f31
Feat/login & Singup #5 수정 2차 : 비밀번호 유효성 변경
Feb 27, 2023
f1f0b75
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Feb 27, 2023
5430af5
Merge branch 'dev/dev' into dev/Test
Feb 27, 2023
42baede
Feat/login & Singup #5 수정 3차 : CSS와 회원가입 안되는거 수정 + 저장소 로컬에서 세션으로 변경
Feb 27, 2023
076b7ef
Feat/login & Singup #5 수정 3차 : CSS와 회원가입 안되는거 수정 + 저장소 로컬에서 세션으로 변경 ,…
Feb 27, 2023
326b0a7
Feat/ScheduleAdd 참여자 5명까지, 이름보여주기
AngelaChaejung Feb 27, 2023
2a7628c
Design/changedDesign
AngelaChaejung Feb 27, 2023
fb15414
Feat/login & Singup #5 수정 3차 파일분리 실패, main복구
Feb 27, 2023
689722b
Merge pull request #73 from haruharuganda/dev
AngelaChaejung Feb 27, 2023
aa32cd4
Feat/NaverLogin #7 네이버로그인 변경된 URI적용
AngelaChaejung Feb 27, 2023
8dc1d63
Merge&resolove conflicts
AngelaChaejung Feb 27, 2023
9c06ee3
Merge pull request #75 from AngelaChaejung/dev
haruharuganda Feb 28, 2023
7533092
Fix #10 팔로우 버튼 로직 변경
dong-fa Feb 28, 2023
7df8ad6
Feat #66 수정시 디폴트값 뜨게 변경
dong-fa Feb 28, 2023
3e96328
Feat. authenticationNumber #78 이메일 인증부분, 확인버튼 구현 안됨
Feb 28, 2023
0c08e16
Merge pull request #76 from dong-fa/Feat/Follow
haruharuganda Feb 28, 2023
f13734e
Merge pull request #77 from dong-fa/Feat/scheduleEdit
haruharuganda Feb 28, 2023
1270a39
Design/ pointer cursor 변경
AngelaChaejung Feb 28, 2023
94686ca
Feat/ScheduleAdd 제목 20자제한
AngelaChaejung Feb 28, 2023
da1c997
Feat/NaverLogin 배포용개인주소로 연결
AngelaChaejung Feb 28, 2023
d7c0a4a
Feat/NaverLogin-test
AngelaChaejung Feb 28, 2023
9e3f92b
Feat/NaverLogin test
AngelaChaejung Feb 28, 2023
09e582a
Feat/Naverlogin-test3
AngelaChaejung Feb 28, 2023
beff280
Feat/KakaoLogin test-1
AngelaChaejung Feb 28, 2023
e16a447
Feat/loading page
AngelaChaejung Feb 28, 2023
5a299cd
Feat/LoadingPage
AngelaChaejung Feb 28, 2023
1a4e8ec
Feat/LoadingPage 구현 1차완료
AngelaChaejung Feb 28, 2023
fad90c3
Feat #5 로그아웃 버튼
dong-fa Feb 28, 2023
0af7967
Merge pull request #79 from dong-fa/Feat/Logout
haruharuganda Feb 28, 2023
bd44d9e
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Feb 28, 2023
b275775
Feat/ 메인페이지,마이페이지,네비바 cursor-pointer, 클릭시 이동
AngelaChaejung Feb 28, 2023
dfd9641
Feat/Friends's schedule 타인의 일정조회 완료
AngelaChaejung Feb 28, 2023
dcd2c90
Merge pull request #80 from AngelaChaejung/dev
haruharuganda Feb 28, 2023
2596837
Feat/userSearch #52 검색 후 타인의 메인페이지이동, 로딩페이지
AngelaChaejung Mar 1, 2023
4696211
Design/자잘한 CSS 문제점 고침.
AngelaChaejung Mar 1, 2023
8760cfa
Feat #66 스케줄 수정 구현 완료
dong-fa Mar 1, 2023
995018a
Merge branch 'dev' into Feat/ScheduleEdit
AngelaChaejung Mar 1, 2023
a6c39a5
Merge pull request #81 from dong-fa/Feat/ScheduleEdit
AngelaChaejung Mar 1, 2023
dd94e28
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Mar 1, 2023
12cd7c0
Feat. authenticationNumber #78 이메일 인증 기능,CSS완성
Mar 1, 2023
8b0c18f
Feat.Sort #82 메인정렬CSS
Mar 1, 2023
8933edc
Merge branch 'dev/passwordChange' into dev/sort
Mar 1, 2023
e6be3d6
#78 이메일 인증 기능,CSS완성 2
Mar 1, 2023
5bbf485
Merge branch 'dev' into passwordChange
haruharuganda Mar 1, 2023
c9c9f61
Design/ z-index 조정
AngelaChaejung Mar 1, 2023
b066f93
Design/로딩아이콘사이즈조정
AngelaChaejung Mar 1, 2023
5d2dbf9
Feat. authenticationNumber #78 이메일 인증 기능,CSS완성
Mar 1, 2023
a124a60
Merge branch 'passwordChange' of https://github.com/haruharuganda/Gni…
Mar 1, 2023
5052eee
Merge pull request #84 from haruharuganda/passwordChange
dong-fa Mar 1, 2023
3e605f0
Feat. authenticationNumber #78 이메일 인증 기능,CSS완성 3차
Mar 1, 2023
554d893
no message
Mar 1, 2023
882c003
Merge pull request #85 from haruharuganda/passwordChange
dong-fa Mar 1, 2023
575344a
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Mar 1, 2023
2072c9b
Feat/main #31 매인 CSS및 무한스크롤변경
Mar 1, 2023
2348e2e
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Mar 1, 2023
e59c30e
Feat. authenticationNumber #78 InputEmail 애러해결
Mar 1, 2023
624132a
Merge pull request #86 from haruharuganda/dev
AngelaChaejung Mar 1, 2023
f6df6a9
Feat #10 팔로우 포인터 설정
dong-fa Mar 1, 2023
8500430
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Mar 1, 2023
1e6a94e
Merge pull request #87 from dong-fa/Feat/Follow
AngelaChaejung Mar 1, 2023
55fd5fb
File/Merge
AngelaChaejung Mar 1, 2023
d69ea53
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Mar 1, 2023
75d67f0
Merge pull request #88 from AngelaChaejung/dev
dong-fa Mar 1, 2023
034ddd4
Design #32 CSS 변경 적용
dong-fa Mar 1, 2023
48fbe84
Merge pull request #89 Design #32 CSS 변경 적용
haruharuganda Mar 1, 2023
9af52ed
Design #32 mainCSS 변경, Router연결
Mar 1, 2023
3b154e8
Merge pull request #90 from haruharuganda/dev
dong-fa Mar 1, 2023
fc62c01
Design 개발중 페이지 표시 제작
dong-fa Mar 1, 2023
cdd3478
Feat/Notification #38 DB내용불러오는변경사항반영
AngelaChaejung Mar 1, 2023
4b04188
Feat/Router #92 Router정리
Mar 1, 2023
6255e54
Feat/Router #92 Main정리
Mar 1, 2023
8539577
Feat/Router #92 Index파일 생성 및 Router 적용
Mar 1, 2023
8911e76
Feat/Notification #38 알림페이지 설정변경
AngelaChaejung Mar 1, 2023
890f95f
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Mar 2, 2023
1f3e7a6
Merge pull request #91 from dong-fa/Feat/develop
AngelaChaejung Mar 2, 2023
c0006f1
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Mar 2, 2023
236790d
Feat/Router #92 Index파일 생성 및 페이지 정리
Mar 2, 2023
f90a13e
Merge branch 'dev' into router
haruharuganda Mar 2, 2023
312a50d
Feat/Router #92 Router 정리 및 Index파일 생성
dong-fa Mar 2, 2023
510fc73
Merge branch 'gnims-project:dev' into dev
AngelaChaejung Mar 2, 2023
f6fc6eb
Fix/notification 무한렌더링 고침 #38
AngelaChaejung Mar 2, 2023
6ea701e
Merge branch 'dev' of https://github.com/AngelaChaejung/Gnims-chaejun…
AngelaChaejung Mar 2, 2023
c098b86
Design / 개발중 페이지 CSS 변경
dong-fa Mar 2, 2023
2aae76b
Merge pull request #94 from dong-fa/dev
AngelaChaejung Mar 2, 2023
42b30ab
File/merge
AngelaChaejung Mar 2, 2023
f9114b1
File/merging
AngelaChaejung Mar 2, 2023
af233d4
Feat/Norificationt #95 DB연결 후 코드 수정
haruharuganda Mar 2, 2023
9257bbd
Feat/Router #92 Router 로그인시 main진입 오류 수정
Mar 2, 2023
66d733a
Merge branch 'dev' of https://github.com/haruharuganda/Gnims-frontend…
Mar 2, 2023
fa295bf
Fix #32 시간 계산 코드 변경
dong-fa Mar 2, 2023
838c346
Merge pull request #96 from haruharuganda/dev
AngelaChaejung Mar 2, 2023
fe368b0
Merge branch 'gnims-project:dev' into dev
dong-fa Mar 2, 2023
86ba816
Merge pull request #97 from dong-fa/dev
AngelaChaejung Mar 2, 2023
e45a39d
Feat/Router #92 Router 로그인시 main진입 오류 수정 2차
Mar 2, 2023
e5257ad
Merge pull request #98 from haruharuganda/dev
dong-fa Mar 2, 2023
427ee13
Design/chores
AngelaChaejung Mar 2, 2023
c05e1c3
Design/schedule add datepicker input사이즈 조절
haruharuganda Mar 2, 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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules/
/.pnp
.pnp.js
.env
# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

node_modules
yarn-error.log
*.json

*.env
66 changes: 66 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"name": "gnims-pwa",
"version": "0.1.0",
"private": true,
"dependencies": {
"@reduxjs/toolkit": "^1.9.2",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^13.0.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.3.2",
"event-source-polyfill": "^1.0.31",
"html-webpack-plugin": "^5.5.0",
"json-server": "^0.17.1",
"picker": "^0.1.4",
"react": "^18.2.0",
"react-date": "^2.0.0",
"react-datepicker": "^4.10.0",
"react-dom": "^18.2.0",
"react-modal": "^3.16.1",
"react-redux": "^8.0.5",
"react-router-dom": "^6.8.1",
"react-scripts": "5.0.1",
"react-spinners": "^0.13.8",
"redux": "^4.2.1",
"styled-components": "^5.3.6",
"styled-reset": "^4.4.5",
"tailwindcss": "^3.2.6",
"web-vitals": "^2.1.4",
"workbox-background-sync": "^6.4.2",
"workbox-broadcast-update": "^6.4.2",
"workbox-cacheable-response": "^6.4.2",
"workbox-core": "^6.4.2",
"workbox-expiration": "^6.4.2",
"workbox-google-analytics": "^6.4.2",
"workbox-navigation-preload": "^6.4.2",
"workbox-precaching": "^6.4.2",
"workbox-range-requests": "^6.4.2",
"workbox-routing": "^6.4.2",
"workbox-strategies": "^6.4.2",
"workbox-streams": "^6.4.2"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
46 changes: 46 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<html lang="en">
<head>
<script
type="text/javascript"
src="https://static.nid.naver.com/js/naveridlogin_js_sdk_2.0.0.js"
charset="utf-8"
></script>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="/manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
8 changes: 8 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions public/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
14 changes: 14 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from "react";
import Router from "./shared/Router";
import GlobalStyles from "./styles/GlobalStyle";

function App() {
return (
<>
<GlobalStyles />
<Router />
</>
);
}

export default App;
9 changes: 9 additions & 0 deletions src/App.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import App from './App';

test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});
21 changes: 21 additions & 0 deletions src/api/LoginApi.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { instance } from "../shared/AxiosInstance";

export const LoginApi = {
EmailLogin: (payload) => {
const data = instance.post("/auth/login", payload);
return data;
},

KakaoLogin: async (payload) => {
console.log("카카오 페이로드", payload);
return await instance.post("kakao/login", payload);
},

SendEmailAuthenticationNumber: async (payload) => {
return await instance.post("/auth/password", payload);
},

SendAuthenticationNumber: async (payload) => {
return await instance.patch("/auth/code", payload);
},
};
41 changes: 41 additions & 0 deletions src/api/ScheduleApi.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { instance } from "../shared/AxiosInstance";

export const ScheduleApi = {
//스케줄 전체 조회
getSccheduleApi: (payload) => {
//const data = instance.get(`/v2-dto/users/${payload}/events`);
const data = instance.get(`/users/${payload}/events`);
return data;
},

getInfiniteScrollPage: (payload) => {
const data = instance.get(
`/v2-page/users/${payload.userId}/events?page=${payload.page}&size=${3}`
);
return data;
},

//스케줄 등록
postScheduleApi: (payload) => {
const data = instance.post("/events", payload);
return data;
},
//스케줄 수정
editScheduleApi: (payload) => {
console.log("수정데이터?", payload);
const data = instance.put(`/events/${payload.eventId}`, payload.Schedule);
return data;
},

//지난일정 조회
getPastScheduleApi: () => {
const data = instance.get("/events/past");
return data;
},

//스케줄 삭제
deleteScheduleApi: (payload) => {
const data = instance.delete(`/events/${payload}`);
return data;
},
};
17 changes: 17 additions & 0 deletions src/api/Signup.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { instance } from "../shared/AxiosInstance";

export const SignupApi = {
emailDoubleCheck: async (payload) => {
const { data } = await instance.post("/auth/email", payload);
return data;
},
nickNameDoubleCheck: async (payload) => {
const { data } = await instance.post("/auth/nickname", payload);
return data;
},

Signup: async (payload) => {
const { data } = await instance.post("/auth/signup", payload);
return data;
},
};
20 changes: 20 additions & 0 deletions src/api/UserApi.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { async } from "q";
import { instance } from "../shared/AxiosInstance";

export const UserApi = {
userSearch: async (payload) => {
const { data } = await instance.get(
`/users/search?username=${payload}&page=${0}&size=${10}`,
payload
);
return data;
},
editProfile: async (payload) => {
const data = await instance.patch("users/profile", payload);
return data;
},
passwordChange: async (payload) => {
const { data } = await instance.patch("/auth/password", payload);
return data;
},
};
Loading