[ADD] 貸出中図書一覧の返却処理を追加しました。

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

src/main/java/com/example/demo/controller/BookLendController.java

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 @Controller
 public class BookLendController {
 		@PostMapping("/bookLend")
-		public String welcome() {
+		public String bookLend() {
 			return "bookLend";
 		}
 	

src/main/java/com/example/demo/controller/BookUpdateConfirmController.java

@@ -0,0 +1,13 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class BookUpdateConfirmController {
+	
+	@PostMapping("/updateconfirm")
+	public String updateConfirm() {
+		return "updateconfirm";
+	}
+}

src/main/java/com/example/demo/controller/BookUpdateController.java

@@ -0,0 +1,19 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class BookUpdateController {
+
+	@PostMapping("/update")
+	public String update() {
+		return "update";
+	}
+	
+	@PostMapping("/bookUpdate")
+	public String bookUpdate() {
+		return "book";
+	}
+	
+}

src/main/java/com/example/demo/controller/LendListController.java

@@ -1,13 +1,36 @@
 package com.example.demo.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.demo.service.BookLendService;
+
 
 @Controller
 public class LendListController {
+	
+	@Autowired
+	private BookLendService lendlistService;
+	
 	@GetMapping("/lendList")
-	public String lendList() {
+	public String list(Model model) {
+		
+ 		// findAllを使って、DBから一覧を取得　でバックで取得したのを確認
+		model.addAttribute("list",lendlistService.findAll());
+		
 		return "lendList";
 		
 	}
+	
+	@GetMapping("/return-book")
+	public String retun(@RequestParam(name="lendId") int returnBook){
+		
+		lendlistService.regist(returnBook);
+	
+	
+	return  "bookLendResult";
+}
 }

src/main/java/com/example/demo/controller/LoginController.java

@@ -1,24 +1,79 @@
 package com.example.demo.controller;
 
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
+
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.service.LoginService;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
+@RequiredArgsConstructor
 public class LoginController {
 
-    @GetMapping("/login")
-    public String showLogin() {
-        return "login";
-    }
+	private final LoginService loginService;
 
-    @PostMapping("/doLogin")
-    public String doLogin() {
-        return "redirect:/topmenu";
-    }
+	// Boot起動直後にログイン画面に移動する用のメソッド
+	@GetMapping("/")
+	public String index(HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+		return "redirect:/login";
+	}
 
-    @GetMapping("/topmenu")
-    public String showTopMenu() {
-        return "topmenu";
-    }
+	@GetMapping("/login")
+	public String loginForm(Model model, HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+
+		model.addAttribute("loginForm", new LoginForm());
+		return "login";
+	}
+
+	// 実際のログイン処理
+	@PostMapping("/login")
+	public String doLogin(
+			@Valid @ModelAttribute LoginForm loginForm,
+			BindingResult bindingResult,
+			Model model,
+			HttpSession session) {
+
+		if (bindingResult.hasErrors()) {
+			return "login";
+		}
+
+		AccountEntity accountEntity = loginService.login(loginForm);
+		if (accountEntity == null) {
+			model.addAttribute("loginError",
+					"ログインIDまたはパスワードが正しくありません");
+			return "login";
+		}
+
+		session.setAttribute("loginEmployee", accountEntity);
+		return "redirect:/topmenu";
+	}
+	
+	// ログアウト処理
+	@GetMapping("/logout")
+	public String logout(HttpSession session) {
+		session.invalidate();
+		return "redirect:/login";
+	}
+
+	// 各画面からトップメニューへの遷移用
+	@GetMapping("/topmenu")
+	public String showTopMenu() {
+		return "topmenu";
+	}
 }

src/main/java/com/example/demo/entity/AccountEntity.java

@@ -0,0 +1,40 @@
+package com.example.demo.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/*
+ * accountテーブル用のEntityクラス
+ * ログイン時やセッションでの管理者判別に使う
+ */
+
+@Entity
+@Table(name = "account")
+@Getter
+@Setter
+@NoArgsConstructor
+public class AccountEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="login_info_id")
+	private Integer loginInfoId;
+	
+	@Column(name="employee_id")
+	private Integer employeeId;
+	
+	@Column(name="password_hash")
+	private String passwordHash;
+	
+	@Column(name="admin_flag")
+	private int adminFlag;
+	
+}

src/main/java/com/example/demo/entity/Book.java

@@ -9,6 +9,7 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -25,7 +26,7 @@ public class Book {
 	private int bookId;
 
 	// 図書管理ID（BK-1など）
-	@Column(name = "book_manage_id", nullable = true)
+	@Column(name = "book_manage_id", nullable = true, unique = true)
 	private String bookManageId;
 
 	// タイトル
@@ -77,7 +78,7 @@ public class Book {
 
 	// 寄贈者社員ID??
 	@ManyToOne
-	@JoinColumn(name = "donor_id", nullable = false)
+	@JoinColumn(name = "donor_id", nullable = true)
 	private Employee employee;
 
 	//備考
@@ -87,5 +88,8 @@ public class Book {
 	//申請承認フラグ
 	@Column(name = "book_approval", nullable = false)
 	private Integer bookApproval;
-
+	
+	@OneToOne(mappedBy = "book")
+	private BookLend bookLends;
+	
 }

src/main/java/com/example/demo/entity/BookLend.java

@@ -7,6 +7,9 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -22,12 +25,13 @@ public class BookLend {
 	private int lendId;
 
 	// 図書管理ID（BK-1など）
-	@Column(name = "book_manage_id", nullable = false)
-	private String bookManageId;
+	@OneToOne
+	@JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false)
+	private Book book;
 
-	// 図書管理ID（BK-1など）
-	@Column(name = "employee_id", nullable = false)
-	private Integer employeeId;
+	@ManyToOne
+	@JoinColumn(name = "employee_id", nullable = false)
+	private Employee employeeBooklend;
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)

src/main/java/com/example/demo/entity/Employee.java

@@ -34,4 +34,7 @@ public class Employee {
 	@OneToMany(mappedBy = "employee")
 	private List<Book> employees = new ArrayList<>();
 	
+	@OneToMany(mappedBy = "employeeBooklend")
+	private List<BookLend> employeesBooklend = new ArrayList<>();
+	
 }

src/main/java/com/example/demo/form/LoginForm.java

@@ -0,0 +1,17 @@
+package com.example.demo.form;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Data
+public class LoginForm {
+
+	@NotNull(message = "社員IDを入力してください")
+	private Integer employeeId;
+
+	@NotBlank(message = "パスワードを入力してください")
+	private String passwordHash;
+
+}

src/main/java/com/example/demo/repository/AccountRepository.java

@@ -0,0 +1,11 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.AccountEntity;
+
+public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
+	
+	AccountEntity findByEmployeeId (Integer employeeId);
+
+}

src/main/java/com/example/demo/repository/BookLendRepository.java

@@ -0,0 +1,15 @@
+package com.example.demo.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookLend;
+
+@Repository
+public interface BookLendRepository extends JpaRepository<BookLend, Integer> {
+
+	List<BookLend> findBybookStatus(Integer bookStatus);
+	
+}

src/main/java/com/example/demo/service/BookLendService.java

@@ -0,0 +1,34 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.entity.BookLend;
+import com.example.demo.repository.BookLendRepository;
+
+@Service
+public class BookLendService {
+
+	@Autowired
+	private BookLendRepository bookLendRepository;
+
+	public List<BookLend> findAll() {
+		return bookLendRepository.findBybookStatus(1);
+		
+		
+	}
+	
+	@Transactional
+	public void regist(Integer lendId) {
+	
+		BookLend booklend = bookLendRepository.findById(lendId).orElse(null);
+		
+		booklend.setBookStatus(0); 
+
+		bookLendRepository.save(booklend);
+	}
+
+}

src/main/java/com/example/demo/service/LoginService.java

@@ -0,0 +1,31 @@
+package com.example.demo.service;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.repository.AccountRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class LoginService {
+	
+	private final AccountRepository accountRepository;
+	
+	public AccountEntity login(LoginForm form) {
+		AccountEntity accountEntity = 
+				accountRepository.findByEmployeeId(form.getEmployeeId());
+		
+		if(accountEntity == null) {
+			return null;
+		}
+		
+		if(!accountEntity.getPasswordHash().equals(form.getPasswordHash()))
+			return null;
+		
+		return accountEntity;
+	}
+
+}

src/main/resources/templates/book.html

@@ -19,43 +19,42 @@
 					<tr>
 						<th>図書ID</th>
 						<th>ISBN</th>
-						<th>書籍名</th>
+						<th>タイトル</th>
 						<th>著者名</th>
 						<th>出版社</th>
 						<th>出版日</th>
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>貸出状態</th>
 						<th>本の状態</th>
-						<th>備考</th>
 						<th>登録日時</th>
 						<th>更新日時</th>
 						<th>寄贈者</th>
-						<th>??</th>
-						<th>操作</th>
+						<th>貸出状態??</th>
+						<th>操作??</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="b : ${book}">
-						<td th:text="*{b.bookId}"></td>
-						<td th:text="*{b.bookManageId}"></td>
-						<td th:text="*{b.title}"></td>
-						<td th:text="*{b.isbn}"></td>
-						<td th:text="*{b.author}"></td>
-						<td th:text="*{b.publisher}"></td>
-						<td th:text="*{b.publicationDate}"></td>
-						<td th:text="*{b.bookSubcategory.bookSubcategoryName}"></td>
-						<td th:text="*{b.bookSubcategory.bookCategory.bookCategoryName}"></td>
-						<td th:text="*{b.storageLocation.locationName}"></td>
-						<td th:text="*{b.condition}"></td>
-						<td th:text="*{b.createdAt}"></td>
-						<td th:text="*{b.updatedAt}"></td>
-						<td th:text="*{b.isDeleted}"></td>
-						<td th:text="${b.donorId != null ? b.donorId : '-'}"></td>
-						<td th:text="*{b.description}"></td>
-						<td th:text="*{b.bookApproval}"></td>
+					<tr th:each="book : ${book}">
+						
+						<td th:text="*{book.bookManageId}"></td>
+						<td th:text="*{book.isbn}"></td>
+						<td th:text="*{book.title}"></td>
+						<td th:text="*{book.author}"></td>
+						<td th:text="*{book.publisher}"></td>
+						<td th:text="*{book.publicationDate}"></td>
+						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
+						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
+						<td th:text="*{book.storageLocation.locationName}"></td>
+						<td th:text="*{book.condition}"></td>
+						<td th:text="*{book.createdAt}"></td>
+						<td th:text="*{book.updatedAt}"></td>
+						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? book.bookLends.bookStatus : '-'}"></td>
+						
+						
+						
 					</tr>
 				</tbody>
 			</table>
