Merge remote-tracking branch 'origin/main'

src/main/java/site/easystartup/web/forum/controller/ForumController.java

@@ -64,7 +64,7 @@ public class ForumController {
                               Model model) {
         val pinned_discussions = forumFilterService.getPinnedDiscussionsByTopicId(topic_id);
         model.addAttribute("pinned_discussions", pinned_discussions);
-        val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 15);
+        val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 14);
         model.addAttribute("discussions", discussions);
         return "topic-first";
     }
@@ -73,10 +73,8 @@ public class ForumController {
     public String topicPage(@PathVariable(value = "topic_id") long topic_id,
                             @PathVariable(value = "topic_id") long page_index,
                               Model model) {
-        val pinned_discussions = forumFilterService.getPinnedDiscussionsByTopicId(topic_id);
+        val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList((int)(15 * page_index), (int)(15 * page_index) + 15);
-        model.addAttribute("pinned_discussions", pinned_discussions);
-        val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 15);
         model.addAttribute("discussions", discussions);
-        return "topic-first";
+        return "topic-content";
     }
 }

src/main/resources/templates/topic-content.html

@@ -0,0 +1,28 @@
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="https://www.thymeleaf.org"
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
+<head>
+    <meta charset="utf-8">
+    <title th:text="'Обсуждение. Страница' + ${page_index}"></title>
+
+</head>
+
+<body>
+
+<main>
+    <h2>Сообщения</h2>
+    <div th:each="el : ${discussions}">
+        <h2 th:text="${el.title}"/>
+        <p th:text="'Автор: ' + ${el.author}"/>
+        <p th:text="'Дата создания: ' + ${#dates.format(el.date, 'hh:mm dd MMM yyyy')}"/>
+        <p th:text="'Последнее обновление: ' + ${#dates.format(el.last_update, 'hh:mm dd MMM yyyy')}"/>
+    </div>
+</main>
+
+
+
+
+
+</body>
+</html>

src/main/resources/templates/topic-first.html

@@ -4,7 +4,7 @@
       xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
 <head>
     <meta charset="utf-8">
-    <title>Вход</title>
+    <title>Обсуждение</title>
 
 </head>