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.

Sign up for GitHub

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

Jump to bottom

[FEAT/A1] 샘플 데이터 추가 및 회원 상태 정지 구현, html 수정 #70

Merged
merged 62 commits into from
Sep 26, 2023
Merged

[FEAT/A1] 샘플 데이터 추가 및 회원 상태 정지 구현, html 수정 #70

merged 62 commits into from
Sep 26, 2023

Commits on Sep 15, 2023

  1. admin_list

    @Romangduck
    Romangduck committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    1bb385d View commit details
    Browse the repository at this point in the history

  2. admin_list , detail in Controller -ing

    @Romangduck
    Romangduck committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    9c44196 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. figuring Request

    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    b5e7945 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/donsonioc2010/picasso into f… 

    …eat/a1
    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    4a61fac View commit details
    Browse the repository at this point in the history

  3. feat : temp commit

    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8a0c801 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into feat/a1

    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    73cd0a0 View commit details
    Browse the repository at this point in the history

  5. figuring JPA Entity Admin

    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    2e06866 View commit details
    Browse the repository at this point in the history

  6. figuring list.html with thymeleaf

    @Romangduck
    Romangduck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    c02c008 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. figuring list controller & list service

    @Romangduck
    Romangduck committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    c0dfbd2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/donsonioc2010/picasso into f… 

    …eat/a1
    @Romangduck
    Romangduck committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e479f1a View commit details
    Browse the repository at this point in the history

  3. feat : temp commit

    @Romangduck
    Romangduck committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    983d3ba View commit details
    Browse the repository at this point in the history

  4. git merge dev branch

    @Romangduck
    Romangduck committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    5061d39 View commit details
    Browse the repository at this point in the history

  5. figuring detail controller , service & html with thymeleaf

    @Romangduck
    Romangduck committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    60b267f View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. figuring Approve

    @Romangduck
    Romangduck committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    dad9f8c View commit details
    Browse the repository at this point in the history

  2. modify for exception and error

    @Romangduck
    Romangduck committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    1ecf74c View commit details
    Browse the repository at this point in the history

  3. finished approve , detail and list figuring

    @Romangduck
    Romangduck committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    c70d5d7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into feat/a1

    @Romangduck
    Romangduck authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    23fb718 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge branch 'dev' into feat/a1 

    # Conflicts:
#	Domain/src/main/resources/data.sql
    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    01a7a2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feat/a1

    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    75865a3 View commit details
    Browse the repository at this point in the history

  3. dev

    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    bfc20b0 View commit details
    Browse the repository at this point in the history

  4. feat : 테이블 명 수정에 따른 쿼리 변경

    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    7ca061a View commit details
    Browse the repository at this point in the history

  5. feat : AdminBackEnd완료

    @donsonioc2010
    donsonioc2010 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    00fbe53 View commit details
    Browse the repository at this point in the history

  6. Add Modified admin's BackEnd file 

    approvePicture 메서드에 isSessionUserAdmin 주석처리
    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    2a9a0e0 View commit details
    Browse the repository at this point in the history

  7. Add , modify frontEnd css&html 

    list.html수정 , adminlist.css ,관리자 계정 생성을 위한 form.html
추가
    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    cf7212a View commit details
    Browse the repository at this point in the history

  8. Add list of Admin and etc for using it 

    관리자 명단 조회를 위한 메소드 추가
    @Romangduck
    Romangduck committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    4e2468f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Add Admin Account form & list 

    관리자 계정 생성 및 리스트
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    8d24fb9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feat/a1 

    # 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
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    d3a8d4e View commit details
    Browse the repository at this point in the history

  3. feat: modal, index header, footer 수정 #45

    @bongsh0112
    bongsh0112 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    09af3c5 View commit details
    Browse the repository at this point in the history

  4. Modify html & css, need to revise detail.html&css 

    html , css 파일 수정 , detail.html&css 개선 필요
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    4ff7458 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into feat/a1 

    # 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
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    54cbd6b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into 45/feat-exchange-ui

    @donsonioc2010
    donsonioc2010 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    25a3d25 View commit details
    Browse the repository at this point in the history

  7. Modify for dependency 

    의존성 해결을 위한 수정
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7f4fb98 View commit details
    Browse the repository at this point in the history

  8. feat : Login, Join Link 추가

    @donsonioc2010
    donsonioc2010 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    1d79536 View commit details
    Browse the repository at this point in the history

  9. Modify code reviewing 

    사용할 Dto 만 적용가능 하게끔 SignUpAdminRequestDto 작성후 적용
