-
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
리뷰 2주차 #40
Open
BeigeBearDev
wants to merge
145
commits into
review
Choose a base branch
from
dev
base: review
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
리뷰 2주차 #40
Changes from all commits
Commits
Show all changes
145 commits
Select commit
Hold shift + click to select a range
a9715cd
Fix: 도서 상세 페이지 에러 수정
rOyalFruit ea15e10
fix: memberId를 orderId로 변경하여 주문 조회 수정
seng-han c535762
Remove application.yml from git history
rOyalFruit a8911cf
feat: 장바구니 추가 기능 구현 (회원/비회원)
rOyalFruit e8dd3f9
fix: 프론트 코드에서 데이터 불러오기 수정
seng-han ceb38f3
fix: 주문 상세 페이지 수정
seng-han 6be091a
chore: 초기 데이터 수정 - memberId=2의 주문 3개 추가
seng-han f6662f3
OAuth-back
pcyscott 3111935
fix: 주문 상태 및 배송 상태 수정
seng-han e1cc7b6
Feat: openapi-typescript를 이용해서 통신에 필요한 타입 스크립트 생성
rOyalFruit 65510af
Feat: 검색 시 정렬 기준, 별점 기능
1m1nkim dc3295b
login1-front
pcyscott fe95919
Merge remote-tracking branch 'origin/Feature1-Book,Cart' into Feature…
1m1nkim e920955
Fix: Merge conflict resolved
rOyalFruit 9e392b3
Feat: Bookinfo 별점 추가, CartTest 개발
1m1nkim 983d9ed
Fix: Merge conflict resolved
rOyalFruit 31eb3b0
Feat: 검색 시 제목, 저자, 출판사, ISBN13 등 검색 기능 구현
1m1nkim f4b3568
feat: 전체 주문 조회 기능 추가 및 코드 리팩토링
BeigeBearDev 2f9163c
Merge branch 'dev' of https://github.com/prgrms-be-devcourse/NBE3-4-2…
seng-han b7f02c5
change to JWT -back
pcyscott bfa185e
simplify auth
pcyscott 0d99469
modify controller with jwt
pcyscott 88bbf30
fect : qna API 구현
nodonghui f9e193a
Merge remote-tracking branch 'refs/remotes/origin/Feature1-Book,Cart'…
1m1nkim b1353e9
jwt at frontend
pcyscott b9b3ce0
Merge pull request #17 from prgrms-be-devcourse/feature-admin-14
BeigeBearDev 7d7186e
Merge pull request #18 from prgrms-be-devcourse/feature-login
rOyalFruit 1cf47fa
Revert "Feat: 카카오API 로그인, JWT토큰 활용"
BeigeBearDev e66d3ad
Merge pull request #19 from prgrms-be-devcourse/revert-18-feature-login
rOyalFruit 9512980
Merge branch 'dev' into feature-login
BeigeBearDev e6694f4
Merge pull request #20 from prgrms-be-devcourse/feature-login
BeigeBearDev 815d28c
Merge remote-tracking branch 'origin/dev' into Feature1-Book,Cart
rOyalFruit cbe704c
Fix: 브랜치 병합 후 발생한 에러 수정
rOyalFruit 703e7c3
Fix: 카카오 로그인을 수행해도 쿠키가 구워지지 않는 문제 임시로 수정
rOyalFruit 21d526b
feat: 관리자 주문 상세내역 조회 기능 추가 및 리팩토링
BeigeBearDev 6f6116f
feat: 관리자 주문 상세내역 조회 기능 추가 및 리팩토링
BeigeBearDev 1e0cbc7
Merge remote-tracking branch 'origin/dev' into feature-order-search
seng-han 7932af4
Refactor: 장바구니 추가 기능 수정
rOyalFruit faba74e
refactor : 코드 리팩토링
nodonghui 998d9d1
작업 내용 저장 (예: QnA 기능 수정)
nodonghui 164efc2
Conflict 해결
nodonghui 4d4785b
fix: 충돌 해결
seng-han 6b392c9
Remove application.yml from repository tracking
seng-han 2178eea
fix: 서버 요청 및 설정 오류 수정
seng-han 28da0d1
Refactor: pr멘토링 리뷰 사항 반영, 장바구니 기능 리팩토링
rOyalFruit 9ff2c66
refactor: PR 리뷰 반영
seng-han eeaba25
commit
seng-han 860fe54
using token-back
pcyscott 2601acd
adding cookie usage at front
pcyscott dc1e685
Merge pull request #22 from prgrms-be-devcourse/feature-admin-15
BeigeBearDev 88101dd
Merge pull request #25 from prgrms-be-devcourse/feature-token
nodonghui a024af3
save
nodonghui 5e8bb27
fix: conflict 해결 및 병합 완료
seng-han 45a8316
Fix: dev 브랜치 병합 후 생긴 에러 수정 - 1
rOyalFruit 779e388
Fix: SpringDoc 로딩이 안되는 문제 수정
rOyalFruit fd94d04
Merge pull request #21 from prgrms-be-devcourse/Feature1-Book,Cart
seng-han caf150b
feat: memberid 필드를 oauthid로 수정
seng-han ef03db3
fix: 충돌 해결 후 병합
seng-han 8151d13
Refactor: 사용자 인증 정보를 받아오는 방식 변경
rOyalFruit 7e22db3
Refactor: 프론트 인증 방식 변경 MemberDto Id 값 추가
1m1nkim 4626eb7
Merge remote-tracking branch 'origin/dev' into feature-admin-16
BeigeBearDev 3db6368
fix: 오류 해결
seng-han 091237b
regenerate token && answer 1
pcyscott b9bbded
merge finish
nodonghui 54079e6
merge finsh
nodonghui 2347bae
Refactor: 이벤트 배너 첫 실행시에만 저장되게 리팩토링
1m1nkim 136c615
로컬 dev 브랜치 업데이트
nodonghui bd4fe6a
before merge
nodonghui ddbdc99
Feat: 로그인 시 로컬 스토리지(비로그인 상태) 장바구니 내역을 DB에 업데이트
rOyalFruit 25e9ac8
Fix: Merge conflict resolved
rOyalFruit 23b95cd
bug fix
nodonghui 5ee7eeb
Merge pull request #27 from prgrms-be-devcourse/Feature1-Book,Cart
nodonghui 4186518
merge finish
nodonghui c9b3eb1
Merge pull request #29 from prgrms-be-devcourse/feature/review/nodonghui
nodonghui 1b47da6
Revert "Feature/review/nodonghui"
nodonghui d0d98bc
Merge pull request #30 from prgrms-be-devcourse/revert-29-feature/rev…
nodonghui c637c56
token managing
pcyscott e5b3e9a
delete tokens && redirection
pcyscott 56f4ba9
fix: detailorder oauthid 수정
seng-han 6f5f1af
feat: Admin Book 관련 기능 추가 및 리팩토링
BeigeBearDev 431c066
feat: Admin Login 관련 기능 추가 및 리팩토링
BeigeBearDev 2ffeacb
Merge branch 'dev' into feature-admin-16
BeigeBearDev b7e25c0
Merge pull request #32 from prgrms-be-devcourse/feature-admin-16
nodonghui 3610803
Refactor: Cart 로그인/비로그인 사용자 확인 로직 변경
rOyalFruit 2cfb0e4
Revert "Feature: 관리자 페이지 도서, 로그인, 구문 관련 기능 추가 및 리팩토링"
BeigeBearDev f65de87
Merge pull request #33 from prgrms-be-devcourse/revert-32-feature-adm…
BeigeBearDev 21b855e
Merge pull request #34 from prgrms-be-devcourse/Feature1-Book,Cart
rOyalFruit ea76ab7
feat: Admin 관련 기능 추가 및 리팩토링
BeigeBearDev a4a0451
fect : qna,mypage 수정
nodonghui 60ed05b
fix:
seng-han 76331d3
save
nodonghui 8878aca
fix: 변경 사항 커밋
seng-han 38e365d
refactor : front refactor
nodonghui 9d85472
fix: bug fix
nodonghui 11925dc
Feat: °áÁ¦ ±â´É ÄÁÆ®·Ñ·¯ Ãß°¡
rOyalFruit ffa5f3d
qna back2
pcyscott 53d6906
Merge pull request #36 from prgrms-be-devcourse/pr/nodonghui
nodonghui 40b3263
Merge pull request #35 from prgrms-be-devcourse/feature-admin-fix
BeigeBearDev ca9e51c
Feat: 주문기능 프론트엔드 생성
1m1nkim 2ce18ae
fix: 병합 후 충돌 해결
seng-han 1c5763e
resolving merge
pcyscott ba9554b
refacoring
pcyscott 67dc1fa
Feat: 주문 화면에 카카오 우편번호 서비스 도입
rOyalFruit 7e8e244
fix: 마이페이지 버튼
seng-han bd072eb
Feat: 바로 구매 기능 구현
1m1nkim 8e4b518
Design: 프론트 레이아웃 적용
1m1nkim 52149d4
Merge branch 'dev' into Feature1-Book,Cart
1m1nkim dc024db
Merge pull request #38 from prgrms-be-devcourse/feature-admin-qna
pcyscott 0fd5573
Merge pull request #39 from prgrms-be-devcourse/Feature1-Book,Cart
seng-han bc68bc3
fix: 병합 후 충돌 해결
seng-han d095db3
fix: oauthid 제거 후 member로 수정
seng-han 38ea2c9
Fix: 코드 병합 후 생긴 에러 수정
rOyalFruit d358c72
공동 작업 임시저장
rOyalFruit 848c7dc
fix:수정
seng-han 111bba6
.
seng-han df5752a
fect : qna 질문 프론트 구현
nodonghui 7f36fa7
Conflict resolved
nodonghui 2169d85
merge
nodonghui 1e4996b
Merge pull request #42 from prgrms-be-devcourse/feature-qna_mypage-no…
nodonghui 7c33c66
fix: 오류 해결완료
seng-han bda4a1b
fix:오류해결
seng-han 2e02154
Merge branch 'dev' of https://github.com/prgrms-be-devcourse/NBE3-4-2…
rOyalFruit 645f884
Merge pull request #44 from prgrms-be-devcourse/feature-order-search
rOyalFruit f3b2892
fix: ���� �� ���� ���� ����
rOyalFruit f13211e
fix: ���� �� ���� ���� ����
rOyalFruit 69c10da
fix:날짜필터 수정
seng-han 80e41cc
Feat: 사이드바에 사용자 프로필 이미지 추가
rOyalFruit 7e76ab5
Merge pull request #45 from prgrms-be-devcourse/Feature1-Book,Cart
rOyalFruit ff3aa7f
fix:order 페이징처리
seng-han 14eea50
fix:order 페이징처리
seng-han c4a3954
fix: order 페이징 처리
seng-han e977731
fix
seng-han 7e1121b
Fix: 바로구매 detail_order에 저장 안되던 점 수정
1m1nkim 740c2cb
feat: admin 부분 병합
BeigeBearDev c6279bf
Merge branch 'dev' into feature-admin
BeigeBearDev 38ab04c
Feat: 책 상세페이지 개발, 기본 배송지 주문기능에서 불러오기
1m1nkim 14bf0bf
Merge pull request #46 from prgrms-be-devcourse/temp-order
seng-han 707ab62
Merge pull request #47 from prgrms-be-devcourse/feature-admin
BeigeBearDev 07f8d9a
Merge branch 'dev' into Fe-pr
1m1nkim 4023fb6
Merge pull request #49 from prgrms-be-devcourse/Fe-pr
1m1nkim bf7e631
Fix: 관리자 페이지 글자 색이 하얗게 표시되는 문제 수정
rOyalFruit 214f628
Merge pull request #48 from prgrms-be-devcourse/Feature1-Book,Cart
rOyalFruit 7bd9e9b
"머지 병합 충돌 해결을 위한 파일 생성"
1m1nkim 08ff1ca
Merge Conflict Slove
1m1nkim 3edbf35
Merge Conflict Solve 2
1m1nkim 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
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
File renamed without changes.
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
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
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.
형식은 맞춰주세요.