diff --git a/src/main/java/it/boergmann/tkd_api/TkdApiApplication.java b/src/main/java/it/boergmann/tkdApp/TkdApiApplication.java similarity index 90% rename from src/main/java/it/boergmann/tkd_api/TkdApiApplication.java rename to src/main/java/it/boergmann/tkdApp/TkdApiApplication.java index bf8c029..d07b101 100644 --- a/src/main/java/it/boergmann/tkd_api/TkdApiApplication.java +++ b/src/main/java/it/boergmann/tkdApp/TkdApiApplication.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api; +package it.boergmann.tkdApp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java b/src/main/java/it/boergmann/tkdApp/config/SecurityConfig.java similarity index 94% rename from src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java rename to src/main/java/it/boergmann/tkdApp/config/SecurityConfig.java index 35525a2..66a7179 100644 --- a/src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java +++ b/src/main/java/it/boergmann/tkdApp/config/SecurityConfig.java @@ -1,7 +1,7 @@ -package it.boergmann.tkd_api.config; +package it.boergmann.tkdApp.config; -import it.boergmann.tkd_api.security.CustomUserDetailsService; -import it.boergmann.tkd_api.security.JwtAuthenticationFilter; +import it.boergmann.tkdApp.security.CustomUserDetailsService; +import it.boergmann.tkdApp.security.JwtAuthenticationFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java b/src/main/java/it/boergmann/tkdApp/controller/api/AuthController.java similarity index 87% rename from src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java rename to src/main/java/it/boergmann/tkdApp/controller/api/AuthController.java index 3fd459b..565a44b 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/api/AuthController.java @@ -1,12 +1,12 @@ -package it.boergmann.tkd_api.controller.api; +package it.boergmann.tkdApp.controller.api; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.dto.LoginRequest; -import it.boergmann.tkd_api.dto.LoginResponse; -import it.boergmann.tkd_api.dto.RegisterRequest; -import it.boergmann.tkd_api.repository.AppUserRepository; -import it.boergmann.tkd_api.security.JwtTokenProvider; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.dto.LoginRequest; +import it.boergmann.tkdApp.dto.LoginResponse; +import it.boergmann.tkdApp.dto.RegisterRequest; +import it.boergmann.tkdApp.repository.AppUserRepository; +import it.boergmann.tkdApp.security.JwtTokenProvider; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java b/src/main/java/it/boergmann/tkdApp/controller/api/UserAdminApiController.java similarity index 87% rename from src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java rename to src/main/java/it/boergmann/tkdApp/controller/api/UserAdminApiController.java index 4d07b7e..a70941c 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/api/UserAdminApiController.java @@ -1,7 +1,7 @@ -package it.boergmann.tkd_api.controller.api; +package it.boergmann.tkdApp.controller.api; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.service.AppUserService; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.service.AppUserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/UserController.java b/src/main/java/it/boergmann/tkdApp/controller/api/UserController.java similarity index 77% rename from src/main/java/it/boergmann/tkd_api/controller/api/UserController.java rename to src/main/java/it/boergmann/tkdApp/controller/api/UserController.java index c511367..34bf1f0 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/api/UserController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/api/UserController.java @@ -1,8 +1,8 @@ -package it.boergmann.tkd_api.controller.api; +package it.boergmann.tkdApp.controller.api; -import it.boergmann.tkd_api.dto.AppUserResponse; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.service.AppUserService; +import it.boergmann.tkdApp.dto.AppUserResponse; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.service.AppUserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java b/src/main/java/it/boergmann/tkdApp/controller/web/AdminController.java similarity index 84% rename from src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java rename to src/main/java/it/boergmann/tkdApp/controller/web/AdminController.java index dead173..c1c4d0f 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/web/AdminController.java @@ -1,9 +1,9 @@ -package it.boergmann.tkd_api.controller.web; +package it.boergmann.tkdApp.controller.web; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.service.AppUserService; -import it.boergmann.tkd_api.repository.AppUserRepository; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.service.AppUserService; +import it.boergmann.tkdApp.repository.AppUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; diff --git a/src/main/java/it/boergmann/tkdApp/controller/web/HomeController.java b/src/main/java/it/boergmann/tkdApp/controller/web/HomeController.java new file mode 100644 index 0000000..4621570 --- /dev/null +++ b/src/main/java/it/boergmann/tkdApp/controller/web/HomeController.java @@ -0,0 +1,5 @@ +package it.boergmann.tkdApp.controller.web; + + +public class HomeController { +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java b/src/main/java/it/boergmann/tkdApp/controller/web/RegisterController.java similarity index 88% rename from src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java rename to src/main/java/it/boergmann/tkdApp/controller/web/RegisterController.java index 7913985..db21681 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/web/RegisterController.java @@ -1,9 +1,9 @@ -package it.boergmann.tkd_api.controller.web; +package it.boergmann.tkdApp.controller.web; -import it.boergmann.tkd_api.dto.RegisterRequest; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.repository.AppUserRepository; +import it.boergmann.tkdApp.dto.RegisterRequest; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.repository.AppUserRepository; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/WebController.java b/src/main/java/it/boergmann/tkdApp/controller/web/WebController.java similarity index 82% rename from src/main/java/it/boergmann/tkd_api/controller/web/WebController.java rename to src/main/java/it/boergmann/tkdApp/controller/web/WebController.java index c01ace1..04e30ac 100644 --- a/src/main/java/it/boergmann/tkd_api/controller/web/WebController.java +++ b/src/main/java/it/boergmann/tkdApp/controller/web/WebController.java @@ -1,7 +1,7 @@ -package it.boergmann.tkd_api.controller.web; +package it.boergmann.tkdApp.controller.web; -import it.boergmann.tkd_api.service.AppUserService; -import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkdApp.service.AppUserService; +import it.boergmann.tkdApp.domain.AppUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/it/boergmann/tkd_api/domain/AppUser.java b/src/main/java/it/boergmann/tkdApp/domain/AppUser.java similarity index 96% rename from src/main/java/it/boergmann/tkd_api/domain/AppUser.java rename to src/main/java/it/boergmann/tkdApp/domain/AppUser.java index c8e962d..5e2a0f2 100644 --- a/src/main/java/it/boergmann/tkd_api/domain/AppUser.java +++ b/src/main/java/it/boergmann/tkdApp/domain/AppUser.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.domain; +package it.boergmann.tkdApp.domain; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/it/boergmann/tkd_api/domain/Role.java b/src/main/java/it/boergmann/tkdApp/domain/Role.java similarity index 58% rename from src/main/java/it/boergmann/tkd_api/domain/Role.java rename to src/main/java/it/boergmann/tkdApp/domain/Role.java index 096059a..c0480c3 100644 --- a/src/main/java/it/boergmann/tkd_api/domain/Role.java +++ b/src/main/java/it/boergmann/tkdApp/domain/Role.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.domain; +package it.boergmann.tkdApp.domain; public enum Role { NONE, diff --git a/src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java b/src/main/java/it/boergmann/tkdApp/dto/AppUserResponse.java similarity index 76% rename from src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java rename to src/main/java/it/boergmann/tkdApp/dto/AppUserResponse.java index 1033f18..0f16de4 100644 --- a/src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java +++ b/src/main/java/it/boergmann/tkdApp/dto/AppUserResponse.java @@ -1,6 +1,6 @@ -package it.boergmann.tkd_api.dto; +package it.boergmann.tkdApp.dto; -import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkdApp.domain.Role; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java b/src/main/java/it/boergmann/tkdApp/dto/LoginRequest.java similarity index 76% rename from src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java rename to src/main/java/it/boergmann/tkdApp/dto/LoginRequest.java index eb7215c..f655040 100644 --- a/src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java +++ b/src/main/java/it/boergmann/tkdApp/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.dto; +package it.boergmann.tkdApp.dto; import lombok.Data; diff --git a/src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java b/src/main/java/it/boergmann/tkdApp/dto/LoginResponse.java similarity index 80% rename from src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java rename to src/main/java/it/boergmann/tkdApp/dto/LoginResponse.java index c1c04d5..fe2b536 100644 --- a/src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java +++ b/src/main/java/it/boergmann/tkdApp/dto/LoginResponse.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.dto; +package it.boergmann.tkdApp.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java b/src/main/java/it/boergmann/tkdApp/dto/RegisterRequest.java similarity index 89% rename from src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java rename to src/main/java/it/boergmann/tkdApp/dto/RegisterRequest.java index f5c0519..8f15cba 100644 --- a/src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java +++ b/src/main/java/it/boergmann/tkdApp/dto/RegisterRequest.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.dto; +package it.boergmann.tkdApp.dto; import jakarta.validation.constraints.Email; diff --git a/src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java b/src/main/java/it/boergmann/tkdApp/repository/AppUserRepository.java similarity index 73% rename from src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java rename to src/main/java/it/boergmann/tkdApp/repository/AppUserRepository.java index f04f5b4..dc3544c 100644 --- a/src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java +++ b/src/main/java/it/boergmann/tkdApp/repository/AppUserRepository.java @@ -1,6 +1,6 @@ -package it.boergmann.tkd_api.repository; +package it.boergmann.tkdApp.repository; -import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkdApp.domain.AppUser; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java b/src/main/java/it/boergmann/tkdApp/security/CustomUserDetailsService.java similarity index 84% rename from src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java rename to src/main/java/it/boergmann/tkdApp/security/CustomUserDetailsService.java index 6308f4d..c6120a2 100644 --- a/src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java +++ b/src/main/java/it/boergmann/tkdApp/security/CustomUserDetailsService.java @@ -1,8 +1,8 @@ -package it.boergmann.tkd_api.security; +package it.boergmann.tkdApp.security; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.repository.AppUserRepository; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.repository.AppUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java b/src/main/java/it/boergmann/tkdApp/security/JwtAuthenticationFilter.java similarity index 98% rename from src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java rename to src/main/java/it/boergmann/tkdApp/security/JwtAuthenticationFilter.java index 490e457..33bd386 100644 --- a/src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java +++ b/src/main/java/it/boergmann/tkdApp/security/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.security; +package it.boergmann.tkdApp.security; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java b/src/main/java/it/boergmann/tkdApp/security/JwtTokenProvider.java similarity index 97% rename from src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java rename to src/main/java/it/boergmann/tkdApp/security/JwtTokenProvider.java index 60fe77d..027cca1 100644 --- a/src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java +++ b/src/main/java/it/boergmann/tkdApp/security/JwtTokenProvider.java @@ -1,4 +1,4 @@ -package it.boergmann.tkd_api.security; +package it.boergmann.tkdApp.security; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; diff --git a/src/main/java/it/boergmann/tkd_api/service/AppUserService.java b/src/main/java/it/boergmann/tkdApp/service/AppUserService.java similarity index 89% rename from src/main/java/it/boergmann/tkd_api/service/AppUserService.java rename to src/main/java/it/boergmann/tkdApp/service/AppUserService.java index 4f3b6eb..e3a82a6 100644 --- a/src/main/java/it/boergmann/tkd_api/service/AppUserService.java +++ b/src/main/java/it/boergmann/tkdApp/service/AppUserService.java @@ -1,8 +1,8 @@ -package it.boergmann.tkd_api.service; +package it.boergmann.tkdApp.service; -import it.boergmann.tkd_api.domain.AppUser; -import it.boergmann.tkd_api.domain.Role; -import it.boergmann.tkd_api.repository.AppUserRepository; +import it.boergmann.tkdApp.domain.AppUser; +import it.boergmann.tkdApp.domain.Role; +import it.boergmann.tkdApp.repository.AppUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java b/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java deleted file mode 100644 index 846a62c..0000000 --- a/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java +++ /dev/null @@ -1,5 +0,0 @@ -package it.boergmann.tkd_api.controller.web; - - -public class HomeController { -} diff --git a/src/main/resources/templates/admin_users.html b/src/main/resources/templates/admin_users.html index ee40913..28c5fe0 100644 --- a/src/main/resources/templates/admin_users.html +++ b/src/main/resources/templates/admin_users.html @@ -18,9 +18,9 @@