@@ -72,6 +71,30 @@
 			</button>
 		</form>
 
+		<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="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>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookLendResult.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>貸出中図書、返却処理結果画面</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<h1>返却処理が完了しました。</h1>
+
+	<td>
+		<form th:action="@{/lendList}" method="get">
+			<button type="submit" th:value="貸出">貸出中図書一覧に戻る</button>
+	</td>
+	
+</body>
+
+</html>

src/main/resources/templates/lendList.html

@@ -1,47 +1,62 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 
 <head>
 	<meta charset="UTF-8">
 	<title>貸出中図書一覧</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
 	<h1>貸出中図書一覧</h1>
+
 	
-	<!-- action先要修正 -->
-	<form action="/lendList" method="GET">
-		<input type="submit" value="返却" class="btn">
-	</form>
+		<table>
 
-	<!-- 以下ポップアップ -->
-	<div id="registerModal" class="modal-overlay">
+			<thead>
+				<tr>
+					<th>社員ID</th>
+					<th>社員名</th>
+					<th>管理ID</th>
+					<th>タイトル</th>
+					<th>返却予定日</th>
 
-		<div class="modal">
-
-			<div class="modal-message">
-				返却処理が完了しました！
-			</div>
-
-			<div class="modal-buttons">
-
-				<!-- OK -->
-				<form method="get" action="/lendList">
-
-					<button type="submit" class="modal-btn">
-						OK
-					</button>
-
-				</form>
+				</tr>
+			</thead>
 
 
+			<tbody>
+				<tr th:each="booklist : ${list}">
 
