Develop - #5

Open

hyunjong-96 wants to merge 212 commits into

mainfrom

Commits on Jul 5, 2021

Commits on Jul 6, 2021

feat : 무지개 작가의 말 작성
hyunjong-96
committed
b12d7e1
refactor : 1.5부 무지개 제목 동적할당 적용
hyunjong-96
committed
cae3cc1
refactor : 무지개 홈뷰에서 버튼 활성화 rainbowCheck 필드 DTO에 추가
hyunjong-96
committed
2f16322
feat : 무지개 최고의 순간 불러오기
hyunjong-96
committed
d40e11a
refactor : 스키마 배열 생성시 빈배열 생성
hyunjong-96
committed
dbfa666
feat : 로그인, 회원가입, 반려동물 등록 기능 구현
soleu
committed
b58cf69
refactor : 2부 작가의 말 등록 조건 수정
hyunjong-96
committed
93ee5b0
refactor : 2부 작가의 말 등록 조건 수정
hyunjong-96
committed
2c9e017
feat : 작별할 반려동물 이름 불러오기
hyunjong-96
committed
445d482

Commits on Jul 7, 2021

Merge remote-tracking branch 'origin/feat/sol/user'
soleu
committed
1040500
feat : 책 프롤로그 작성 API
soleu
committed
38046db
feat : 책 프롤로그 작성 API
soleu
committed
e8fe268
petDiary 작성
soleu
committed
24cc240
feat : 1부 메인 홈화면 API
soleu
committed
949e938
fix : package.json 수정
soleu
committed
e72791c
feat : 1부 홈화면 API
soleu
committed
d5a8206
refactor : 목차 객체 생성 추가
soleu
committed
32ee480
feat : 프롤로그 작성 API
soleu
committed
94c3dbe
수정중
soleu
committed
3390b02
feat : 최고의 순간 API
hyunjong-96
committed
e35f9da
feat : 반려동물 이별 취소
hyunjong-96
committed
eb22a6f
Merge branch 'feat/hyunjong/rainbow' of https://github.com/TeamMascota/Mascota-Server into feat/hyunjong/rainbow
hyunjong-96
committed
56b5d44
feat : 무지개 서브뷰 불러오기
hyunjong-96
committed
e577156
refactor : 최고의 순간 해당 반려동물 이름과 종 추가
hyunjong-96
committed
250d3ca
feat : 무지개 서브 뷰
hyunjong-96
committed
a7f3089
feat : 무지개 서브 뷰
hyunjong-96
committed
b76ee43
1부 홈화면(TableContents 출력안됨)
soleu
committed
fba3bfc
add
soleu
committed
bc9df32

Commits on Jul 8, 2021

feat : 일기 상세 조회 API
soleu
committed
8d3052a
feat: 1부 일기 수정, 삭제 API
soleu
committed
c53ffd8
Merge pull request #4 from TeamMascota/feat/hyunjong/rainbow
hyunjong-96
authored
f46ec81
1부 일기 조회/삽입/삭제/수정
soleu
committed
4d79503
반려동물 일기 작성,조회,수정,삭제 API
soleu
committed
32c3dd9
feat : 캘린더 불러오기
hyunjong-96
committed
6181426
feat : 캘린더 불러오기
hyunjong-96
committed
9b9f92f
refactor : getLastDateMonth 수정
hyunjong-96
committed
139d9a2

Commits on Jul 9, 2021

Merge pull request #6 from TeamMascota/feat/hyunjong/calendar
hyunjong-96
authored
1e5a73a
feat : 2부 메인화면 init
hyunjong-96
committed
044f330
feat : 2부 메인뷰
hyunjong-96
committed
426d2fa
목차별 일기 조회 API
soleu
committed
9aea7b8
feat : 2부 목차별 일기 조회
hyunjong-96
committed
b1081c8
refactor : 반환데이터에 feeling 추가
soleu
committed
c440253

Commits on Jul 10, 2021

feat : 2부 목차 불러오기
hyunjong-96
committed
8d9593c
feat : 2부 목차 추가
hyunjong-96
committed
274917e
refactor : 목차추가 body 필드값 수정
hyunjong-96
committed
0d1fee8
feat : 2부 목차 수정
hyunjong-96
committed
4188886
feat : 목차 조회 API
soleu
committed
6e13ecf
feat : 목차추가 API
soleu
committed
1a6a8a0
feat : 목차리스트 수정 API
soleu
committed
847c6c0
feat : 목차 삭제 API
soleu
committed
8aba5ca
refactor : 일기 부분 오류 수정중
soleu
committed
8e35542
refactor : 일기 API 출력값 수정
soleu
committed
e175221
refactor : 로그인 분기 수정
soleu
committed
eee1bdd
refactor :목차리스트 반려동물 종류 추가
soleu
committed
35fa17a

Commits on Jul 11, 2021

