最終調整途中

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

@@ -135,6 +135,11 @@ public class EcsiteController {
 		model.addAttribute("user", user);
 		List<SalesLog> list = salesLogService.history(id);
 		model.addAttribute("log", list);
+		if(session.getAttribute("cartValue") ==  null) {
+			model.addAttribute("cartValue", 0);
+		}else {
+			model.addAttribute("cartValue",session.getAttribute("cartValue"));
+		}
 		return "log";
 	}
 	
@@ -148,6 +153,11 @@ public class EcsiteController {
 		}
 		List<SalesLog> list = salesLogService.historyDetails(created, user.getId());
 		model.addAttribute("logDetails", list);
+		if(session.getAttribute("cartValue") ==  null) {
+			model.addAttribute("cartValue", 0);
+		}else {
+			model.addAttribute("cartValue",session.getAttribute("cartValue"));
+		}
 		return "logDetails";
 	}
 	
@@ -189,6 +199,11 @@ public class EcsiteController {
 		model.addAttribute("user", user);
 		wallet = walletsService.findOne(id);
 		model.addAttribute("wallet", wallet);
+		if(session.getAttribute("cartValue") ==  null) {
+			model.addAttribute("cartValue", 0);
+		}else {
+			model.addAttribute("cartValue",session.getAttribute("cartValue"));
+		}
 		return "wallets";
 	}
 	

src/main/resources/templates/log.html

@@ -70,7 +70,7 @@
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
                         <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">0</span></a></li>
+                        <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>
                     </div><!-- /.navbar-collapse -->
                 </div><!-- /.container -->

src/main/resources/templates/logDetails.html

@@ -70,7 +70,7 @@
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
                         <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">0</span></a></li>
+                        <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>
                     </div><!-- /.navbar-collapse -->
                 </div><!-- /.container -->

src/main/resources/templates/wallets.html

@@ -31,6 +31,18 @@
                             </ul>
                         </div>
                     </div>
+                    <div  class="col-md-6">
+                        <div class="header-top-menu">
+                            <ul class="nav nav-pills navbar-right">
+                                <!-- 履歴ページへ遷移 -->
+                                <li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
+                                <!-- カートページへ遷移 -->
+                                <li><a th:href="@{/limited/cart}">Cart</a></li>
+                                <!-- ログアウト -->
+                                <li><form th:action="@{/logout}" method="post"><input type="submit" value="logout" style="border:none;background-color:transparent;text-decoration:none;" class="logoutBtn"/></form></li>
+                            </ul>
+                        </div>
+                    </div>
                 </div>
             </div>
         </section>
@@ -58,7 +70,7 @@
                         </ul>
                         <ul class="nav navbar-nav navbar-right cart-menu">
                         <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">0</span></a></li>
+                        <li><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
                     </ul>
                     </div><!-- /.navbar-collapse -->
                 </div><!-- /.container -->