Merge branch '発表後修正' into 'master'

最終修正

See merge request !84

src/main/java/com/example/web/EcsiteController.java

@@ -86,6 +86,8 @@ public class EcsiteController {
 	public String top(Model model, @AuthenticationPrincipal LoginUser userDetails) {
 		User user = userDetails.getUser();
 		model.addAttribute("user", user);
+		Wallets wallets = walletsService.findOne(user.getId());
+		model.addAttribute("wallets", wallets);
 		if(session.getAttribute("cartValue") ==  null) {
 			model.addAttribute("cartValue", 0);
 		}else {
@@ -116,6 +118,8 @@ public class EcsiteController {
 		//user情報取得、格納
 		User user = userDetails.getUser();
 		model.addAttribute("user", user);
+		Wallets wallets = walletsService.findOne(user.getId());
+		model.addAttribute("wallets", wallets);
 		//カート個数取得、格納
 		if(session.getAttribute("cartValue") ==  null) {
 			model.addAttribute("cartValue", 0);
@@ -131,6 +135,8 @@ public class EcsiteController {
 	public String history (@PathVariable Integer id, Model model, SalesLog salesLog, @AuthenticationPrincipal LoginUser userDetails) {
 		User user = userDetails.getUser();
 		model.addAttribute("user", user);
+		Wallets wallets = walletsService.findOne(user.getId());
+		model.addAttribute("wallets", wallets);
 		if(session.getAttribute("cartValue") ==  null) {
 			model.addAttribute("cartValue", 0);
 		}else {
@@ -146,6 +152,8 @@ public class EcsiteController {
 	public String historyDetails (@PathVariable Date created, Model model, @AuthenticationPrincipal LoginUser userDetails) {
 		User user = userDetails.getUser();
 		model.addAttribute("user", user);
+		Wallets wallets = walletsService.findOne(user.getId());
+		model.addAttribute("wallets", wallets);
 		if(session.getAttribute("cartValue") ==  null) {
 			model.addAttribute("cartValue", 0);
 		}else {

src/main/resources/static/css/slick.css

+/* Slider */
+.slick-slider
+{
+    position: relative;
+
+    display: block;
+    box-sizing: border-box;
+
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+
+    -webkit-touch-callout: none;
+    -khtml-user-select: none;
+    -ms-touch-action: pan-y;
+        touch-action: pan-y;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.slick-list
+{
+    position: relative;
+
+    display: block;
+    overflow: hidden;
+
+    margin: 0;
+    padding: 0;
+}
+.slick-list:focus
+{
+    outline: none;
+}
+.slick-list.dragging
+{
+    cursor: pointer;
+    cursor: hand;
+}
+
+.slick-slider .slick-track,
+.slick-slider .slick-list
+{
+    -webkit-transform: translate3d(0, 0, 0);
+       -moz-transform: translate3d(0, 0, 0);
+        -ms-transform: translate3d(0, 0, 0);
+         -o-transform: translate3d(0, 0, 0);
+            transform: translate3d(0, 0, 0);
+}
+
+.slick-track
+{
+    position: relative;
+    top: 0;
+    left: 0;
+
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+.slick-track:before,
+.slick-track:after
+{
+    display: table;
+
+    content: '';
+}
+.slick-track:after
+{
+    clear: both;
+}
+.slick-loading .slick-track
+{
+    visibility: hidden;
+}
+
+.slick-slide
+{
+    display: none;
+    float: left;
+
+    height: 100%;
+    min-height: 1px;
+}
+[dir='rtl'] .slick-slide
+{
+    float: right;
+}
+.slick-slide img
+{
+    display: block;
+}
+.slick-slide.slick-loading img
+{
+    display: none;
+}
+.slick-slide.dragging img
+{
+    pointer-events: none;
+}
+.slick-initialized .slick-slide
+{
+    display: block;
+}
+.slick-loading .slick-slide
+{
+    visibility: hidden;
+}
+.slick-vertical .slick-slide
+{
+    display: block;
+
+    height: auto;
+
+    border: 1px solid transparent;
+}
+.slick-arrow.slick-hidden {
+    display: none;
+}

src/main/resources/static/css/style.css

@@ -2062,3 +2062,8 @@ th, td {
 #top-footer {
 	margin-top: 70px;
 }
+
+/* ヘッダーにBalance表示 */
+#balance-li {
+	margin-top: 19px;
+}
\ No newline at end of file

src/main/resources/static/js/common.js

+$('.slick01').slick({ //{}を入れる
+    autoplay: true, //「オプション名: 値」の形式で書く
+    dots: true //複数書く場合は「,」でつなぐ
+  });
\ No newline at end of file

src/main/resources/templates/cart.html

@@ -70,6 +70,7 @@
                             <li><a id="wallets" th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallets.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li class="active"><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>
@@ -129,7 +130,7 @@
                 </div>
                 <br/>
                 <div id="walletAmount">
-                	<p id="total-price">Wallet Amount<span id="total-price-span" th:text="'&yen;' + ${wallets.amount}">10000</span></p>
+                	<p id="total-price">Balance<span id="total-price-span" th:text="'&yen;' + ${wallets.amount}">10000</span></p>
                 </div>
                 <div id="buy">
                     <button class="js-modal-open" id="buy-btn">Buy</button>

src/main/resources/templates/index.html

@@ -9,6 +9,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
       	<link rel="icon" href="images/favicon.png" th:href="@{/images/favicon.png}"/>
         <link rel="stylesheet" href="css/style.css" th:href="@{/css/style.css}"/>
+        <!-- スライドショー -->
+        <link rel="stylesheet" type="text/css" th:href="@{css/slick.css}"/>
+		<link rel="stylesheet" type="text/css" th:href="@{css/commmon.css}"/>
 		<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" 
             integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous"/> -->
         <!--[if lt IE 9]>
@@ -69,6 +72,7 @@
                             <li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallets.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>
@@ -117,7 +121,7 @@
                 </ol>
 
                 <!-- Wrapper for slides -->
-                <div class="carousel-inner" role="listbox">
+                <div class="carousel-inner slick01" role="listbox">
                     <div class="item active">
                         <img th:src="@{/images/スニーカー1.jpg}" width="1648" height="600" alt=""/>
                         <div class="carousel-caption">
@@ -271,5 +275,9 @@
             integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" 
             integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
+            
+        <!-- スライドショー -->
+        <script type="text/javascript" th:src="@{js/slick.min.js}"></script>
+		<script type="text/javascript" th:src="@{js/common.js}"></script>
     </body>
 </html>

src/main/resources/templates/list.html

@@ -92,6 +92,7 @@
                             <li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallets.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" id="shoping-cart-span" th:text="${cartValue}">0</span></a></li>
                     </ul>

src/main/resources/templates/log.html

@@ -70,6 +70,7 @@
                             <li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallets.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" id="shoping-cart-span" th:text="${cartValue}">0</span></a></li>
                    	</ul>

src/main/resources/templates/logDetails.html

@@ -70,6 +70,7 @@
                             <li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallets.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li class="active"><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>

src/main/resources/templates/management.html

@@ -135,6 +135,7 @@
                             <tr>
                                 <th>ID</th>
                                 <th>商品名</th>
+                                <th>サイズ</th>
                                 <th>価格</th>
                                 <th>在庫数</th>
                                 <th>商品画像</th>
@@ -144,6 +145,7 @@
                             <tr th:each="shoe : ${shoes}">
                                 <td th:text="${shoe.id}">1</td>
                                 <td th:text="${shoe.name}">AirMax</td>
+                                <td th:text="${shoe.size}">27</td>
                                 <td th:text="${shoe.price}">¥10,000</td>
                                 <td th:text="${shoe.stock}">10</td>
                                 <td><img class="shoeImage" th:src="@{/upload/{photo}(photo=${shoe.photo})}" alt="productImage" width="100" height="50"/></td>

src/main/resources/templates/wallets.html

@@ -70,6 +70,7 @@
                             <li class="active"><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
+                        <li id="balance-li">Balance<span th:text="'&yen;' + ${wallet.amount}">10000</span></li>
                         <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
                         <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>