[add]新規登録画面

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

@@ -1,13 +0,0 @@
-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/BookController.java

@@ -1,28 +1,14 @@
 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) {
+		public String book() {
-		
-		List<Book> aaa = bookService.findAll();
-		
-		// DBから取得したデータをHTMLで扱えるようにする
-		model.addAttribute("book",bookService.findAll());
 			return "book";
 		}
 		
+	
+
 }

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

@@ -1,14 +1,6 @@
 package com.example.demo.controller;
 
-import org.springframework.stereotype.Controller;
+//@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

@@ -1,13 +1,52 @@
 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.PostMapping;
+
+import com.example.demo.entity.BookInsert;
+import com.example.demo.repository.BookCategoryRepository;
+import com.example.demo.service.BookInsertService;
 
 @Controller
 public class BookInsertController {
-	@GetMapping("bookInsert")
+	
-		public String bookInsert() {
+@Autowired
+private BookInsertService bookInsertService;
+
+@Autowired
+private BookCategoryRepository categoryRepository;
+
+	    @GetMapping("/bookInsert")
+	    public String bookInsert(Model model) {
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
+	    }
+	    
+	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
+	    
+	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
+	    @PostMapping("/bookInsertConfirm")
+	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsertConfirm";
+	    }
+	    
+	    @PostMapping("/bookInsert")
+	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+
+	        model.addAttribute("categoryList",categoryRepository.findAll());
+
+	        model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsert";
+	    }
+	    
+	  
+
 	    
 	    }
-}
+	   
+	 

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

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

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

@@ -1,13 +0,0 @@
-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

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

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

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

@@ -1,14 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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

@@ -1,95 +0,0 @@
-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/BookCategory.java

@@ -1,12 +1,8 @@
 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;
@@ -16,13 +12,11 @@ import lombok.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/BookInsert.java

@@ -0,0 +1,32 @@
+package com.example.demo.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+import lombok.Data;
+
+@Entity  // このクラスがDBのテーブルに対応することを表す
+@Data
+public class BookInsert {
+
+    @Id  // 主キー
+    @GeneratedValue(strategy = GenerationType.IDENTITY)  // 自動採番
+    private Long Id;
+
+    private String bookId;
+    private String title;
+    private Integer isbn;
+    private String author;
+    private String category;
+    private String subcategory;
+    private Integer publisher;
+    private Integer publicationDate;
+    private String location;
+    private String condition;
+    private String donor;
+    private String discription;
+    
+  
+}

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

@@ -1,47 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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/BookForm.java

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

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

@@ -1,17 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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/BookInsertRepository.java

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

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

@@ -1,15 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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/BookInsertService.java

@@ -0,0 +1,11 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import com.example.demo.entity.BookInsert;
+
+public interface BookInsertService {
+	String regist(BookInsert book);
+
+	List<BookInsert> findAll();
+	}

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

@@ -0,0 +1,33 @@
+	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.BookInsert;
+import com.example.demo.repository.BookInsertRepository;
+	
+	@Service
+	public class BookInsertServiceImpl implements BookInsertService {
+	
+	    @Autowired
+	    private BookInsertRepository bookInsertRepository;
+	
+	    @Override
+	    public String regist(BookInsert book) {
+	        // DTO → エンティティへ詰め替えて保存
+	    	    bookInsertRepository.save(book);
+	        book.setBookId("bk"+book.getId());
+	        bookInsertRepository.save(book);  // 保存
+	        return "登録が完了しました";
+	    }
+	
+	    @Override
+	    public List<BookInsert> findAll() {
+	        return bookInsertRepository.findAll();  // 全件取得
+	    }
+	}
+	
+	// ※BookService インタフェースにも List<Review> findAll(); を追加すること
+	

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

@@ -1,34 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,62 +0,0 @@
-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

@@ -1,34 +1,10 @@
 <!DOCTYPE html>
 <html>
-
 <head>
-	<meta charset="UTF-8">
+<meta charset="UTF-8">
-	<title>寄贈申請 受信BOX</title>
+<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

@@ -1,100 +1,18 @@
 <!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>
-	<div class="container">
+	<form method="post" action="bookLend">
-		<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"
+	                        <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>
-					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/bookInsert.html

