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

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

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

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

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

@@ -0,0 +1,23 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.SessionAttributes;
+
+@Controller
+@SessionAttributes("bookApprovalForm") //セッションに保存
+public class BookApprovalController {
+
+    @GetMapping("/bookApproval")
+    public String bookApproval() {
+        return "bookApproval";
+    }
+
+    @PostMapping("/bookApprovalConfirm")
+    public String bookApprovalConfirm() {
+        return "bookApprovalConfirm";
+    }
+}
+
+ 

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

@@ -0,0 +1,28 @@
+package com.example.demo.controller;
+
+import java.util.List;
+
+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 com.example.demo.entity.Book;
+import com.example.demo.service.BookServiceImpl;
+
+@Controller
+public class BookController {
+	@Autowired
+	private BookServiceImpl bookService;
+	
+	@GetMapping("/book")
+	public String book(Model model) {
+		
+		List<Book> aaa = bookService.findAll();
+		
+		// DBから取得したデータをHTMLで扱えるようにする
+		model.addAttribute("book",bookService.findAll());
+		return "book";
+	}
+
+}

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

@@ -0,0 +1,14 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class BookInsertConfirmController {
+	@GetMapping("/bookInsertConfirm")
+	public String bookInsertConfirm() {
+		return "bookInsertConfirm";
+		
+	}
+
+}

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

@@ -0,0 +1,13 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class BookInsertController {
+	@GetMapping("bookInsert")
+		public String bookInsert() {
+			return "bookInsert";
+		
+	}
+}

src/main/java/com/example/demo/controller/BookLendController.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 BookLendController {
+		@PostMapping("/bookLend")
+		public String bookLend() {
+			return "bookLend";
+		}
+	
+
+}

src/main/java/com/example/demo/controller/BookLendReturnController.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 BookLendReturnController {
+		@PostMapping("/bookLendConfirmation")
+		public String bookLendConfirmation() {
+			return "book";
+		}
+	
+
+}

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

@@ -0,0 +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 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")
+	private final LoginService loginService;
-    public String showLogin() {
-        return "login";
-    }
 
-    @PostMapping("/doLogin")
+	// Boot起動直後にログイン画面に移動する用のメソッド
-    public String doLogin() {
+	@GetMapping("/")
-        return "redirect:/topmenu";
+	public String index(HttpSession session) {
-    }
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+		return "redirect:/login";
+	}
 
-    @GetMapping("/topmenu")
+	@GetMapping("/login")
-    public String showTopMenu() {
+	public String loginForm(Model model, HttpSession session) {
-        return "topmenu";
+		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/controller/PasswordChangeController.java

@@ -0,0 +1,14 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PasswordChangeController {
+
+    @GetMapping("/passwordChange")
+    public String showPasswordChange() {
+
+        return "passwordChange";
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.example.demo.entity;
+
+import java.sql.Date;
+
+import jakarta.persistence.Column;
+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;
+
+@Entity // このクラスがDBのテーブルに対応することを表す
+@Data
+@Table(name = "book")
+public class Book {
+
+	//図書ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "book_id", nullable = false)
+	private int bookId;
+
+	// 図書管理ID（BK-1など）
+	@Column(name = "book_manage_id", nullable = true, unique = true)
+	private String bookManageId;
+
+	// タイトル
+	@Column(name = "title", nullable = false)
+	private String title;
+
+	//ISBN
+	@Column(name = "isbn", nullable = false)
+	private String isbn;
+
+	// 著者名
+	@Column(name = "author", nullable = false)
+	private String author;
+
+	// 出版社
+	@Column(name = "publisher", nullable = true)
+	private String publisher;
+
+	// 出版日
+	@Column(name = "publication_date", nullable = true)
+	private Date publicationDate;
+
+	// サブカテゴリーID!!
+	@ManyToOne
+	@JoinColumn(name = "book_subcategory_id", nullable = false)
+	private BookSubcategory bookSubcategory;
+
+	// 保管場所
+	@ManyToOne
+	@JoinColumn(name = "location_id", nullable = false)
+	private StorageLocation storageLocation;
+
+
+	// 本の状態
+	@Column(name = "condition_s", nullable = false)
+	private int condition;
+
+	// 登録日
+	@Column(name = "created_at", nullable = false)
+	private Date createdAt;
+
+	// 更新日
+	@Column(name = "updated_at", nullable = false)
+	private Date updatedAt;
+
+	//削除フラグ
+	@Column(name = "is_deleted", nullable = false)
+	private Integer isDeleted;
+
+	// 寄贈者社員ID??
+	@ManyToOne
+	@JoinColumn(name = "donor_id", nullable = true)
+	private Employee employee;
+
+	//備考
+	@Column(name = "description", nullable = true)
+	private String description;
+
+	//申請承認フラグ
+	@Column(name = "book_approval", nullable = false)
+	private Integer bookApproval;
+	
+	@OneToOne(mappedBy = "book")
+	private BookLend bookLends;
+	
+}

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

@@ -0,0 +1,80 @@
+package com.example.demo.entity;
+
+import java.time.LocalDate;
+
+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.Data;
+
+/*
+ * 【JPAエンティティ】department テーブルの「1行」を表すJavaオブジェクト。
+ * JDBCではSQL結果を手動で詰め替えていたが、JPAは
+ * 「クラス⇔テーブル」「フィールド⇔カラム」の対応を書いておけば自動でやってくれる。
+ */
+
+@Data
+@Entity
+@Table(name = "book") // DBのテーブルに対応するエンティティであることを宣言
+public class BookApproval { // 対応テーブル名（クラス名と違うので明示）
+
+	/*
+	 * @Id             … 主キー（エンティティに必須）
+	 * @GeneratedValue … DB側で自動採番。IDENTITY = MySQLのAUTO_INCREMENTを使う
+	 * @Column(name)   … カラム名。フィールド名と違うので明示
+	 */
+	
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "book_id")
+    private Integer bookId;
+
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+
+    @Column(name = "isbn")
+    private String isbn;
+
+    @Column(name = "author")
+    private String author;
+
+    @Column(name = "publisher")
+    private String publisher;
+
+    @Column(name = "publication_date")
+    private LocalDate publicationDate;
+
+    @Column(name = "book_subcategory_id")
+    private Integer bookSubcategoryId;
+
+    @Column(name = "location_id")
+    private Integer locationId;
+
+    @Column(name = "condition_s")
+    private Integer conditionS;
+
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+
+    @Column(name = "donor_id")
+    private Integer donorId;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+}

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

@@ -0,0 +1,28 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="book_category")
+public class BookCategory {
+
+    @Id
+    @Column(name = "book_category_id")
+    private Integer bookCategoryId;
+
+    @Column(name = "book_category_name")
+    private String bookCategoryName;
+    
+    @OneToMany(mappedBy = "bookCategory")
+	private List<BookSubcategory> BookSubcategories = new ArrayList<>();
+}

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

@@ -0,0 +1,47 @@
+package com.example.demo.entity;
+
+import java.sql.Date;
+
+import jakarta.persistence.Column;
+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;
+
+@Entity // このクラスがDBのテーブルに対応することを表す
+@Data
+@Table(name = "book_lend")
+public class BookLend {
+	//貸出ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "lend_Id", nullable = false)
+	private int lendId;
+
+	// 図書管理ID（BK-1など）
+	@OneToOne
+	@JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false)
+	private Book book;
+
+	@ManyToOne
+	@JoinColumn(name = "employee_id", nullable = false)
+	private Employee employeeBooklend;
+
+	// 貸出日
+	@Column(name = "book_lend_date", nullable = false)
+	private Date bookLendDate;
+
+	// 返却日
+	@Column(name = "book_return_date", nullable = false)
+	private Date bookReturnDate;
+
+	// 貸出状態
+	@Column(name = "book_status", nullable = false)
+	private Integer bookStatus;
+}

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

@@ -0,0 +1,34 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "book_subcategory")
+public class BookSubcategory {
+	@Id
+	@Column(name = "book_subcategory_id")
+	private Integer bookSubcategoryId;
+
+	@ManyToOne
+	@JoinColumn(name = "book_category_id", nullable = false)
+	private BookCategory bookCategory;
+
+	@Column(name = "book_subcategory_name")
+	private String bookSubcategoryName;
+
+	@OneToMany(mappedBy = "bookSubcategory")
+	private List<Book> Books = new ArrayList<>();
+	
+}

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

