split front and back end, add react to project

20 files changed, 0 insertions, 998 deletions

diff --git a/src/main/java/com/blog/web/WebApplication.java b/src/main/java/com/blog/web/WebApplication.java
deleted file mode 100644
index f5dd2ef..0000000
--- a/src/main/java/com/blog/web/WebApplication.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.blog.web;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class WebApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(WebApplication.class, args);
-    }
-}
diff --git a/src/main/java/com/blog/web/controllers/ArticleController.java b/src/main/java/com/blog/web/controllers/ArticleController.java
deleted file mode 100644
index 6cd5d50..0000000
--- a/src/main/java/com/blog/web/controllers/ArticleController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.blog.web.controllers;
-
-import com.blog.web.dto.ArticleDto;
-import com.blog.web.dto.ArticlePublicDto;
-import com.blog.web.models.Article;
-import com.blog.web.models.UserEntity;
-import com.blog.web.services.ArticleService;
-import com.blog.web.services.UserService;
-import jakarta.validation.Valid;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.List;
-
-@RestController
-@Controller
-public class ArticleController {
-    private ArticleService articleService;
-    private UserService userService;
-
-    public ArticleController(ArticleService articleService, UserService userService) {
-        this.articleService = articleService;
-        this.userService = userService;
-    }
-
-    @GetMapping("/get")
-    public Article getMethod() {
-        return new Article(
-                5,
-                "blah",
-                "blah",
-                "blah",
-                new UserEntity(),
-                LocalDateTime.now(),
-                LocalDateTime.now()
-        );
-    }
-
-    @GetMapping("/articles")
-    public HashSet<ArticlePublicDto> listArticles(Model model) {
-        HashSet<ArticlePublicDto> articles = new HashSet<ArticlePublicDto>(articleService.findAllArticles());
-        //UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        //model.addAttribute("user", user);
-        //model.addAttribute("articles", articles);
-        //return "index";
-        return articles;
-    }
-
-    @GetMapping("/articles/{articleId}")
-    public String showArticle(@PathVariable("articleId") long articleId, Model model) {
-        ArticleDto articleDto = articleService.findArticleById(articleId);
-        model.addAttribute("article", articleDto);
-        UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        model.addAttribute("user", user);
-        return "articles/show";
-    }
-
-    @GetMapping("/articles/new")
-    public String createArticleForm(Model model) {
-        model.addAttribute("user", userService.getLoggedInUser().orElse(new UserEntity()));
-        model.addAttribute("article", new Article());
-        return "articles/new";
-    }
-
-    @PostMapping("/articles/new")
-    public String saveArticle(@Valid @ModelAttribute("article") ArticleDto articleDto, BindingResult result, Model model) {
-        // if non-authenticated in user tries to create an article
-        // redirect them to login page
-        UserEntity user = userService.getLoggedInUser().orElse(null);
-        if (user == null) {
-            return "redirect:/userlogin";
-        } else if (result.hasErrors()) {
-            model.addAttribute("article", articleDto);
-            return "articles/new";
-        } else {
-            articleService.saveArticle(articleDto);
-            return "redirect:/articles";
-        }
-    }
-
-    @GetMapping("/articles/delete/{articleId}")
-    public String deleteArticle(@PathVariable("articleId") Long articleId) {
-        articleService.delete(articleId);
-        return "redirect:/articles";
-    }
-
-    @GetMapping("/articles/edit/{articleId}")
-    public String editArticleForm(@PathVariable("articleId") long articleId, Model model) {
-        UserEntity user = userService.getLoggedInUser().orElse(null);
-        if (user != null) {
-            model.addAttribute("user", user);
-            ArticleDto articleDto = articleService.findArticleById(articleId);
-            model.addAttribute("article", articleDto);
-        }
-        return "articles/edit";
-    }
-
-    @PostMapping("/articles/edit/{articleId}")
-    public String updateArticle(@PathVariable("articleId") Long articleId, @Valid @ModelAttribute("article") ArticleDto article, BindingResult result) {
-        if (result.hasErrors()) {
-            return "articles/edit";
-        }
-        article.setId(articleId);
-        articleService.updateArticle(article);
-        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);
-        List<ArticleDto> articles = articleService.searchArticles(search);
-        model.addAttribute("articles", articles);
-        return "index";
-    }
-
-    @GetMapping("/")
-    public String getArticles() {
-        return "redirect:/articles";
-    }
-}
diff --git a/src/main/java/com/blog/web/controllers/AuthController.java b/src/main/java/com/blog/web/controllers/AuthController.java
deleted file mode 100644
index efb3672..0000000
--- a/src/main/java/com/blog/web/controllers/AuthController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.blog.web.controllers;
-
-import com.blog.web.dto.RegistrationDto;
-import com.blog.web.models.UserEntity;
-import com.blog.web.services.UserService;
-import jakarta.validation.Valid;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@Controller
-public class AuthController {
-    private final UserService userService;
-
-    public AuthController(UserService userService) {
-        this.userService = userService;
-    }
-
-    @GetMapping("/userlogin")
-    public String login(Model model) {
-        final UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        model.addAttribute("user", user);
-        return "auth/login";
-    }
-
-    @GetMapping("/register")
-    public String getRegisterForm(Model model) {
-        final RegistrationDto user = new RegistrationDto();
-        model.addAttribute("user", user);
-        return "auth/register";
-    }
-
-    @PostMapping("/register/save")
-    public String register(@Valid @ModelAttribute("user") RegistrationDto user, BindingResult result, Model model) {
-        UserEntity existingUserEmail = userService.findByEmail(user.getEmail()).orElse(null);
-        if (existingUserEmail != null && StringUtils.isBlank(existingUserEmail.getEmail())) {
-            result.rejectValue("email", "There is already a user with this email");
-        }
-
-        UserEntity existingUsername = userService.findByUsername(user.getUsername()).orElse(null);
-        if (existingUsername != null && StringUtils.isBlank(existingUsername.getUsername())) {
-            result.rejectValue("username", "There is already a user with this username");
-        }
-
-        if (result.hasErrors()) {
-            model.addAttribute("user", user);
-            return "register";
-        }
-        userService.saveUser(user);
-        return "redirect:/articles?success";
-    }
-}
diff --git a/src/main/java/com/blog/web/dto/ArticleDto.java b/src/main/java/com/blog/web/dto/ArticleDto.java
deleted file mode 100644
index d275f3b..0000000
--- a/src/main/java/com/blog/web/dto/ArticleDto.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.blog.web.dto;
-
-import com.blog.web.models.Article;
-import com.blog.web.models.UserEntity;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.NotEmpty;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-import org.hibernate.validator.constraints.URL;
-
-import java.time.LocalDateTime;
-
-public class ArticleDto {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @NotEmpty(message = "Article title should not be empty")
-    private String title;
-    @NotEmpty(message = "Article Photo URL should not be empty")
-    @URL(message = "Article Photo URL should be a URL")
-    private String photoUrl;
-    @NotEmpty(message = "Article Content should not be empty")
-    private String content;
-    @CreationTimestamp
-    private LocalDateTime createdOn;
-    @UpdateTimestamp
-    private LocalDateTime updatedOn;
-    @ManyToOne
-    @JoinColumn(name = "created_by", nullable = false)
-    private UserEntity createdBy;
-
-    public ArticleDto(long id, String title, String photoUrl, String content, UserEntity createdBy, LocalDateTime createdOn, LocalDateTime updatedOn) {
-        this.id = id;
-        this.title = title;
-        this.photoUrl = photoUrl;
-        this.content = content;
-        this.createdBy = createdBy;
-        this.createdOn = createdOn;
-        this.updatedOn = updatedOn;
-    }
-
-    public ArticleDto() {
-    }
-
-    ;
-
-    public ArticleDto(Article article) {
-        this.id = article.getId();
-        this.title = article.getTitle();
-        this.photoUrl = article.getPhotoUrl();
-        this.content = article.getContent();
-        this.createdBy = article.getCreatedBy();
-        this.createdOn = article.getCreatedOn();
-        this.updatedOn = article.getUpdatedOn();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public @NotEmpty(message = "Article title should not be empty") String getTitle() {
-        return title;
-    }
-
-    public void setTitle(@NotEmpty(message = "Article title should not be empty") String title) {
-        this.title = title;
-    }
-
-    public @NotEmpty(message = "Article Photo URL should not be empty") @URL(message = "Article Photo URL should be a URL") String getPhotoUrl() {
-        return photoUrl;
-    }
-
-    public void setPhotoUrl(@NotEmpty(message = "Article Photo URL should not be empty") @URL(message = "Article Photo URL should be a URL") String photoUrl) {
-        this.photoUrl = photoUrl;
-    }
-
-    public @NotEmpty(message = "Article Content should not be empty") String getContent() {
-        return content;
-    }
-
-    public void setContent(@NotEmpty(message = "Article Content should not be empty") String content) {
-        this.content = content;
-    }
-
-    public LocalDateTime getCreatedOn() {
-        return createdOn;
-    }
-
-    public void setCreatedOn(LocalDateTime createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public LocalDateTime getUpdatedOn() {
-        return updatedOn;
-    }
-
-    public void setUpdatedOn(LocalDateTime updatedOn) {
-        this.updatedOn = updatedOn;
-    }
-
-    public UserEntity getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(UserEntity createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getUsername() { return createdBy.getUsername(); }
-}
diff --git a/src/main/java/com/blog/web/dto/ArticlePublicDto.java b/src/main/java/com/blog/web/dto/ArticlePublicDto.java
deleted file mode 100644
index 3ced6d2..0000000
--- a/src/main/java/com/blog/web/dto/ArticlePublicDto.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.blog.web.dto;
-
-import com.blog.web.models.Article;
-
-import java.time.LocalDateTime;
-
-public class ArticlePublicDto {
-    private Long id;
-    private String title;
-    private String photoUrl;
-    private String content;
-    private LocalDateTime createdOn;
-    private LocalDateTime updatedOn;
-    private String createdBy;
-
-    public ArticlePublicDto(long id, String title, String photoUrl, String content, String createdBy, LocalDateTime createdOn, LocalDateTime updatedOn) {
-        this.id = id;
-        this.title = title;
-        this.photoUrl = photoUrl;
-        this.content = content;
-        this.createdBy = createdBy;
-        this.createdOn = createdOn;
-        this.updatedOn = updatedOn;
-    }
-
-    public ArticlePublicDto() {
-    }
-
-    ;
-
-    public ArticlePublicDto(Article article) {
-        this.id = article.getId();
-        this.title = article.getTitle();
-        this.photoUrl = article.getPhotoUrl();
-        this.content = article.getContent();
-        this.createdBy = article.getCreatedBy().getUsername();
-        this.createdOn = article.getCreatedOn();
-        this.updatedOn = article.getUpdatedOn();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle( String title) {
-        this.title = title;
-    }
-
-    public String getPhotoUrl() {
-        return photoUrl;
-    }
-
-    public void setPhotoUrl(String photoUrl) {
-        this.photoUrl = photoUrl;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent( String content) {
-        this.content = content;
-    }
-
-    public LocalDateTime getCreatedOn() {
-        return createdOn;
-    }
-
-    public void setCreatedOn(LocalDateTime createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public LocalDateTime getUpdatedOn() {
-        return updatedOn;
-    }
-
-    public void setUpdatedOn(LocalDateTime updatedOn) {
-        this.updatedOn = updatedOn;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-}
diff --git a/src/main/java/com/blog/web/dto/RegistrationDto.java b/src/main/java/com/blog/web/dto/RegistrationDto.java
deleted file mode 100644
index 5b86557..0000000
--- a/src/main/java/com/blog/web/dto/RegistrationDto.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.blog.web.dto;
-
-import jakarta.validation.constraints.NotEmpty;
-
-public class RegistrationDto {
-    private Long id;
-    @NotEmpty
-    private String username;
-    @NotEmpty
-    private String email;
-
-    @NotEmpty
-    private String password;
-
-    public RegistrationDto() {
-    }
-
-    public RegistrationDto(String username, String email, String password) {
-        this.username = username;
-        this.email = email;
-        this.password = password;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public @NotEmpty String getUsername() {
-        return username;
-    }
-
-    public void setUsername(@NotEmpty String username) {
-        this.username = username;
-    }
-
-    public @NotEmpty String getEmail() {
-        return email;
-    }
-
-    public void setEmail(@NotEmpty String email) {
-        this.email = email;
-    }
-
-    public void setPassword(@NotEmpty String password) {
-        this.password = password;
-    }
-
-    public @NotEmpty String getPassword() {
-        return password;
-    }
-}
diff --git a/src/main/java/com/blog/web/mappers/ArticleMapper.java b/src/main/java/com/blog/web/mappers/ArticleMapper.java
deleted file mode 100644
index 8fe729e..0000000
--- a/src/main/java/com/blog/web/mappers/ArticleMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.blog.web.mappers;
-
-import com.blog.web.dto.ArticleDto;
-import com.blog.web.dto.ArticlePublicDto;
-import com.blog.web.models.Article;
-
-public class ArticleMapper {
-    private ArticleMapper() {
-    }
-
-    public static Article mapToArticle(ArticleDto articleDto) {
-        return new Article(articleDto);
-    }
-
-    public static ArticleDto mapToArticleDto(Article article) {
-        return new ArticleDto(article);
-    }
-
-    public static ArticlePublicDto mapToArticlePublicDto(Article article) {
-        return new ArticlePublicDto(article);
-    }
-}
diff --git a/src/main/java/com/blog/web/models/Article.java b/src/main/java/com/blog/web/models/Article.java
deleted file mode 100644
index b54907a..0000000
--- a/src/main/java/com/blog/web/models/Article.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.blog.web.models;
-
-import com.blog.web.dto.ArticleDto;
-import jakarta.persistence.*;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
-import java.time.LocalDateTime;
-
-@Entity
-public class Article {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-    private String title;
-    private String photoUrl;
-    private String content;
-    @CreationTimestamp
-    private LocalDateTime createdOn;
-    @UpdateTimestamp
-    private LocalDateTime updatedOn;
-    @ManyToOne
-    @JoinColumn(name = "created_by", nullable = false)
-    private UserEntity createdBy;
-
-    public Article(long id, String title, String photoUrl, String content, UserEntity createdBy, LocalDateTime createdOn, LocalDateTime updatedOn) {
-        this.id = id;
-        this.title = title;
-        this.photoUrl = photoUrl;
-        this.content = content;
-        this.createdBy = createdBy;
-        this.createdOn = createdOn;
-        this.updatedOn = updatedOn;
-    }
-
-    public Article() {
-    }
-
-    public Article(ArticleDto articleDto) {
-        this.id = articleDto.getId();
-        this.title = articleDto.getTitle();
-        this.photoUrl = articleDto.getPhotoUrl();
-        this.content = articleDto.getContent();
-        this.createdBy = articleDto.getCreatedBy();
-        this.createdOn = articleDto.getCreatedOn();
-        this.updatedOn = articleDto.getUpdatedOn();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getPhotoUrl() {
-        return photoUrl;
-    }
-
-    public void setPhotoUrl(String photoUrl) {
-        this.photoUrl = photoUrl;
-    }
-
-    public LocalDateTime getCreatedOn() {
-        return createdOn;
-    }
-
-    public void setCreatedOn(LocalDateTime createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public LocalDateTime getUpdatedOn() {
-        return updatedOn;
-    }
-
-    public void setUpdatedOn(LocalDateTime updatedOn) {
-        this.updatedOn = updatedOn;
-    }
-
-    public UserEntity getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(UserEntity createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-}
diff --git a/src/main/java/com/blog/web/models/Role.java b/src/main/java/com/blog/web/models/Role.java
deleted file mode 100644
index 2b7143f..0000000
--- a/src/main/java/com/blog/web/models/Role.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.blog.web.models;
-
-import jakarta.persistence.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity(name = "roles")
-public class Role {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-    private String name;
-    @ManyToMany(mappedBy = "roles")
-    private List<UserEntity> users = new ArrayList<>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<UserEntity> getUsers() {
-        return users;
-    }
-}
diff --git a/src/main/java/com/blog/web/models/UserEntity.java b/src/main/java/com/blog/web/models/UserEntity.java
deleted file mode 100644
index bf45b21..0000000
--- a/src/main/java/com/blog/web/models/UserEntity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.blog.web.models;
-
-import jakarta.persistence.*;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Entity(name = "users")
-// Named UserEntity to prevent conflicts with Java User object
-public class UserEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-    private String username;
-    private String email;
-    private String password;
-    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinTable(name = "user_roles", joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "role_id", referencedColumnName = "id")})
-    private final List<Role> roles = new ArrayList<>();
-
-    public boolean equals(UserEntity user) {
-        return this.id == user.getId();
-    }
-
-    public User toSecurityUser() {
-        return new User(this.getEmail(), this.getPassword(), this.getRoles().stream().map((role) -> new SimpleGrantedAuthority(role.getName())).collect(Collectors.toList()));
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public List<Role> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(List<Role> roles) {
-        this.roles.clear();
-        this.roles.addAll(roles);
-    }
-}
diff --git a/src/main/java/com/blog/web/repository/ArticleRepository.java b/src/main/java/com/blog/web/repository/ArticleRepository.java
deleted file mode 100644
index 594cb15..0000000
--- a/src/main/java/com/blog/web/repository/ArticleRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.blog.web.repository;
-
-import com.blog.web.models.Article;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
-public interface ArticleRepository extends JpaRepository<Article, Long> {
-    @Query("SELECT a from Article a WHERE a.title LIKE CONCAT('%', :search, '%')")
-    List<Article> searchArticles(String search);
-}
diff --git a/src/main/java/com/blog/web/repository/RoleRepository.java b/src/main/java/com/blog/web/repository/RoleRepository.java
deleted file mode 100644
index f271bf1..0000000
--- a/src/main/java/com/blog/web/repository/RoleRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.blog.web.repository;
-
-import com.blog.web.models.Role;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.Optional;
-
-public interface RoleRepository extends JpaRepository<Role, Long> {
-    Optional<Role> findByName(String name);
-}
diff --git a/src/main/java/com/blog/web/repository/UserRepository.java b/src/main/java/com/blog/web/repository/UserRepository.java
deleted file mode 100644
index 30eefc5..0000000
--- a/src/main/java/com/blog/web/repository/UserRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.blog.web.repository;
-
-import com.blog.web.models.UserEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.Optional;
-
-public interface UserRepository extends JpaRepository<UserEntity, Long> {
-    Optional<UserEntity> findByEmail(String email);
-
-    Optional<UserEntity> findByUsername(String username);
-
-    Optional<UserEntity> findFirstByUsername(String username);
-}
diff --git a/src/main/java/com/blog/web/security/CustomUserDetailsService.java b/src/main/java/com/blog/web/security/CustomUserDetailsService.java
deleted file mode 100644
index ee3e950..0000000
--- a/src/main/java/com/blog/web/security/CustomUserDetailsService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.blog.web.security;
-
-import com.blog.web.models.UserEntity;
-import com.blog.web.repository.UserRepository;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-import java.util.stream.Collectors;
-
-@Service
-public class CustomUserDetailsService implements UserDetailsService {
-    private final UserRepository userRepository;
-
-    public CustomUserDetailsService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        UserEntity userEntity = userRepository.findFirstByUsername(username).orElse(new UserEntity());
-        if (userEntity.getUsername() != null) {
-            return userEntity.toSecurityUser();
-        } else {
-            throw new UsernameNotFoundException("Invalid username");
-        }
-    }
-}
diff --git a/src/main/java/com/blog/web/security/SecurityConfig.java b/src/main/java/com/blog/web/security/SecurityConfig.java
deleted file mode 100644
index 17e09c7..0000000
--- a/src/main/java/com/blog/web/security/SecurityConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.blog.web.security;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-@EnableMethodSecurity(securedEnabled = true)
-public class SecurityConfig {
-    private CustomUserDetailsService userDetailsService;
-
-    public SecurityConfig(CustomUserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
-
-    @Bean
-    public static PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-    @Bean
-    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        // disabling csrf leaves us vulnerable, in a real production app do not do this
-        http.csrf(c -> c.disable()).cors(c -> c.disable()).authorizeHttpRequests(auths -> auths.anyRequest().permitAll()).formLogin(form -> form.loginPage("/userlogin").usernameParameter("username").passwordParameter("password").defaultSuccessUrl("/articles").loginProcessingUrl("/userlogin").failureUrl("/userlogin?error=true").permitAll()).logout(logout -> logout.logoutUrl("/logout").logoutSuccessUrl("/articles"));
-        return http.build();
-    }
-
-    public void configure(AuthenticationManagerBuilder builder) throws Exception {
-        builder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
-    }
-}
diff --git a/src/main/java/com/blog/web/security/SecurityUtil.java b/src/main/java/com/blog/web/security/SecurityUtil.java
deleted file mode 100644
index ef0b3d9..0000000
--- a/src/main/java/com/blog/web/security/SecurityUtil.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.blog.web.security;
-
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-public class SecurityUtil {
-    public static String getSessionUser() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        return !(authentication instanceof AnonymousAuthenticationToken) ? authentication.getName() : null;
-    }
-}
diff --git a/src/main/java/com/blog/web/services/ArticleService.java b/src/main/java/com/blog/web/services/ArticleService.java
deleted file mode 100644
index 1bfe38f..0000000
--- a/src/main/java/com/blog/web/services/ArticleService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.blog.web.services;
-
-import com.blog.web.dto.ArticleDto;
-import com.blog.web.dto.ArticlePublicDto;
-import com.blog.web.models.Article;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface ArticleService {
-    List<ArticlePublicDto> findAllArticles();
-
-    Optional<Article> saveArticle(ArticleDto article);
-
-    ArticleDto findArticleById(long articleId);
-
-    void updateArticle(ArticleDto articleDto);
-
-    boolean delete(Long articleId);
-
-    List<ArticleDto> searchArticles(String search);
-}
diff --git a/src/main/java/com/blog/web/services/UserService.java b/src/main/java/com/blog/web/services/UserService.java
deleted file mode 100644
index b9c231b..0000000
--- a/src/main/java/com/blog/web/services/UserService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.blog.web.services;
-
-import com.blog.web.dto.RegistrationDto;
-import com.blog.web.models.UserEntity;
-
-import java.util.Optional;
-
-public interface UserService {
-    void saveUser(RegistrationDto registrationDto);
-
-    Optional<UserEntity> findByEmail(String email);
-
-    Optional<UserEntity> findByUsername(String username);
-
-    public Optional<UserEntity> getLoggedInUser();
-}
diff --git a/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java b/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
deleted file mode 100644
index 7073073..0000000
--- a/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.blog.web.services.impl;
-
-import com.blog.web.dto.ArticleDto;
-import com.blog.web.dto.ArticlePublicDto;
-import com.blog.web.models.Article;
-import com.blog.web.models.UserEntity;
-import com.blog.web.repository.ArticleRepository;
-import com.blog.web.repository.UserRepository;
-import com.blog.web.security.SecurityUtil;
-import com.blog.web.services.ArticleService;
-import com.blog.web.services.UserService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.blog.web.mappers.ArticleMapper;
-
-import static com.blog.web.mappers.ArticleMapper.mapToArticle;
-import static com.blog.web.mappers.ArticleMapper.mapToArticleDto;
-
-@Service
-public class ArticleServiceImpl implements ArticleService {
-    final private ArticleRepository articleRepository;
-    final private UserRepository userRepository;
-    final private UserService userService;
-
-    public ArticleServiceImpl(ArticleRepository articleRepository, UserRepository userRepository, UserService userService) {
-        this.userRepository = userRepository;
-        this.articleRepository = articleRepository;
-        this.userService = userService;
-    }
-
-
-    @Override
-    public List<ArticlePublicDto> findAllArticles() {
-        List<Article> articles = articleRepository.findAll();
-        return articles.stream().map(ArticleMapper::mapToArticlePublicDto).collect(Collectors.toList());
-    }
-
-    @Override
-    public Optional<Article> saveArticle(ArticleDto articleDto) {
-        String username = SecurityUtil.getSessionUser();
-        UserEntity user = userRepository.findByUsername(username).orElse(null);
-        if (user == null) {
-            return null;
-        }
-        Article article = mapToArticle(articleDto);
-        article.setCreatedBy(user);
-        return Optional.of(articleRepository.save(article));
-    }
-
-    @Override
-    public ArticleDto findArticleById(long articleId) {
-        Article article = articleRepository.findById(articleId).get();
-        return mapToArticleDto(article);
-    }
-
-    @Override
-    public void updateArticle(ArticleDto articleDto) {
-        String username = SecurityUtil.getSessionUser();
-        UserEntity user = userRepository.findByUsername(username).orElse(null);
-        if (user == null) {
-            return;
-        }
-        Article article = mapToArticle(articleDto);
-        article.setCreatedBy(user);
-        articleRepository.save(article);
-    }
-
-    @Override
-    public boolean delete(Long articleId) {
-        final UserEntity user = userService.getLoggedInUser().orElse(null);
-        if (user == null) {
-            return false;
-        }
-        String userId = user.getUsername();
-        ArticleDto article = this.findArticleById(articleId);
-        String ownerId = article.getUsername();
-        if (ownerId.equals(userId)) {
-            articleRepository.deleteById(articleId);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public List<ArticleDto> searchArticles(String search) {
-        List<Article> articles = articleRepository.searchArticles(search);
-        return articles.stream().map(article -> mapToArticleDto(article)).collect(Collectors.toList());
-    }
-}
diff --git a/src/main/java/com/blog/web/services/impl/UserServiceImpl.java b/src/main/java/com/blog/web/services/impl/UserServiceImpl.java
deleted file mode 100644
index 859e72c..0000000
--- a/src/main/java/com/blog/web/services/impl/UserServiceImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.blog.web.services.impl;
-
-import com.blog.web.dto.RegistrationDto;
-import com.blog.web.models.Role;
-import com.blog.web.models.UserEntity;
-import com.blog.web.repository.RoleRepository;
-import com.blog.web.repository.UserRepository;
-import com.blog.web.security.SecurityUtil;
-import com.blog.web.services.UserService;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-@Service
-public class UserServiceImpl implements UserService {
-    private final UserRepository userRepository;
-    private final RoleRepository roleRepository;
-    private final PasswordEncoder passwordEncoder;
-
-    public UserServiceImpl(UserRepository userRepository, RoleRepository roleRepository, PasswordEncoder passwordEncoder) {
-        this.userRepository = userRepository;
-        this.roleRepository = roleRepository;
-        this.passwordEncoder = passwordEncoder;
-    }
-
-    @Override
-    public void saveUser(RegistrationDto registrationDto) {
-        UserEntity user = new UserEntity();
-        user.setUsername(registrationDto.getUsername());
-        user.setEmail(registrationDto.getEmail());
-        user.setPassword(passwordEncoder.encode(registrationDto.getPassword()));
-
-        final Role role = roleRepository.findByName("User").orElse(new Role());
-        user.setRoles(Arrays.asList(role));
-        userRepository.save(user);
-    }
-
-    @Override
-    public Optional<UserEntity> findByEmail(String email) {
-        return userRepository.findByEmail(email);
-    }
-
-    @Override
-    public Optional<UserEntity> findByUsername(String username) {
-        return userRepository.findByUsername(username);
-    }
-
-    public Optional<UserEntity> getLoggedInUser() {
-        final Optional<UserEntity> user;
-        String username = SecurityUtil.getSessionUser();
-        if (username != null) {
-            user = this.findByUsername(username);
-        } else {
-            user = Optional.of(new UserEntity());
-        }
-        return user;
-    }
-}