2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_0910_AI_5G_Java_MUN:19d27c7722d161a10a3124cbd6ed6798c4b4f0f3
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein
..
compare: 2026_0910_AI_5G_Java_MUN:o-matsuda
Branches Tags
2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein

6 Commits
19d27c7722 ... o-matsuda

Author SHA1 Message Date
o-matsuda
044a6b5609 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/pom.xml
#	book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
#	book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java
 2026-10-27 15:22:16 +09:00
o-matsuda
bc8c93d2ea Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/src/main/resources/static/css/style.css
 2026-10-27 14:47:24 +09:00
o-matsuda
adf3ece0d2 バリテーション追加 2026-10-27 14:25:06 +09:00
t-eguchi
309b2a2b79 プルNG 2026-10-27 13:52:32 +09:00
t-eguchi
fa606e3cbf ログインロック 2026-10-27 13:29:46 +09:00
t-eguchi
72bd137e8d ログインロック機能 2026-10-27 10:59:00 +09:00
20 changed files with 575 additions and 964 deletions
Expand all files Collapse all files

254
book-rent/pom.xml
View File

@@ -1,254 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
<artifactId>book-rent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>book-rent</name>
<description/>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<!--<?xml version="1.0" encoding="UTF-8"?>-->
<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
<!-- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">-->
<!-- <modelVersion>4.0.0</modelVersion>-->
<!-- <parent>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
<!-- <version>4.1.1</version>-->
<!-- <relativePath/> lookup parent from repository -->
<!-- </parent>-->
<!-- <groupId>com.example</groupId>-->
<!-- <artifactId>book-rent</artifactId>-->
<!-- <version>0.0.1-SNAPSHOT</version>-->
<!-- <packaging>war</packaging>-->
<!-- <name>book-rent</name>-->
<!-- <description/>-->
<!-- <url/>-->
<!-- <licenses>-->
<!-- <license/>-->
<!-- </licenses>-->
<!-- <developers>-->
<!-- <developer/>-->
<!-- </developers>-->
<!-- <scm>-->
<!-- <connection/>-->
<!-- <developerConnection/>-->
<!-- <tag/>-->
<!-- <url/>-->
<!-- </scm>-->
<!-- <properties>-->
<!-- <java.version>21</java.version>-->
<!-- </properties>-->
<!-- <dependencies>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-thymeleaf</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-validation</artifactId>-->
<!--</dependency>-->
<!-- webmvcから通常のwebスターターに変更 -->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-web</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-devtools</artifactId> ここを修正 -->
<!--<scope>runtime</scope>-->
<!--<optional>true</optional>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.mysql</groupId>-->
<!--<artifactId>mysql-connector-j</artifactId>-->
<!--<scope>runtime</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.projectlombok</groupId>-->
<!--<artifactId>lombok</artifactId>-->
<!--<optional>true</optional>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-test</artifactId>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>default-compile</id>-->
<!-- <phase>compile</phase>-->
<!-- <goals>-->
<!-- <goal>compile</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <annotationProcessorPaths>-->
<!-- <path>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- </path>-->
<!-- </annotationProcessorPaths>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>default-testCompile</id>-->
<!-- <phase>test-compile</phase>-->
<!-- <goals>-->
<!-- <goal>testCompile</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <annotationProcessorPaths>-->
<!-- <path>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- </path>-->
<!-- </annotationProcessorPaths>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
<!--</project>-->

33
book-rent/src/main/java/com/example/demo/common/LoginUser.java
View File

@@ -1,7 +1,5 @@
package com.example.demo.common; package com.example.demo.common;
import java.io.Serializable; import java.io.Serializable;
/** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */ /** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */
@@ -20,12 +18,31 @@ public class LoginUser implements Serializable {
this.knEmployee = knEmployee; this.knEmployee = knEmployee;
this.mailAddress = mailAddress; this.mailAddress = mailAddress;
this.flgAdmin = flgAdmin; this.flgAdmin = flgAdmin;
}
public Integer getIdEmployee() {
return idEmployee;
}
public String getNmEmployee() {
return nmEmployee;
}
public String getKnEmployee() {
return knEmployee;
}
public String getMailAddress() {
return mailAddress;
}
public String getFlgAdmin() {
return flgAdmin;
}
public boolean isAdmin() {
return Const.ADMIN_YES.equals(flgAdmin);
} }
public Integer getIdEmployee() { return idEmployee; }
public String getNmEmployee() { return nmEmployee; }
public String getKnEmployee() { return knEmployee; }
public String getMailAddress() { return mailAddress; }
public String getFlgAdmin() { return flgAdmin; }
public boolean isAdmin() { return Const.ADMIN_YES.equals(flgAdmin); }
} }