@@ -0,0 +1,40 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity // このクラスがDBのテーブルに対応することを表す
+@Data
+@Table(name = "employee")
+public class Employee {
+	//社員ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "employee_Id", nullable = false)
+	private int employeeId;
+
+	// 社員名
+	@Column(name = "employee_name", nullable = false)
+	private String employeeName;
+
+	//部署ID
+	@Column(name = "department_id", nullable = false)
+	private Integer departmentId;
+	
+	@OneToMany(mappedBy = "employee")
+	private List<Book> employees = new ArrayList<>();
+	
+	@OneToMany(mappedBy = "employeeBooklend")
+	private List<BookLend> employeesBooklend = new ArrayList<>();
+	
+}

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

@@ -0,0 +1,34 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity // このクラスがDBのテーブルに対応することを表す
+@Data
+@Table(name = "storage_location")
+public class StorageLocation {
+	//保管場所ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "location_id", nullable = false)
+	private int locationId;
+
+	// 保管場所名
+	@Column(name = "location_name", nullable = false)
+	private String locationName;
+	
+	@OneToMany(mappedBy = "storageLocation")
+	private List<Book> Location = new ArrayList<>();
+	
+
+}

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

@@ -0,0 +1,51 @@
+package com.example.demo.form;
+
+import java.time.LocalDate;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor //全フィールドを初期化するコンストラクタが生成
+@NoArgsConstructor //デフォルトコンストラクタを自動で生成
+public class BookApprovalForm {
+	
+	//社員ID
+	private String employeeId;
+	
+	//社員名
+	private String employeeName;
+	
+	//タイトル（必須）
+	@NotBlank(message = "タイトルは必須です")
+    private String title;
+
+	//著者名（必須）
+    @NotBlank(message = "著者名は必須です")
+    private String author;
+
+    //本の状態（必須）
+    @NotBlank(message = "本の状態は必須です")
+    private String bookCondition;
+    
+    //出版社（任意）
+    private String publisher;
+
+    //ISBN（任意）
+    private String isbn;
+
+    //出版日（任意）
+    private LocalDate publishDate;
+
+    //備考（任意）
+    //最大400文字
+    @Size(max = 400, message = "備考は400文字以内で入力してください")
+    private String remarks;
+
+}
+
+

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

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

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/BookApprovalRepository.java

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookApproval;
+
+
+	@Repository
+	public interface BookApprovalRepository extends JpaRepository<BookApproval, Integer>{
+	}
+

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

@@ -0,0 +1,10 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.BookCategory;
+
+public interface BookCategoryRepository
+        extends JpaRepository<BookCategory,Integer> {
+
+}

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/repository/BookRepository.java

@@ -0,0 +1,10 @@
+package com.example.demo.repository;
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.Book;
+
+public interface BookRepository extends JpaRepository<Book, Integer>{
+
+}

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

@@ -0,0 +1,61 @@
+package com.example.demo.service;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.entity.BookApproval;
+import com.example.demo.form.BookApprovalForm;
+import com.example.demo.repository.BookApprovalRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class BookApprovalService {
+
+	private final BookApprovalRepository bookApprovalRepository;
+
+	/*
+	 * 【登録(regist)】
+	 * @Transactional … このメソッドを1トランザクションで実行。途中で例外が出れば全ロールバック。
+	 *
+	 * Controllerから来る employee.department は new して departmentId だけ入れた「仮」オブジェクト。
+	 * JPAから見ると管理下にない(detached)状態なので、そのまま保存すると
+	 * 部署まで新規INSERTしようとするなど事故のもと。
+	 * → findById で「管理下(managed)の本物のDepartment」を取り直し、紐付けてから save する。
+	 *
+	 * save()：主キー(employeeId)がnullなのでINSERTになり、AUTO_INCREMENTのIDが採番される。
+	 */
+
+@Transactional
+ public void regist(BookApprovalForm bookApprovalForm) {
+
+	        BookApproval entity = new BookApproval();
+
+	        //必須こうもく
+	        entity.setTitle(bookApprovalForm.getTitle());
+	        entity.setAuthor(bookApprovalForm.getAuthor());
+
+	        //任意
+	        entity.setPublisher(bookApprovalForm.getPublisher());
+	        entity.setIsbn(bookApprovalForm.getIsbn());
+	        entity.setPublicationDate(bookApprovalForm.getPublishDate());
+	        entity.setDescription(bookApprovalForm.getRemarks());
+
+	        //本の状態
+	        entity.setConditionS(Integer.parseInt(bookApprovalForm.getBookCondition()));
+
+	        //寄贈者
+	        entity.setDonorId(Integer.parseInt(bookApprovalForm.getEmployeeId()));
+
+	       
+
+	        //登録日時
+	        entity.setCreatedAt(LocalDate.now());
+	        entity.setUpdatedAt(LocalDate.now());
+
+	        bookApprovalRepository.save(entity);
+	    }
+	}

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/BookService.java

@@ -0,0 +1,11 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import com.example.demo.entity.Book;
+
+public interface BookService {
+	String booklist(Book book);
+
+	List<java.awt.print.Book> findAll();
+}

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

@@ -0,0 +1,35 @@
+package com.example.demo.service;
+
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Book;
+import com.example.demo.repository.BookRepository;
+
+@Service
+public class BookServiceImpl{
+	
+	@Autowired
+	private BookRepository bookRepository;
+	
+//	@Override
+//	public String booklist(com.example.demo.entity.Book book) {
+//		Book booklist = new Book();
+//		booklist.setBookId(book.getBookId());
+//		
+//		return null;
+//	}
+	
+	
+
+	public List<Book> findAll() {
+		return bookRepository.findAll();
+	}
+
+	
+	
+
+}

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/static/js/passwordChange.js