..
soleu
committed
d8b5767
"refactor : 로그인,회원가입 수정"
soleu
committed
8768f4e
refactor : 일기 수정,삭제 api 수정
soleu
committed
0d1d34a
feat : 2부 목차 삭제
hyunjong-96
committed
58fbbed
Merge pull request #7 from TeamMascota/feat/secondPart
hyunjong-96
authored
81e2630
refactor : 로그인 api 수정
soleu
committed
2d6b39f
Merge branch 'develop' into feat/sol/user
soleu
authored
79a8afc
Merge pull request #8 from TeamMascota/feat/sol/user
soleu
authored
580590a
refactor : petDiary Branch solve conflict with devlop
soleu
committed
3d8ac71
Merge pull request #9 from TeamMascota/feat/sol/petDiary
soleu
authored
689c67a
Merge branch 'develop' into feat/sol/chapter
soleu
authored
932d919
Merge pull request #10 from TeamMascota/feat/sol/chapter
soleu
authored
641faa5
feat : config.test
hyunjong-96
committed
04f73b9
refactor 일기 상세 조회 뷰 API feelingList 수정
soleu
committed
ad99e6f

Commits on Jul 12, 2021

feat : apply to s3
hyunjong-96
committed
766f111
refactor : setting config
hyunjong-96
committed
f443d07
refactor: 2부 일기 작성 api
soleu
committed
e99e4a0
refactor: 2부 일기 작성 api
soleu
committed
ee0bb5a
refactor : solve conflict error
soleu
committed
89fcc15
refactor : solve conflic error
soleu
committed
894b219
refactor : solve conflict
hyunjong-96
committed
2f3db42
refactor : solve conflict
hyunjong-96
committed
9f4a8a8
refacotr : 1부 홈 이슈 해결
hyunjong-96
committed
87841f9
Merge pull request #12 from TeamMascota/feat/sol/petHome
hyunjong-96
authored
c64591a
Merge branch 'develop' into feat/s3multer
hyunjong-96
authored
3919711
refactor : s3 수정
hyunjong-96
committed
0dfda43
Merge branch 'feat/s3multer' of https://github.com/TeamMascota/Mascota-Server into feat/s3multer
hyunjong-96
committed
cb8c96d
Merge pull request #13 from TeamMascota/feat/s3multer
hyunjong-96
authored
07571eb
2부 일기 조회 api
soleu
committed
fa44c38
refactor : post PetDiary images
hyunjong-96
committed
0edbc61
refactor : resolve fisrtPartController
hyunjong-96
committed
4d481cf
feat: 2부 일기 수정 API
soleu
committed
0503653
feat : 2부 일기 삭제 API
soleu
committed
6e9a488
Merge remote-tracking branch 'origin/feat/sol/userDiary' into feat/secondPart
soleu
committed
31c5d1c

Commits on Jul 13, 2021

Commits on Jul 14, 2021

refactor : 목차 추가,삭제,수정 api 출력 결과 수정
soleu
committed
92ea0f6
refactor: 2부 목차 추가,삭제,수정 api 출력값 수정
soleu
committed
97a4e83
refactgor : 이슈 수정
hyunjong-96
committed
2aa17c2
Merge pull request #18 from TeamMascota/feat/issue
hyunjong-96
authored
0716baa
refactor : 1부 홈화면 이슈 해결
hyunjong-96
committed
1c14482
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop/sol
soleu
committed
6f6607e
1부 홈화면 api 출력 결과 수정
soleu
committed
870e001
refactor : deleteSecondPartDiary 목차에 삭제 안됨 이슈 해결
hyunjong-96
committed
3c751fd
refactor : 반려동물 등록 사진&데이터 합침
hyunjong-96
committed
5a89509
refactor : dist update
hyunjong-96
committed
bcee1d4
Merge pull request #19 from TeamMascota/feat/divide/imgApi
hyunjong-96
authored
b5216cf
refactor : 1부 프롤로그 책뷰 이슈 해결
hyunjong-96
committed
5e9f999
Merge pull request #20 from TeamMascota/feat/divide/imgApi
hyunjong-96
authored
98a13d3
refactor dist update
hyunjong-96
committed
5bab2ca
refactor : 1.5부 memories 이슈 수정
hyunjong-96
committed
21bb628
refactor : add memorise diaryId field
hyunjong-96
committed
96d49c0
refactor : dist update
hyunjong-96
committed
da792a7
refactor : 1부,2부 홈화면 형식 동일화
soleu
committed
88cf3f6
Merge pull request #21 from TeamMascota/sol/develop
soleu
authored
bc93084
refactor : theBestMoment update
hyunjong-96
committed
8372c48

Commits on Jul 15, 2021

