From 867926391fa7477ea166e28437cb5e99510d5dc5 Mon Sep 17 00:00:00 2001
From: k-oshita <k-oshita@iij.ad.jp>
Date: Thu, 17 Sep 2026 13:56:58 +0900
Subject: [PATCH 1/8] =?UTF-8?q?[ADD]=20=E7=9B=AE=E6=A8=99=E3=81=AE?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AERepository=E3=82=92=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/app/infra/repository/GoalRepository.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/main/java/com/example/demo/app/infra/repository/GoalRepository.java

diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
new file mode 100644
index 0000000..ce05827
--- /dev/null
+++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
@@ -0,0 +1,11 @@
+package com.example.demo.app.infra.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.app.infra.entity.GoalEntity;
+
+@Repository
+public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
+
+}
\ No newline at end of file

From 68fbe403859b62593a9643771e59b513512e0d0a Mon Sep 17 00:00:00 2001
From: k-oshita <k-oshita@iij.ad.jp>
Date: Thu, 17 Sep 2026 14:03:44 +0900
Subject: [PATCH 2/8] =?UTF-8?q?[EDIT]=20=E6=94=B9=E8=A1=8C=E3=83=BB?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/app/infra/repository/GoalRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
index ce05827..a5a06cd 100644
--- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
+++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
@@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity;
 
 @Repository
 public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
-
+//aaaaaa
 }
\ No newline at end of file

From 0b336dcf5aae3a620f508ae78bea533c98a5481f Mon Sep 17 00:00:00 2001
From: k-oshita <k-oshita@iij.ad.jp>
Date: Thu, 17 Sep 2026 14:16:29 +0900
Subject: [PATCH 3/8] =?UTF-8?q?[EDIT]=20=E6=94=B9=E8=A1=8C=E3=83=BB?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E4=BD=8D=E7=BD=AE=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/app/infra/repository/GoalRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
index a5a06cd..17d2bbf 100644
--- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
+++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
@@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity;
 
 @Repository
 public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
-//aaaaaa
+	//aaa
 }
\ No newline at end of file

From 54b909d00d5ec378bab24ec36d9e19607e616eb2 Mon Sep 17 00:00:00 2001
From: k-oshita <k-oshita@iij.ad.jp>
Date: Thu, 17 Sep 2026 14:22:06 +0900
Subject: [PATCH 4/8] =?UTF-8?q?[ADD]=20=E7=9B=AE=E6=A8=99=E3=81=AE?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AEModel=E3=82=92=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/app/domain/model/GoalModel.java      | 24 +++++++++++++++++++
 .../app/infra/repository/GoalRepository.java  |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/example/demo/app/domain/model/GoalModel.java

diff --git a/src/main/java/com/example/demo/app/domain/model/GoalModel.java b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
new file mode 100644
index 0000000..7764281
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
@@ -0,0 +1,24 @@
+package com.example.demo.app.domain.model;
+
+import java.time.LocalDate;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class GoalModel {
+
+	private Long goalId;
+
+	private String goalTitle;
+
+	private String goalSubtitle;
+
+	private Integer targetAmount;
+
+	private LocalDate deadline;
+
+	private Integer goalComplete;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
index 17d2bbf..c66aa15 100644
--- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
+++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
@@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity;
 
 @Repository
 public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
-	//aaa
+	
 }
\ No newline at end of file

From a89c54f8c0be3b81503242377b8cf852a9dc698a Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Thu, 17 Sep 2026 15:49:11 +0900
Subject: [PATCH 5/8] =?UTF-8?q?[ADD]=20Course,=20CoureseInfo=E3=81=AE?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=93=E3=82=B9=E3=81=A8=E3=81=9D=E3=82=8C?=
 =?UTF-8?q?=E3=82=92=E5=AE=9F=E8=A3=85=E3=81=97=E3=81=9F=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/domain/service/CourseInfoService.java | 10 ++++++++
 .../app/domain/service/CourseService.java     | 11 +++++++++
 .../service/impl/CourseInfoServiceImpl.java   | 23 ++++++++++++++++++
 .../service/impl/CourseServiceImpl.java       | 24 +++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 src/main/java/com/example/demo/app/domain/service/CourseInfoService.java
 create mode 100644 src/main/java/com/example/demo/app/domain/service/CourseService.java
 create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java
 create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java

