From dd87a58873c9e9dfba23eb2d5af21cfc0c4f3aa8 Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Sat, 15 Apr 2023 23:50:16 +0400 Subject: [PATCH] Half Lab5 --- build.gradle | 14 ++- data.mv.db | Bin 53248 -> 118784 bytes front/lab4_vue_front | 2 +- .../webproglabs/lab1/WebConfiguration.java | 7 ++ .../lab34/controller/CommentController.java | 3 +- .../lab1/lab34/controller/CommentDto.java | 6 +- .../lab1/lab34/controller/PostController.java | 3 +- .../lab1/lab34/controller/PostDto.java | 10 ++- .../lab34/controller/ProfileController.java | 3 +- .../lab1/lab34/controller/ProfileDto.java | 6 +- .../mvc_controllers/FeedMvcController.java | 75 ++++++++++++++++ .../mvc_controllers/ProfileMvcController.java | 15 ++++ .../lab1/lab34/services/PostService.java | 2 +- src/main/resources/public/css/style.css | 15 ++++ src/main/resources/public/favicon.svg | 4 + src/main/resources/templates/default.html | 38 ++++++++ .../resources/templates/editPostModal.html | 37 ++++++++ src/main/resources/templates/feed.html | 36 ++++++++ src/main/resources/templates/feedPosts.html | 81 ++++++++++++++++++ 19 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/FeedMvcController.java create mode 100644 src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/ProfileMvcController.java create mode 100644 src/main/resources/public/css/style.css create mode 100644 src/main/resources/public/favicon.svg create mode 100644 src/main/resources/templates/default.html create mode 100644 src/main/resources/templates/editPostModal.html create mode 100644 src/main/resources/templates/feed.html create mode 100644 src/main/resources/templates/feedPosts.html diff --git a/build.gradle b/build.gradle index f2e7794..53e4666 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,23 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-devtools' + 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 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'com.h2database:h2:2.1.210' + implementation 'org.hibernate.validator:hibernate-validator' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.5' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + } tasks.named('test') { diff --git a/data.mv.db b/data.mv.db index 2f670b1664fa9bbc905dbf87fedc939a8b531658..e689d5469bceecb261a673ce02f18be79c7451e0 100644 GIT binary patch literal 118784 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 literal 53248 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 comments = new ArrayList<>(); + private String authorLogin; + public PostDto(Post post){ this.id = post.getId(); this.text = post.getText(); for(Comment comment: post.getComments()){ comments.add(new CommentDto(comment)); } + this.authorLogin = post.getAuthor().getLogin(); } - public Long getId() {return id;} + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public long getId() { + return id; + } public String getText() {return text;} public List getComments() {return comments;} + public String getAuthor() {return authorLogin;} } diff --git a/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileController.java b/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileController.java index 46cb114..a0f80cc 100644 --- a/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileController.java +++ b/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileController.java @@ -1,5 +1,6 @@ package com.webproglabs.lab1.lab34.controller; +import com.webproglabs.lab1.WebConfiguration; import com.webproglabs.lab1.lab34.services.ProfileService; import org.springframework.web.bind.annotation.*; @@ -7,7 +8,7 @@ import java.util.ArrayList; import java.util.List; @RestController -@RequestMapping("/profile") +@RequestMapping(WebConfiguration.REST_API + "/profile") public class ProfileController { private final ProfileService profileService; diff --git a/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileDto.java b/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileDto.java index 29f948b..398331f 100644 --- a/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileDto.java +++ b/src/main/java/com/webproglabs/lab1/lab34/controller/ProfileDto.java @@ -1,5 +1,6 @@ package com.webproglabs.lab1.lab34.controller; +import com.fasterxml.jackson.annotation.JsonProperty; import com.webproglabs.lab1.lab34.model.Comment; import com.webproglabs.lab1.lab34.model.Post; import com.webproglabs.lab1.lab34.model.Profile; @@ -26,7 +27,10 @@ public class ProfileDto { } } - public Long getId() {return id;} + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public long getId() { + return id; + } public String getLogin() {return login;} public String getPassword() {return password;} public List getComments() {return comments;} diff --git a/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/FeedMvcController.java b/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/FeedMvcController.java new file mode 100644 index 0000000..3acb327 --- /dev/null +++ b/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/FeedMvcController.java @@ -0,0 +1,75 @@ +package com.webproglabs.lab1.lab34.controller.mvc_controllers; + +import com.webproglabs.lab1.lab34.controller.PostDto; +import com.webproglabs.lab1.lab34.controller.ProfileDto; +import com.webproglabs.lab1.lab34.model.Post; +import com.webproglabs.lab1.lab34.services.PostService; +import com.webproglabs.lab1.lab34.services.ProfileService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +@Controller +@RequestMapping("/feed") +public class FeedMvcController { + + private final ProfileService profileService; + private final PostService postService; + + public FeedMvcController(ProfileService profileService, PostService postService) { + this.profileService = profileService; + this.postService = postService; + } + + @GetMapping + public String getFeedPage(Model model) { + model.addAttribute("profiles", profileService.findAllUsers().stream().map(ProfileDto::new).toList()); + return "feed"; + } + + @GetMapping(value = {"/{id}"}) + public String getFeedPageAuthorized(@PathVariable(required = false) Long id, Model model) { + model.addAttribute("profiles", profileService.findAllUsers().stream().map(ProfileDto::new).toList()); + model.addAttribute("posts", postService.findAllPosts().stream().map(PostDto::new).toList()); + model.addAttribute("selectedProfile", new ProfileDto(profileService.findUser(id))); + + return "feedPosts"; + } + + @GetMapping(value= {"/filter/{id}/"}) + public String getFeedPageFiltered(@PathVariable(required = false) Long id, @RequestParam(value="searchField") String searchField, Model model) { + model.addAttribute("profiles", profileService.findAllUsers().stream().map(ProfileDto::new).toList()); + model.addAttribute("posts", postService.findFilteredPosts(searchField).stream().map(PostDto::new).toList()); + model.addAttribute("selectedProfile", new ProfileDto(profileService.findUser(id))); + return "feedPosts"; + } + + @PostMapping(value={"/post/{id}/"}) + public String createPost(@PathVariable(required = false) Long id, @RequestParam(value="postInputField") String postInputField) { + postService.addPost(postInputField, new ArrayList<>(), id); + return "redirect:/feed/" + id.toString(); + } + + @PostMapping(value = {"/deletePost/{id}/{authorId}"}) + public String deletePost(@PathVariable(required = false) Long id, @PathVariable(required = false) Long authorId) { + postService.deletePost(id); + return "redirect:/feed/" + authorId.toString(); + } + + @GetMapping(value = {"postModal/{id}/{authorId}"}) + public String getPostEditModal(@PathVariable(required = false) Long id,@PathVariable(required = false) Long authorId, Model model) { + model.addAttribute("selectedPost", new PostDto(postService.findPost(id))); + model.addAttribute("profiles", profileService.findAllUsers().stream().map(ProfileDto::new).toList()); + model.addAttribute("posts", postService.findAllPosts().stream().map(PostDto::new).toList()); + model.addAttribute("selectedProfile", new ProfileDto(profileService.findUser(authorId))); + return "editPostModal"; + } + + @PostMapping(value = {"editPost/{id}/{authorId}/"}) + public String editPost(@PathVariable(required = false) Long id, @PathVariable(required = false) Long authorId, @RequestParam(value="postEditField") String postEditField) { + postService.updatePost(id, postEditField); + return "redirect:/feed/" + authorId.toString(); + } +} diff --git a/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/ProfileMvcController.java b/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/ProfileMvcController.java new file mode 100644 index 0000000..032ba34 --- /dev/null +++ b/src/main/java/com/webproglabs/lab1/lab34/controller/mvc_controllers/ProfileMvcController.java @@ -0,0 +1,15 @@ +package com.webproglabs.lab1.lab34.controller.mvc_controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/") +public class ProfileMvcController { + + @GetMapping + public String index() { + return "default"; + } +} diff --git a/src/main/java/com/webproglabs/lab1/lab34/services/PostService.java b/src/main/java/com/webproglabs/lab1/lab34/services/PostService.java index 43a7584..5b4abf7 100644 --- a/src/main/java/com/webproglabs/lab1/lab34/services/PostService.java +++ b/src/main/java/com/webproglabs/lab1/lab34/services/PostService.java @@ -53,7 +53,7 @@ public class PostService { } @Transactional - public Post addPost(String text, List comments, Long authorId) { + public Post addPost (String text, List comments, Long authorId) { if (!StringUtils.hasText(text)) { throw new IllegalArgumentException("Post data is null or empty"); } diff --git a/src/main/resources/public/css/style.css b/src/main/resources/public/css/style.css new file mode 100644 index 0000000..a68a220 --- /dev/null +++ b/src/main/resources/public/css/style.css @@ -0,0 +1,15 @@ +.container-padding { + padding: 10px; +} + +.margin-bottom { + margin-bottom: 10px; +} + +.button-fixed { + min-width: 120px; +} + +.button-sm { + padding: 1px; +} \ No newline at end of file diff --git a/src/main/resources/public/favicon.svg b/src/main/resources/public/favicon.svg new file mode 100644 index 0000000..c2e8ab2 --- /dev/null +++ b/src/main/resources/public/favicon.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html new file mode 100644 index 0000000..098c64a --- /dev/null +++ b/src/main/resources/templates/default.html @@ -0,0 +1,38 @@ + + + + + Лабораторная работа 5 + + + + + + + + + + + +
+

Лабораторная работа 5

+
+ + +
+
+
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/editPostModal.html b/src/main/resources/templates/editPostModal.html new file mode 100644 index 0000000..fcb157d --- /dev/null +++ b/src/main/resources/templates/editPostModal.html @@ -0,0 +1,37 @@ + + + + + + +
+ + + +
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/feed.html b/src/main/resources/templates/feed.html new file mode 100644 index 0000000..2b02dd5 --- /dev/null +++ b/src/main/resources/templates/feed.html @@ -0,0 +1,36 @@ + + + + + +
+
+ +
+
+ + +
+
+
+ + +
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/feedPosts.html b/src/main/resources/templates/feedPosts.html new file mode 100644 index 0000000..e6064e4 --- /dev/null +++ b/src/main/resources/templates/feedPosts.html @@ -0,0 +1,81 @@ + + + + + +
+ +
+

+
+
+ + Лента + +
+ +
+ + +
+ + +
+
+

+
+
+ Автор: + +
+
+
+ +
+
+ +
+
+
+
+
+ + + +
+ + +
+ + + + \ No newline at end of file