@@ -8,8 +8,74 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	<form action="/bookInsertConfirm" method="GET">
+	
+	<br>
+	       <br><br>
+		   
+	<form action="/bookInsertConfirm" method="POST">
+ 
+	<label for="bookId">図書管理ID</label><br>
+	<input type="text" id="bookId" name="bookId" placeholder="図書管理Idを入力" th:value="${bookInsert.bookId}" required>
+	<br><br>
+
+	<label for="title">タイトル</label><br>
+	<input type="text" id="title" name="title" placeholder="タイトルを入力" th:value="${bookInsert.title}" required>
+	<br><br>
+	
+	<label for="isbn">ISBN</label><br>
+	<input type="text" id="isbn" name="isbn" th:value="${bookInsert.isbn}" required>
+		<br><br>
+	
+		<label for="title">著者名</label><br>
+		<input type="text" id="author" name="author" placeholder="著者名を入力" th:value="${bookInsert.author}" required>
+		<br><br>
+		
+		<label for="category">カテゴリ</label><br>
+		<input type="text" id="category" name="category" placeholder="カテゴリを選択" th:value="${bookInsert.category}" required>
+		<br><br>
+		
+		<label for="subcategory">サブカテゴリ</label><br>
+		<input type="text" id="subcategory" name="subcategory" placeholder="サブカテゴリを選択" th:value="${bookInsert.subcategory}" required>
+		<br><br>
+	
+		<label for="publisher">主パン者</label><br>
+		<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
+		<br><br>
+		
+		<label for="publicationDate">出版日</label><br>
+		<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
+		<br><br>
+		
+		<label for="location">保管場所</label><br>
+		<select id="location" name="location" required >
+			<option value="undecided">未確定</option>
+			<option value="area">開発エリア書棚</option>
+			<option value="rack">会議室前ラック</option>
+			</select>
+		<br><br>
+		
+		<label for="condition">図書状態</label><br>
+		<select id="condition" name="condition" required th:value="${bookInsert.condition}">
+			<option value="new">新品同様</option>
+			<option value="good">良好</option>
+			<option value="use">使用感あり</option>
+			<option value="pain">傷みあり</option>
+			</select>
+		<br><br>		
+	   
+		<label for="donor">寄贈者社員ID</label><br>
+		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
+		<br><br>
+		
+		<label for="discription">備考</label><br>
+		<input type="text" id="discription" name="discription" th:value="${bookInsert.discription}">
+		<br><br>
+</label>
+
+
 	<input type="submit" value="確認画面へ" class="btn">
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -9,9 +9,23 @@
 <body>
 	<h1>登録内容確認</h1>
 
-	<!-- 戻る -->
+		
-	<form action="/bookInsert" method="GET">
+		<!-- もどる: 入力中の値を持って入力画面へ -->
-		<input type="submit" value="戻る" class="btn">
+		<form method="post" th:action="@{/bookInsert}" >
+		    <input type="hidden" name="bookId" th:value="${bookInsert.bookId}">
+		    <input type="hidden" name="title" th:value="${bookInsert.title}">
+			<input type="hidden" name="isbn" th:value="${bookInsert.isbn}">
+			<input type="hidden" name="author" th:value="${bookInsert.author}">
+			<input type="hidden" name="category" th:value="${bookInsert.category}">
+			<input type="hidden" name="subcategory" th:value="${bookInsert.subcategory}">
+			<input type="hidden" name="publisher" th:value="${bookInsert.publisher}">
+			<input type="hidden" name="publicationDate" th:value="${bookInsert.publicationDate}">
+			<input type="hidden" name="location" th:value="${bookInsert.location}">
+			<input type="hidden" name="condition" th:value="${bookInsert.condition}">
+			<input type="hidden" name="donor" th:value="${bookInsert.donor}">
+			<input type="hidden" name="discription" th:value="${bookInsert.discription}">
+		    <button type="submit">もどる</button>
+		</form>
 	</form>
 	<!-- 完了 -->
 	<form action="/book" method="GET">
@@ -53,6 +67,7 @@
 
 				</form>
 				
+
 			</div>
 
 		</div>

src/main/resources/templates/bookLendResult.html

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

src/main/resources/templates/lendList.html

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

src/main/resources/templates/passwordChange.html

@@ -1,377 +0,0 @@
-<!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,42 +1,16 @@
 <!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>
 
@@ -49,7 +23,7 @@
 
 	<!-- ===== 共通：寄贈申請 ===== -->
 	
-	<a class="card" href="/bookApproval">
+	<a class="card" href="${pageContext.request.contextPath}/employee">
 
 		<h3>寄贈申請</h3>
 
@@ -74,7 +48,7 @@
 	<hr>
 	
 	
-	<a class="card" href="/lendList">
+	<a class="card" href="${pageContext.request.contextPath}/lendList">
 		
 		<h3>貸出中図書一覧</h3>
 
@@ -85,7 +59,7 @@
 	
 	<hr>
 	
-	<a class="card" href="/approvalReceive">
+	<a class="card" href="${pageContext.request.contextPath}/bookApproval-list">
 
 		<h3>寄贈申請受信BOX</h3>
 
@@ -94,16 +68,5 @@
 		</p>
 	</a>
 
-	<hr>
-
-	<a class="card" href="/passwordChange">
-		<h3>パスワード変更</h3>
-
-		<p>
-			初期パスワードを<br> 変更します。
-		</p>
-	</a>
-
 </body>
-
 </html>

src/main/resources/templates/update.html

@@ -5,13 +5,6 @@
 <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

@@ -1,24 +0,0 @@
-<!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>