-			</div>
+					<td th:text="*{booklist.employeeBooklend.employeeId}"></td>
+					<td th:text="*{booklist.employeeBooklend.employeeName}"></td>
+					<td th:text="*{booklist.book.bookManageId}"></td>
+					<td th:text="*{booklist.book.title}"></td>
+					<td th:text="*{booklist.bookReturnDate}"></td>
 
-		</div>
 
-	</div>
+					<td>
+						<form th:action="@{/return-book}" method="get">
+							<button type="submit" name="lendId" th:value="${booklist.lendId}"
+								onclick="return MoveCheck();">返却
+							</button>
+						</form>
+					</td>
 
+				</tr>
+				
+			</tbody>
+			
+		</table>
+
+
+		<script>
+
+			function MoveCheck() {
+				return window.confirm("返却処理を実行します。よろしいですか？");
+			}
+
+		</script>
 
 </body>
 

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/topmenu.html

@@ -1,31 +1,54 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
-<title>トップメニュー</title>
+	<meta charset="UTF-8">
+	<title>トップメニュー</title>
 </head>
+
 <body>
+
+	<div class="header-bar">
+
+		<div class="header-left">
+			ShareBooks
+		</div>
+
+		<div class="header-right">
+
+			<span class="user">
+				テストユーザー（一般）
+			</span>
+
+			<a class="button-link" th:href="@{/logout}">
+				ログアウト
+			</a>
+
+		</div>
+
+
+	</div>
+
 	<h1>
 		メインメニュー
 	</h1>
