Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto

# Conflicts:
#	src/main/resources/templates/transaction_detail.html

src/main/java/com/example/demo/app/infra/entity/TestController6.java

@@ -1,5 +0,0 @@
-package com.example.demo.app.infra.entity;
-
-public class TestController6 {
-
-}

src/main/java/com/example/demo/app/presentation/controller/ProfileController.java

@@ -57,7 +57,8 @@ public class ProfileController {
 	                    profileModel.getBirthDate(),
 	                    profileModel.getSaving(),
 	                    profileModel.getAnnualIncome(),
-	                    profileModel.getMonthlyBudget());
+	                    profileModel.getMonthlyBudget(),
+	                    profileModel.getBirthDate());
 
 	    model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
 	    return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

@@ -16,4 +16,5 @@ public class ProfileEditForm {
 	private Integer saving;
 	private Integer annualIncome;
 	private Integer monthlyBudget;
+	private LocalDate birthDate;
 }

src/main/resources/templates/category_list.html

@@ -9,13 +9,13 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
 					<div class="card-body">
 						<div class="d-flex justify-content-between">
@@ -49,30 +49,20 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
 			</ul>
 		</div>
 
-		<div class="d-grid mt-4">
+
 
 		<form th:action="@{/category/create}" method="get">
-
+			<input type="hidden" name="today" id="today" th:value="${today}">
-				<input type="hidden"
+			<button type="submit">新規登録</button>
-			           name="today"
-					   id="today"
-			           th:value="${today}">
-
-			    <button class="btn btn-success w-100" type="submit">
-					新規登録
-				</button>
-
 		</form>
 
-		</div>
-		
-	</div>
-
 		<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/fixed_cost.html

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -19,7 +19,7 @@
 		<h2 class="page-title" th:text="${today}"></h2>
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
 
 					<div class="card-body">
@@ -52,29 +52,21 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
+		</div>
 		</ul>
 	</div>
-		<div class="d-grid mt-4">
 
-			<form th:action="@{/category/create}" method="get">
 
-				<input type="hidden"
-					   name="today"
-					   id="today"
-					   th:value="${today}">
-
-				<button class="btn btn-success w-100" type="submit">
-			    	新規登録
-				</button>
 
+	<form th:action="@{/fixed-cost/create}" method="get">
+		<input type="hidden" name="today" id="today" th:value="${today}">
+		<button type="submit">新規登録</button>
 	</form>
 
-		</div>
-		
-	</div>
-
 	<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/goal_create.html

@@ -52,12 +52,9 @@
 
 				</form>
 
-			</div>
-		</div>
-	</div>
-	
 				<div th:replace="~{footer :: footer}"></div>
 
+
 </body>
 
 </html>

src/main/resources/templates/goal_record.html

@@ -8,7 +8,7 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 
@@ -74,16 +74,16 @@
 				</ul>
 
 			</div>
-		</div>
-		
 			<div class="d-grid mt-4">
 				<form th:action="@{/goal}" method="get">
+
 					<button class="btn btn-success w-100" type="submit">
 						戻る
 					</button>
+
 				</form>
 			</div>
-		
+		</div>
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

src/main/resources/templates/menu.html

@@ -138,6 +138,8 @@
 
 	    </div>
 
+
+
 	</div>
 	
 	<div class="card shadow-sm">

src/main/resources/templates/select_course.html

@@ -10,6 +10,7 @@
 
 <body style="padding-bottom: 120px">
 	<div th:replace="~{header :: header}"></div>
+
 	<h1 class="page-title">コース選択</h1>
 
 	<th:block th:if="${mode == 'change'}">