From 458011644cefb36ab3c5fe8caf0e50ba0dfd8a5a Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 11 Mar 2022 14:26:24 +0400 Subject: [PATCH] #5 -- add pagination, styles and footer --- data/db.mv.db | Bin 40960 -> 61440 bytes .../ru/ulstu/controller/NewsController.java | 25 ++++- .../ru/ulstu/model/OffsetablePageRequest.java | 93 ++++++++++++++++++ .../ru/ulstu/repository/NewsRepository.java | 4 + .../java/ru/ulstu/service/NewsService.java | 6 ++ src/main/resources/public/css/main.css | 23 ++++- src/main/resources/templates/admin.html | 2 +- src/main/resources/templates/default.html | 1 + src/main/resources/templates/news.html | 10 ++ 9 files changed, 160 insertions(+), 4 deletions(-) create mode 100644 src/main/java/ru/ulstu/model/OffsetablePageRequest.java diff --git a/data/db.mv.db b/data/db.mv.db index d6e4cd9f6c6e1bcfbe2afeae7d02b1f7788bef06..06af13aad16e56b9be7343f62f4e00221e501083 100644 GIT binary patch literal 61440 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 ZmVEy&+28I`q`CHgxCHip=_c6!{|C(v9Si^f delta 4474 zcmeHLUu+ab9G<;)33r9|TCmbK>Vc)9z4f~P?rv`r4WLGeZG}?QwEUafor9C>T~qF` zF){5s#vmIL6HWAqni!Sl(gdGGP2`CLUkqtNC=WiUguW6J5@&a2c8B{z0TX<&58eB2 zcIP+q?eF*fzPW|fmW9h9>2*_;vW1d$%1o2%!TkHkRAgC}tdo`EDH9@HvI+P(3aD(IM6+hrQfvikFtP+c?KmHe?D*Gn#5PPpq|p_rQUT$x(lnegjWoW@nJG<{ zifFEkS33hwpwoEuv!znmRI`SK*DT9w&d{WCej1r}7VkpKNN3RO>3pe(H=;T4INTd4 z13>_xOP2x2{D!Z)K_uU`ZD4Z|PNPJ=XrsA=q5;tQQo9MZfw0Fy0wTr#q&i1;%!G~9 z2E49>k#?@_h|Pa4Ft!xBc+Fcp{+~aCM)Aru*^oW3-&?n$@!Qf;S-LNa?n_Df8`Ir= zWmL_o*;u7mIgRW+<+sr6R=Pul+pXfjueP*6q&kV^!ISIrXSiV+@JGViT{#&I zgPnb=tsyWz;oQ2|`#c_erf*pcf%c7|f^e<{jC&u}dWDHt41kWVt)EntJ<*QT&_@vg zD4;X+hK+KtQYeev_}T8Exi*3OQt^Vpp`DvTK-?roowNHV@HC(|e(w-@ytQ*|{LPV9 zkL`J7bl(^r>5H#8KOE@M;y=CZ-5}gQ+!O!$9X9~?Es1d`e%)ysKR6msPP*g!pgo;0 zik)8ko_J!a;X~2*vxnV*)=qB{;pd?nM@1lZiCe_2;!|RG^_%gFLKx3+b@0wH5jZy| zu8a;QUL&=)8-x?xtoC~9Ywz~ZGU)MZ&ql2F>>T@qhYC`(9!OxsbBrhf!mknjT9zkGgfL(&}0q2Eg$K6MpgrqRCU=$hOQVq!Y_^+Ll%dU z`h6%Xr-D1@(=tD4I>}F(&hihYb2c|=PBtum8agShk@cerZ^-xmnbfjBYr$ zq)DF#l7Wl|f*21JQ630lJTOFfV2JQQ5#@m)!UIK&2MQ?<3=tj}B0Nw;c_4`KKoH}B z-bs0&i1NUY%fk{}6wb#s4Dt#dXs;4zzGYy|&jgx}-2w9}sYh}L&AM93C+d%Q zd$f^(N3<%}li!7Xs}dw3mq0<uimSqe6R9*jaRw&Ag^+cdX=+{y~+m-y-KXktK4nsRc;cma;1q^`L>x?xk0>& z+{mlMn|YPK8n1G_nOFHM@G5&fCHNi?uY#|U!ubYD@b}OKP6_yPg0BQxjS}D!L)&6- zVsJjYF!(O>Dvy5>AWa>oM!iMX0ylyFn{xrRFdDNk4{;!A=$-I^jyGuQ?pAxGDtA51 zhY#anNLjMpO%Utd6w%&I5bNCxk>1S^>D?63-pvr{-4wCjO(E^w43XZ=5b50%(cVoE x>)iyg-c9eMy_+K1yBYF4O!V-`{~pHoFuQnZ51Ik@D~XZPp+bV diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/controller/NewsController.java index 111a1ca..34e8ba3 100644 --- a/src/main/java/ru/ulstu/controller/NewsController.java +++ b/src/main/java/ru/ulstu/controller/NewsController.java @@ -6,6 +6,7 @@ package ru.ulstu.controller; +import org.springframework.data.domain.Page; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -14,14 +15,21 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import ru.ulstu.model.News; +import ru.ulstu.model.OffsetablePageRequest; import ru.ulstu.service.NewsService; import javax.validation.Valid; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.IntStream; @Controller @RequestMapping("news") public class NewsController { + private final static int DEFAULT_PAGE_SIZE = 10; private final NewsService newsService; public NewsController(NewsService newsService) { @@ -29,8 +37,21 @@ public class NewsController { } @GetMapping("/news") - public String index(Model model) { - model.addAttribute("news", newsService.getAll()); + public String listNews(Model model, + @RequestParam Optional page, + @RequestParam Optional size) { + int currentPage = page.orElse(1); + int pageSize = size.orElse(DEFAULT_PAGE_SIZE); + + Page newsPage = newsService.getNews(new OffsetablePageRequest(currentPage - 1, pageSize)); + model.addAttribute("news", newsPage); + int totalPages = newsPage.getTotalPages(); + if (totalPages > 0) { + List pageNumbers = IntStream.rangeClosed(1, totalPages) + .boxed() + .collect(Collectors.toList()); + model.addAttribute("pageNumbers", pageNumbers); + } return "news"; } diff --git a/src/main/java/ru/ulstu/model/OffsetablePageRequest.java b/src/main/java/ru/ulstu/model/OffsetablePageRequest.java new file mode 100644 index 0000000..c715296 --- /dev/null +++ b/src/main/java/ru/ulstu/model/OffsetablePageRequest.java @@ -0,0 +1,93 @@ +package ru.ulstu.model; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +import java.io.Serializable; + +public class OffsetablePageRequest implements Pageable, Serializable { + private final int offset; + private final int count; + private final Sort sort; + + public OffsetablePageRequest(int page, long pageSize) { + this(pageSize * page, pageSize, Sort.by("id")); + } + + public OffsetablePageRequest(long offset, long count, Sort sort) { + if (offset < 0) { + throw new IllegalArgumentException("Offset value must not be less than zero!"); + } + if (count < 1) { + throw new IllegalArgumentException("Count value must not be less than one!"); + } + this.offset = (int) offset; + this.count = (int) count; + this.sort = sort; + } + + @Override + public Sort getSort() { + return sort; + } + + @Override + public int getPageSize() { + return count; + } + + @Override + public int getPageNumber() { + return offset / count; + } + + @Override + public long getOffset() { + return offset; + } + + @Override + public boolean hasPrevious() { + return offset > 0; + } + + @Override + public Pageable next() { + return new OffsetablePageRequest(getOffset() + getPageSize(), getPageSize(), getSort()); + } + + @Override + public Pageable previousOrFirst() { + return hasPrevious() ? previous() : first(); + } + + public Pageable previous() { + return getOffset() == 0 ? this : new OffsetablePageRequest(getOffset() - getPageSize(), getPageSize(), getSort()); + } + + @Override + public Pageable first() { + return new OffsetablePageRequest(0, getPageSize(), getSort()); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || getClass() != obj.getClass()) { + return false; + } + final OffsetablePageRequest other = (OffsetablePageRequest) obj; + return this.offset == other.offset && this.count == other.count; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + offset; + result = prime * result + count; + return result; + } +} diff --git a/src/main/java/ru/ulstu/repository/NewsRepository.java b/src/main/java/ru/ulstu/repository/NewsRepository.java index 6bd607a..f7f4fcf 100644 --- a/src/main/java/ru/ulstu/repository/NewsRepository.java +++ b/src/main/java/ru/ulstu/repository/NewsRepository.java @@ -1,5 +1,7 @@ package ru.ulstu.repository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import ru.ulstu.model.News; @@ -7,4 +9,6 @@ import java.util.List; public interface NewsRepository extends JpaRepository { List findFirst3ByOrderByDateDesc(); + + Page findByOrderByDateDesc(Pageable pageable); } diff --git a/src/main/java/ru/ulstu/service/NewsService.java b/src/main/java/ru/ulstu/service/NewsService.java index 3f743f0..f49dbdd 100644 --- a/src/main/java/ru/ulstu/service/NewsService.java +++ b/src/main/java/ru/ulstu/service/NewsService.java @@ -1,5 +1,7 @@ package ru.ulstu.service; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import ru.ulstu.model.News; import ru.ulstu.repository.NewsRepository; @@ -50,4 +52,8 @@ public class NewsService { public List getLast() { return newsRepository.findFirst3ByOrderByDateDesc(); } + + public Page getNews(Pageable pageable) { + return newsRepository.findByOrderByDateDesc(pageable); + } } diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css index 9b299ad..bbdc26e 100644 --- a/src/main/resources/public/css/main.css +++ b/src/main/resources/public/css/main.css @@ -31,4 +31,25 @@ .link-dark, .link-dark:visited, .link-dark:focus, .link-dark:any-link { color: black; -} \ No newline at end of file +} + +.pagination { + display: inline-block; +} + +.pagination a { + color: black; + float: left; + padding: 5px 5px; + text-decoration: none; +} + +.pagination a.active { + background-color: gray; + color: white; + border-radius: 2px; +} + +footer { + height: 50px; +} diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html index f37ada4..22e05cf 100644 --- a/src/main/resources/templates/admin.html +++ b/src/main/resources/templates/admin.html @@ -7,7 +7,7 @@
- +
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 3146bbf..99f7ed0 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -64,6 +64,7 @@
+
\ No newline at end of file diff --git a/src/main/resources/templates/news.html b/src/main/resources/templates/news.html index 1f6edf8..3b444e5 100644 --- a/src/main/resources/templates/news.html +++ b/src/main/resources/templates/news.html @@ -36,5 +36,15 @@ class="news-date">
+ + +