-	
-	
+
+
 	<!-- ===== 共通：社内図書一覧 ===== -->
-		<form method="post" name="社内図書一覧" action="book">
-		    <a href="javascript:form1.submit()">リンク名</a>
-				<button type="submit" class="btn-book">
 
-				<h3>社内図書一覧</h3>
+	<a class="card" href="/book">
 
-				<p>
-					登録されている図書の<br> 一覧を表示します。
-				</p>
-				</button>
-		</form>
-		<hr> <!--区切り線-->
+		<h3>社内図書一覧</h3>
+
+		<p>
+			登録されている図書の<br> 一覧を表示します。
+		</p>
+	</a>
+
+	<hr> <!--区切り線-->
 
 	<!-- ===== 共通：寄贈申請 ===== -->
-	
+
 	<a class="card" href="/bookApproval">
 
 		<h3>寄贈申請</h3>
@@ -34,11 +57,11 @@
 			寄贈申請フォームの<br> 入力を行います。
 		</p>
 	</a>
-	
+
 	<hr>
-	
+
 	<!-- ===== 管理者のみ ===== -->
-	
+
 	<a class="card" href="/bookInsert">
 
 		<h3>新規図書登録</h3>
@@ -49,19 +72,19 @@
 	</a>
 
 	<hr>
-	
-	
+
+
 	<a class="card" href="/lendList">
-		
+
 		<h3>貸出中図書一覧</h3>
 
 		<p>
 			貸出中図書の<br> 一覧を表示します。
-		</p> 
+		</p>
 	</a>
-	
+
 	<hr>
-	
+
 	<a class="card" href="/approvalReceive">
 
 		<h3>寄贈申請受信BOX</h3>
@@ -70,16 +93,17 @@
 			寄贈申請の<br> 受信一覧を確認します。
 		</p>
 	</a>
-	
+
 	<hr>
-	
+
 	<a class="card" href="/passwordChange">
 		<h3>パスワード変更</h3>
-		
+
 		<p>
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
 
 </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>