@@ -0,0 +1,62 @@
+function togglePassword(id) {
+
+    const input = document.getElementById(id);
+
+    if (input === null) {
+        return;
+    }
+
+    if (input.type === "password") {
+        input.type = "text";
+    } else {
+        input.type = "password";
+    }
+}
+
+
+function clearForm() {
+
+    const form = document.getElementById("pwForm");
+
+    if (form === null) {
+        return;
+    }
+
+    form.reset();
+}
+
+
+
+function showCompletedPopup() {
+
+    const completedDialog = document.getElementById("completedDialog");
+
+    if (completedDialog === null) {
+        return;
+    }
+
+    completedDialog.showModal();
+}
+
+function goTopMenu() {
+
+    const topMenuUrl = document.body.dataset.topmenuUrl;
+
+    if (topMenuUrl) {
+        window.location.href = topMenuUrl;
+        return;
+    }
+
+    window.location.href = "/topmenu";
+}
+
+function goLogin(){
+	const loginUrl = document.body.dataset.loginUrl;
+	
+	if (loginUrl){
+		window.location.href = loginUrl;
+		return;
+	}
+	
+	window.location.href="/login"	
+}

src/main/resources/templates/approvalReceive.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>寄贈申請 受信BOX</title>
+</head>
+
+<body>
+	<h1>寄贈申請 受信BOX</h1>
+	<!-- action先要修正 -->
+	<form action="/approvalReceive" method="GET">
+		<input type="submit" value="承認" class="btn">
+	</form>
+	
+	<!-- action先要修正 -->
+	<form action="/approvalReceive" method="GET">
+		<input type="submit" value="却下" class="btn">
+	</form>
+	
+	<!-- 新規登録画面へ遷移 -->
+	<form action="/bookInsert" method="GET">
+		<input type="submit" value="登録" class="btn">
+	</form>
+	
+	<!-- action先要修正 -->
+	<form action="/approvalReceive" method="GET">
+		<input type="submit" value="戻る" class="btn">
+	</form>
+
+
+</body>
+
+</html>

src/main/resources/templates/book.html

@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>社内図書一覧</title>
+</head>
+
+<body>
+	<div class="container">
+		<h1>社内図書一覧</h1>
+		<div class="float-end">
+		</div>
+		<form method="get" action="bookLend">
+
+			<table class="table table-striped">
+				<thead>
+					<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>
+					</tr>
+				</thead>
+
+				<tbody>
+					<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>
+
+
+			<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>
+
+		<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/bookApproval.html

