From e868bcee5417cd803944c2ca7e81abd23eac2c68 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 29 Mar 2021 15:41:37 +0400 Subject: [PATCH 1/3] #17 - Add some pages --- .../controller/BaseIndexingController.java | 36 +++++++++++++++++++ .../extractor/model/mvc/IndexRepoForm.java | 20 +++++++++++ src/main/resources/templates/default.html | 2 +- src/main/resources/templates/indexRepo.html | 25 +++++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java create mode 100644 src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java create mode 100644 src/main/resources/templates/indexRepo.html diff --git a/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java b/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java new file mode 100644 index 0000000..c6d1b7a --- /dev/null +++ b/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java @@ -0,0 +1,36 @@ +package ru.ulstu.extractor.controller; + +import org.springframework.stereotype.Controller; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import ru.ulstu.extractor.model.mvc.IndexRepoForm; +import ru.ulstu.extractor.model.mvc.RepoForm; +import ru.ulstu.extractor.service.GitRepositoryService; + +@Controller +public class BaseIndexingController { + private final GitRepositoryService gitRepositoryService; + + public BaseIndexingController(GitRepositoryService gitRepositoryService) { + this.gitRepositoryService = gitRepositoryService; + } + + @GetMapping("/indexRepo") + public String indexNewRepo(Model model) { + model.addAttribute(new RepoForm()); + return "indexRepo"; + } + + @RequestMapping(value = "/indexRepo", method = RequestMethod.POST, params = "send") + public String getBranch(@ModelAttribute IndexRepoForm indexRepoForm, Model model) { + try { + return "indexRepo"; + } catch (Exception ex) { + model.addAttribute("error", ex.getMessage()); + return "indexRepo"; + } + } +} diff --git a/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java b/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java new file mode 100644 index 0000000..27f55b7 --- /dev/null +++ b/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java @@ -0,0 +1,20 @@ +package ru.ulstu.extractor.model.mvc; + +public class IndexRepoForm { + private String repo; + + public String getRepo() { + return repo; + } + + public void setRepo(String repo) { + this.repo = repo; + } + + @Override + public String toString() { + return "IndexRepoForm{" + + "repo='" + repo + '\'' + + '}'; + } +} diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 8497859..04f7459 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -25,7 +25,7 @@ Link
  • - Link + Link
    • diff --git a/src/main/resources/templates/indexRepo.html b/src/main/resources/templates/indexRepo.html new file mode 100644 index 0000000..5266427 --- /dev/null +++ b/src/main/resources/templates/indexRepo.html @@ -0,0 +1,25 @@ + + + + Индексировать новый репозиторий + + +
    +
    + + + + + + + + + + + +
    Url
    +
    +
    + From ec209e8fe8fcaa990aaf8fcb8bc570909d434a0f Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 29 Mar 2021 17:21:42 +0400 Subject: [PATCH 2/3] #17 - Show indexed repositories --- .../controller/BaseIndexingController.java | 25 ++++------------- .../extractor/model/mvc/IndexRepoForm.java | 20 ------------- src/main/resources/templates/indexRepo.html | 28 +++++++++---------- 3 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java diff --git a/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java b/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java index c6d1b7a..e2a154a 100644 --- a/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java +++ b/src/main/java/ru/ulstu/extractor/controller/BaseIndexingController.java @@ -3,34 +3,19 @@ package ru.ulstu.extractor.controller; import org.springframework.stereotype.Controller; 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.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import ru.ulstu.extractor.model.mvc.IndexRepoForm; -import ru.ulstu.extractor.model.mvc.RepoForm; -import ru.ulstu.extractor.service.GitRepositoryService; +import ru.ulstu.extractor.repository.RepositoryRepository; @Controller public class BaseIndexingController { - private final GitRepositoryService gitRepositoryService; + private final RepositoryRepository repositoryRepository; - public BaseIndexingController(GitRepositoryService gitRepositoryService) { - this.gitRepositoryService = gitRepositoryService; + public BaseIndexingController(RepositoryRepository repositoryRepository) { + this.repositoryRepository = repositoryRepository; } @GetMapping("/indexRepo") public String indexNewRepo(Model model) { - model.addAttribute(new RepoForm()); + model.addAttribute("repositories", repositoryRepository.findAll()); return "indexRepo"; } - - @RequestMapping(value = "/indexRepo", method = RequestMethod.POST, params = "send") - public String getBranch(@ModelAttribute IndexRepoForm indexRepoForm, Model model) { - try { - return "indexRepo"; - } catch (Exception ex) { - model.addAttribute("error", ex.getMessage()); - return "indexRepo"; - } - } } diff --git a/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java b/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java deleted file mode 100644 index 27f55b7..0000000 --- a/src/main/java/ru/ulstu/extractor/model/mvc/IndexRepoForm.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.ulstu.extractor.model.mvc; - -public class IndexRepoForm { - private String repo; - - public String getRepo() { - return repo; - } - - public void setRepo(String repo) { - this.repo = repo; - } - - @Override - public String toString() { - return "IndexRepoForm{" + - "repo='" + repo + '\'' + - '}'; - } -} diff --git a/src/main/resources/templates/indexRepo.html b/src/main/resources/templates/indexRepo.html index 5266427..50fedff 100644 --- a/src/main/resources/templates/indexRepo.html +++ b/src/main/resources/templates/indexRepo.html @@ -3,23 +3,21 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}"> - Индексировать новый репозиторий + Проиндексированные репозитории
    -
    - - - - - - - - - - - -
    Url
    -
    + + + + + + + + + + + +
    Репозиторий
    From bbdfb91b1d0bdc3b5d5d95685b4d6657460c9b94 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 31 Mar 2021 13:25:33 +0400 Subject: [PATCH 3/3] #17 - Redirect to filtering --- .../controller/BranchController.java | 28 +++++++++++++++++++ .../repository/BranchRepository.java | 4 +++ src/main/resources/templates/indexBranch.html | 24 ++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 src/main/java/ru/ulstu/extractor/controller/BranchController.java create mode 100644 src/main/resources/templates/indexBranch.html diff --git a/src/main/java/ru/ulstu/extractor/controller/BranchController.java b/src/main/java/ru/ulstu/extractor/controller/BranchController.java new file mode 100644 index 0000000..8254210 --- /dev/null +++ b/src/main/java/ru/ulstu/extractor/controller/BranchController.java @@ -0,0 +1,28 @@ +package ru.ulstu.extractor.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 ru.ulstu.extractor.repository.BranchRepository; +import ru.ulstu.extractor.repository.RepositoryRepository; + +@Controller +public class BranchController { + private final RepositoryRepository repositoryRepository; + private final BranchRepository branchRepository; + + public BranchController(RepositoryRepository repositoryRepository, BranchRepository branchRepository) { + this.repositoryRepository = repositoryRepository; + this.branchRepository = branchRepository; + } + + @GetMapping("/details") + public String indexBranch( + Model model, + @RequestParam int repositoryId) { + model.addAttribute("branches", branchRepository.findByRepositoryId(repositoryId)); + model.addAttribute("repository", repositoryRepository.findById(repositoryId).get()); + return "indexBranch"; + } +} diff --git a/src/main/java/ru/ulstu/extractor/repository/BranchRepository.java b/src/main/java/ru/ulstu/extractor/repository/BranchRepository.java index f893bb6..d16b1a2 100644 --- a/src/main/java/ru/ulstu/extractor/repository/BranchRepository.java +++ b/src/main/java/ru/ulstu/extractor/repository/BranchRepository.java @@ -4,6 +4,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import ru.ulstu.extractor.model.Branch; import ru.ulstu.extractor.model.Repository; +import java.util.List; + public interface BranchRepository extends JpaRepository { Branch findByRepositoryAndName(Repository repository, String name); + + List findByRepositoryId(Integer repositoryId); } diff --git a/src/main/resources/templates/indexBranch.html b/src/main/resources/templates/indexBranch.html new file mode 100644 index 0000000..938b141 --- /dev/null +++ b/src/main/resources/templates/indexBranch.html @@ -0,0 +1,24 @@ + + + + Проиндексированные репозитории + + +
    + + + + + + + + + + + +
    Ветки
    +
    +