Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>分析画面</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<h2 class="text-center">支出分析</h2>
|
||||
|
||||
<table class="table text-center">
|
||||
@@ -78,6 +81,9 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div th:replace="~{footer :: footer}">
|
||||
</div>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
32
src/main/resources/templates/error.html
Normal file
32
src/main/resources/templates/error.html
Normal file
@@ -0,0 +1,32 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>エラー</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="container text-center mt-5">
|
||||
|
||||
<h2 class="text-danger">
|
||||
エラーが発生しました
|
||||
</h2>
|
||||
|
||||
<p th:text="${errorMessage}"></p>
|
||||
|
||||
<a class="btn btn-primary" th:href="@{/login}">
|
||||
ログイン画面へ
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
42
src/main/resources/templates/footer.html
Normal file
42
src/main/resources/templates/footer.html
Normal file
@@ -0,0 +1,42 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>フッター</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<footer th:fragment="footer" class="fixed-bottom border-top py-2" style="background-color:#E3F2FD;">
|
||||
|
||||
<nav data-bs-theme="light">
|
||||
<div class="card-footer text-center">
|
||||
<div class="row">
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/transaction/create}">入力</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/transaction/list}">一覧</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/analysis}">分析</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/goal}">目標</a>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
</footer>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
29
src/main/resources/templates/header.html
Normal file
29
src/main/resources/templates/header.html
Normal file
@@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>ヘッダー</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<header th:fragment="header">
|
||||
|
||||
<nav class="navbar" style="background-color: #e3f2fd;" data-bs-theme="light">
|
||||
<div class="container-fluid">
|
||||
<a th:href="@{/menu}" class="navbar-brand fw-bold">Monegement</a>
|
||||
<div class="d-flex gap-2">
|
||||
<a class="btn btn-outline-primary btn-sm" th:href="@{/course}">
|
||||
コース
|
||||
</a>
|
||||
<a class="btn btn-outline-secondary btn-sm" th:href="@{/profile}">
|
||||
プロフィール
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
</header>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -13,11 +13,11 @@
|
||||
<div th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<form th:action="@{/login}" th:object="${loginForm}" method="post">
|
||||
<div>
|
||||
<label for="emailAddress">メールアドレス</label>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
|
||||
<input type="email"
|
||||
id="emailAddress"
|
||||
th:field="{emailAddress}"
|
||||
id="mailAddress"
|
||||
th:field="*{mailAddress}"
|
||||
required>
|
||||
</div>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
<input type="password"
|
||||
id="password"
|
||||
th:field="{password}"
|
||||
th:field="*{password}"
|
||||
required>
|
||||
</div>
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
</form>
|
||||
|
||||
<div>
|
||||
<a href="@{user/register}">新規会員登録</a>
|
||||
<a th:href="@{user/register}">新規会員登録</a>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<a href="@{password/authentication}">パスワードを忘れた方</a>
|
||||
<a th:href="@{/authentication}">パスワードを忘れた方</a>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
72
src/main/resources/templates/menu.html
Normal file
72
src/main/resources/templates/menu.html
Normal file
@@ -0,0 +1,72 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Calendar</title>
|
||||
<link rel="stylesheet" th:href="@{/css/menu.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<span class="year" th:text="|${year}年|"></span>
|
||||
<span class="month" th:text="|${month}月|"></span>
|
||||
|
||||
<table id="calendar">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="holiday">日</th>
|
||||
<th>月</th>
|
||||
<th>火</th>
|
||||
<th>水</th>
|
||||
<th>木</th>
|
||||
<th>金</th>
|
||||
<th>土</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
<tr th:each="week : ${#numbers.sequence(0, 5)}">
|
||||
|
||||
<td th:each="weekDay : ${#numbers.sequence(0, 6)}">
|
||||
|
||||
<div th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1 and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}">
|
||||
|
||||
<div class="date" th:text="${week * 7 + weekDay - firstDayOfWeek + 1}">
|
||||
</div>
|
||||
|
||||
<div th:each="income : ${incomeList}"
|
||||
th:if="${income.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
|
||||
class="income"
|
||||
th:text="|収入 +${income.amount}円|"
|
||||
style="color: blue;">
|
||||
</div>
|
||||
|
||||
<div th:each="expense : ${expenseList}"
|
||||
th:if="${expense.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
|
||||
class="expense"
|
||||
th:text="|支出 -${expense.amount}円|"
|
||||
style="color: red;">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div>
|
||||
<h2>
|
||||
<span th:text="|収入：${totalIncome}|"></span>
|
||||
<span th:text="|支出：${totalExpense}|"></span>
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
42
src/main/resources/templates/password_reset.html
Normal file
42
src/main/resources/templates/password_reset.html
Normal file
@@ -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:object="${passwordResetForm}" 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>
|
||||
68
src/main/resources/templates/transaction_create.html
Normal file
68
src/main/resources/templates/transaction_create.html
Normal file
@@ -0,0 +1,68 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Insert title here</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>取引登録</h1>
|
||||
|
||||
<form th:action="@{/transaction/create}" th:object="${transactionForm}" method="post">
|
||||
|
||||
<div>
|
||||
<label for="transactionDate">日付</label>
|
||||
<input type="date" id="transactionDate" th:field="*{transactionDate}">
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<div>
|
||||
<label for="transactionType">収入・支出</label>
|
||||
|
||||
<select id="transactionType" th:field="*{transactionType}">
|
||||
|
||||
<option value="">選択してください</option>
|
||||
<option value="1">支出</option>
|
||||
<option value="2">収入</option>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<div>
|
||||
<label for="categoryId">カテゴリ</label>
|
||||
|
||||
<select id="categoryId" th:field="*{categoryId}">
|
||||
|
||||
<option value="">選択してください</option>
|
||||
|
||||
<option th:each="category : ${categoryFormList}" th:value="${category.categoryId}"
|
||||
th:text="${category.categoryName}">
|
||||
</option>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<div>
|
||||
<label for="amount">金額</label>
|
||||
|
||||
<input type="number" id="amount" th:field="*{amount}" min="0" placeholder="金額を入力してください">
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<input type="hidden" name="today" id="today" th:value="${today}">
|
||||
|
||||
<button type="submit">登録</button>
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
38
src/main/resources/templates/transaction_detail.html
Normal file
38
src/main/resources/templates/transaction_detail.html
Normal file
@@ -0,0 +1,38 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>収支詳細</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1 th:text="${today}"></h1>
|
||||
|
||||
<div>
|
||||
<ul>
|
||||
<li th:each="transactionForm : ${transactionFormList}">
|
||||
<p>カテゴリ名：<span th:text="${transactionForm.categoryName}"></span>
|
||||
<br>金額：<span th:text="${transactionForm.amount}"></span>
|
||||
</p>
|
||||
<form th:action="@{/transaction/delete}" method="post">
|
||||
<input type="hidden" name="today" id="today" th:value="${today}">
|
||||
<input type="hidden" name="transactionId" id="transactionId" value="${transactionForm.transactionId}">
|
||||
|
||||
<button type="submit">削除</button>
|
||||
</form>
|
||||
<hr />
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<form th:action="@{/transaction/create}" method="get">
|
||||
<input type="hidden" name="today" id="today" th:value="${today}">
|
||||
|
||||
<button type="submit">新規登録</button>
|
||||
</form>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
29
src/main/resources/templates/transaction_list.html
Normal file
29
src/main/resources/templates/transaction_list.html
Normal file
@@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>一覧</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div th:each="transactionForm : ${transactionFormMap}">
|
||||
|
||||
<a th:href="@{/transaction/detail(todayDates=${transactionForm.key})}">
|
||||
<h3 th:text="${transactionForm.key}"></h3>
|
||||
</a>
|
||||
<ul>
|
||||
<li th:each="transaction : ${transactionForm.value}">
|
||||
<p>カテゴリ名：<span th:text="${transaction.categoryName}"></span>
|
||||
<br>金額：<span th:text="${transaction.amount}"></span>
|
||||
</p>
|
||||
<hr />
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -98,28 +98,18 @@
|
||||
|
||||
<div>
|
||||
<label for="goalId">目標</label>
|
||||
<select id="goalId"
|
||||
<input type="number"
|
||||
id="goalId"
|
||||
th:field="*{goalId}"
|
||||
min="0"
|
||||
required>
|
||||
<option value="">選択してください</option>
|
||||
<option th:each="goal : ${goalList}"
|
||||
th:value="${goal.goalId}"
|
||||
th:text="${goal.goalTitle}">
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="courseId">コース</label>
|
||||
<select id="courseId"
|
||||
th:field="*{courseId}"
|
||||
required>
|
||||
<option value="">選択してください</option>
|
||||
<option th:each="course : ${courseList}"
|
||||
th:value="${course.courseId}"
|
||||
th:text="${course.courseName}">
|
||||
</option>
|
||||
</select>
|
||||
<label>コース</label>
|
||||
<input type="hidden" th:field="*{courseId}">
|
||||
<span th:text="${selectedCourseName}">未選択</span>
|
||||
<button type="button"onclick="location.href='/select-course'">コース選択</button>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user