@@ -0,0 +1,573 @@
+<!DOCTYPE html>
+<html lang="ja">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+	<title>寄贈申請フォーム</title>
+
+	
+	</head>
+
+<body>
+
+	<!-- =========================
+     ヘッダー
+     ========================= -->
+
+	<header class="header">
+
+		<div class="logo">
+			📖 ShareBooks
+		</div>
+
+		<div class="header-right">
+
+			<!-- サインイン中アカウント -->
+			<span class="account" title="サインイン中のアカウント">
+
+				山田 太郎 さん（一般ユーザ）
+
+			</span>
+
+			<!-- ログアウト -->
+			<button type="button" class="logout-btn">
+
+				ログアウト
+
+			</button>
+
+		</div>
+
+	</header>
+
+
+	<!-- =========================
+     レイアウト
+     ========================= -->
+
+	<div class="wrapper">
+
+
+		<!-- =========================
+         サイドメニュー
+         ========================= -->
+
+		<aside class="sidebar">
+
+			<div class="sidebar-title">
+				一般メニュー
+			</div>
+
+			<ul class="menu">
+
+				<li>
+					🏠 トップメニュー
+				</li>
+
+				<li class="active">
+					📘 新規図書申請
+				</li>
+
+			</ul>
+
+		</aside>
+
+
+		<!-- =========================
+         メイン
+         ========================= -->
+
+		<main class="main">
+
+
+			<!-- パンくず -->
+
+			<div class="breadcrumb">
+				トップメニュー ＞ 新規図書申請
+			</div>
+
+
+			<!-- タイトル -->
+
+			<h1 class="page-title">
+				寄贈申請フォーム
+			</h1>
+
+
+			<!-- 説明 -->
+
+			<div class="description">
+				図書の寄贈を希望する方は、以下のフォームに入力し、
+				「確認」ボタンを押してください。
+			</div>
+
+
+			<!-- 必須項目説明 -->
+
+			<div class="required-note">
+				（※）は必須項目です。
+			</div>
+
+
+			<!-- =========================
+             フォーム
+             ========================= -->
+
+			<form action="/bookApprovalConfirm" method="post">
+
+
+				<div class="card">
+
+					<div class="card-body">
+
+
+						<!-- =========================
+                         申請者情報
+                         ========================= -->
+
+						<div class="section-title">
+							申請者情報（ログイン中のアカウント情報）
+						</div>
+
+
+						<div class="form-grid">
+
+
+							<!-- 社員ID -->
+
+							<div class="form-group">
+
+								<label>
+									社員ID
+								</label>
+
+								<div class="input-area">
+
+									<input type="text" value="123456" readonly>
+
+								</div>
+
+							</div>
+
+
+							<!-- 部署 -->
+
+							<div class="form-group">
+
+								<label>
+									部署
+								</label>
+
+								<div class="input-area">
+
+									<input type="text" value="システム開発部" readonly>
+
+								</div>
+
+							</div>
+
+
+							<!-- 氏名 -->
+
+							<div class="form-group">
+
+								<label>
+									氏名
+								</label>
+
+								<div class="input-area">
+
+									<input type="text" value="山田 太郎" readonly>
+
+								</div>
+
+							</div>
+
+						</div>
+
+
+						<br>
+
+						<hr style="border:1px solid #edf0f2;">
+
+						<br>
+
+
+						<!-- =========================
+                         必須項目
+                         ========================= -->
+
+						<div class="section-title">
+							本の情報（必須項目）
+						</div>
+
+
+						<div class="form-grid">
+
+
+							<!-- =========================
+                             タイトル
+                             ========================= -->
+
+							<div class="form-group">
+
+								<label>
+
+									<span class="required">
+										（※）
+									</span>
+
+									タイトル
+
+								</label>
+
+								<div class="input-area">
+
+									<input type="text" name="title" placeholder="タイトルを入力してください" required>
+
+								</div>
+
+							</div>
+
+
+							<!-- =========================
+                             著者名
+                             ========================= -->
+
+							<div class="form-group">
+
+								<label>
+
+									<span class="required">
+										（※）
+									</span>
+
+									著者名
+
+								</label>
+
+								<div class="input-area">
+
+									<input type="text" name="author" placeholder="著者名を入力してください" required>
+
+								</div>
+
+							</div>
+
+
+							<!-- =========================
+                             本の状態
+                             ========================= -->
+
+							<div class="form-group">
+
+								<label>
+
+									<span class="required">
+										（※）
+									</span>
+
+									本の状態
+
+								</label>
+
+								<div class="input-area">
+
+									<select name="bookCondition" required>
+
+										<option value="">
+											選択してください
+										</option>
+
+										<option value="0">
+											0：仮値・不明
+										</option>
+
+										<option value="1">
+											1：新品同様：ほぼ未使用
+										</option>
+
+										<option value="2">
+											2：良好：目立つ傷や汚れ無し
+										</option>
+
+										<option value="3">
+											3：使用感あり：多少の折れ、擦れあり
+										</option>
+
+										<option value="4">
+											4：傷みあり：目立つ傷、汚れ、書き込みあり
+										</option>
+
+									</select>
+
+								</div>
+
+							</div>
+
+						</div>
+
+
+						<!-- =========================
+                         任意項目
+                         ========================= -->
+
+						<div class="optional-section">
+
+
+							<div class="optional-section-title">
+								本の情報（任意項目）
+							</div>
+
+
+							<div class="form-grid">
+
+
+								<!-- =========================
+                                 出版社
+                                 ========================= -->
+
+								<div class="form-group">
+
+									<label>
+
+										出版社
+
+										<span class="optional">
+											（任意）
+										</span>
+
+									</label>
+
+									<div class="input-area">
+
+										<input type="text" name="publisher" placeholder="出版社を入力してください">
+
+									</div>
+
+								</div>
+
+
+								<!-- =========================
+                                 ISBN
+                                 ========================= -->
+
+								<div class="form-group">
+
+									<label>
+
+										ISBN
+
+										<span class="optional">
+											（任意）
+										</span>
+
+									</label>
+
+									<div class="input-area">
+
+										<input type="text" name="isbn" placeholder="ISBNがある場合は入力してください">
+
+										<div class="help">
+
+										</div>
+
+									</div>
+
+								</div>
+
+
+								<!-- =========================
+                                 出版日
+                                 ========================= -->
+
+								<div class="form-group">
+
+									<label>
+
+										出版日
+
+										<span class="optional">
+											（任意）
+										</span>
+
+									</label>
+
+									<div class="input-area">
+
+										<input type="date" name="publishDate">
+
+										<div class="help">
+											※出版日が分かる場合に入力してください。
+										</div>
+
+									</div>
+
+								</div>
+
+
+								<!-- =========================
+                                 備考
+                                 ========================= -->
+
+								<div class="form-group">
+
+									<label>
+
+										備考
+
+										<span class="optional">
+											（任意）
+										</span>
+
+									</label>
+
+									<div class="input-area">
+
+										<textarea name="remarks" maxlength="300"
+											placeholder="付属品の有無（CD/DVD等）や、本の概要が分かるAmazon等のURLなどをご記入ください"></textarea>
+
+										<div class="counter">
+											0 / 300
+										</div>
+
+									</div>
+
+								</div>
+
+
+							</div>
+
+						</div>
+
+
+					</div>
+
+				</div>
+
+
+				<!-- =========================
+                 ボタン
+                 ========================= -->
+
+				<div class="button-area">
+
+
+					<!-- 戻る -->
+
+					<button type="button" class="btn" onclick="history.back();">
+
+						トップメニューへ戻る
+
+					</button>
+
+
+					<!-- 右側 -->
+
+					<div class="right-btns">
+
+
+						<!-- クリア -->
+
+						<button type="reset" class="btn">
+
+							クリア
+
+						</button>
+
+
+						<!-- 確認 -->
+
+						<button type="submit" class="btn btn-primary">
+
+							確認
+
+						</button>
+
+
+					</div>
+
+				</div>
+
+
+			</form>
+
+
+			<!-- =========================
+             フッター
+             ========================= -->
+
+			<div class="footer">
+				© 2026 ShareBooks
+			</div>
+
+
+		</main>
+
+	</div>
+
+
+	<!-- =========================
+     JavaScript
+     ========================= -->
+
+	<script>
+
+		/*
+		 * 備考文字数カウンター
+		 */
+
+		const remarks = document.querySelector(
+			'textarea[name="remarks"]'
+		);
+
+		const counter = document.querySelector(
+			'.counter'
+		);
+
+		if (remarks && counter) {
+
+			remarks.addEventListener('input', function () {
+
+				counter.textContent =
+					this.value.length + ' / 300';
+
+			});
+
+		}
+
+		/*
+		 * ログアウト
+		 *
+		 * 実際のログアウト処理を実装する場合は、
+		 * ここにServlet等への遷移処理を追加してください。
+		 */
+
+		const logoutButton =
+			document.querySelector('.logout-btn');
+
+		if (logoutButton) {
+
+			logoutButton.addEventListener('click', function () {
+
+				const result = confirm(
+					'ログアウトします。よろしいですか？'
+				);
+
+				if (result) {
+
+					alert('ログアウトします。');
+
+				}
+
+			});
+
+		}
+
+	</script>
+
+</body>
+
+</html>

src/main/resources/templates/bookApprovalConfirm.html

