1 files changed, 8 insertions, 11 deletions
diff --git a/backend/src/main/java/com/blog/web/controllers/ArticleController.java b/backend/src/main/java/com/blog/web/controllers/ArticleController.java
index ec8af85..0df26a2 100644
--- a/backend/src/main/java/com/blog/web/controllers/ArticleController.java
+++ b/backend/src/main/java/com/blog/web/controllers/ArticleController.java
@@ -40,8 +40,14 @@ public class ArticleController {
     }
 
     @GetMapping("/articles")
-    public HashSet<ArticlePublicDto> listArticles() {
-        HashSet<ArticlePublicDto> articles = new HashSet<ArticlePublicDto>(articleService.findAllArticles());
+    public HashSet<ArticlePublicDto> listArticles(@RequestParam(value = "search", required = false) String search) {
+        HashSet<ArticlePublicDto> articles;
+        if(search != null) {
+            articles = articleService.searchPublicArticles(search);
+        }
+        else {
+            articles = new HashSet<ArticlePublicDto>(articleService.findAllArticles());
+        }
         return articles;
     }
 
@@ -103,15 +109,6 @@ public class ArticleController {
         return "redirect:/articles";
     }
 
-    @GetMapping("/articles/search")
-    public String searchArticle(@RequestParam(value = "search") String search, Model model) {
-        //UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        //model.addAttribute("user", user);
-        HashSet<ArticlePublicDto> articles = articleService.searchPublicArticles(search);
-        //model.addAttribute("articles", articles);
-        return "index";
-    }
-
     @GetMapping("/")
     public String getArticles() {
         return "redirect:/articles";