From 794388d0f63f189e10cf067878cbf82d070b17d0 Mon Sep 17 00:00:00 2001
From: 1yuee <lisnik79@yandex.ru>
Date: Tue, 20 Jun 2023 15:49:30 +0400
Subject: [PATCH] kaif

---
 src/main/java/com/webproglabs/lab1/dto/CommentDto.java | 4 ++++
 src/main/java/com/webproglabs/lab1/dto/PostDto.java    | 5 +++++
 src/main/java/com/webproglabs/lab1/dto/TopicDto.java   | 5 +++++
 src/main/java/com/webproglabs/lab1/dto/UserDto.java    | 7 +++++++
 src/main/resources/templates/feed.html                 | 4 ++--
 src/main/resources/templates/feedPosts.html            | 2 +-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webproglabs/lab1/dto/CommentDto.java b/src/main/java/com/webproglabs/lab1/dto/CommentDto.java
index 1d2720d..fbea0b6 100644
--- a/src/main/java/com/webproglabs/lab1/dto/CommentDto.java
+++ b/src/main/java/com/webproglabs/lab1/dto/CommentDto.java
@@ -3,9 +3,13 @@ package com.webproglabs.lab1.dto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.webproglabs.lab1.models.Comment;
 
+import javax.validation.constraints.NotBlank;
+
 public class CommentDto {
     private Long id;
+    @NotBlank
     private String text;
+    @NotBlank
     private String authorLogin;
 
     public CommentDto(Comment comment) {
diff --git a/src/main/java/com/webproglabs/lab1/dto/PostDto.java b/src/main/java/com/webproglabs/lab1/dto/PostDto.java
index 4f0d3bf..701f6df 100644
--- a/src/main/java/com/webproglabs/lab1/dto/PostDto.java
+++ b/src/main/java/com/webproglabs/lab1/dto/PostDto.java
@@ -4,13 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.webproglabs.lab1.models.Comment;
 import com.webproglabs.lab1.models.Post;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
 public class PostDto {
     private Long id;
+    @NotBlank
     private String text;
+    @NotNull
     private List<CommentDto> comments = new ArrayList<>();
+    @NotBlank
     private String authorLogin;
 
     public PostDto(Post post){
diff --git a/src/main/java/com/webproglabs/lab1/dto/TopicDto.java b/src/main/java/com/webproglabs/lab1/dto/TopicDto.java
index 9d2961a..4374a01 100644
--- a/src/main/java/com/webproglabs/lab1/dto/TopicDto.java
+++ b/src/main/java/com/webproglabs/lab1/dto/TopicDto.java
@@ -4,13 +4,18 @@ import com.webproglabs.lab1.models.Comment;
 import com.webproglabs.lab1.models.Post;
 import com.webproglabs.lab1.models.Topic;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TopicDto {
     private Long id;
+    @NotBlank
     private String name;
+    @NotBlank
     private String description;
+    @NotNull
     private List<PostDto> posts = new ArrayList<>();
 
     public TopicDto(Topic topic) {
diff --git a/src/main/java/com/webproglabs/lab1/dto/UserDto.java b/src/main/java/com/webproglabs/lab1/dto/UserDto.java
index 977d844..8254ceb 100644
--- a/src/main/java/com/webproglabs/lab1/dto/UserDto.java
+++ b/src/main/java/com/webproglabs/lab1/dto/UserDto.java
@@ -6,15 +6,22 @@ import com.webproglabs.lab1.models.Post;
 import com.webproglabs.lab1.models.User;
 import com.webproglabs.lab1.models.UserRole;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
 public class UserDto {
     private Long id;
+    @NotBlank
     private String login;
+    @NotBlank
     private String password;
+    @NotNull
     private List<CommentDto> comments = new ArrayList<>();
+    @NotNull
     private List<PostDto> posts = new ArrayList<>();
+    @NotNull
     private UserRole role;
 
 
diff --git a/src/main/resources/templates/feed.html b/src/main/resources/templates/feed.html
index 5b53682..c8f8aac 100644
--- a/src/main/resources/templates/feed.html
+++ b/src/main/resources/templates/feed.html
@@ -10,10 +10,10 @@
   <div class="text-center">
                 <div class="dropdown text-center mx-auto w-75">
                     <div class="text-center mt-3">
-                        <button class="btn btn-secondary dropdown-toggle ms-3 mb-3  w-50" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                        <button class="btn btn-secondary dropdown-toggle mb-3  w-100" type="button" data-bs-toggle="dropdown" aria-expanded="false">
                             Выбор темы
                         </button>
-                        <ul class="dropdown-menu w-50" >
+                        <ul class="dropdown-menu w-100" >
                             <li th:each="topic: ${topics}">
                                 <a class="dropdown-item" th:href="@{/feed/{id}(id=${topic.id})}" th:text="${topic.name + '. ' + topic.description}">
                                 </a>
diff --git a/src/main/resources/templates/feedPosts.html b/src/main/resources/templates/feedPosts.html
index e734fe0..9902a49 100644
--- a/src/main/resources/templates/feedPosts.html
+++ b/src/main/resources/templates/feedPosts.html
@@ -8,7 +8,7 @@
 <div layout:fragment="contentFeed">
 
   <div class='mb-3 mx-auto w-75'>
-    <div class="text-center w-100 border border-2">
+    <div class="text-center w-100 border border-2 bg-light">
       <p class="text-center h3" th:text="${selectedTopic.name}"></p>
       <p class="text-center fw-light" th:text="${selectedTopic.description}"></p>
     </div>