@@ -0,0 +1,864 @@
+
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>寄贈申請内容確認</title>
+
+<style>
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    font-family: "Yu Gothic", "Meiryo", sans-serif;
+}
+
+body {
+    background: #f5f7fa;
+    color: #333;
+}
+
+/* =========================
+   ヘッダー
+   ========================= */
+
+.header {
+    height: 60px;
+    background: #fff;
+    border-bottom: 1px solid #e5e7eb;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+}
+
+.logo {
+    font-size: 20px;
+    font-weight: bold;
+    color: #1b3768;
+}
+
+.header-right {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+}
+
+.notification {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    font-size: 18px;
+    cursor: pointer;
+    border-radius: 4px;
+    transition: background-color 0.2s;
+}
+
+.notification:hover {
+    background: #f0f4fa;
+}
+
+.notification-badge {
+    position: absolute;
+    top: 3px;
+    right: 3px;
+    width: 7px;
+    height: 7px;
+    background: #dc2626;
+    border-radius: 50%;
+    border: 1px solid #fff;
+}
+
+.account {
+    padding: 8px 10px;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background-color 0.2s, color 0.2s;
+}
+
+.account:hover {
+    background: #f0f4fa;
+    color: #1659d4;
+}
+
+.logout-btn {
+    padding: 8px 15px;
+    background: #fff;
+    border: 1px solid #d1d5db;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background-color 0.2s,
+                border-color 0.2s,
+                color 0.2s;
+}
+
+.logout-btn:hover {
+    background: #f0f4fa;
+    border-color: #1659d4;
+    color: #1659d4;
+}
+
+/* =========================
+   レイアウト
+   ========================= */
+
+.wrapper {
+    display: flex;
+    min-height: calc(100vh - 60px);
+}
+
+/* =========================
+   サイドメニュー
+   ========================= */
+
+.sidebar {
+    width: 220px;
+    background: #002b66;
+    color: #fff;
+}
+
+.sidebar-title {
+    padding: 18px;
+    font-size: 13px;
+    border-bottom: 1px solid rgba(255,255,255,.1);
+}
+
+.menu {
+    list-style: none;
+}
+
+.menu li {
+    padding: 16px 20px;
+    cursor: pointer;
+    transition: background-color 0.2s;
+}
+
+.menu li:hover {
+    background: #0d477f;
+}
+
+.menu li.active {
+    background: #1158d8;
+    border-radius: 4px;
+    margin: 8px;
+}
+
+/* =========================
+   メイン
+   ========================= */
+
+.main {
+    flex: 1;
+    padding: 24px;
+}
+
+.breadcrumb {
+    font-size: 12px;
+    color: #64748b;
+    margin-bottom: 15px;
+}
+
+.page-title {
+    font-size: 38px;
+    color: #173a70;
+    margin-bottom: 10px;
+}
+
+.description {
+    font-size: 14px;
+    margin-bottom: 4px;
+}
+
+.required-note {
+    color: #d9534f;
+    font-size: 12px;
+    margin-bottom: 18px;
+}
+
+/* =========================
+   カード
+   ========================= */
+
+.card {
+    background: #fff;
+    border: 1px solid #e5e7eb;
+    border-radius: 4px;
+}
+
+.card-body {
+    padding: 25px;
+}
+
+.section-title {
+    font-weight: bold;
+    margin-bottom: 15px;
+    color: #1f3a64;
+}
+
+/* =========================
+   フォーム
+   ========================= */
+
+.form-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 18px;
+}
+
+.form-group {
+    display: flex;
+    align-items: flex-start;
+}
+
+.form-group label {
+    width: 140px;
+    flex-shrink: 0;
+    font-size: 13px;
+    font-weight: bold;
+    padding-top: 10px;
+}
+
+.input-area {
+    flex: 1;
+    max-width: 700px;
+}
+
+.required {
+    color: #d9534f;
+    font-size: 11px;
+}
+
+.optional {
+    color: #555;
+    font-size: 11px;
+}
+
+input[type="text"],
+input[type="date"],
+select,
+textarea {
+    width: 100%;
+    border: 1px solid #d6dbe3;
+    border-radius: 4px;
+    padding: 10px;
+    font-size: 13px;
+    background: #fff;
+}
+
+input[type="text"]:focus,
+input[type="date"]:focus,
+select:focus,
+textarea:focus {
+    outline: none;
+    border-color: #1659d4;
+    box-shadow: 0 0 0 2px rgba(22, 89, 212, 0.1);
+}
+
+input[readonly] {
+    background: #f3f4f6;
+}
+
+textarea {
+    resize: none;
+    height: 90px;
+}
+
+.help {
+    font-size: 11px;
+    color: #6b7280;
+    margin-top: 4px;
+}
+
+.counter {
+    text-align: right;
+    font-size: 11px;
+    color: #888;
+    margin-top: 3px;
+}
+
+/* =========================
+   必須・任意項目の区切り
+   ========================= */
+
+.optional-section {
+    margin-top: 25px;
+    padding-top: 22px;
+    border-top: 1px solid #e5e7eb;
+}
+
+.optional-section-title {
+    font-weight: bold;
+    color: #1f3a64;
+    margin-bottom: 15px;
+}
+
+/* =========================
+   ボタン
+   ========================= */
+
+.button-area {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+}
+
+.btn {
+    min-width: 120px;
+    padding: 10px 20px;
+    border-radius: 4px;
+    border: 1px solid #d1d5db;
+    background: #fff;
+    cursor: pointer;
+    font-weight: bold;
+    transition: background-color 0.2s,
+                border-color 0.2s,
+                color 0.2s;
+}
+
+.btn:hover {
+    background: #f0f4fa;
+    border-color: #1659d4;
+    color: #1659d4;
+}
+
+.btn-primary {
+    background: #1158d8;
+    border: none;
+    color: #fff;
+}
+
+.btn-primary:hover {
+    background: #0d47b5;
+    color: #fff;
+}
+
+.right-btns {
+    display: flex;
+    gap: 12px;
+}
+
+/* =========================
+   フッター
+   ========================= */
+
+.footer {
+    text-align: center;
+    margin-top: 25px;
+    font-size: 12px;
+    color: #666;
+}
+
+/* =========================
+   レスポンシブ
+   ========================= */
+
+@media (max-width: 700px) {
+
+    .header {
+        padding: 0 12px;
+    }
+
+    .logo {
+        font-size: 16px;
+    }
+
+    .account {
+        display: none;
+    }
+
+    .sidebar {
+        width: 180px;
+    }
+
+    .main {
+        padding: 18px;
+    }
+
+    .page-title {
+        font-size: 30px;
+    }
+
+    .form-group {
+        flex-direction: column;
+    }
+
+    .form-group label {
+        width: 100%;
+        padding-top: 0;
+        margin-bottom: 6px;
+    }
+
+    .input-area {
+        width: 100%;
+        max-width: none;
+    }
+
+    .button-area {
+        flex-direction: column;
+        gap: 12px;
+        align-items: stretch;
+    }
+
+    .right-btns {
+        justify-content: flex-end;
+    }
+}
+
+@media (max-width: 480px) {
+
+    .sidebar {
+        display: none;
+    }
+
+    .main {
+        padding: 15px;
+    }
+
+    .page-title {
+        font-size: 25px;
+    }
+
+    .card-body {
+        padding: 18px;
+    }
+
+    .right-btns {
+        flex-direction: column;
+    }
+
+    .btn {
+        width: 100%;
+    }
+}
+</style>
+</head>
+
+<body>
+
+<header class="header">
+
+    <div class="logo">
+		📖 ShareBooks
+    </div>
+
+    <div class="header-right">
+
+        <!-- サインイン中アカウント -->
+        <span class="account">
+            山田 太郎 さん（一般ユーザ）
+        </span>
+
+        <!-- ログアウト -->
+        <button type="button" class="logout-btn">
+            ログアウト
+        </button>
+
+    </div>
+
+</header>
+
+
+<div class="wrapper">
+
+    <!-- =========================
+         サイドメニュー
+         ========================= -->
+
+    <aside class="sidebar">
+
+        <div class="sidebar-title">
+            一般メニュー
+        </div>
+
+        <ul class="menu">
+
+            <li>
+                🏠 トップメニュー
+            </li>
+
+            <li class="active">
+                新規図書申請
+            </li>
+
+        </ul>
+
+    </aside>
+
+
+    <!-- =========================
+         メイン
+         ========================= -->
+
+    <main class="main">
+
+        <div class="breadcrumb">
+            トップメニュー ＞ 新規図書申請＞申請内容確認
+        </div>
+
+        <h1 class="page-title">
+            寄贈申請内容確認
+        </h1>
+
+        <div class="description">
+            入力した内容に間違いがないかご確認ください。よろしければ「申請する」ボタンを押してください。
+        </div>
+
+        <div class="required-note">
+            （※）は必須項目です。
+        </div>
+
+
+        <form action="BookDonationConfirmServlet" method="post">
+
+            <div class="card">
+
+                <div class="card-body">
+
+                    <!-- =========================
+                         申請者情報
+                         ========================= -->
+
+                    <div class="section-title">
+                        申請者情報（ログイン中のアカウント情報）
+                    </div>
+
+                    <div class="form-grid">
+
+                        <div class="form-group">
+
+                            <label>
+                                社員ID
+                            </label>
+
+                            <div class="input-area">
+
+                                <input
+                                    type="text"
+                                    value="123456"
+                                    readonly>
+
+                            </div>
+
+                        </div>
+
+
+                        <div class="form-group">
+
+                            <label>
+                                部署
+                            </label>
+
+                            <div class="input-area">
+
+                                <input
+                                    type="text"
+                                    value="システム開発部"
+                                    readonly>
+
+                            </div>
+
+                        </div>
+
+
+                        <div class="form-group">
+
+                            <label>
+                                氏名
+                            </label>
+
+                            <div class="input-area">
+
+                                <input
+                                    type="text"
+                                    value="山田 太郎"
+                                    readonly>
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+
+                    <br>
+
+                    <hr style="border:1px solid #edf0f2;">
+
+                    <br>
+
+
+                    <!-- =========================
+                         必須項目
+                         ========================= -->
+
+                    <div class="section-title">
+                        本の情報（必須項目）
+                    </div>
+
+                    <div class="form-grid">
+
+                        <!-- タイトル -->
+
+                        <div class="form-group">
+
+                            <label>
+                                <span class="required">（※）</span>
+                                タイトル
+                            </label>
+
+                            <div class="input-area">
+
+                                <input
+                                    type="text"
+                                    name="title"
+                                    placeholder="タイトルを入力してください">
+
+                            </div>
+
+                        </div>
+
+
+                        <!-- 著者名 -->
+
+                        <div class="form-group">
+
+                            <label>
+                                <span class="required">（※）</span>
+                                著者名
+                            </label>
+
+                            <div class="input-area">
+
+                                <input
+                                    type="text"
+                                    name="author"
+                                    placeholder="著者名を入力してください">
+
+                            </div>
+
+                        </div>
+
+
+                        <!-- 本の状態 -->
+
+                        <div class="form-group">
+
+                            <label>
+                                <span class="required">（※）</span>
+                                本の状態
+                            </label>
+
+                            <div class="input-area">
+
+                                <select name="bookCondition">
+
+                                    <option value="">
+                                        選択してください
+                                    </option>
+
+                                    <option value="0">
+                                        0：不明
+                                    </option>
+
+                                    <option value="1">
+                                        1：新品同様・ほぼ未使用
+                                    </option>
+
+                                    <option value="2">
+                                        2：良好・目立つ傷や汚れ無し
+                                    </option>
+
+                                    <option value="3">
+                                        3：使用感あり・多少の折れ、擦れあり
+                                    </option>
+
+                                    <option value="4">
+                                        4：傷みあり・目立つ傷、汚れ、書き込みあり
+                                    </option>
+
+                                </select>
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+
+                    <!-- =========================
+                         任意項目
+                         ========================= -->
+
+                    <div class="optional-section">
+
+                        <div class="optional-section-title">
+                            本の情報（任意項目）
+                        </div>
+
+
+                        <div class="form-grid">
+
+                            <!-- 出版社 -->
+
+                            <div class="form-group">
+
+                                <label>
+                                    出版社
+                                    <span class="optional">（任意）</span>
+                                </label>
+
+                                <div class="input-area">
+
+                                    <input
+                                        type="text"
+                                        name="publisher"
+                                        placeholder="出版社を入力してください">
+
+                                </div>
+
+                            </div>
+
+
+                            <!-- ISBN -->
+
+                            <div class="form-group">
+
+                                <label>
+                                    ISBN
+                                    <span class="optional">（任意）</span>
+                                </label>
+
+                                <div class="input-area">
+
+                                    <input
+                                        type="text"
+                                        name="isbn"
+                                        placeholder="ISBNがある場合は入力してください">
+
+                                </div>
+
+                                <div class="help">
+                                    
+                                </div>
+
+                            </div>
+
+                            <!-- 出版日 -->
+
+                            <div class="form-group">
+
+                                <label>
+                                    出版日
+                                    <span class="optional">（任意）</span>
+                                </label>
+
+                                <div class="input-area">
+
+                                    <input
+                                        type="date"
+                                        name="publishDate">
+
+                                    <div class="help">
+                                        ※出版日が分かる場合に入力してください。
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+
+                            <!-- 備考 -->
+
+                            <div class="form-group">
+
+                                <label>
+                                    備考
+                                    <span class="optional">（任意）</span>
+                                </label>
+
+                                <div class="input-area">
+
+                                    <textarea
+                                        name="remarks"
+                                        placeholder="付属品の有無（CD/DVD等）や、本の概要が分かるAmazon等のURLなどをご記入ください"></textarea>
+
+                                    <div class="counter">
+                                        0 / 300
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                </div>
+
+            </div>
+
+
+            <!-- =========================
+                 ボタン
+                 ========================= -->
+
+            <div class="button-area">
+
+                <button
+                    type="button"
+                    class="btn">
+
+                    トップメニューへ戻る
+
+                </button>
+
+
+                <div class="right-btns">
+
+					<button
+					    type="button"
+					    class="btn"
+					    onclick="location.href='/bookApproval'">
+
+					    修正
+
+					</button>
+
+                    <button
+                        type="button"
+                        class="btn btn-primary"
+						onclick="CompleteModal()">申請送信</button>
+
+                </div>
+
+            </div>
+
+        </form>
+
+
+        <div class="footer">
+            © 2026 社内備品・図書管理システム
+        </div>
+
+    </main>
+
+</div>
+
+
+<script>
+
+function CompleteModal() { //関数定義
+    alert("申請が完了しました。");
+    location.href = "/bookApproval";
+}
+
+</script>
+
+</body>
+</html>

