Changeset 276a8b6 for src/main

Timestamp:

10/07/21 20:07:41 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

0c37625

Parents:

0f4f552

Message:

post pagination

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (2 diffs)
• java/it/finki/charitable/repository/DonationPostRepository.java (modified) (2 diffs)
• java/it/finki/charitable/services/DonationPostService.java (modified) (1 diff)
• resources/static/js/pagination.js (added)
• resources/templates/album.html (modified) (3 diffs)
• resources/templates/common/navbar.html (modified) (1 diff)

src/main/java/it/finki/charitable/controller/DonationPostController.java

@@ -4 +4 @@
 import it.finki.charitable.services.*;
 import it.finki.charitable.util.FileUploadUtil;
+import org.springframework.data.domain.Page;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -122 +123 @@
 
     @RequestMapping("/album")
-    public String album(Model model) {
-        List<DonationPost> postList = donationPostService.findAllByApproved(true);
-        if (postList.size() == 0) {
+    public String album(Model model,
+                        @RequestParam int page,
+                        @RequestParam String sort,
+                        @RequestParam(required = false,defaultValue = "") String order) {
+        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "album";
         }
+        model.addAttribute("totalPages", postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "album";

src/main/java/it/finki/charitable/repository/DonationPostRepository.java

@@ -4 +4 @@
 import it.finki.charitable.entities.DonationPost;
 import it.finki.charitable.entities.Moderator;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -14 +16 @@
     List<DonationPost> findAllByApproved(Boolean approved);
     List<DonationPost> findAllByModerator(Moderator moderator);
+    Page<DonationPost> findAllByApproved(Pageable pageable, boolean approved);
 }

src/main/java/it/finki/charitable/services/DonationPostService.java

@@ -54 +54 @@
     }
 
-    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort) {
-        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(sort));
-        return donationPostRepository.findAll(pageable);
+    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort, String order) {
+        Sort s = Sort.by(sort);
+        s = order.equals("asc") ? s.ascending() : s.descending();
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, s);
+        return donationPostRepository.findAllByApproved(pageable, true);
     }
 }

src/main/resources/templates/album.html

@@ -16 +16 @@
     <p th:if="${noPosts}">No posts</p>
     <div th:unless="${noPosts}" class="album py-5 bg-light">
+
         <div class="container">
-
+            <div class="row">
+                <div class="col-md-2">
+                    <label class="form-label" for="sortBy">Sort By</label>
+                    <select class="input-group-text" id="sortBy">
+                        <option value="id">Default</option>
+                        <option value="title">Title</option>
+                        <option value="dateDue">Date due</option>
+                        <option value="fundsNeeded">Funds needed</option>
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label" for="order">Order</label>
+                    <select class="input-group-text" id="order">
+                        <option value="asc">Ascending</option>
+                        <option value="desc">Descending</option>
+                    </select>
+                </div>
+            </div>
+            <br>
             <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
                 <div class="col" th:each="post : ${postList}">
@@ -37 +56 @@
             </div>
         </div>
-        <hr class="ui-menu-divider" />
+        <hr class="ui-menu-divider"/>
         <nav>
-            <ul class="pagination justify-content-center">
-                <li class="page-item"><a class="page-link" href="#">Previous</a></li>
-                <li class="page-item"><a class="page-link" href="#">1</a></li>
-                <li class="page-item"><a class="page-link" href="#">2</a></li>
-                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                <li class="page-item"><a class="page-link" href="#">Next</a></li>
-            </ul>
+            <div id="pagination"></div>
         </nav>
     </div>
@@ -51 +64 @@
 </main>
 <script src="/js/bootstrap.min.js"></script>
+<script id="helper" src="/js/pagination.js" th:data-pages="${totalPages}"></script>
 </body>
 </html>

src/main/resources/templates/common/navbar.html

@@ -23 +23 @@
                     </li>
                     <li class="nav-item">
-                        <a sec:authorize="isAnonymous() or hasAuthority('USER')" th:href="@{/album?page=1}" class="nav-link px-2 text-white">Posts</a>
+                        <a sec:authorize="isAnonymous() or hasAuthority('USER')" th:href="@{/album?page=1&sort=id}" class="nav-link px-2 text-white">Posts</a>
                         <a sec:authorize="hasAuthority('MODERATOR')" th:href="@{/moderator/approval}" class="nav-link px-2 text-white">Posts for approval</a>
                     </li>