38
book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
View File

@@ -14,59 +14,47 @@ import com.example.demo.service.LoginAttemptService;
// ログイン失敗時の処理 // ログイン失敗時の処理
@Component @Component
public class CustomAuthenticationFailureHandler public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
extends SimpleUrlAuthenticationFailureHandler {
private final LoginAttemptService loginAttemptService; private LoginAttemptService loginAttemptService;
public CustomAuthenticationFailureHandler( public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
LoginAttemptService loginAttemptService) {
this.loginAttemptService = loginAttemptService; this.loginAttemptService = loginAttemptService;
} }
@Override @Override
public void onAuthenticationFailure( public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
HttpServletRequest request, AuthenticationException exception) throws IOException, ServletException {
HttpServletResponse response,
AuthenticationException exception)
throws IOException, ServletException {
// 画面から入力されたメールアドレスを取得 // 画面から入力されたメールアドレスを取得
String mailAddress = request.getParameter("mailAddress"); String mailAddress = request.getParameter("mailAddress");
// メールアドレスが空欄の場合 if (mailAddress != null && !mailAddress.isBlank()) {
if (mailAddress == null || mailAddress.isBlank()) {
getRedirectStrategy().sendRedirect(
request, response, "/login?error=empty");
return;
}
String mail = mailAddress.trim(); String mail = mailAddress.trim();
// すでにロックされている場合
if (loginAttemptService.isBlocked(mail)) { if (loginAttemptService.isBlocked(mail)) {
getRedirectStrategy().sendRedirect( getRedirectStrategy().sendRedirect(
request, response, "/login?error=locked"); request, response, "/login?error=locked");
return; return;
} }
// ログイン失敗回数を増やす // 失敗回数を１増やす
loginAttemptService.loginFailed(mail); loginAttemptService.loginFailed(mail);
// 失敗回数の上限に達した場合 // すでにロック中なら失敗回数を増やさない
if (loginAttemptService.isBlocked(mail)) { if (loginAttemptService.isBlocked(mail)) {
getRedirectStrategy().sendRedirect( getRedirectStrategy().sendRedirect(
request, response, "/login?error=locked"); request, response, "/login?error=locked");
return; return;
} }
// 残りのログイン試行回数を取得 // あと何回失敗されるとロックされるか取得
int remaining = int remaining = loginAttemptService.getRemainingAttempts(mail);
loginAttemptService.getRemainingAttempts(mail);
getRedirectStrategy().sendRedirect( getRedirectStrategy().sendRedirect(
request, response, request, response, "/login?error=failed&remaining=" + remaining);
"/login?error=failed&remaining=" + remaining); }
} }
} }

1
book-rent/src/main/java/com/example/demo/config/LoginCheckInterceptor.java
View File

@@ -34,4 +34,5 @@ public class LoginCheckInterceptor implements HandlerInterceptor {
} }
return true; return true;
} }
} }

6
book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
View File

@@ -43,7 +43,8 @@ public class AdminBookController {
@PostMapping(NEW + "/confirm") @PostMapping(NEW + "/confirm")
public String newConfirm(@ModelAttribute("form") BookForm form, Model model) { public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
List<String> errors = bookAdminService.validate(form); List<String> errors = bookAdminService.validate(form);
if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model); if (!errors.isEmpty())
return input(form, errors, "書籍登録", NEW, model);
return confirm("書籍登録", NEW, model); return confirm("書籍登録", NEW, model);
} }
@@ -87,7 +88,8 @@ public class AdminBookController {
@PostMapping(EDIT + "/confirm") @PostMapping(EDIT + "/confirm")
public String editConfirm(@ModelAttribute("form") BookForm form, Model model) { public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
List<String> errors = bookAdminService.validate(form); List<String> errors = bookAdminService.validate(form);
if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model); if (!errors.isEmpty())
return input(form, errors, "書籍編集", EDIT, model);
return confirm("書籍編集", EDIT, model); return confirm("書籍編集", EDIT, model);
} }

48
book-rent/src/main/java/com/example/demo/controller/BookController.java
View File

