[FEAT/A1] 샘플 데이터 추가 및 회원 상태 정지 구현, html 수정 #70
Merged
Conversation
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
# Conflicts: # Domain/src/main/resources/data.sql
approvePicture 메서드에 isSessionUserAdmin 주석처리
list.html수정 , adminlist.css ,관리자 계정 생성을 위한 form.html 추가
관리자 명단 조회를 위한 메소드 추가
관리자 계정 생성 및 리스트
# Conflicts: # Api/src/main/java/picasso/server/api/admin/controller/AdminController.java # Api/src/main/java/picasso/server/api/admin/service/AdminService.java # Api/src/main/resources/templates/admin/list.html # Domain/src/main/resources/data.sql
html , css 파일 수정 , detail.html&css 개선 필요
# Conflicts: # Api/src/main/java/picasso/server/api/admin/controller/AdminController.java # Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java # Domain/src/main/resources/data.sql
- 경매품 이미지 출력 및 Detail페이지로 이동 할 수 있게 a태그 설정.
- 출력할 물품이 없는 경우에 맞는 Block추가
- More 버튼 이벤트 추가
- Vanila Javascript Function 생성 및 인자값에 따라 다르게 가져 올 수 있도록 생성.
# Conflicts: # Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java
컨트롤러 불필요 코드 제거 , html 규격에 맞게 수정중(아직 미완)
html 파일 규격에 맞게끔 수정
# Conflicts: # Api/src/main/resources/templates/admin/form.html # Api/src/main/resources/templates/admin/list.html # Api/src/main/resources/templates/admin/memberList.html
memberlist 에러 해결 및 JPA pagenation 구현작업시작
# Conflicts: # Api/src/main/java/picasso/server/api/admin/controller/AdminController.java # Api/src/main/java/picasso/server/api/admin/service/AdminService.java # Api/src/main/resources/static/css/admindetail.css # Common/src/main/java/picasso/server/common/exception/GlobalException.java
예시 데이터 추가
샘플 데이터 수정
# Conflicts: # Domain/src/main/resources/data.sql
충돌 해결 노력
에러수정
…to feat/a1 GlobalException 에러 해결
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
.