src/main/resources/templates/bookInsert.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>新規図書登録</title>
+</head>
+
+<body>
+	<h1>新規図書登録入力</h1>
+	<form action="/bookInsertConfirm" method="GET">
+	<input type="submit" value="確認画面へ" class="btn">
+</body>
+
+</html>

src/main/resources/templates/bookInsertConfirm.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>登録内容確認</title>
+</head>
+
+<body>
+	<h1>登録内容確認</h1>
+
+	<!-- 戻る -->
+	<form action="/bookInsert" method="GET">
+		<input type="submit" value="戻る" class="btn">
+	</form>
+	<!-- 完了 -->
+	<form action="/book" method="GET">
+		<input type="submit" value="完了" class="btn">
+	</form>
+	<div id="registerModal" class="modal-overlay">
+
+		<div class="modal">
+
+			<div class="modal-message">
+				新規図書の登録が完了しました！
+			</div>
+
+			<div class="modal-buttons">
+
+				<!-- 続けて追加 -->
+				<form method="get" action="/bookInsert">
+
+					<button type="submit" class="modal-btn">
+						続けて追加
+					</button>
+
+				</form>
+
+				<!-- 図書一覧へ戻る -->
+				<form method="get" action="/book">
+
+					<button type="submit" class="modal-btn modal-btn-primary">
+						図書一覧へ戻る
+					</button>
+				</form>
+
+				<!-- トップメニューへ戻る -->
+				<form method="get" action="/topmenu">
+
+					<button type="submit" class="modal-btn modal-btn-primary">
+						トップメニューへ戻る
+					</button>
+
+				</form>
+
+			</div>
+
+		</div>
+
+	</div>
+
+</body>
+
+</html>

