From 129aa849c5224220c8dc6ea69e81b9639b5afbde Mon Sep 17 00:00:00 2001 From: hydrationn Date: Wed, 15 May 2024 17:25:34 +0900 Subject: [PATCH] =?UTF-8?q?style:=20#89=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20ge?= =?UTF-8?q?tmapping=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/UserPointDetailApiClient.java | 2 +- .../controller/UserPointDetailController.java | 4 ++-- .../templates/main/fragment/mypageSidebar.html | 2 +- .../main/{pointdetails => page}/pointdetail.html | 14 ++++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) rename src/main/resources/templates/main/{pointdetails => page}/pointdetail.html (84%) diff --git a/src/main/java/com/t3t/frontserver/pointdetail/client/UserPointDetailApiClient.java b/src/main/java/com/t3t/frontserver/pointdetail/client/UserPointDetailApiClient.java index ce027442..5e6195d0 100644 --- a/src/main/java/com/t3t/frontserver/pointdetail/client/UserPointDetailApiClient.java +++ b/src/main/java/com/t3t/frontserver/pointdetail/client/UserPointDetailApiClient.java @@ -20,6 +20,6 @@ public interface UserPointDetailApiClient { * @param pointDetailType 조회할 포인트 타입(사용/적립) * @author hydrationn(박수화) */ - @GetMapping("/t3t/bookstore/members/point-details") + @GetMapping("/t3t/bookstore/mypage/point-details") public ResponseEntity>> getPointDetailByPointDetailType(@RequestParam(name = "pointDetailType", required = false) String pointDetailType); } \ No newline at end of file diff --git a/src/main/java/com/t3t/frontserver/pointdetail/controller/UserPointDetailController.java b/src/main/java/com/t3t/frontserver/pointdetail/controller/UserPointDetailController.java index c2c2a7c0..3b7e19e1 100644 --- a/src/main/java/com/t3t/frontserver/pointdetail/controller/UserPointDetailController.java +++ b/src/main/java/com/t3t/frontserver/pointdetail/controller/UserPointDetailController.java @@ -25,7 +25,7 @@ public class UserPointDetailController { * @return 포인트 사용/적립 내역 뷰 * @author hydrationn(박수화) */ - @GetMapping("/member/point-details") + @GetMapping("/mypage/point-details") public String pointDetailView(Model model, @Valid @RequestParam(value = "pointDetailType", required = false) String pointDetailType) { // 로그인 정보가 없으면 로그인 페이지로 이동 @@ -50,6 +50,6 @@ public String pointDetailView(Model model, @Valid @RequestParam(value = "pointDe model.addAttribute("pointDetails", pointDetails); - return "main/pointdetails/pointdetail"; + return "main/page/pointdetail"; } } diff --git a/src/main/resources/templates/main/fragment/mypageSidebar.html b/src/main/resources/templates/main/fragment/mypageSidebar.html index ea33368e..3f58aef8 100644 --- a/src/main/resources/templates/main/fragment/mypageSidebar.html +++ b/src/main/resources/templates/main/fragment/mypageSidebar.html @@ -43,7 +43,7 @@

쿠폰 및 포인트 정보

보유 쿠폰 내역
  • - 포인트 이력 + 포인트 이력
  • 쿠폰 이력 diff --git a/src/main/resources/templates/main/pointdetails/pointdetail.html b/src/main/resources/templates/main/page/pointdetail.html similarity index 84% rename from src/main/resources/templates/main/pointdetails/pointdetail.html rename to src/main/resources/templates/main/page/pointdetail.html index f7f3fb7d..9ef01603 100644 --- a/src/main/resources/templates/main/pointdetails/pointdetail.html +++ b/src/main/resources/templates/main/page/pointdetail.html @@ -1,18 +1,20 @@ + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="main/layout/mypageLayout">
    +

    +

    +

    회원 포인트 내역 조회

    - 전체 - 사용 - 적립 + 전체 + 사용 + 적립