refactor : add s3 in registerPet
hyunjong-96
committed
5eae151
refactor : 펫등록하기 s3 추가
hyunjong-96
committed
fb86a1c
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop
hyunjong-96
committed
9f47302
refactor : 펫선택 리스트 수정
hyunjong-96
committed
e28ed8c
refactor : 반려동물 이미지 등록
hyunjong-96
committed
602f80b
refactor : 반려동물 등록 수정
hyunjong-96
committed
498c4af
refactor : statusCode 수정
hyunjong-96
committed
8211b03
refactor : 반려동물 무지개 다리 멘트 수정
hyunjong-96
committed
f5c6b13
refactor : 반려동물 등록 수정
hyunjong-96
committed
4f8e888
refactor : 반려동물 등록
hyunjong-96
committed
9e3d946
refacotr : 반려동물 등록 타입확인
hyunjong-96
committed
b6dd5e1
refacotr : 반려동물 등록 타입확인
hyunjong-96
committed
5bc2cdb
refactro : 반려동물 등록 수정
hyunjong-96
committed
6e59744
refactro : dist update
hyunjong-96
committed
757f819
refactor : 목차별 일기 조회 요일 수정
hyunjong-96
committed
fac6bc2
reafactor : 무지개 이별동물 선택
hyunjong-96
committed
5084a1e
refacotr : dist update
hyunjong-96
committed
2a94252
refacotr : 반려동물 등록 수정
hyunjong-96
committed
1a3c12c
refacotr : 반려동물 등록 수정
hyunjong-96
committed
6d327dc
feat : 반려동물 정보 불러오기
hyunjong-96
committed
45c0e18
feat : 반려동물 정보 불러오기
hyunjong-96
committed
285d008
refacotr : 1.5부 홈화면 이슈 해결
hyunjong-96
committed
73d7367
refactor : dist update
hyunjong-96
committed
cc3282e
refacotr : 동물정보 리스트 불러오기
hyunjong-96
committed
c4caf8c
refactor : 목차별 상세보기 _id필드값 추가
hyunjong-96
committed
a0891c2
refactoer : add kind
hyunjong-96
committed
b8cdb56

Commits on Jul 16, 2021

refactor : 1부 목차별 일기조회 리스트 오류 수정
soleu
committed
d22af42
Merge pull request #22 from TeamMascota/sol/develop
soleu
authored
1a1b48e
refactor: 2부 목차별 일기 조회 출력 결과 수정
soleu
committed
9b01a03
Merge pull request #23 from TeamMascota/sol/develop
soleu
authored
387ee9d
refactor : 최고의 순간 결과값 일기ID 삽입
soleu
committed
b4086f8
Merge pull request #24 from TeamMascota/sol/develop
soleu
authored
ce1fc41
refactor : post method 더미 이미지추가
hyunjong-96
committed
cc3c8fa
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop
hyunjong-96
committed
9eff8c1
refactor : dist update
hyunjong-96
committed
878ae08
refactor : imgurl 추가
hyunjong-96
committed
2edf882
refactor : 무지개 뷰 멘트 수정
soleu
authored
1f744d9
refactor : 최고의순간 이슈 수정
hyunjong-96
committed
02a9f81
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop
hyunjong-96
committed
99e2000
refactor : 이슈 해결
hyunjong-96
committed
96d1355
refactor : 프롤로그 등록 이슈 돌려막기
hyunjong-96
committed
9087f5b
refactor : 무지개 다리 멘트 수정
hyunjong-96
committed
1c1d103
refactor : 무지개 다리 멘트 수정
hyunjong-96
committed
6dd05a9
refactor : 최고의 순간 날짜 추가
hyunjong-96
committed
a76c695
refactor : 반려동물 등록 이슈 해결
hyunjong-96
committed
334c2ab
refactor : 반려동물 등록 이슈 해결
hyunjong-96
committed
a2ce958
refactor : 반려동물 등록 반환값 수정
hyunjong-96
committed
200bbac
Update README.md
soleu
authored
bb1c660
Update README.md
soleu
authored
af3dd4f
feat : 엽이 챌린지
hyunjong-96
committed
a8920d9
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop
hyunjong-96
committed
5ff0127
refactor : 1부 화면 kind 추가
hyunjong-96
committed
2e8778b
reafactor : postPet image
hyunjong-96
committed
cbd98bd
README 기능 설명 추가
soleu
committed
2ac37dd
Merge pull request #25 from TeamMascota/sol/develop2
soleu
authored
0cdd42e
Update README.md
soleu
authored
562eea4
Update README.md
soleu
authored
4013e87
Create README.md
soleu
authored
1e3dce2
refactor : 반려동물 등록 with img
hyunjong-96
committed
910b89e
Merge branch 'develop' of https://github.com/TeamMascota/Mascota-Server into develop
hyunjong-96
committed
29e242e
refactor : 최고의 순간 comment 이슈 수정
hyunjong-96
committed
59e7048
fix : 반려동물 등록하기 populate이슈
hyunjong-96
committed
6f7b227
refacotr : populate 수정
hyunjong-96
committed
fbf9043
refacotr : 반려동물 등록 type
hyunjong-96
committed
56af16c

Commits on Jul 17, 2021

refactor : updatwe
hyunjong-96
committed
3854720
refactor : update
hyunjong-96
committed
bcc0343
refactor : update
hyunjong-96
committed
f29ee4b
refactor : update
hyunjong-96
committed
31c7cd5
refactor : update
hyunjong-96
committed
ea832a3