src/main/resources/templates/bookLend.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>図書貸出処理</title>
+</head>
+<body>
+	図書貸出処理
+	<form id="loanForm"action="bookLendConfirmation" method="post">
+			<div class="button-area">
+
+						<div class="right-buttons">
+							<button type="button" class="btn btn-primary"
+								onclick="submitLoan()">貸出する</button>
+						</div>
+					</div>
+
+				</form>
+				
+				<script>
+				
+				function submitLoan() {
+
+							if (confirm('この図書を貸出しますか？')) {
+								// OK選択時にフォーム送信を実行し、BookLendReturnControllerに処理を投げる
+								document.getElementById('loanForm').submit();
+							}
+						}
+		</script>
+
+</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

@@ -0,0 +1,63 @@
+<!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>
+
+	
+		<table>
+
+			<thead>
+				<tr>
+					<th>社員ID</th>
+					<th>社員名</th>
+					<th>管理ID</th>
+					<th>タイトル</th>
+					<th>返却予定日</th>
+
+				</tr>
+			</thead>
+
+
+			<tbody>
+				<tr th:each="booklist : ${list}">
+
+					<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>
+
+
+					<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>
+
+</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">
+	<meta charset="UTF-8">
-<title>ログイン</title>
+	<title>ログイン</title>
 </head>
+
 <body>
-	
+
 	<h1>ログイン</h1>
-	<form action="doLogin"
-	      method="post"
-	      th:object="${loginInfoForm}">
 
-	    <div class="msgBox error" th:if="${messageError} != null">
+	<p class="message message-error" th:if="${loginError}" th:text="${loginError}">
-	        <span class="error" th:text="${messageError.message}"></span>
+	</p>
-	    </div>
 
-	    <table>
+	<form th:action="@{/login}" th:object="${loginForm}" method="post">
-	            <tr>
+		<div class="form-group">
-	            <td class="btnArea" colspan="2">
+			<label for="employeeId">社員ID</label>
-	                <input type="submit" value="ログイン"/>
+			<input id="employeeId" type="text" th:field="*{employeeId}">
-	                <button onclick="clearInput()">リセット</button>
+			<p class="field-error" th:errors="*{employeeId}"></p>
-	            </td>
+		</div>
-	        </tr>
+
-	    </table>
+		<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/passwordChange.html

