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

리뷰 2주차 #40

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

.idea/
db_dev.mv.db
db_dev.trace.db
api-docs.json
# End of https://www.toptal.com/developers/gitignore/api/nextjs,intellij,java,gradle
File renamed without changes.
1 change: 1 addition & 0 deletions api-docs.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@ src/main/java/com/ll/nbe342team8/domain/member/member/dto/KakaoProfile.java
src/main/java/com/ll/nbe342team8/domain/member/member/dto/KakaoTokenResponse.java
src/main/java/com/ll/nbe342team8/domain/member/member/dto/KakaoUserProperties.java
src/main/java/com/ll/nbe342team8/domain/member/member/dto/KakaoUserResponse.java

# Ignore application configuration files
application.yml
application-dev.yml
application-prod.yml
application-secret.yml
7 changes: 6 additions & 1 deletion backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ repositories {

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
//implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation("io.jsonwebtoken:jjwt-api:0.11.5")

Choose a reason for hiding this comment

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

형식은 맞춰주세요.

runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
annotationProcessor 'org.projectlombok:lombok'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
Expand All @@ -44,6 +47,8 @@ dependencies {
runtimeOnly 'com.h2database:h2'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' //Swagger
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.0' // Jackson JSR310
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
}

tasks.named('test') {
Expand Down
Loading