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

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/LendListController.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 LendListController {
+	@GetMapping("/lendList")
+	public String lendList() {
+		return "lendList";
+		
+	}
+}

src/main/resources/templates/approvalReceive.html

@@ -1,10 +1,34 @@
 <!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/lendList.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>貸出中図書一覧</title>
+</head>
+
+<body>
+	<h1>貸出中図書一覧</h1>
+	
+	<!-- action先要修正 -->
+	<form action="/lendList" 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">
+
+				<!-- OK -->
+				<form method="get" action="/lendList">
+
+					<button type="submit" class="modal-btn">
+						OK
+					</button>
+
+				</form>
+
+
+
+			</div>
+
+		</div>
+
+	</div>
+
+
+</body>
+
+</html>

src/main/resources/templates/topmenu.html

@@ -26,7 +26,7 @@
 
 	<!-- ===== 共通：寄贈申請 ===== -->
 	
-	<a class="card" href="${pageContext.request.contextPath}/employee">
+	<a class="card" href="/bookApproval">
 
 		<h3>寄贈申請</h3>
 
@@ -51,7 +51,7 @@
 	<hr>
 	
 	
-	<a class="card" href="${pageContext.request.contextPath}/lendList">
+	<a class="card" href="/lendList">
 		
 		<h3>貸出中図書一覧</h3>
 
@@ -62,7 +62,7 @@
 	
 	<hr>
 	
-	<a class="card" href="${pageContext.request.contextPath}/bookApproval-list">
+	<a class="card" href="/approvalReceive">
 
 		<h3>寄贈申請受信BOX</h3>