@@ -0,0 +1,377 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="ja">
+
+<head>
+    <meta charset="UTF-8">
+    <title>ShareBooks｜パスワード変更</title>
+</head>
+
+<body th:data-topmenu-url="@{/topmenu}">
+
+    <!-- ヘッダー -->
+    <div class="header-bar">
+
+        <div class="header-left">
+            ShareBooks
+        </div>
+
+        <div class="header-right">
+
+            <span class="bell">
+                🔔
+                <span class="badge">3</span>
+            </span>
+
+            <span class="user">
+                テストユーザー（一般）
+            </span>
+
+            <button type="button" class="logout">
+                ログアウト
+            </button>
+
+        </div>
+    </div>
+
+    <div class="layout">
+
+        <!-- サイドバー -->
+        <div class="sidebar">
+
+            <div class="section-label">
+                共通画面
+            </div>
+
+            <a class="side-menu" th:href="@{/topmenu}">
+                トップメニュー
+            </a>
+
+            <div class="active">
+                パスワード再設定
+            </div>
+
+        </div>
+
+        <!-- メイン -->
+        <div class="main-area">
+
+            <!-- パンくずリスト -->
+            <div class="breadcrumb">
+
+                <a th:href="@{/topmenu}">
+                    トップメニュー
+                </a>
+
+                &gt; パスワード再設定
+
+            </div>
+
+            <h1 class="page-title">
+                パスワード再設定
+            </h1>
+
+            <p class="page-desc">
+                現在のパスワードと新しいパスワードを入力し、
+                「確定」ボタンを押してください。
+            </p>
+
+            <p class="required-note">
+                （※）は必須項目です。
+            </p>
+
+            <div class="content-columns">
+
+                <!-- 左カラム -->
+                <div class="left-column">
+
+                    <div class="form-card">
+
+                        <h2>
+                            パスワード再設定入力
+                        </h2>
+
+                        <!--
+                            簡易実装のため、フォーム送信は行いません。
+                        -->
+                        <form id="pwForm" onsubmit="return false;">
+
+                            <!-- 現在のパスワード -->
+                            <div class="form-group">
+
+                                <label for="currentPassword">
+                                    現在のパスワード
+                                    <span class="req">（※）</span>
+                                </label>
+
+                                <div class="input-with-icon">
+
+                                    <input
+                                        type="password"
+                                        id="currentPassword"
+                                        name="currentPassword"
+                                        autocomplete="current-password"
+                                        placeholder="現在のパスワードを入力してください">
+
+                                    <button
+                                        type="button"
+                                        class="toggle-password"
+                                        aria-label="現在のパスワードの表示を切り替える"
+                                        onclick="togglePassword('currentPassword')">
+
+                                        <svg
+                                            viewBox="0 0 24 24"
+                                            fill="none"
+                                            stroke="currentColor"
+                                            stroke-width="2"
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round">
+
+                                            <path
+                                                d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z">
+                                            </path>
+
+                                            <circle
+                                                cx="12"
+                                                cy="12"
+                                                r="3">
+                                            </circle>
+
+                                        </svg>
+
+                                    </button>
+
+                                </div>
+                            </div>
+
+                            <!-- 新しいパスワード -->
+                            <div class="form-group">
+
+                                <label for="newPassword">
+                                    新しいパスワード
+                                    <span class="req">（※）</span>
+                                </label>
+
+                                <div class="input-with-icon">
+
+                                    <input
+                                        type="password"
+                                        id="newPassword"
+                                        name="newPassword"
+                                        autocomplete="new-password"
+                                        placeholder="新しいパスワードを入力してください">
+
+                                    <button
+                                        type="button"
+                                        class="toggle-password"
+                                        aria-label="新しいパスワードの表示を切り替える"
+                                        onclick="togglePassword('newPassword')">
+
+                                        <svg
+                                            viewBox="0 0 24 24"
+                                            fill="none"
+                                            stroke="currentColor"
+                                            stroke-width="2"
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round">
+
+                                            <path
+                                                d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z">
+                                            </path>
+
+                                            <circle
+                                                cx="12"
+                                                cy="12"
+                                                r="3">
+                                            </circle>
+
+                                        </svg>
+
+                                    </button>
+
+                                </div>
+
+                                <p class="field-hint">
+                                    ※ 半角英数字・記号を含む8文字以上16文字以下で入力してください。
+                                </p>
+
+                            </div>
+
+                            <!-- 確認用パスワード -->
+                            <div class="form-group">
+
+                                <label for="confirmPassword">
+                                    新しいパスワードの確認
+                                    <span class="req">（※）</span>
+                                </label>
+
+                                <div class="input-with-icon">
+
+                                    <input
+                                        type="password"
+                                        id="confirmPassword"
+                                        name="confirmPassword"
+                                        autocomplete="new-password"
+                                        placeholder="新しいパスワードをもう一度入力してください">
+
+                                    <button
+                                        type="button"
+                                        class="toggle-password"
+                                        aria-label="確認用パスワードの表示を切り替える"
+                                        onclick="togglePassword('confirmPassword')">
+
+                                        <svg
+                                            viewBox="0 0 24 24"
+                                            fill="none"
+                                            stroke="currentColor"
+                                            stroke-width="2"
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round">
+
+                                            <path
+                                                d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z">
+                                            </path>
+
+                                            <circle
+                                                cx="12"
+                                                cy="12"
+                                                r="3">
+                                            </circle>
+
+                                        </svg>
+
+                                    </button>
+
+                                </div>
+
+                                <p class="field-hint">
+                                    ※ 確認のため、もう一度新しいパスワードを入力してください。
+                                </p>
+
+                            </div>
+
+                        </form>
+
+                    </div>
+
+                    <!-- 注意事項 -->
+                    <div class="notice-box">
+
+                        <div class="notice-title">
+                            注意事項
+                        </div>
+
+                    </div>
+
+                    <!-- 操作ボタン -->
+                    <div class="button-row">
+
+                        <button
+                            type="button"
+                            class="btn btn-secondary"
+                            onclick="goTopMenu()">
+                            トップメニューへ戻る
+                        </button>
+
+                        <div class="btn-group-right">
+
+                            <button
+                                type="button"
+                                class="btn btn-secondary"
+                                onclick="clearForm()">
+                                クリア
+                            </button>
+
+                            <!-- ダイアログを表示 -->
+                            <button
+                                type="button"
+                                class="btn btn-primary"
+                                onclick="showCompletedPopup()">
+                                確定
+                            </button>
+
+                        </div>
+                    </div>
+
+                </div>
+
+                <!-- 右カラム -->
+                <div class="right-column">
+
+                    <div class="constraint-panel">
+
+                        <div class="panel-title">
+                            パスワードの制約
+                        </div>
+
+                        <div class="group-label">
+                            使用可能文字
+                        </div>
+
+                        <div class="chars-value">
+                            半角英数字・記号
+                        </div>
+
+                        <hr>
+
+                        <div class="group-label">
+                            制約
+                        </div>
+
+                        <ul class="constraint-list">
+                            <li>✓ 8文字以上16文字以下</li>
+                            <li>✓ 1つ以上の小文字を使用</li>
+                            <li>✓ 1つ以上の大文字を使用</li>
+                            <li>✓ 1つ以上の数字を使用</li>
+                            <li>✓ 1つ以上の記号を使用</li>
+                        </ul>
+
+                        <div class="example-box">
+
+                            <div class="example-label">
+                                設定例
+                            </div>
+
+                            <div class="example-value">
+                                Abcdef12!
+                            </div>
+
+                            <div class="example-note">
+                                （9文字、英字大小・数字・記号を含む）
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+
+    <div class="footer">
+        © 2026 ShareBooks
+    </div>
+
+    <dialog id="completedDialog">
+
+        <h2>
+            変更完了
+        </h2>
+
+        <p>
+            パスワードの変更が完了しました。
+        </p>
+
+        <button
+            type="button"
+            onclick="goLogin()">
+            完了
+        </button>
+
+    </dialog>
+
+    <script th:src="@{/js/passwordChange.js}"></script>
+
+</body>
+</html>

src/main/resources/templates/topmenu.html

@@ -1,16 +1,42 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
+	<meta charset="UTF-8">
-<title>トップメニュー</title>
+	<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>
-	
+
+
 	<!-- ===== 共通：社内図書一覧 ===== -->
-	<a class="card" href="${pageContext.request.contextPath}/BookServlet">
+
+	<a class="card" href="/book">
 
 		<h3>社内図書一覧</h3>
 
@@ -21,10 +47,24 @@
 
 	<hr> <!--区切り線-->
 
-	<!-- ===== 共通：新規図書申請 ===== -->
+	<!-- ===== 共通：寄贈申請 ===== -->
-	<a class="card" href="${pageContext.request.contextPath}/bookApproval">
 
-		<h3>新規図書申請</h3>
+	<a class="card" href="/bookApproval">
+
+		<h3>寄贈申請</h3>
+
+		<p>
+			寄贈申請フォームの<br> 入力を行います。
+		</p>
+	</a>
+
+	<hr>
+
+	<!-- ===== 管理者のみ ===== -->
+
+	<a class="card" href="/bookInsert">
+
+		<h3>新規図書登録</h3>
 
 		<p>
 			図書の登録申請を<br> 行います。
@@ -33,31 +73,19 @@
 
 	<hr>
 
-	<!-- ===== 管理者のみ ===== -->
 
-	<a class="card" href="${pageContext.request.contextPath}/employee">
+	<a class="card" href="/lendList">
 
-		<h3>寄贈申請</h3>
-
-		<p>
-			寄贈申請フォームの<br> 入力を行います。
-		</p>
-	</a>
-	
-	<hr>
-	
-	<a class="card" href="${pageContext.request.contextPath}/lendList">
-		
 		<h3>貸出中図書一覧</h3>
 
 		<p>
 			貸出中図書の<br> 一覧を表示します。
-		</p> 
+		</p>
 	</a>
-	
+
 	<hr>
-	
+
-	<a class="card" href="${pageContext.request.contextPath}/bookApproval-list">
+	<a class="card" href="/approvalReceive">
 
 		<h3>寄贈申請受信BOX</h3>
 
@@ -66,5 +94,16 @@
 		</p>
 	</a>
 
+	<hr>
+
+	<a class="card" href="/passwordChange">
+		<h3>パスワード変更</h3>
+
+		<p>
+			初期パスワードを<br> 変更します。
+		</p>
+	</a>
+
 </body>
+
 </html>

src/main/resources/templates/update.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<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>