Commit e1eebedc authored by shoei.kanno's avatar shoei.kanno

財布画面デザイン(財布画面へのリンクも追加)

parent 61493dbd
......@@ -164,4 +164,12 @@ HttpSession session;
}
return "Cart";
}
//財布画面
@GetMapping("wallets/{id}")
public String wallets(Model model, @AuthenticationPrincipal LoginUser userDetails) {
User user = userDetails.getUser();
model.addAttribute("user", user);
return "wallets";
}
}
......@@ -66,6 +66,7 @@
<li><a th:href="@{/limited/top}">Home</a></li>
<li><a th:href="@{/limited/list}">Shop</a></li>
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<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><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
......
......@@ -66,6 +66,7 @@
<li class="active"><a th:href="@{/limited/top}">Home</a></li>
<li><a th:href="@{/limited/list}">Shop</a></li>
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
</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>
......
......@@ -63,7 +63,7 @@
<!-- 履歴ページへ遷移 -->
<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><a th:href="@{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>
......@@ -92,6 +92,7 @@
<li><a th:href="@{/limited/top}">Home</a></li>
<li class="active"><a th:href="@{/limited/list}">Shop</a></li>
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
</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>
......
......@@ -66,6 +66,7 @@
<li><a th:href="@{/limited/top}">Home</a></li>
<li><a th:href="@{/limited/list}">Shop</a></li>
<li class="active"><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
</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>
......
......@@ -66,6 +66,7 @@
<li><a th:href="@{/limited/top}">Home</a></li>
<li><a th:href="@{/limited/list}">Shop</a></li>
<li class="active"><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<li><a th:href="@{/limited/wallets/{id}(id=${user.id})}">Wallets</a></li>
</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>
......
<!doctype html>
<html class="no-js" lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<!-- csrf -->
<meta name="_csrf" th:content="${_csrf.token}"/>
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
<link rel="icon" href="images/favicon.png" th:href="@{/images/favicon.png}"/>
<link rel="stylesheet" href="css/style.css" th:href="@{/css/style.css}"/>
<title>Limited</title>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script>window.html5 || document.write('<script src="js/vendor/html5shiv.js"><\/script>')</script>
<![endif]-->
</head>
<body>
<section class="header-top-section">
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="header-top-content">
<ul class="nav nav-pills navbar-left">
<li><a href="#"><i class="pe-7s-call"></i><span>123-123456789</span></a></li>
<li><a href="#"><i class="pe-7s-mail"></i><span> info@mart.com</span></a></li>
</ul>
</div>
</div>
</div>
</div>
</section>
<header class="header-section">
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><b>L</b>imited</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a th:href="@{/limited/top}">Home</a></li>
<li><a th:href="@{/limited/list}">Shop</a></li>
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<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><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>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container -->
</nav>
</header>
<!-- ログインフォーム -->
<div class="container">
<p id="online-shoe-store"><span id="online-shoe-store-span">Wallets</span></p>
<form id="login-form" method="post" th:action="@{/login}">
<div id="email-form">
<label for="login-email">Email</label>
<input type="email" class="login" name="email" id="login-email" placeholder="Email" required="required"/>
</div>
<div id="password-form">
<label for="login-password">Password</label>
<input type="password" class="login" name="password" id="login-password" placeholder="Password" required="required"/>
</div>
<div id="submit-form">
<input type="submit" class="login" id="btn" value="Login"/>
<!-- 会員登録ボタン -->
<button class="js-modal-open" id="sign-up">Sign Up</button>
</div>
</form>
</div>
<!-- footer -->
<footer class="footer" id="login-footer">
<div class="container">
<div class="row">
<div class="col-md-12">
<p class="center">Made with <i class="fa fa-heart"></i> by <a href="https://revolthemes.net/" target="_blank">Limited</a>. All Rights Reserved</p>
</div>
</div>
</div>
</footer>
<!-- モーダル中身 -->
<div class="modal js-modal">
<div class="modal__bg js-modal-close"></div>
<div class="modal__content">
<div class="sign-up-form">
<p id="sign-up-text">Sign Up</p>
<label for="name" class="sign-up-form-label">Name</label>
<input type="text" id="name" class="sign-up-form-input" placeholder="Name" required="required"/>
</div>
<div class="sign-up-form">
<label for="postal-code" class="sign-up-form-label">Postal Code</label>
<input type="text" id="postal-code" class="sign-up-form-input" placeholder="Postal Code" required="required"/>
<p class="attention">Please enter 7-digit alphanumeric characters with no hyphens.</p>
</div>
<div class="sign-up-form">
<label for="address" class="sign-up-form-label">Address</label>
<input type="text" id="address" class="sign-up-form-input" placeholder="Address" required="required"/>
<p class="attention">Please enter numbers in half-width characters.</p>
</div>
<div class="sign-up-form">
<label for="phone-number" class="sign-up-form-label">Phone Number</label>
<input type="text" id="phone-number" class="sign-up-form-input" placeholder="Phone Number" required="required"/>
<p class="attention">Please enter 11-digit alphanumeric characters with no hyphens.</p>
</div>
<div class="sign-up-form">
<label for="email" class="sign-up-form-label">Email</label>
<input type="email" id="email" class="sign-up-form-input" placeholder="Email" required="required"/>
</div>
<div class="sign-up-form">
<label for="password" class="sign-up-form-label">Password</label>
<input type="password" id="password" class="sign-up-form-input" placeholder="Password" required="required"/>
</div>
<div>
<button class="js-modal-sign-up" id="ok-btn">Ok</button>
<button class="js-modal-close" id="close-btn">Close</button>
</div>
</div><!--modal__inner-->
</div><!--modal-->
<!-- モーダル用 -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<!-- JQUERY -->
<!-- <script src="js/vendor/jquery-1.11.2.min.js" th:src="@{/js/vendor/jquery-1.11.2.min.js}"></script>
<script src="js/vendor/bootstrap.min.js" th:src="@{/js/vendor/bootstrap.min.js}"></script>
<script src="js/isotope.pkgd.min.js" th:src="@{/js/isotope.pkgd.min.js}"></script>
<script src="js/owl.carousel.min.js" th:src="@{/js/owl.carousel.min.js}"></script>
<script src="js/wow.min.js" th:src="@{/js/wow.min.js}"></script>
<script src="js/custom.js" th:src="@{/js/custom.js}"></script>-->
<script src="js/login.js" th:src="@{/js/login.js}"></script>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment