5 lab start work

build.gradle

@@ -1,4 +1,3 @@
-
 plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.0.2'
@@ -15,16 +14,24 @@ repositories {
 jar {
 	enabled = false
 }
-
 dependencies {
 	implementation(project(':FrontEnd'))
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation 'org.springframework.boot:spring-boot-devtools'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
+
+	implementation 'org.webjars:bootstrap:5.1.3'
+	implementation 'org.webjars:jquery:3.6.0'
+	implementation 'org.webjars:font-awesome:6.1.0'
+
 	implementation 'com.h2database:h2:2.1.210'
 	implementation 'org.hibernate.validator:hibernate-validator'
-	implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springdoc:springdoc-openapi-ui:1.6.5'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	//implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
+
 }
 
 tasks.named('test') {

src/main/java/ru/ulstu/is/sbapp/Comment/controller/CommentController.java

@@ -1,6 +1,7 @@
 package ru.ulstu.is.sbapp.Comment.controller;
 
 import org.springframework.web.bind.annotation.*;
+import ru.ulstu.is.sbapp.Comment.model.CommentDto;
 import ru.ulstu.is.sbapp.Comment.service.CommentService;
 
 import java.util.List;

src/main/java/ru/ulstu/is/sbapp/Comment/model/CommentDto.java

@@ -1,8 +1,5 @@
-package ru.ulstu.is.sbapp.Comment.controller;
+package ru.ulstu.is.sbapp.Comment.model;
 
-import ru.ulstu.is.sbapp.Comment.model.Comment;
-import ru.ulstu.is.sbapp.Post.model.Post;
-import ru.ulstu.is.sbapp.User.model.User;
 
 public class CommentDto {
     private Long id;

src/main/java/ru/ulstu/is/sbapp/Post/controller/PostController.java

@@ -2,11 +2,9 @@ package ru.ulstu.is.sbapp.Post.controller;
 
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
-import ru.ulstu.is.sbapp.Comment.controller.CommentDto;
-import ru.ulstu.is.sbapp.Post.model.Post;
+import ru.ulstu.is.sbapp.Comment.model.CommentDto;
+import ru.ulstu.is.sbapp.Post.model.PostDto;
 import ru.ulstu.is.sbapp.Post.service.PostService;
-import ru.ulstu.is.sbapp.User.controller.UserDto;
-import ru.ulstu.is.sbapp.User.service.UserService;
 
 import java.util.List;
 

src/main/java/ru/ulstu/is/sbapp/Post/model/Post.java

@@ -1,10 +1,8 @@
 package ru.ulstu.is.sbapp.Post.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import ru.ulstu.is.sbapp.Comment.model.Comment;
-import ru.ulstu.is.sbapp.Post.controller.PostDto;
 import ru.ulstu.is.sbapp.User.model.User;
 
 import java.util.ArrayList;

src/main/java/ru/ulstu/is/sbapp/Post/model/PostDto.java

@@ -1,9 +1,7 @@
-package ru.ulstu.is.sbapp.Post.controller;
+package ru.ulstu.is.sbapp.Post.model;
 
-import ru.ulstu.is.sbapp.Comment.controller.CommentDto;
-import ru.ulstu.is.sbapp.Comment.model.Comment;
+import ru.ulstu.is.sbapp.Comment.model.CommentDto;
 import ru.ulstu.is.sbapp.Post.model.Post;
-import ru.ulstu.is.sbapp.User.model.User;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

src/main/java/ru/ulstu/is/sbapp/Post/service/PostService.java

@@ -4,7 +4,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.is.sbapp.Comment.model.Comment;
 import ru.ulstu.is.sbapp.Comment.service.CommentService;
-import ru.ulstu.is.sbapp.Post.controller.PostDto;
+import ru.ulstu.is.sbapp.Post.model.PostDto;
 import ru.ulstu.is.sbapp.Post.model.Post;
 import ru.ulstu.is.sbapp.Post.repository.PostRepository;
 import ru.ulstu.is.sbapp.User.service.UserService;

src/main/java/ru/ulstu/is/sbapp/User/controller/UserController.java

@@ -2,8 +2,8 @@ package ru.ulstu.is.sbapp.User.controller;
 
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
-import ru.ulstu.is.sbapp.Post.controller.PostDto;
-import ru.ulstu.is.sbapp.Post.model.Post;
+import ru.ulstu.is.sbapp.Post.model.PostDto;
+import ru.ulstu.is.sbapp.User.model.UserDto;
 import ru.ulstu.is.sbapp.User.service.UserService;
 
 import java.util.List;

src/main/java/ru/ulstu/is/sbapp/User/model/UserDto.java

@@ -1,4 +1,4 @@
-package ru.ulstu.is.sbapp.User.controller;
+package ru.ulstu.is.sbapp.User.model;
 
 import ru.ulstu.is.sbapp.Comment.model.Comment;
 import ru.ulstu.is.sbapp.Post.model.Post;

src/main/java/ru/ulstu/is/sbapp/User/service/UserService.java

@@ -3,10 +3,9 @@ package ru.ulstu.is.sbapp.User.service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.is.sbapp.Comment.service.CommentService;
-import ru.ulstu.is.sbapp.Post.controller.PostDto;
+import ru.ulstu.is.sbapp.Post.model.PostDto;
 import ru.ulstu.is.sbapp.Post.model.Post;
 import ru.ulstu.is.sbapp.Post.repository.PostRepository;
-import ru.ulstu.is.sbapp.Post.service.PostService;
 import ru.ulstu.is.sbapp.User.model.User;
 
 import ru.ulstu.is.sbapp.User.repository.UserRepository;

src/test/java/ru/ulstu/is/sbapp/JpaCommentTest.java

@@ -8,7 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import ru.ulstu.is.sbapp.Comment.controller.CommentDto;
+import ru.ulstu.is.sbapp.Comment.model.CommentDto;
 import ru.ulstu.is.sbapp.Comment.model.Comment;
 import ru.ulstu.is.sbapp.Comment.service.CommentNotFoundException;
 import ru.ulstu.is.sbapp.Comment.service.CommentService;