@@ -1,6 +1,5 @@
package com.example.demo.controller; package com.example.demo.controller;
import java.util.List; import java.util.List;
import java.util.stream.IntStream; import java.util.stream.IntStream;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import com.example.demo.entity.BookCollection; import com.example.demo.entity.BookCollection;
import com.example.demo.service.BookService; import com.example.demo.service.BookService;
/** BOOK-01：書籍検索（bookList.html） */ /** BOOK-01：書籍検索（bookList.html） */
@Controller @Controller
public class BookController { public class BookController {
@@ -23,7 +21,6 @@ public class BookController {
this.bookService = bookService; this.bookService = bookService;
} }
/** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */ /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
@GetMapping("/books") @GetMapping("/books")
public String list(@RequestParam(defaultValue = "") String nmBook, public String list(@RequestParam(defaultValue = "") String nmBook,
@@ -33,10 +30,8 @@ public class BookController {
@RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "10") int size,
Model model) { Model model) {
Page<BookCollection> bookPage = Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
bookService.searchLendable(nmBook, publisher, note, page, size); List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
List<Integer> pageNumbers =
IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
model.addAttribute("books", bookPage); model.addAttribute("books", bookPage);
model.addAttribute("bookPage", bookPage); model.addAttribute("bookPage", bookPage);
@@ -49,42 +44,3 @@ public class BookController {
} }
} }
//package com.example.demo.controller;
//
//
//
//
//
//
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RequestParam;
//
//import com.example.demo.service.BookService;
//
//
///** BOOK-01：書籍検索（bookList.html） */
//@Controller
//public class BookController {
// private final BookService bookService;
//
// public BookController(BookService bookService) {
// this.bookService = bookService;
// }
//
// /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
// @GetMapping("/books")
// public String list(@RequestParam(defaultValue = "") String nmBook,
// @RequestParam(defaultValue = "") String publisher,
// @RequestParam(defaultValue = "") String note,
// Model model) {
// model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
// // 検索条件を保持
// model.addAttribute("nmBook", nmBook);
// model.addAttribute("publisher", publisher);
// model.addAttribute("note", note);
// return "bookList";
// }
//
//}

3
book-rent/src/main/java/com/example/demo/controller/EmployeeController.java
View File

@@ -46,7 +46,8 @@ public class EmployeeController {
} }
@PostMapping(NEW + "/confirm") @PostMapping(NEW + "/confirm")
public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) { public String registConfirm(@ModelAttribute("form") EmployeeForm form,
Model model) {
List<String> errors = employeeService.validateRegist(form); List<String> errors = employeeService.validateRegist(form);
if (!errors.isEmpty()) if (!errors.isEmpty())
return registView(form, errors, model); return registView(form, errors, model);

1
book-rent/src/main/java/com/example/demo/entity/Employee.java
View File

@@ -105,4 +105,5 @@ public class Employee {
public void setDateUpdate(LocalDateTime v) { public void setDateUpdate(LocalDateTime v) {
this.dateUpdate = v; this.dateUpdate = v;
} }
} }

2
book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
View File

@@ -1,5 +1,7 @@
package com.example.demo.form; package com.example.demo.form;
/** 社員登録・編集フォーム */ /** 社員登録・編集フォーム */
public class EmployeeForm { public class EmployeeForm {
private Integer idEmployee; private Integer idEmployee;

39
book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java
View File

@@ -40,42 +40,3 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to, int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
@Param("uid") Integer uid, @Param("now") LocalDateTime now); @Param("uid") Integer uid, @Param("now") LocalDateTime now);
} }
//package com.example.demo.repository;
//
//import java.time.LocalDateTime;
//import java.util.List;
//
//import org.springframework.data.jpa.repository.JpaRepository;
//import org.springframework.data.jpa.repository.Modifying;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.query.Param;
//
//import com.example.demo.entity.BookCollection;
//
//public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
//
// /**
// * 貸出可の蔵書を部分一致(AND)で検索する。
// * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
// */
// @Query("select b from BookCollection b "
// + "where b.flgLending = :lending "
// + "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
// + "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
// + "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
// + "order by b.idBook")
// List<BookCollection> search(@Param("lending") String lending,
// @Param("nm") String nm,
// @Param("publisher") String publisher,
// @Param("note") String note);
//
// /**
// * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
// * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
// */
// @Modifying(clearAutomatically = true, flushAutomatically = true)
// @Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
// + "where b.idBook = :id and b.flgLending = :from")
// int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
// @Param("uid") Integer uid, @Param("now") LocalDateTime now);
//}

