diff --git a/src/main/java/ru/redrise/marinesco/User.java b/src/main/java/ru/redrise/marinesco/User.java index bc95d06..e61966b 100644 --- a/src/main/java/ru/redrise/marinesco/User.java +++ b/src/main/java/ru/redrise/marinesco/User.java @@ -11,6 +11,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Data; @@ -35,7 +36,7 @@ public class User implements UserDetails{ private String password; private String displayname; - @ManyToAny(fetch = FetchType.EAGER) + @ManyToMany(fetch = FetchType.EAGER) private final List authorities; public User(String username, String password, String displayname, List authorities){ diff --git a/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java b/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java index da114d4..68f2f8e 100644 --- a/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java +++ b/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java @@ -45,7 +45,8 @@ public class SecurityConfig { public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception { return http .authorizeHttpRequests(autorize -> autorize - .requestMatchers(mvc.pattern("/favicon.ico")).permitAll() + .requestMatchers(mvc.pattern("/favicon.svg")).permitAll() + .requestMatchers(mvc.pattern("/favicon.png")).permitAll() .requestMatchers(mvc.pattern("/jquery.js")).permitAll() .requestMatchers(mvc.pattern("/styles/**")).permitAll() .requestMatchers(mvc.pattern("/images/*")).permitAll() diff --git a/src/main/resources/static/favicon.ico b/src/main/resources/static/favicon.ico deleted file mode 100644 index 48975f4..0000000 Binary files a/src/main/resources/static/favicon.ico and /dev/null differ diff --git a/src/main/resources/static/favicon.png b/src/main/resources/static/favicon.png new file mode 100644 index 0000000..ef066be Binary files /dev/null and b/src/main/resources/static/favicon.png differ diff --git a/src/main/resources/static/favicon.svg b/src/main/resources/static/favicon.svg new file mode 100644 index 0000000..4d7e74f --- /dev/null +++ b/src/main/resources/static/favicon.svg @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/src/main/resources/static/images/logo.svg b/src/main/resources/static/images/logo.svg deleted file mode 100644 index f6a4bcd..0000000 --- a/src/main/resources/static/images/logo.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 6de9ca6..521f64b 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -3,7 +3,8 @@ - + + title diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index cb4bd3f..3a2ffae 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -3,7 +3,8 @@ Marinesco - + + diff --git a/src/main/resources/templates/manage_users.html b/src/main/resources/templates/manage_users.html index 51ffa08..f985b87 100644 --- a/src/main/resources/templates/manage_users.html +++ b/src/main/resources/templates/manage_users.html @@ -3,7 +3,8 @@ Marinesco - Manage users - + + diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html index 7ba740d..42b8127 100644 --- a/src/main/resources/templates/registration.html +++ b/src/main/resources/templates/registration.html @@ -3,7 +3,8 @@ Marinesco - registration form - + + diff --git a/src/main/resources/templates/root.html b/src/main/resources/templates/root.html index 7378f45..c4e675e 100644 --- a/src/main/resources/templates/root.html +++ b/src/main/resources/templates/root.html @@ -3,7 +3,8 @@ Marinesco - + + @@ -11,7 +12,6 @@
-
Login
/profile
/manage_users diff --git a/src/main/resources/templates/user_settings.html b/src/main/resources/templates/user_settings.html index 850caa0..698e941 100644 --- a/src/main/resources/templates/user_settings.html +++ b/src/main/resources/templates/user_settings.html @@ -3,7 +3,8 @@ Marinesco - Profile settings - + +