- Добавил базовую реализацию пагинации для сообщений.
https://www.youtube.com/watch?v=Sc3EQBy0tuk&list=PLU2ftbIeotGpAYRP9Iv2KLIwK36-o_qYk&index=28
This commit is contained in:
@@ -5,6 +5,9 @@ import net.sytes.kashey.sweater.domain.Message;
|
|||||||
import net.sytes.kashey.sweater.repository.MessageRepository;
|
import net.sytes.kashey.sweater.repository.MessageRepository;
|
||||||
import net.sytes.kashey.sweater.security.CustomUserDetails;
|
import net.sytes.kashey.sweater.security.CustomUserDetails;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
|
import org.springframework.data.web.PageableDefault;
|
||||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
@@ -35,14 +38,17 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/main")
|
@GetMapping("/main")
|
||||||
public String findAllMessages(@RequestParam(required = false, defaultValue = "") String tag, Model model) {
|
public String findAllMessages(@RequestParam(required = false, defaultValue = "") String tag,
|
||||||
|
Model model,
|
||||||
|
@PageableDefault(sort = {"id"}, direction = Sort.Direction.DESC) Pageable pageable) {
|
||||||
|
|
||||||
if (tag == null || tag.isEmpty()) {
|
if (tag == null || tag.isEmpty()) {
|
||||||
model.addAttribute("messages", messageRepository.findAll());
|
model.addAttribute("page", messageRepository.findAll(pageable));
|
||||||
} else {
|
} else {
|
||||||
model.addAttribute("messages", messageRepository.findByTag(tag));
|
model.addAttribute("page", messageRepository.findByTag(tag, pageable));
|
||||||
}
|
}
|
||||||
model.addAttribute("tag", tag);
|
model.addAttribute("tag", tag);
|
||||||
|
model.addAttribute("url", "/main");
|
||||||
return "main";
|
return "main";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,6 +57,7 @@ public class MainController {
|
|||||||
@Valid Message message,
|
@Valid Message message,
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
Model model,
|
Model model,
|
||||||
|
@PageableDefault(sort = {"id"}, direction = Sort.Direction.DESC) Pageable pageable,
|
||||||
@RequestParam("file") MultipartFile file
|
@RequestParam("file") MultipartFile file
|
||||||
) throws IOException {
|
) throws IOException {
|
||||||
|
|
||||||
@@ -65,7 +72,8 @@ public class MainController {
|
|||||||
messageRepository.save(message);
|
messageRepository.save(message);
|
||||||
model.addAttribute("message", null);
|
model.addAttribute("message", null);
|
||||||
}
|
}
|
||||||
model.addAttribute("messages", messageRepository.findAll());
|
model.addAttribute("page", messageRepository.findAll(pageable));
|
||||||
|
model.addAttribute("url", "/main");
|
||||||
model.addAttribute("tag", "");
|
model.addAttribute("tag", "");
|
||||||
return "main";
|
return "main";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package net.sytes.kashey.sweater.repository;
|
package net.sytes.kashey.sweater.repository;
|
||||||
|
|
||||||
import net.sytes.kashey.sweater.domain.Message;
|
import net.sytes.kashey.sweater.domain.Message;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.repository.CrudRepository;
|
import org.springframework.data.repository.CrudRepository;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface MessageRepository extends CrudRepository<Message, Integer> {
|
public interface MessageRepository extends CrudRepository<Message, Integer> {
|
||||||
List<Message> findByTag(String tag);
|
|
||||||
|
Page<Message> findByTag(String tag, Pageable pageable);
|
||||||
|
|
||||||
|
Page<Message> findAll(Pageable pageable);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<#include "security.ftl">
|
<#include "security.ftl">
|
||||||
|
<#import "pager.ftl" as p>
|
||||||
|
|
||||||
<div class="row row-cols-1 row-cols-md-3 g-4" id="message-list">
|
<@p.pager url page! />
|
||||||
<#list messages as message>
|
<div class="row row-cols-1 row-cols-md-3 g-4" id="message-list">
|
||||||
|
<#list page.content as message>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="card h-100" data-id="${message.id}"> <!-- h-100 делает карточки одинаковой высоты -->
|
<div class="card h-100" data-id="${message.id}"> <!-- h-100 делает карточки одинаковой высоты -->
|
||||||
<#if message.filename??>
|
<#if message.filename??>
|
||||||
@@ -14,7 +16,8 @@
|
|||||||
<div class="card-footer d-flex justify-content-between">
|
<div class="card-footer d-flex justify-content-between">
|
||||||
<a href="/user-messages/${message.author.id}"> ${message.authorName} </a>
|
<a href="/user-messages/${message.author.id}"> ${message.authorName} </a>
|
||||||
<#if message.author.id == currentUserId>
|
<#if message.author.id == currentUserId>
|
||||||
<a class="btn btn-primary btn-sm" href="/user-messages/${message.author.id}?message=${message.id}">Edit</a>
|
<a class="btn btn-primary btn-sm"
|
||||||
|
href="/user-messages/${message.author.id}?message=${message.id}">Edit</a>
|
||||||
</#if>
|
</#if>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -22,4 +25,5 @@
|
|||||||
<#else>
|
<#else>
|
||||||
<p>No messages found</p>
|
<p>No messages found</p>
|
||||||
</#list>
|
</#list>
|
||||||
</div>
|
</div>
|
||||||
|
<@p.pager url page />
|
||||||
26
src/main/resources/templates/parts/pager.ftl
Normal file
26
src/main/resources/templates/parts/pager.ftl
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<#macro pager url page>
|
||||||
|
<div class="mt-3">
|
||||||
|
<ul class="pagination">
|
||||||
|
<li class="page-item disabled"><a class="page-link" href="#">Pages</a></li>
|
||||||
|
<#list 1..page.totalPages as p>
|
||||||
|
<#if (p - 1) == page.number>
|
||||||
|
<li class="page-item active"><a class="page-link" href="#">${p}</a></li>
|
||||||
|
<#else >
|
||||||
|
<li class="page-item"><a class="page-link" href="${url}?page=${p - 1}&size=${page.size}">${p}</a></li>
|
||||||
|
</#if>
|
||||||
|
</#list>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="mt-3">
|
||||||
|
<ul class="pagination">
|
||||||
|
<li class="page-item disabled"><a class="page-link" href="#">Items per page</a></li>
|
||||||
|
<#list [5, 10, 20, 50] as c>
|
||||||
|
<#if c == page.size>
|
||||||
|
<li class="page-item active"><a class="page-link" href="#">${c}</a></li>
|
||||||
|
<#else >
|
||||||
|
<li class="page-item"><a class="page-link" href="${url}?page=${page.number}&size=${c}">${c}</a></li>
|
||||||
|
</#if>
|
||||||
|
</#list>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</#macro>
|
||||||
Reference in New Issue
Block a user