1
book-rent/src/main/java/com/example/demo/repository/EmployeeRepository.java
View File

@@ -10,4 +10,5 @@ public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement); Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
Optional<Employee> findByMailAddress(String mailAddress); Optional<Employee> findByMailAddress(String mailAddress);
} }

26
book-rent/src/main/java/com/example/demo/service/BookAdminService.java
View File

@@ -28,14 +28,20 @@ public class BookAdminService {
public List<String> validate(BookForm f) { public List<String> validate(BookForm f) {
f.trim(); f.trim();
List<String> e = new ArrayList<>(); List<String> e = new ArrayList<>();
if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。"); if (f.getIsbn().isEmpty())
else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。"); e.add("ISBNを入力してください。");
if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。"); else if (f.getIsbn().length() > 13)
else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。"); e.add("ISBNは13文字以内で入力してください。");
if(!f.getKnBook().matches("^[\\u3040-\\u309F]+$")) e.add("書籍名よみはひらがなで入力してください"); if (f.getNmBook().isEmpty())
else if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。"); e.add("書籍名を入力してください。");
if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。"); else if (f.getNmBook().length() > 50)
e.add("書籍名は50文字以内で入力してください。");
if (f.getKnBook().length() > 100)
e.add("書籍名よみは100文字以内で入力してください。");
else if (!f.getKnBook().matches("^[\\u3040-\\u309F]+$"))
e.add("書籍名よみはひらがなで入力してください");
if (f.getPublisher().length() > 50)
e.add("出版社は50文字以内で入力してください。");
return e; return e;
} }
@@ -80,10 +86,10 @@ public class BookAdminService {
private void check(BookForm f) { private void check(BookForm f) {
List<String> errors = validate(f); List<String> errors = validate(f);
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors)); if (!errors.isEmpty())
throw new BusinessException(String.join(" ", errors));
} }
private static void apply(BookCollection b, BookForm f) { private static void apply(BookCollection b, BookForm f) {
b.setIsbn(f.getIsbn()); b.setIsbn(f.getIsbn());
b.setNmBook(f.getNmBook()); b.setNmBook(f.getNmBook());

42
book-rent/src/main/java/com/example/demo/service/BookService.java
View File

@@ -20,48 +20,16 @@ public class BookService {
/** 貸出可の蔵書を検索する。全て未入力なら全件。 */ /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Page<BookCollection> searchLendable(String nmBook, String publisher, String note,int page, int size) { public Page<BookCollection> searchLendable(String nmBook, String publisher, String note, int page, int size) {
return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),PageRequest.of(page, size)); return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),
PageRequest.of(page, size));
} }
/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */ /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
static String normalize(String s) { static String normalize(String s) {
if (s == null) return ""; if (s == null)
return "";
return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_"); return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
} }
} }
//package com.example.demo.service;
//
//import java.util.List;
//
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//
//import com.example.demo.common.Const;
//import com.example.demo.entity.BookCollection;
//import com.example.demo.repository.BookCollectionRepository;
//
///** BOOK-01：書籍検索 */
//@Service
//public class BookService {
// private final BookCollectionRepository bookRepository;
//
// public BookService(BookCollectionRepository bookRepository) {
// this.bookRepository = bookRepository;
// }
//
// /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
// @Transactional(readOnly = true)
// public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
// return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
// }
//
// /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
// static String normalize(String s) {
// if (s == null) return "";
// return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
// }
//}
//

2
book-rent/src/main/java/com/example/demo/service/EmployeeService.java
View File

