From ac9dcaa11d0b29c5f0ee2fdaa54086b735764c1a Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Wed, 17 Mar 2021 12:19:03 +0400
Subject: [PATCH] #2 - add web pages

---
 .../extractor/mvc/GitExtractorController.java | 23 ++++++-----
 .../ulstu/extractor/mvc/model/EmailForm.java  | 40 -------------------
 .../ulstu/extractor/mvc/model/RepoForm.java   | 20 ++++++++++
 src/main/resources/templates/filtering.html   | 25 ++++++++++++
 src/main/resources/templates/index.html       | 32 ---------------
 src/main/resources/templates/newRepo.html     | 22 ++++++++++
 src/main/resources/templates/result.html      | 25 ------------
 src/main/resources/templates/resultRepo.html  | 18 +++++++++
 8 files changed, 97 insertions(+), 108 deletions(-)
 delete mode 100644 src/main/java/ru/ulstu/extractor/mvc/model/EmailForm.java
 create mode 100644 src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
 create mode 100644 src/main/resources/templates/filtering.html
 delete mode 100644 src/main/resources/templates/index.html
 create mode 100644 src/main/resources/templates/newRepo.html
 delete mode 100644 src/main/resources/templates/result.html
 create mode 100644 src/main/resources/templates/resultRepo.html