diff --git a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java
new file mode 100644
index 0000000..83cf4ab
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java
@@ -0,0 +1,10 @@
+package com.example.demo.app.domain.service;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.CourseInfoModel;
+
+public interface CourseInfoService {
+
+	public List<CourseInfoModel> findAll();
+}
diff --git a/src/main/java/com/example/demo/app/domain/service/CourseService.java b/src/main/java/com/example/demo/app/domain/service/CourseService.java
new file mode 100644
index 0000000..4681860
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/CourseService.java
@@ -0,0 +1,11 @@
+package com.example.demo.app.domain.service;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.CourseModel;
+
+public interface CourseService {
+	
+	public List<CourseModel> findAll();
+	
+}
diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java
new file mode 100644
index 0000000..4658a18
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java
@@ -0,0 +1,23 @@
+package com.example.demo.app.domain.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.model.CourseInfoModel;
+import com.example.demo.app.domain.service.CourseInfoService;
+import com.example.demo.app.infra.repository.AllocationRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class CourseInfoServiceImpl implements CourseInfoService {
+	
+	private final AllocationRepository allocationRepository;
+	
+	@Override
+	public List<CourseInfoModel> findAll() {
+		return allocationRepository.findAllJoinedAllocation();
+	}
+}
diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
new file mode 100644
index 0000000..a4dec5f
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
@@ -0,0 +1,24 @@
+package com.example.demo.app.domain.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.model.CourseModel;
+import com.example.demo.app.domain.service.CourseService;
+import com.example.demo.app.infra.entity.CourseEntity;
+import com.example.demo.app.infra.repository.CourseRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class CourseServiceImpl implements CourseService {
+
+	private final CourseRepository courseRepository;
+	
+	public List<CourseModel> findAll(){
+		return CourseEntity.createCourseModelList(courseRepository.findAll());
+	}
+	
+}

From 1e0946398414163441ac7ac510b8be69bcf80a04 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Thu, 17 Sep 2026 15:50:11 +0900
Subject: [PATCH 6/8] =?UTF-8?q?[ADD]=20=E3=82=B3=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=AB=E9=81=B7=E7=A7=BB?=
 =?UTF-8?q?=E3=81=99=E3=82=8BCourseController=E3=82=92=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CourseController.java          | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/main/java/com/example/demo/app/presentation/controller/CourseController.java

diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java
new file mode 100644
index 0000000..c9199af
--- /dev/null
+++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java
@@ -0,0 +1,52 @@
+package com.example.demo.app.presentation.controller;
+
+import java.util.logging.Logger;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import com.example.demo.app.domain.service.CourseInfoService;
+import com.example.demo.app.domain.service.CourseService;
+import com.example.demo.app.presentation.form.CourseForm;
+import com.example.demo.app.presentation.form.CourseInfoForm;
+
+import lombok.RequiredArgsConstructor;
+
+
+@Controller
+@RequiredArgsConstructor
+public class CourseController {
+	
+	private final static Logger LOGGER = Logger.getLogger(CourseController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    // private final HttpSession httpSession;
+    private final CourseService courseService;
+    private final CourseInfoService courseInfoService;
+    
+    
+    
+    @GetMapping("/select-course")
+    public String select(Model model) {
+    	
+    	//try {
+    		model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
+    		model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
+    		
+    		return "select-course";
+    		
+    	//} catch (Exception e) {
+//    		// ログイン情報の破棄
+//            httpSession.invalidate();
+//
+//            e.printStackTrace();
+//
+//            // エラーログ出力
+//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//            // エラー画面遷移
+//            return null;
+//    	}
+    }
+}

From bda791567cb7f91ff683f2e4245691ea07befcc8 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Thu, 17 Sep 2026 15:50:43 +0900
Subject: [PATCH 7/8] =?UTF-8?q?[ADD]=20=E3=82=B3=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=82=92=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/select_course.html    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/main/resources/templates/select_course.html

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
new file mode 100644
index 0000000..6718ef4
--- /dev/null
+++ b/src/main/resources/templates/select_course.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>コース選択</title>
+</head>
+<body>
+	
+	<div class="accordion" id="accordionExample">
+	  <div class="accordion-item" th:each="course:${courseList}">
+	    <h2 class="accordion-header">
+	      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+	        <span th:text="${course.courseName}"></span>
+	      </button>
+	    </h2>
+	    <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
+	      <div class="accordion-body">
+	        <span th:text="${course.description}"></span>
+			<table border="1">
+				<tr>
+					<th>カテゴリ名</th><tr>配分(%)</tr>
+				</tr>
+				<tr th:each="courseInfo:${courseInfoList}" th:if="course.courseId=courseInfo.courseId">
+					<td th:text="${courseInfo.categoryName}"></td>
+					<td th:text="${courseInfo.allocationRatio}"></td>
+				</tr>
+			</table>
+	      </div>
+	    </div>
+	  </div>
+	</div>
+	
+	
+</body>
+</html>
\ No newline at end of file

From 192191d352f1a468d450890424445c7383c82262 Mon Sep 17 00:00:00 2001
From: s-morimoto <s-morimoto@iij.ad.jp>
Date: Thu, 17 Sep 2026 15:59:33 +0900
Subject: [PATCH 8/8] =?UTF-8?q?[ADD]=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E5=86=8D=E8=A8=AD=E5=AE=9A=E3=81=AE=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/service/PasswordResetService.java  |  8 +++
 .../impl/PasswordResetServiceImpl.java        | 41 +++++++++++++
 .../controller/PasswordResetController.java   | 61 +++++++++++++++++++
 .../presentation/form/PasswordResetForm.java  | 13 ++++
 .../resources/templates/password_reset.html   | 42 +++++++++++++
 .../templates/user_register_confirm.html      |  2 +-
 6 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
 create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java
 create mode 100644 src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
 create mode 100644 src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
 create mode 100644 src/main/resources/templates/password_reset.html

diff --git a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
new file mode 100644
index 0000000..ec1140e
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
@@ -0,0 +1,8 @@
+package com.example.demo.app.domain.service;
+
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+public interface PasswordResetService {
+
+    boolean resetPassword(Long userId, PasswordResetForm passwordResetForm);
+}
diff --git a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java
new file mode 100644
index 0000000..2866cea
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java
@@ -0,0 +1,41 @@
+package com.example.demo.app.domain.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class PasswordResetServiceImpl implements PasswordResetService {
+
+    private final UserRepository userRepository;
+
+    @Override
+    public boolean resetPassword(
+            Long userId,
+            PasswordResetForm passwordResetForm) {
+
+        if (!passwordResetForm.getPassword()
+                .equals(passwordResetForm.getPasswordConfirm())) {
+            return false;
+        }
+
+        UserEntity userEntity =
+                userRepository.findById(userId).orElse(null);
+
+        if (userEntity == null) {
+            return false;
+        }
+
+        userEntity.setPassword(passwordResetForm.getPassword());
+
+        userRepository.save(userEntity);
+
+        return true;
+    }
+}
diff --git a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
new file mode 100644
index 0000000..b5fcfba
--- /dev/null
+++ b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
@@ -0,0 +1,61 @@
+package com.example.demo.app.presentation.controller;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+public class PasswordResetController {
+
+    private final PasswordResetService passwordResetService;
+
+    @GetMapping("/password_reset")
+    public String showPasswordReset(Model model) {
+
+        model.addAttribute(
+                "passwordResetForm",
+                new PasswordResetForm());
+
+        return "password_reset";
+    }
+
+    @PostMapping("/password_reset")
+    public String resetPassword(
+            PasswordResetForm passwordResetForm,
+            Model model,
+            HttpSession session) {
+
+        Long userId =
+                (Long) session.getAttribute("passwordResetUserId");
+
+        if (userId == null) {
+            return "redirect:/login";
+        }
+
+        boolean isReset =
+                passwordResetService.resetPassword(
+                        userId,
+                        passwordResetForm);
+
+        if (!isReset) {
+            model.addAttribute(
+                    "errorMessage",
+                    "パスワードが一致していません。");
+
+            return "password_reset";
+        }
+
+        session.removeAttribute("passwordResetUserId");
+
+        return "redirect:/login";
+    }
+}
diff --git a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
new file mode 100644
index 0000000..3213e1b
--- /dev/null
+++ b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
@@ -0,0 +1,13 @@
+package com.example.demo.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PasswordResetForm {
+    private String password;
+    private String passwordConfirm;
+}
diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html
new file mode 100644
index 0000000..522fd4b
--- /dev/null
+++ b/src/main/resources/templates/password_reset.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="ja"xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>パスワード再設定</title>
+</head>
+<body>
+	<header></header>
+	
+	<main>
+		<h1>パスワード再設定</h1>
+		
+		<form th:action="@{/password_reset}" th:obiect="${passwordResteForm"} method="post">
+			<div>
+				<label for="password">新しいパスワード</label>
+				<input type="password"
+				id="password"
+				th:field="*{password}"
+				minlength="8"
+				maxlength="255"
+				required>
+			</div>
+			
+			<div>
+				<label for="passwordConfirm">パスワード確認</label>
+				<input type="password"
+				id="passwordConfirm"
+				th:field="*{passwordConfirm}"
+				minlength="8"
+				maxlength="255"
+				required>
+			</div>
+			
+			<button type="submit">再設定</button>
+		</form>
+		
+		<div th:if="${errorMessage}">
+		    <p th:text="${errorMessage}"></p>
+		</div>
+	</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html
index aad56dd..2b35041 100644
--- a/src/main/resources/templates/user_register_confirm.html
+++ b/src/main/resources/templates/user_register_confirm.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="ja"xmlns:th="http://www.thymeleaf.org">
 <head>
 <meta charset="UTF-8">
 <title>新規会員登録確認</title>