@@ -110,8 +110,6 @@ public class EmployeeService {
e.add("社員名よみを入力してください。"); e.add("社員名よみを入力してください。");
else if (f.getKnEmployee().length() > 100) else if (f.getKnEmployee().length() > 100)
e.add("社員名よみは100文字以内で入力してください。"); e.add("社員名よみは100文字以内で入力してください。");
else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
e.add("社員名よみはひらがなで入力してください");
} }
private void checkMail(EmployeeForm f, Integer selfId, List<String> e) { private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {

171
book-rent/src/main/resources/static/css/style.css
View File

@@ -1,100 +1,119 @@
/* ----------------------------------------------------
Login Layout & Animation Styles (Updated)
---------------------------------------------------- */
body { body {
font-family: "Meiryo", "Hiragino Sans", sans-serif; font-family:
"Meiryo", "Hiragino Sans", sans-serif;
margin: 0; margin: 0;
color: #222; color: #222;
background: #f6f7f9; background: #f6f7f9
} }
header.top { header.top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: #176a78; background: #176a78;
color: #fff; color: #fff;
padding: 10px 20px; padding: 10px 20px
}
header.top form { display: inline; margin: 0; }
header.top .user { margin-right: 12px; }
main { max-width: 960px; margin: 24px auto; padding: 0 16px; }
h1 { font-size: 20px; }
.card { background: #fff; border: 1px solid #dde; border-radius: 6px; padding: 20px; margin-bottom: 16px; }
label { display: block; margin: 10px 0 4px; font-weight: bold; }
input[type=text], input[type=password], input[type=email] { width: 100%; max-width: 360px; padding: 6px; box-sizing: border-box; }
button, .btn { display: inline-block; background: #176a78; color: #fff; border: 0; border-radius: 4px; padding: 7px 16px; cursor: pointer; text-decoration: none; font-size: 14px; }
button.sub, .btn.sub { background: #6b7b80; }
.error { background: #fdecea; color: #b3261e; border: 1px solid #f5c2be; padding: 8px 12px; border-radius: 4px; margin-bottom: 12px; }
.info { background: #e8f4ea; color: #1b5e20; border: 1px solid #bfdcc3; padding: 8px 12px; border-radius: 4px; margin-bottom: 12px; }
table { border-collapse: collapse; width: 100%; background: #fff; }
th, td { border: 1px solid #dde; padding: 6px 8px; text-align: left; font-size: 14px; }
th { background: #eaf4f6; }
.menu a { display: block; margin: 8px 0; }
/* Flexbox Layout: ဘယ်ဘက် Icon နှင့် ညာဘက် Login အချက်အလက်များ ဘေးချင်းယှဉ်ရန် */
.login-container-flex {
display: flex;
align-items: flex-start;
gap: 35px; /* Icon နှင့် Form ကြား အကွာအဝေး */
} }
/* ဘယ်ဘက်ခြမ်း Icon Box Styling */ header.top form {
.avatar-box { display: inline;
flex-shrink: 0; margin: 0
width: 90px; }
height: 90px;
background: #eaf4f6; header.top .user {
border-radius: 50%; margin-right: 12px
display: flex; }
align-items: center;
justify-content: center; main {
transition: all 0.4s ease; max-width: 960px;
margin: 24px auto;
padding: 0 16px
}
h1 {
font-size: 20px
}
.card {
background: #fff;
border: 1px solid #dde;
border-radius: 6px;
padding: 20px;
margin-bottom: 16px
}
label {
display: block;
margin: 10px 0 4px;
font-weight: bold
}
input[type=text],
input[type=password],
input[type=email] {
width: 100%;
max-width: 360px;
padding: 6px;
box-sizing: border-box
}
button,
.btn {
display: inline-block;
background: #176a78;
color: #fff;
border: 0;
border-radius: 4px;
padding: 7px 16px;
cursor: pointer; cursor: pointer;
margin-top: 5px; text-decoration: none;
font-size: 14px
} }
.avatar-box:hover { button.sub,
transform: scale(1.08); .btn.sub {
background: #d5edf1; background: #6b7b80
} }
/* ညာဘက်ခြမ်း Form Area ကို အပြည့်အသုံးပြုရန် */ .error {
.form-content-area { background: #fdecea;
flex-grow: 1; color: #b3261e;
border: 1px solid #f5c2be;
padding: 8px 12px;
border-radius: 4px;
margin-bottom: 12px
} }
/* 1. FALSE / ERROR State (တုန်ခါမည်) */ .info {
.card.shake { background: #e8f4ea;
animation: shake 0.4s ease-in-out; color: #1b5e20;
border: 1px solid #bfdcc3;
padding: 8px 12px;
border-radius: 4px;
margin-bottom: 12px
} }
.avatar-box.error-state { table {
background: #fdecea !important; border-collapse: collapse;
animation: pulseError 0.4s ease-in-out; width: 100%;
background: #fff
} }
@keyframes shake { th,
0%, 100% { transform: translateX(0); } td {
20%, 60% { transform: translateX(-8px); } border: 1px solid #dde;
40%, 80% { transform: translateX(8px); } padding: 6px 8px;
text-align: left;
font-size: 14px
} }
@keyframes pulseError { th {
0% { transform: scale(1); } background: #eaf4f6
50% { transform: scale(1.15); }
100% { transform: scale(1); }
} }
/* 2. TRUE / SUCCESS State (အောင်မြင်မှု Animation) */ .menu a {
.avatar-box.success-state { display: block;
background: #e8f4ea !important; margin: 8px 0
animation: successFly 0.6s ease-in-out forwards;
}
@keyframes successFly {
0% { transform: scale(1); }
40% { transform: scale(1.2) translateY(-8px); }
100% { transform: scale(0.9) translateY(-20px); opacity: 0.8; }
} }
/* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */ /* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
@@ -104,13 +123,18 @@ th { background: #eaf4f6; }
align-items: center; align-items: center;
text-align: center; text-align: center;
} }
.form-content-area { .form-content-area {
width: 100%; width: 100%;
} }
input[type=text], input[type=password], input[type=email] {
input[type=text],
input[type=password],
input[type=email] {
max-width: 100% !important; max-width: 100% !important;
} }
} }
/* ページネーション */ /* ページネーション */
.page-number { .page-number {
display: inline-block; display: inline-block;
@@ -127,8 +151,3 @@ th { background: #eaf4f6; }
.page-number:hover { .page-number:hover {
background: #d5edf1; background: #d5edf1;
} }
.page-number.active {
background: #176a78;
color: #fff;
border-color: #176a78;
}

13
book-rent/src/main/resources/templates/bookInput.html
View File

@@ -1,13 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍情報入力</title> <title>書籍情報入力</title>
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<main> <main>
<h1>書籍情報入力</h1> <h1>書籍情報入力</h1>
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div> <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
<div class="error" th:each="e : ${errors}" th:text="${e}"></div> <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
@@ -21,14 +23,17 @@
<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50"> <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
<label for="knBook">書籍名よみ（100文字以内）</label> <label for="knBook">書籍名よみ（100文字以内）</label>
<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100"> <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
<!-- <span th:errors="${form.knBook}"></span>-->
<label for="publisher">出版社（50文字以内）</label> <label for="publisher">出版社（50文字以内）</label>
<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50"> <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
<label for="note">特記事項</label> <label for="note">特記事項</label>
<input type="text" id="note" name="note" th:value="${form.note}"> <input type="text" id="note" name="note" th:value="${form.note}">
<p><button type="submit" th:text="${title} + '確認'">確認</button> <p><button type="submit" th:text="${title} + '確認'">確認</button>
<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p> <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
</p>
</form> </form>
</div> </div>
</main> </main>
</body> </body>
</html> </html>

68
book-rent/src/main/resources/templates/bookList.html
View File

@@ -65,7 +65,6 @@
th:href="@{/books(page=${bookPage.number-1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">前へ</a> th:href="@{/books(page=${bookPage.number-1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">前へ</a>
<span th:each="pageNum : ${pageNumbers}"> <span th:each="pageNum : ${pageNumbers}">
<a class="page-number" <a class="page-number"
th:classappend="${pageNum == bookPage.number} ? ' active' : ''"
th:href="@{/books(page=${pageNum}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}" th:href="@{/books(page=${pageNum}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}"
th:text="${pageNum + 1}"></a> th:text="${pageNum + 1}"></a>
</span> </span>
@@ -79,70 +78,3 @@
</body> </body>
</html> </html>
<!--<!DOCTYPE html>-->
<!--<html xmlns:th="http://www.thymeleaf.org">-->
<!--<head>-->
<!-- <meta charset="UTF-8">-->
<!-- <title>書籍一覧</title>-->
<!-- <link rel="stylesheet" th:href="@{/css/style.css}">-->
<!--</head>-->
<!--<body>-->
<!-- <div th:replace="~{fragments/header :: header}"></div>-->
<!-- <main>-->
<!-- <h1>書籍一覧</h1>-->
<!-- <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
<!-- <div class="card">-->
<!-- <form th:action="@{/books}" method="get">-->
<!-- <label for="nmBook">書籍名</label>-->
<!-- <input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">-->
<!-- <label for="publisher">出版社</label>-->
<!-- <input type="text" id="publisher" name="publisher" th:value="${publisher}">-->
<!-- <label for="note">特記事項</label>-->
<!-- <input type="text" id="note" name="note" th:value="${note}">-->
<!-- <p><button type="submit">検索</button>-->
<!-- <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
<!-- <a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>-->
<!-- </p>-->
<!-- </form>-->
<!-- </div>-->
<!-- <div class="card">-->
<!-- <h2>検索結果</h2>-->
<!-- <p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>-->
<!-- <table th:unless="${#lists.isEmpty(books)}">-->
<!-- <thead>-->
<!-- <tr>-->
<!-- <th>蔵書ID</th>-->
<!-- <th>ISBN</th>-->
<!-- <th>書籍名</th>-->
<!-- <th>書籍名よみ</th>-->
<!-- <th>出版社</th>-->
<!-- <th>特記事項</th>-->
<!-- <th>操作</th>-->
<!-- </tr>-->
<!-- </thead>-->
<!-- <tbody>-->
<!-- <tr th:each="b : ${books}">-->
<!-- <td th:text="${b.idBook}"></td>-->
<!-- <td th:text="${b.isbn}"></td>-->
<!-- <td th:text="${b.nmBook}"></td>-->
<!-- <td th:text="${b.knBook}"></td>-->
<!-- <td th:text="${b.publisher}"></td>-->
<!-- <td th:text="${b.note}"></td>-->
<!-- <td>-->
<!-- 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
<!-- <a class="btn" th:unless="${session.loginUser.admin}"-->
<!-- th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>-->
<!-- <a class="btn" th:if="${session.loginUser.admin}"-->
<!-- th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>-->
<!-- </td>-->
<!-- </tr>-->
<!-- </tbody>-->
<!-- </table>-->
<!-- </div>-->
<!-- </main>-->
<!--</body>-->
<!--</html>-->

1
book-rent/src/main/resources/templates/employeeRegistInput.html
View File

@@ -37,6 +37,7 @@
<div> <div>
<label for="knEmployee">社員名よみ</label> <label for="knEmployee">社員名よみ</label>
<input type="text" id="knEmployee" th:field="*{knEmployee}"> <input type="text" id="knEmployee" th:field="*{knEmployee}">
<span th:errors="*{knEmployee}"></span>
</div> </div>
<!-- メールアドレス --> <!-- メールアドレス -->

184
book-rent/src/main/resources/templates/login.html
View File

@@ -1,117 +1,123 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>ログイン</title> <title>ログイン</title>
<!-- Lordicon Script -->
<script src="https://cdn.lordicon.com/lordicon.js"></script>
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<main> <main>
<h1>書籍貸出管理システム</h1> <h1>書籍貸出管理システム</h1>
<div class="card" id="loginCard"> <div class="card">
<!-- Main Flex Container: ဘယ်ဘက် Icon နှင့် ညာဘက် Form Area ကို ဘေးချင်းယှဉ်ရန် -->
<div class="login-container-flex">
<!-- ဘယ်ဘက်ခြမ်းရှိ Lordicon Avatar Box -->
<div class="avatar-box" id="avatarBox">
<lord-icon
id="lordIcon"
src="https://cdn.lordicon.com/dxjqoygy.json"
trigger="hover"
colors="primary:#176a78,secondary:#08a88a"
style="width:90px;height:90px">
</lord-icon>
</div>
<!-- ညာဘက်ခြမ်းရှိ Login Content (ခေါင်းစဉ်နှင့် Form အားလုံး ပါဝင်သည်) -->
<div class="form-content-area">
<h2>ログイン</h2> <h2>ログイン</h2>
<!-- Error Message -->
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div> <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
<form th:action="@{/login}" method="post">
<form th:action="@{/login}" method="post" id="loginForm">
<label for="mailAddress">メールアドレス</label> <label for="mailAddress">メールアドレス</label>
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username"> <input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}"
autocomplete="username">
<label for="password">パスワード</label> <label for="password">パスワード</label>
<input type="password" id="password" name="password" autocomplete="current-password"> <input type="password" id="password" name="password" autocomplete="current-password">
<p><button type="submit">ログイン</button></p> <p><button type="submit">ログイン</button></p>
</form> </form>
</div> </div>
</main>
</div>
</div>
</main>
<script>
const loginCard = document.getElementById('loginCard');
const lordIcon = document.getElementById('lordIcon');
const avatarBox = document.getElementById('avatarBox');
const errorDiv = document.querySelector('.error');
const loginForm = document.getElementById('loginForm');
// 1. Icon နှိပ်လျှင် Animation လှုပ်ရှားရန်
if (lordIcon) {
lordIcon.addEventListener('click', () => {
lordIcon.setAttribute('trigger', 'morph');
setTimeout(() => {
lordIcon.setAttribute('trigger', 'hover');
}, 1000);
});
}
// 2. Login မှားယွင်းသောအခါ (False / Error) -> Card Shake Animation & Icon Color Change
if (errorDiv) {
loginCard.classList.add('shake');
if (avatarBox) {
avatarBox.classList.add('error-state');
}
if (lordIcon) {
lordIcon.setAttribute('colors', 'primary:#b3261e,secondary:#f5c2be');
}
}
// 3. Login နှိပ်လိုက်ချိန် (True / Success Animation State)
if (loginForm) {
loginForm.addEventListener('submit', function(e) {
if (avatarBox && lordIcon) {
avatarBox.classList.add('success-state');
lordIcon.setAttribute('colors', 'primary:#1b5e20,secondary:#81c784');
}
});
}
</script>
</body> </body>
</html> </html>
<!--<!DOCTYPE html>--> <!--<!DOCTYPE html>-->
<!--<html xmlns:th="http://www.thymeleaf.org">--> <!--<html xmlns:th="http://www.thymeleaf.org">-->
<!--<head>>-->
<!--<head>-->
<!-- <meta charset="UTF-8">--> <!-- <meta charset="UTF-8">-->
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
<!-- 外部スクリプトの読み込み -->
<!-- <script th:src="@{/js/common.js}"></script>-->
<!-- CSSの読み込み -->
<!-- <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
<!-- <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
<!-- <title>ログイン</title>--> <!-- <title>ログイン</title>-->
<!-- <link rel="stylesheet" th:href="@{/css/style.css}">-->
<!--</head>--> <!--</head>-->
<!--<body>--> <!--<body>-->
<!--<main>-->
<!-- <h1>書籍貸出管理システム</h1>--> <!-- <div class="loginContainer">-->
<!-- <div class="card">-->
<!-- <h2>ログイン</h2>--> <!-- <h1>ログイン</h1>-->
<!-- <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
<!-- <form th:action="@{/login}" method="post">--> <!-- <form th:action="@{/doLogin}"-->
<!-- <label for="mailAddress">メールアドレス</label>--> <!-- method="post"-->
<!-- <input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username">--> <!-- th:object="${loginInfoForm}">-->
<!-- <label for="password">パスワード</label>-->
<!-- <input type="password" id="password" name="password" autocomplete="current-password">--> <!-- エラーメッセージ -->
<!-- <p><button type="submit">ログイン</button></p>--> <!-- <div class="msgBox error"-->
<!-- </form>--> <!-- th:if="${messageError != null}">-->
<!-- <span class="error"-->
<!-- th:text="${messageError.message}"></span>-->
<!-- </div>--> <!-- </div>-->
<!--</main>-->
<!-- <table>-->
<!-- メールアドレス -->
<!-- <tr>-->
<!-- <th class="header">メールアドレス</th>-->
<!-- <td>-->
<!-- <input-->
<!-- id="mailAddress"-->
<!-- type="text"-->
<!-- th:field="*{mailAddress}"-->
<!-- placeholder="メールアドレス"-->
<!-- required-->
<!-- />-->
<!-- </td>-->
<!-- </tr>-->
<!-- パスワード -->
<!-- <tr>-->
<!-- <th class="header">パスワード</th>-->
<!-- <td>-->
<!-- <input-->
<!-- id="password"-->
<!-- type="password"-->
<!-- th:field="*{password}"-->
<!-- placeholder="パスワード"-->
<!-- required-->
<!-- />-->
<!-- </td>-->
<!-- </tr>-->
<!-- ボタン -->
<!-- <tr>-->
<!-- <td class="btnArea" colspan="2">-->
<!-- <input-->
<!-- type="submit"-->
<!-- value="ログイン"-->
<!-- />-->
<!-- <button-->
<!-- type="button"-->
<!-- onclick="clearInput()">-->
<!-- リセット-->
<!-- </button>-->
<!-- </td>-->
<!-- </tr>-->
<!-- </table>-->
<!-- </form>-->
<!-- </div>-->
<!-- 入力内容のリセット -->
<!-- <script>-->
<!-- function clearInput() {-->
<!-- document.getElementById('mailAddress').value = '';-->
<!-- document.getElementById('password').value = '';-->
<!-- }-->
<!-- </script>-->
<!--</body>--> <!--</body>-->
<!--</html>--> <!--</html>-->