8 Commits

10 changed files with 78 additions and 51 deletions

View File

@@ -25,8 +25,6 @@ public class LoginServiceImpl implements LoginService {
if (userEntity == null) {
return null;
} else if (userEntity.getDeleteFlag() == 1) {
return null;
}
boolean isValidPassword = false;

View File

@@ -35,7 +35,7 @@
<table class="table text-center">
<thead>
<tr>
<th scope="col">カテゴリ別</th>
<th scope="col"></th>
<th scope="col">支出</th>
<th scope="col">前月比</th>
</tr>

View File

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

View File

@@ -47,7 +47,7 @@
<input type="hidden" name="categoryId" th:value="${categoryId}">
<div class="d-grid">
<button type="submit" class="btn btn-primary">登録</button>
<button type="submit" class="btn btn-primary">更新</button>
</div>
</form>
</div>

View File

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

View File

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

View File

@@ -8,7 +8,7 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
</head>
<body class="pb-5 pt-5">
<body style="padding-top:80px; padding-bottom:80px;">
<div th:replace="~{header :: header}"></div>
@@ -74,16 +74,16 @@
</ul>
</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 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 th:replace="~{footer :: footer}"></div>

View File

@@ -189,6 +189,8 @@
</div>
<div class="d-grid gap-2 mt-4">
<form th:action="@{/goal/create}" method="get">
<button type="submit" class="btn btn-success w-100">
@@ -205,6 +207,8 @@
</form>
</div>
<div th:replace="~{footer :: footer}"></div>
</body>

View File

@@ -102,14 +102,14 @@
required>
</div>
</div>
<div class="d-grid">
<button type="submit"
class="btn btn-primary">
編集
</button>
</div>
<div class="d-grid">
<button type="submit"
class="btn btn-primary">
確定
</button>
</div>
</div>
</form>

View File

@@ -5,6 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" th:href="@{/css/style.css}">
<title>コース選択</title>
</head>
@@ -12,13 +13,15 @@
<div th:replace="~{header :: header}"></div>
<h1 class="page-title">コース選択</h1>
<th:block th:if="${mode == 'change'}">
<form th:action="@{/course/create}" method="get">
<button type="submit">新規登録</button>
</form>
<div class="d-grid gap-2 mt-4">
<th:block th:if="${mode == 'change'}">
<form th:action="@{/course/create}" method="get">
<button class="btn btn-success w-100" type="submit">
新規登録
</button>
</form>
</th:block>
</th:block>
<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
<button type="submit" class="btn btn-primary w-100">確定</button>
@@ -53,6 +56,7 @@
</div>
</div>
</form>
</div>
<th:block th:if="${mode=='change'}">
<div th:replace="~{footer :: footer}"></div>