Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa

book-rent/src/main/java/com/example/demo/controller/AdminBookController.java

@@ -1,5 +1,125 @@
 package com.example.demo.controller;
 
-public class AdminBookController {
+import java.util.List;
 
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.SessionAttribute;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.common.BusinessException;
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.form.BookForm;
+import com.example.demo.service.BookAdminService;
+
+/** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */
+@Controller
+public class AdminBookController {
+    private static final String NEW = "/admin/books/new";
+    private static final String EDIT = "/admin/books/edit";
+
+    private final BookAdminService bookAdminService;
+
+    public AdminBookController(BookAdminService bookAdminService) {
+        this.bookAdminService = bookAdminService;
+    }
+
+    // ===== BOOK-02 登録 =====
+    @GetMapping(NEW)
+    public String newInput(Model model) {
+        return input(new BookForm(), List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/input")
+    public String newBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/confirm")
+    public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+        return confirm("書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/execute")
+    public String newExecute(@ModelAttribute("form") BookForm form,
+                             @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                             Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.register(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
+        }
+        ra.addFlashAttribute("message", "書籍登録が完了しました。");
+        return "redirect:" + NEW + "/complete";
+    }
+
+    @GetMapping(NEW + "/complete")
+    public String newComplete(Model model) {
+        model.addAttribute("backUrl", "/books");
+        model.addAttribute("backLabel", "書籍一覧に戻る");
+        return "complete";
+    }
+
+    // ===== BOOK-03 編集 =====
+    @GetMapping(EDIT)
+    public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
+        try {
+            BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
+            return input(form, List.of(), "書籍編集", EDIT, model);
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+    }
+
+    @PostMapping(EDIT + "/input")
+    public String editBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/confirm")
+    public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+        return confirm("書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/execute")
+    public String editExecute(@ModelAttribute("form") BookForm form,
+                              @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                              Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.update(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
+        }
+        ra.addFlashAttribute("message", "書籍編集が完了しました。");
+        return "redirect:" + EDIT + "/complete";
+    }
+
+    @GetMapping(EDIT + "/complete")
+    public String editComplete(Model model) {
+        return newComplete(model);
+    }
+
+    private String input(BookForm form, List<String> errors, String title, String base, Model model) {
+        model.addAttribute("form", form);
+        model.addAttribute("errors", errors);
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookInput";
+    }
+
+    private String confirm(String title, String base, Model model) {
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookConfirm";
+    }
 }

book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java

@@ -1,5 +1,34 @@
 package com.example.demo.controller;
 
-public class GlobalExceptionHandler {
 
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+/** 予期しない例外：内部情報を画面に出さず、原因調査用にログへ出力する（NFR-04, NFR-08） */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /** 存在しないURL（favicon.ico など）はエラーログを出さず404にする */
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ModelAndView handleNotFound(NoResourceFoundException e) {
+        ModelAndView mav = new ModelAndView("error");
+        mav.setStatus(HttpStatus.NOT_FOUND);
+        mav.addObject("errorMessage", "ページが見つかりません。");
+        return mav;
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ModelAndView handle(Exception e) {
+        log.error("予期しないエラーが発生しました", e);
+        ModelAndView mav = new ModelAndView("error");
+        mav.addObject("errorMessage", "システムエラーが発生しました。しばらくしてからもう一度お試しください。");
+        return mav;
+    }
 }

book-rent/src/main/java/com/example/demo/controller/LoanContorller.java

@@ -1,5 +0,0 @@
-package com.example.demo.controller;
-
-public class LoanContorller {
-
-}

book-rent/src/main/java/com/example/demo/controller/LoanController.java

@@ -0,0 +1,113 @@
+package com.example.demo.controller;
+
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.SessionAttribute;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.common.BusinessException;
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.service.LoanService;
+
+/** LOAN-01：書籍貸出申請（一般ユーザーのみ）。入力 → 確認 → 完了 */
+@Controller
+@RequestMapping("/loan")
+public class LoanController {
+    private final LoanService loanService;
+
+    public LoanController(LoanService loanService) {
+        this.loanService = loanService;
+    }
+
+    /** 書籍一覧 →（申請ボタン）→ 申請入力 */
+    @GetMapping("/apply")
+    public String input(@RequestParam Integer idBook,
+                        @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+                        Model model, RedirectAttributes ra) {
+        return showInput(idBook, "", "", List.of(), user, model, ra);
+    }
+
+    /** 確認画面 →（申請情報入力に戻る）→ 申請入力（入力値を保持） */
+    @PostMapping("/apply/input")
+    public String back(@RequestParam Integer idBook,
+                       @RequestParam(defaultValue = "") String dateBorrow,
+                       @RequestParam(defaultValue = "") String dateScheduledReturn,
+                       @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+                       Model model, RedirectAttributes ra) {
+        return showInput(idBook, dateBorrow, dateScheduledReturn, List.of(), user, model, ra);
+    }
+
+    /** 申請入力 →（申請確認）→ 確認 */
+    @PostMapping("/apply/confirm")
+    public String confirm(@RequestParam Integer idBook,
+                          @RequestParam(defaultValue = "") String dateBorrow,
+                          @RequestParam(defaultValue = "") String dateScheduledReturn,
+                          @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+                          Model model, RedirectAttributes ra) {
+        List<String> errors = loanService.validateDates(dateBorrow, dateScheduledReturn);
+        if (!errors.isEmpty()) {
+            return showInput(idBook, dateBorrow, dateScheduledReturn, errors, user, model, ra);
+        }
+        if (user.isAdmin()) return "redirect:/menu";
+        try {
+            model.addAttribute("book", loanService.getLendableBook(idBook));
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+        model.addAttribute("idBook", idBook);
+        model.addAttribute("dateBorrow", dateBorrow);
+        model.addAttribute("dateScheduledReturn", dateScheduledReturn);
+        return "loanApplyConfirm";
+    }
+
+    /** 確認 →（申請）→ 完了。二重送信防止のため登録後はリダイレクトする（PRG） */
+    @PostMapping("/apply/execute")
+    public String execute(@RequestParam Integer idBook,
+                          @RequestParam(defaultValue = "") String dateBorrow,
+                          @RequestParam(defaultValue = "") String dateScheduledReturn,
+                          @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+                          RedirectAttributes ra) {
+        if (user.isAdmin()) return "redirect:/menu";
+        try {
+            Integer id = loanService.apply(idBook, dateBorrow, dateScheduledReturn, user);
+            ra.addFlashAttribute("message", "書籍貸出申請が完了しました。（申請ID：" + id + "）");
+            return "redirect:/loan/apply/complete";
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+    }
+
+    @GetMapping("/apply/complete")
+    public String complete(Model model) {
+        model.addAttribute("backUrl", "/books");
+        model.addAttribute("backLabel", "書籍一覧に戻る");
+        return "complete";
+    }
+
+    private String showInput(Integer idBook, String dateBorrow, String dateScheduledReturn, List<String> errors,
+                             LoginUser user, Model model, RedirectAttributes ra) {
+        if (user.isAdmin()) return "redirect:/menu";   // 申請は一般ユーザーのみ
+        try {
+            model.addAttribute("book", loanService.getLendableBook(idBook));
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+        model.addAttribute("idBook", idBook);
+        model.addAttribute("dateBorrow", dateBorrow);
+        model.addAttribute("dateScheduledReturn", dateScheduledReturn);
+        model.addAttribute("errors", errors);
+        return "loanApplyInput";
+    }
+}

book-rent/src/main/java/com/example/demo/controller/LoginController.java

@@ -1,5 +1,73 @@
 package com.example.demo.controller;
 
-public class LoginController {
 
+import java.util.Optional;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.service.AuthService;
+
+/** AUTH-01：ログイン／ログアウト（login.html） */
+@Controller
+public class LoginController {
+    private final AuthService authService;
+
+    public LoginController(AuthService authService) {
+        this.authService = authService;
     }
+
+    @GetMapping("/")
+    public String root() {
+        return "redirect:/menu";
+    }
+
+    @GetMapping("/login")
+    public String loginForm(HttpSession session) {
+        if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
+            return "redirect:/menu";
+        }
+        return "login";
+    }
+
+    @PostMapping("/login")
+    public String login(@RequestParam(defaultValue = "") String mailAddress,
+                        @RequestParam(defaultValue = "") String password,
+                        HttpServletRequest request, Model model) {
+        String mail = mailAddress.trim();
+        model.addAttribute("mailAddress", mail);   // 入力値を保持（パスワードは保持しない）
+
+        if (mail.isEmpty() || password.isEmpty()) {
+            model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
+            return "login";
+        }
+        Optional<LoginUser> user = authService.authenticate(mail, password);
+        if (user.isEmpty()) {
+            // どちらが誤りかは分からない文言にする
+            model.addAttribute("errorMessage", "メールアドレスまたはパスワードが正しくありません。");
+            return "login";
+        }
+        // セッション固定化攻撃対策：古いセッションを破棄して新規発行
+        HttpSession old = request.getSession(false);
+        if (old != null) {
+            old.invalidate();
+        }
+        request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
+        return "redirect:/menu";
+    }
+
+    @PostMapping("/logout")
+    public String logout(HttpSession session) {
+        session.invalidate();
+        return "redirect:/login";
+    }
+}
+

book-rent/src/main/java/com/example/demo/controller/MenuController.java

@@ -1,19 +1,13 @@
 package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+/** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
 @Controller
 public class MenuController {
-
     @GetMapping("/menu")
-    public String showMenu(Model model) {
+    public String menu() {
-
-        // 仮のログインユーザー名
-        model.addAttribute("loginUserName", "テストユーザー");
-
-        // menu.htmlを表示
         return "menu";
     }
 }

book-rent/src/main/java/com/example/demo/form/BookForm.java

@@ -1,6 +1,5 @@
 package com.example.demo.form;
 
-
 /** 書籍登録・編集フォーム */
 public class BookForm {
 	private Integer idBook;
@@ -11,20 +10,62 @@ public class BookForm {
 	private String note = "";
 
 	public void trim() {
-        isbn = t(isbn); nmBook = t(nmBook); knBook = t(knBook); publisher = t(publisher); note = t(note);
+		isbn = t(isbn);
+		nmBook = t(nmBook);
+		knBook = t(knBook);
+		publisher = t(publisher);
+		note = t(note);
 	}
-    private static String t(String s) { return s == null ? "" : s.trim(); }
 
-    public Integer getIdBook() { return idBook; }
+	private static String t(String s) {
-    public void setIdBook(Integer v) { this.idBook = v; }
+		return s == null ? "" : s.trim();
-    public String getIsbn() { return isbn; }
+	}
-    public void setIsbn(String v) { this.isbn = v; }
+
-    public String getNmBook() { return nmBook; }
+	public Integer getIdBook() {
-    public void setNmBook(String v) { this.nmBook = v; }
+		return idBook;
-    public String getKnBook() { return knBook; }
+	}
-    public void setKnBook(String v) { this.knBook = v; }
+
-    public String getPublisher() { return publisher; }
+	public void setIdBook(Integer v) {
-    public void setPublisher(String v) { this.publisher = v; }
+		this.idBook = v;
-    public String getNote() { return note; }
+	}
-    public void setNote(String v) { this.note = v; }
+
+	public String getIsbn() {
+		return isbn;
+	}
+
+	public void setIsbn(String v) {
+		this.isbn = v;
+	}
+
+	public String getNmBook() {
+		return nmBook;
+	}
+
+	public void setNmBook(String v) {
+		this.nmBook = v;
+	}
+
+	public String getKnBook() {
+		return knBook;
+	}
+
+	public void setKnBook(String v) {
+		this.knBook = v;
+	}
+
+	public String getPublisher() {
+		return publisher;
+	}
+
+	public void setPublisher(String v) {
+		this.publisher = v;
+	}
+
+	public String getNote() {
+		return note;
+	}
+
+	public void setNote(String v) {
+		this.note = v;
+	}
 }

book-rent/src/main/resources/static/css/style.css

@@ -0,0 +1,90 @@
+body
+{font-family:
+	"Meiryo","Hiragino Sans",sans-serif;
+	margin:0;color:#222;
+	background:#f6f7f9}
+header.top
+{display:flex;
+	justify-content:space-between;
+	align-items:center;
+	background:#176a78;color:#fff;
+	padding:10px 20px
+}
+header.top form
+{display:inline;
+	margin:0}
+header.top .user
+{margin-right:12px
+}
+main
+{max-width:960px;
+	margin:24px auto;
+	padding:0 16px
+}
+h1
+{font-size:20px
+}
+.card
+{background:#fff;
+	border:1px solid #dde;
+	border-radius:6px;
+	padding:20px;
+	margin-bottom:16px
+}
+label
+{display:block;
+	margin:10px 0 4px;
+	font-weight:bold
+}
+input[type=text],input[type=password],input[type=email]
+{width:100%;
+	max-width:360px;
+	padding:6px;
+	box-sizing:border-box
+}
+button,.btn
+{display:inline-block;
+	background:#176a78;
+	color:#fff;border:0;
+	border-radius:4px;
+	padding:7px 16px;
+	cursor:pointer;
+	text-decoration:none;
+	font-size:14px
+}
+button.sub,.btn.sub
+{background:#6b7b80
+}
+.error
+{background:#fdecea;color:#b3261e;
+	border:1px solid #f5c2be;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+.info
+{background:#e8f4ea;
+	color:#1b5e20;
+	border:1px solid #bfdcc3;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+table
+{border-collapse:collapse;
+	width:100%;
+	background:#fff
+}
+th,td
+{border:1px solid #dde;
+	padding:6px 8px;
+	text-align:left;
+	font-size:14px
+}
+th
+{background:#eaf4f6
+}
+.menu a
+{display:block;
+	margin:8px 0
+}

book-rent/src/main/resources/templates/applicationConfirm.html

@@ -0,0 +1,37 @@
+<!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>
+	<table>
+		<!-- エラーメッセージ -->
+		<div class="msgBox error" th:if="${messageError != null}">
+			<span class="error" th:text="${messageError.message}"></span>
+			<th class="header">蔵書ID</th>
+			<td>
+				<input placeholder="蔵書ID" th:field="*{id_book}" type="number" />
+			</td>
+			<th class="header">書籍名</th>
+			<td>
+				<input placeholder="蔵書ID" th:field="*{nm_book}" type="text" />
+			</td>
+			<th class="header">貸出日</th>
+			<td>
+				<input placeholder="貸出日" th:field="*{date_borrow}" type="text" />
+			</td>
+			<th class="header">返却予定日</th>
+			<td>
+				<input placeholder="返却予定日" th:field="*{date_schedule_return}" type="text" />
+			</td>
+
+			<a href="applicationComplete/html" class="btn"> 申請</a>
+	</table>
+	<a href="@{/application}">申請情報入力</a>
+</body>
+
+</html>

book-rent/src/main/resources/templates/applicationList.html

@@ -0,0 +1,34 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍貸出申請一覧（承認待ち）</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <p th:if="${#lists.isEmpty(list)}">承認待ちの申請はありません。</p>
+    <table th:unless="${#lists.isEmpty(list)}">
+      <thead><tr><th>申請ID</th><th>申請者名</th><th>書籍名</th><th>申請日</th><th>貸出日</th><th>返却予定日</th><th>操作</th></tr></thead>
+      <tbody>
+        <tr th:each="r : ${list}">
+          <td th:text="${r.idRequest}"></td>
+          <td th:text="${r.nmApplicant}"></td>
+          <td th:text="${r.nmBook}"></td>
+          <td th:text="${r.dateRequest}"></td>
+          <td th:text="${r.dateBorrow}"></td>
+          <td th:text="${r.dateScheduledReturn}"></td>
+          <td><a class="btn" th:href="@{/admin/applications/{id}(id=${r.idRequest})}">承認</a></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <p><a class="btn sub" th:href="@{/menu}">メニューに戻る</a></p>
+</main>
+</body>
+</html>

book-rent/src/main/resources/templates/error.html

@@ -0,0 +1,17 @@
+<!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>
+<main>
+  <h1>エラー</h1>
+  <div class="card">
+    <div class="error" th:text="${errorMessage} ?: 'エラーが発生しました。'"></div>
+    <a class="btn" th:href="@{/menu}">メニューに戻る</a>
+  </div>
+</main>
+</body>
+</html>

book-rent/src/main/resources/templates/fragments/header.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<body>
+	<!-- ログイン後の全画面共通ヘッダー：右上にログイン者名とログアウト（要件定義書 7.1） -->
+	<header class="top" th:fragment="header">
+		<span>書籍貸出管理システム</span>
+		<span>
+			<span class="user" th:text="${session.loginUser.nmEmployee}">社員名</span>
+			<form th:action="@{/logout}" method="post"><button type="submit" class="sub">ログアウト</button></form>
+		</span>
+	</header>
+</body>
+
+</html>

book-rent/src/main/resources/templates/frament/header.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>

book-rent/src/main/resources/templates/login.html

@@ -3,92 +3,121 @@
 
 <head>
 	<meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- 外部スクリプトの読み込み -->
-    <script th:src="@{/js/common.js}"></script>
-
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-
 	<title>ログイン</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
+	<main>
+		<h1>書籍貸出管理システム</h1>
+		<div class="card">
+			<h2>ログイン</h2>
+			<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+			<form th:action="@{/login}" method="post">
+				<label for="mailAddress">メールアドレス</label>
+				<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}"
+					autocomplete="username">
+				<label for="password">パスワード</label>
+				<input type="password" id="password" name="password" autocomplete="current-password">
+				<p><button type="submit">ログイン</button></p>
+			</form>
+		</div>
+	</main>
+</body>
 
-    <div class="loginContainer">
+</html>
 
-        <h1>ログイン</h1>
+<!--<!DOCTYPE html>-->
+<!--<html xmlns:th="http://www.thymeleaf.org">-->
 
-        <form th:action="@{/doLogin}"
+<!--<head>-->
-              method="post"
+<!--    <meta charset="UTF-8">-->
-              th:object="${loginInfoForm}">
+<!--    <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
+
+<!--     外部スクリプトの読み込み -->
+<!--    <script th:src="@{/js/common.js}"></script>-->
+
+<!--     CSSの読み込み -->
+<!--    <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
+<!--    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
+
+<!--    <title>ログイン</title>-->
+<!--</head>-->
+
+<!--<body>-->
+
+<!--    <div class="loginContainer">-->
+
+<!--        <h1>ログイン</h1>-->
+
+<!--        <form th:action="@{/doLogin}"-->
+<!--              method="post"-->
+<!--              th:object="${loginInfoForm}">-->
 
 <!--             エラーメッセージ -->
-            <div class="msgBox error"
+<!--            <div class="msgBox error"-->
-                 th:if="${messageError != null}">
+<!--                 th:if="${messageError != null}">-->
-                <span class="error"
+<!--                <span class="error"-->
-                      th:text="${messageError.message}"></span>
+<!--                      th:text="${messageError.message}"></span>-->
-            </div>
+<!--            </div>-->
 
-            <table>
+<!--            <table>-->
 <!--                 メールアドレス -->
-                <tr>
+<!--                <tr>-->
-                    <th class="header">メールアドレス</th>
+<!--                    <th class="header">メールアドレス</th>-->
-                    <td>
+<!--                    <td>-->
-                        <input
+<!--                        <input-->
-                            id="mailAddress"
+<!--                            id="mailAddress"-->
-                            type="text"
+<!--                            type="text"-->
-                            th:field="*{mailAddress}"
+<!--                            th:field="*{mailAddress}"-->
-                            placeholder="メールアドレス"
+<!--                            placeholder="メールアドレス"-->
-                            required
+<!--                            required-->
-                        />
+<!--                        />-->
-                    </td>
+<!--                    </td>-->
-                </tr>
+<!--                </tr>-->
 
 <!--                 パスワード -->
-                <tr>
+<!--                <tr>-->
-                    <th class="header">パスワード</th>
+<!--                    <th class="header">パスワード</th>-->
-                    <td>
+<!--                    <td>-->
-                        <input
+<!--                        <input-->
-                            id="password"
+<!--                            id="password"-->
-                            type="password"
+<!--                            type="password"-->
-                            th:field="*{password}"
+<!--                            th:field="*{password}"-->
-                            placeholder="パスワード"
+<!--                            placeholder="パスワード"-->
-                            required
+<!--                            required-->
-                        />
+<!--                        />-->
-                    </td>
+<!--                    </td>-->
-                </tr>
+<!--                </tr>-->
 
 <!--                 ボタン -->
-                <tr>
+<!--                <tr>-->
-                    <td class="btnArea" colspan="2">
+<!--                    <td class="btnArea" colspan="2">-->
-                        <input
+<!--                        <input-->
-                            type="submit"
+<!--                            type="submit"-->
-                            value="ログイン"
+<!--                            value="ログイン"-->
-                        />
+<!--                        />-->
 
-                        <button
+<!--                        <button-->
-                            type="button"
+<!--                            type="button"-->
-                            onclick="clearInput()">
+<!--                            onclick="clearInput()">-->
-                            リセット
+<!--                            リセット-->
-                        </button>
+<!--                        </button>-->
-                    </td>
+<!--                    </td>-->
-                </tr>
+<!--                </tr>-->
-            </table>
+<!--            </table>-->
 
-        </form>
+<!--        </form>-->
 
-    </div>
+<!--    </div>-->
 
 <!--     入力内容のリセット -->
-    <script>
+<!--    <script>-->
-        function clearInput() {
+<!--        function clearInput() {-->
-            document.getElementById('mailAddress').value = '';
+<!--            document.getElementById('mailAddress').value = '';-->
-            document.getElementById('password').value = '';
+<!--            document.getElementById('password').value = '';-->
-        }
+<!--        }-->
-    </script>
+<!--    </script>-->
 
-</body>
+<!--</body>-->
-</html>
+<!--</html>-->

book-rent/src/main/resources/templates/menu.html

@@ -1,12 +1,10 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
 <head>
   <meta charset="UTF-8">
   <title>メニュー</title>
-<!--	<link rel="stylesheet" th:href="@{/css/style.css}">-->
+  <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
-
 <body>
 <div th:replace="~{fragments/header :: header}"></div>
 <main>
@@ -24,5 +22,4 @@
   </div>
 </main>
 </body>
-
 </html>

book-rent/src/main/resources/templates/returnConfirm.html

@@ -0,0 +1,31 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍返却確認</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <table>
+      <tr><th>申請ID</th><td th:text="${r.idRequest}"></td></tr>
+      <tr><th>申請者名</th><td th:text="${r.nmApplicant}"></td></tr>
+      <tr><th>申請日</th><td th:text="${r.dateRequest}"></td></tr>
+      <tr><th>ISBN</th><td th:text="${r.isbn}"></td></tr>
+      <tr><th>書籍名</th><td th:text="${r.nmBook}"></td></tr>
+      <tr><th>出版社</th><td th:text="${r.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${r.note}"></td></tr>
+      <tr><th>貸出日</th><td th:text="${r.dateBorrow}"></td></tr>
+      <tr><th>返却予定日</th><td th:text="${r.dateScheduledReturn}"></td></tr>
+    </table>
+  </div>
+  <form method="post" style="display:inline" th:action="@{/admin/lendings/{id}/return(id=${r.idRequest})}"><button type="submit">返却</button></form>
+  <a class="btn sub" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
+</main>
+</body>
+</html>