diff --git a/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java b/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
index 487479c..4d9b72b 100644
--- a/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
+++ b/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
@@ -5,22 +5,23 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import ru.ulstu.extractor.mvc.model.EmailForm;
+import ru.ulstu.extractor.mvc.model.RepoForm;
 
 @Controller
 public class GitExtractorController {
-    @GetMapping("/")
-    public String indexForm(Model model) {
-        model.addAttribute("emailForm", new EmailForm());
-        return "index";
+
+    @GetMapping("/newRepo")
+    public String indexNewRepo(Model model) {
+        model.addAttribute("repoForm", new RepoForm());
+        return "newRepo";
     }
 
-    @PostMapping("/sendEmail")
-    public String sendEmail(@ModelAttribute EmailForm emailForm, Model model) {
-        if (emailForm.getTo().isEmpty()) {
-            model.addAttribute("error", "'Кому' не должно быть пустым");
-            return "index";
+    @PostMapping("/sendRepo")
+    public String sendRepo(@ModelAttribute RepoForm repoForm, Model model) {
+        if (repoForm.getRepo() == null || repoForm.getRepo().isEmpty()) {
+            model.addAttribute("error", "'Git' не должно быть пустым");
+            return "newRepo";
         }
-        return "result";
+        return "filtering";
     }
 }
diff --git a/src/main/java/ru/ulstu/extractor/mvc/model/EmailForm.java b/src/main/java/ru/ulstu/extractor/mvc/model/EmailForm.java
deleted file mode 100644
index 59765ee..0000000
--- a/src/main/java/ru/ulstu/extractor/mvc/model/EmailForm.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package ru.ulstu.extractor.mvc.model;
-
-public class EmailForm {
-    private String subject;
-    private String to;
-    private String message;
-
-    public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-
-    public String getTo() {
-        return to;
-    }
-
-    public void setTo(String to) {
-        this.to = to;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @Override
-    public String toString() {
-        return "EmailForm{" +
-                "subject='" + subject + '\'' +
-                ", to='" + to + '\'' +
-                ", message='" + message + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java b/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
new file mode 100644
index 0000000..0a86e6e
--- /dev/null
+++ b/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
@@ -0,0 +1,20 @@
+package ru.ulstu.extractor.mvc.model;
+
+public class RepoForm {
+    private String repo;
+
+    public String getRepo() {
+        return repo;
+    }
+
+    public void setRepo(String repo) {
+        this.repo = repo;
+    }
+
+    @Override
+    public String toString() {
+        return "EmailForm{" +
+                "subject='" + repo +
+                '}';
+    }
+}
diff --git a/src/main/resources/templates/filtering.html b/src/main/resources/templates/filtering.html
new file mode 100644
index 0000000..316f877
--- /dev/null
+++ b/src/main/resources/templates/filtering.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<html
+        xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+        layout:decorate="~{default}">
+<head>
+    <title>Простая обработка формы на Spring MVC</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<div class="container" layout:fragment="content">
+    <body>
+    <form name="filtering">
+        <p><b>Фильтровать данные:</b><Br>
+            <input type="checkbox" name="browser" value="author"> Автор<Br>
+            <input type="checkbox" name="browser" value="data"> Дата<Br>
+            <input type="checkbox" name="browser" value="lineFtom"> Удаленные строки<Br>
+            <input type="checkbox" name="browser" value="lineTo"> Добавленные строки<Br>
+        </p>
+        <p>
+            <input type="button" value="Отправить" onClick='location.href="result.html"'>
+        </p>
+    </form>
+    </body>
+
+</div>
+</html>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
deleted file mode 100644
index 939171f..0000000
--- a/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{default}">
-<head>
-    <title>Простая обработка формы на Spring MVC</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<div class="container" layout:fragment="content">
-    <h1>Форма</h1>
-    <form action="#" th:action="@{/sendEmail}" th:object="${emailForm}" method="post">
-        <p style="color:red" th:text="${error}"></p>
-        <table>
-            <tr>
-                <td>Тема:</td>
-                <td><input type="text" th:field="*{subject}"/></td>
-            </tr>
-            <tr>
-                <td>Кому:</td>
-                <td><input type="text" th:field="*{to}"/></td>
-            </tr>
-            <tr>
-                <td>Сообщение:</td>
-                <td><textarea th:field="*{message}"/></td>
-            </tr>
-            <tr>
-                <td colspan="2"><input type="submit" value="Отправить"/></td>
-            </tr>
-        </table>
-    </form>
-</div>
-</html>
diff --git a/src/main/resources/templates/newRepo.html b/src/main/resources/templates/newRepo.html
new file mode 100644
index 0000000..2239fd0
--- /dev/null
+++ b/src/main/resources/templates/newRepo.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{default}">
+<head>
+    <title>Простая обработка формы на Spring MVC</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<div class="container" layout:fragment="content">
+    <body>
+    <form action="#" th:action="@{/sendRepo}" th:object="${repoForm}" method="post">
+        <p style="color:red" th:text="${error}"></p>
+        <p><b>Ваш git репозиторий:</b><br>
+            <input type="text" size="40" th:field="*{repo}">
+        </p>
+        <p>
+            <input type="submit" value="Отправить"/>
+        </p>
+    </form>
+    </body>
+</div>
+</html>
diff --git a/src/main/resources/templates/result.html b/src/main/resources/templates/result.html
deleted file mode 100644
index 08a784e..0000000
--- a/src/main/resources/templates/result.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <title>Простая обработка формы на Spring MVC</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<h1>Результат обработки формы</h1>
-<table>
-    <tr>
-        <td>Тема:</td>
-        <td><p th:text="${emailForm.subject}"/></td>
-    </tr>
-    <tr>
-        <td>Кому:</td>
-        <td><p th:text="${emailForm.to}"/></td>
-    </tr>
-    <tr>
-        <td>Сообщение:</td>
-        <td><p th:text="${emailForm.message}"/></td>
-    </tr>
-</table>
-<a href="/">Отправить другое сообщение</a>
-</body>
-</html>
diff --git a/src/main/resources/templates/resultRepo.html b/src/main/resources/templates/resultRepo.html
new file mode 100644
index 0000000..c206f08
--- /dev/null
+++ b/src/main/resources/templates/resultRepo.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<html
+        xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+        layout:decorate="~{default}">
+<head>
+    <title>Простая обработка формы на Spring MVC</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<div class="container" layout:fragment="content">
+    <body>
+    <form oninput="result">
+        <p>Данные репозитория:</p>
+        <p>
+            <output name="result"></output>
+    </form>
+    </body>
+</div>
+</html>