Commit fa37214b authored by keita.onoguchi's avatar keita.onoguchi

Merge branch 'カート機能' into 'master'

カートルーティング追加

See merge request !31
parents 08483dad c949e8a3
...@@ -114,4 +114,11 @@ public class EcsiteController { ...@@ -114,4 +114,11 @@ public class EcsiteController {
model.addAttribute("logDetails", list); model.addAttribute("logDetails", list);
return "logDetails"; return "logDetails";
} }
@GetMapping("cart")
public String Cart(Model model, @AuthenticationPrincipal LoginUser userDetails){
User user = userDetails.getUser();
model.addAttribute("user", user);
return "Cart";
}
} }
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</div> </div>
<div id="submit-form"> <div id="submit-form">
<input type="submit" class="login" id="btn" value="Login"/> <input type="submit" class="login" id="btn" value="Login"/>
<!-- 会員登録ボタン --> 会員登録ボタン
<!--<button class="js-modal-open" id="sign-up">Sign Up</button> <button class="js-modal-open" id="sign-up">Sign Up</button>
</div> </div>
</form>--> </form>-->
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<tr class="row" id="theadTr"> <tr class="row" id="theadTr">
<th class="th col-xl-4" id="imageTh">Image</th> <th class="th col-xl-4" id="imageTh">Image</th>
<th class="th col-xl-4" id="productNameTh">Product Name</th> <th class="th col-xl-4" id="productNameTh">Product Name</th>
<th class="th col-xl-4"id="priceTh">Price</th> <th class="th col-xl-4" id="priceTh">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- 履歴ページへ遷移 --> <!-- 履歴ページへ遷移 -->
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li> <li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<!-- カートページへ遷移 --> <!-- カートページへ遷移 -->
<li><a th:href="@{/cart/{id}(id=${user.id})}">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> <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> </ul>
......
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