Skip to content

Commit

Permalink
feat: popup 수정 #45
Browse files Browse the repository at this point in the history
  • Loading branch information
bongsh0112 committed Sep 25, 2023
1 parent 9576488 commit 10942c0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions Api/src/main/resources/static/css/paymentpopup.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
height: 500px;
flex-direction: column;
justify-content: space-evenly;
background: #000000;
}

#popup-header {
Expand Down
2 changes: 1 addition & 1 deletion Api/src/main/resources/templates/fragment/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="/user/mypage">마이 페이지</a></li>
<li><a class="dropdown-item" onclick="requestPayment(event)">결제하기</a></li>
<li><a class="dropdown-item" onclick="requestPayment(event)">포인트 환전</a></li>
<th:block th:if="${session.loginUser.userRole.name() == 'ADMIN'}">
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="/admin/list">경매품 인가 대시보드</a></li>
Expand Down
8 changes: 4 additions & 4 deletions Api/src/main/resources/templates/payment/payment.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
<link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<div id="popup-menu">
<div id="popup-header">
<h1 id="popup-title">피카소 포인트 환전하기</h1>
<h1 id="popup-title" style="color: #FFFFFF">피카소 포인트 환전하기</h1>
</div>
<div id="popup-body">
<div id="payment-body">
<h3 id="price_amount">결제 금액 입력</h3>
<h3 id="price_amount" style="color: #FFFFFF">결제 금액 입력</h3>
<input id="inputPrice" onchange="inputPrice(this)" placeholder="inputPrice"/>
</div>
<h3 id="payment-method">결제 수단 선택</h3>
<h3 id="payment-method" style="color: #FFFFFF">결제 수단 선택</h3>
<div id="payment-button">
<button id="kakaopay" onclick="paymentResult(this)" th:value="${T(picasso.server.domain.domains.items.PGName).KAKAO.getValue()}" type="button"><img id="kakaopayimg" src="../static/asset/payment_icon_yellow_large.png" /></button>
<button id="tosspay" onclick="paymentResult(this)" th:value="${T(picasso.server.domain.domains.items.PGName).TOSS.getValue()}" type="button"><img id="tosspayimg" src="../static/asset/logo-toss-symbol-alpha.png" /></button>
</div>
</div>
<div id="popup-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button id="popup-closer" type="button" class="btn btn-secondary" onclick="self.close()">Close</button>
</div>
</div>
</body>
Expand Down

0 comments on commit 10942c0

Please sign in to comment.