Build패턴-> 해당 Dto만 적용
높은 가시성을 위한 메서드 네이밍 및 경로 재설정
    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    3a180ac View commit details
    Browse the repository at this point in the history

  10. 안ìì�안쓰는 ì�의존설성 정리

    @Romangduck
    Romangduck committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    d3ee6dc View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. feat : footer 링크 추가 및 Project 정보 추가

    @donsonioc2010
    donsonioc2010 committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    87ffa7f View commit details
    Browse the repository at this point in the history

  2. feat : Header수정, 및 Bootstrap파일 변경을 위해서 Bootstrap 직접 static에서 가져오도록 변경… 

    …, 관리자 계정 쿼리 추가
    @donsonioc2010
    donsonioc2010 committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    76cb8c6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 45/feat-exchange-ui

    @donsonioc2010
    donsonioc2010 committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    c5c2c14 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. feat : 관리자 UI작업중

    @donsonioc2010
    donsonioc2010 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    c10280b View commit details
    Browse the repository at this point in the history

  2. style : footer size 변경

    @donsonioc2010
    donsonioc2010 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    7837f9d View commit details
    Browse the repository at this point in the history

  3. feat : 로그아웃 li 추가, 로그인시 사용자 닉네임과 포인트 출력 추가

    @donsonioc2010
    donsonioc2010 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    0348871 View commit details
    Browse the repository at this point in the history

  4. style : UI Header, 관리자 컷

    @donsonioc2010
    donsonioc2010 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    1c13a53 View commit details
    Browse the repository at this point in the history

  5. feat : 메인페이지 UI 

    - 경매품 이미지 출력 및 Detail페이지로 이동 할 수 있게 a태그 설정.
- 출력할 물품이 없는 경우에 맞는 Block추가
- More 버튼 이벤트 추가
    - Vanila Javascript Function 생성 및 인자값에 따라 다르게 가져 올 수 있도록 생성.
    @donsonioc2010
    donsonioc2010 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    d259fa8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into feat/a1 

    # Conflicts:
#	Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java
    @Romangduck
    Romangduck committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    1bc6541 View commit details
    Browse the repository at this point in the history

  7. Modify front_end & admincontroller 

    컨트롤러 불필요 코드 제거 , html 규격에 맞게 수정중(아직 미완)
    @Romangduck
    Romangduck committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    28df991 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Modify Admin HTML 

    html 파일 규격에 맞게끔 수정
    @Romangduck
    Romangduck committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    694b5ce View commit details
    Browse the repository at this point in the history

  2. feat : index 누락 태그 추가

    @donsonioc2010
    donsonioc2010 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    27b44b6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into feat/a1 

    # 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
    @Romangduck
    Romangduck committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    bcddef7 View commit details
    Browse the repository at this point in the history

  4. Modify & Add 

    -
    @Romangduck
    Romangduck committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    ea0fd81 View commit details
    Browse the repository at this point in the history

  5. Modify error from memberlist.html & Start to add pagenation with JPA 

    memberlist 에러 해결 및 JPA pagenation 구현작업시작
    @Romangduck
    Romangduck committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7438371 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge branch 'dev' of https://github.com/donsonioc2010/picasso into dev 

    Merge
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    6b9cf5d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/a1' into dev 

    # 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
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d280177 View commit details
    Browse the repository at this point in the history

  3. Add ExamData 

    예시 데이터 추가
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    cbc84ae View commit details
    Browse the repository at this point in the history

  4. Modify Example Data 

    샘플 데이터 수정
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    e1fff53 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/donsonioc2010/picasso into dev 

    충돌 해결
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    b0fff07 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/a1' into dev 

    # Conflicts:
#	Domain/src/main/resources/data.sql
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d3428ac View commit details
    Browse the repository at this point in the history

  7. Try to resolve conflicts 

    충돌 해결 노력
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    ec3daa4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into feat/a1

    @Romangduck
    Romangduck authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    da2c6ad View commit details
    Browse the repository at this point in the history

  9. Modify error 

    에러수정
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    7d0acc5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feat/a1' of https://github.com/donsonioc2010/picasso in… 

    …to feat/a1

GlobalException 에러 해결
    @Romangduck
    Romangduck committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    9f94884 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' into feat/a1

    @Romangduck
    Romangduck authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    f98de4f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' into feat/a1

    @donsonioc2010
    donsonioc2010 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    769ffde View commit details
    Browse the repository at this point in the history