Merge branch 'h-seya' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi

# Conflicts:
#	src/main/resources/templates/book.html
#	src/main/resources/templates/topmenu.html

src/main/resources/templates/login.html

@@ -1,29 +1,35 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-<meta charset="UTF-8">
-<title>ログイン</title>
+	<meta charset="UTF-8">
+	<title>ログイン</title>
 </head>
+
 <body>
-	
+
 	<h1>ログイン</h1>
-	<form action="doLogin"
-	      method="post"
-	      th:object="${loginInfoForm}">
 
-	    <div class="msgBox error" th:if="${messageError} != null">
-	        <span class="error" th:text="${messageError.message}"></span>
-	    </div>
+	<p class="message message-error" th:if="${loginError}" th:text="${loginError}">
+	</p>
 
-	    <table>
-	            <tr>
-	            <td class="btnArea" colspan="2">
-	                <input type="submit" value="ログイン"/>
-	                <button onclick="clearInput()">リセット</button>
-	            </td>
-	        </tr>
-	    </table>
+	<form th:action="@{/login}" th:object="${loginForm}" method="post">
+		<div class="form-group">
+			<label for="employeeId">社員ID</label>
+			<input id="employeeId" type="text" th:field="*{employeeId}">
+			<p class="field-error" th:errors="*{employeeId}"></p>
+		</div>
+
+		<div class="form-group">
+			<label for="passwordHash">パスワード</label>
+			<input id="passwordHash" type="password" th:field="*{passwordHash}">
+			<p class="field-error" th:errors="*{passwordHash}"></p>
+		</div>
+
+		<input type="submit" value="ログイン">
+		<input type="reset" value="リセット">
 	</form>
 
 </body>
+
 </html>

src/main/resources/templates/update.html

@@ -5,6 +5,13 @@
 <title>図書情報更新入力</title>
 </head>
 <body>
-
+	更新入力画面
+	
+	<form method="post" action="updateconfirm">
+		<button type="submit" class="btn-login">
+			 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+				  更新内容確認
+		 </button>
+	</form>
 </body>
 </html>

src/main/resources/templates/updateConfirm.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>更新内容確認</title>
+</head>
+<body>
+更新内容確認画面
+
+      <form method="post" action="update">
+		   <button type="submit" class="btn-login">
+               <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+				    戻る
+		   </button>
+	  </form>
+	  
+	  <form method="post" action="bookUpdate">
+	  	   <button type="submit" class="btn-login">
+	                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+	  			    更新完了
+	  	   </button>
+	    </form>
+</body>
+</html>