From 6318e14bc8db7f388bba2d14be810d317390e203 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Thu, 28 Dec 2023 20:53:55 +0300
Subject: [PATCH] Add 'manage users' page; ability to remove users

---
 src/main/java/ru/redrise/marinesco/User.java  |   5 +-
 .../ru/redrise/marinesco/UserGenerified.java  |  27 +++++++
 .../Validators/LoginOccupiedConstraint.java   |  20 +++++
 .../Validators/LoginOccupiedValidator.java    |  22 ++++++
 .../security/ManageUsersController.java       |  61 ++++++++++++++++
 .../security/RegistrationController.java      |   6 +-
 .../marinesco/security/RegistrationForm.java  |   2 +-
 .../marinesco/security/SecurityConfig.java    |   4 +-
 .../security/UserSettingsController.java      |   8 +-
 .../marinesco/web/HandyErrorController.java   |   4 +-
 .../marinesco/web/RoleByIdConverter.java      |  23 ++++++
 src/main/resources/application.yml            |   3 +-
 src/main/resources/static/images/logo.svg     |  69 +++++-------------
 .../resources/templates/manage_users.html     |  47 ++++++++++++
 .../resources/templates/registration.html     |   2 +-
 src/main/resources/templates/root.html        |   4 +
 target/classes/application.yml                |   3 +-
 .../classes/ru/redrise/marinesco/User.class   | Bin 5303 -> 5365 bytes
 .../ru/redrise/marinesco/UserGenerified.class | Bin 0 -> 3908 bytes
 .../Validators/LoginOccupiedConstraint.class  | Bin 0 -> 904 bytes
 .../Validators/LoginOccupiedValidator.class   | Bin 0 -> 1738 bytes
 .../security/ManageUsersController.class      | Bin 0 -> 3122 bytes
 .../security/RegistrationController.class     | Bin 2777 -> 3300 bytes
 .../marinesco/security/SecurityConfig.class   | Bin 10651 -> 10657 bytes
 .../security/UserSettingsController.class     | Bin 4364 -> 4364 bytes
 .../marinesco/web/HandyErrorController.class  | Bin 1187 -> 1389 bytes
 .../marinesco/web/RoleByIdConverter.class     | Bin 0 -> 1322 bytes
 target/classes/static/images/logo.svg         |  69 +++++-------------
 target/classes/templates/manage_users.html    |  47 ++++++++++++
 target/classes/templates/registration.html    |   2 +-
 target/classes/templates/root.html            |   4 +
 31 files changed, 311 insertions(+), 121 deletions(-)
 create mode 100644 src/main/java/ru/redrise/marinesco/UserGenerified.java
 create mode 100644 src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.java
 create mode 100644 src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedValidator.java
 create mode 100644 src/main/java/ru/redrise/marinesco/security/ManageUsersController.java
 create mode 100644 src/main/java/ru/redrise/marinesco/web/RoleByIdConverter.java
 create mode 100644 src/main/resources/templates/manage_users.html
 create mode 100644 target/classes/ru/redrise/marinesco/UserGenerified.class
 create mode 100644 target/classes/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.class
 create mode 100644 target/classes/ru/redrise/marinesco/Validators/LoginOccupiedValidator.class
 create mode 100644 target/classes/ru/redrise/marinesco/security/ManageUsersController.class
 create mode 100644 target/classes/ru/redrise/marinesco/web/RoleByIdConverter.class
 create mode 100644 target/classes/templates/manage_users.html

diff --git a/src/main/java/ru/redrise/marinesco/User.java b/src/main/java/ru/redrise/marinesco/User.java
index 969bdf1..957fc05 100644
--- a/src/main/java/ru/redrise/marinesco/User.java
+++ b/src/main/java/ru/redrise/marinesco/User.java
@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -29,6 +30,8 @@ public class User implements UserDetails{
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
     
+    @Column(unique=true)
+    //@LoginOccupiedConstraint
     private final String username;
     private String password;
     private String displayname;
@@ -63,7 +66,7 @@ public class User implements UserDetails{
         return true;
     }
 
-    public void setRole(UserRole role){
+    public void setRole(UserRole role){ // TODO
         this.authorities.add(role);
     }
 }
diff --git a/src/main/java/ru/redrise/marinesco/UserGenerified.java b/src/main/java/ru/redrise/marinesco/UserGenerified.java
new file mode 100644
index 0000000..2f70581
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/UserGenerified.java
@@ -0,0 +1,27 @@
+package ru.redrise.marinesco;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.redrise.marinesco.security.UserRole;
+
+@Data
+@NoArgsConstructor
+public class UserGenerified {
+
+    private static final long serialVersionUID = 1L;
+    
+    private Long id;
+
+    private String name;
+    private String displayName;
+    private List<UserRole> role;
+
+    public UserGenerified(User user){
+        this.id = user.getId();
+        this.name = user.getUsername();
+        this.displayName = user.getDisplayname();
+        this.role = user.getAuthorities();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.java b/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.java
new file mode 100644
index 0000000..e06157b
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.java
@@ -0,0 +1,20 @@
+package ru.redrise.marinesco.Validators;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+@Documented
+@Constraint(validatedBy = LoginOccupiedValidator.class)
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LoginOccupiedConstraint {
+    String message() default "Login already taken. Please use anohter one.";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedValidator.java b/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedValidator.java
new file mode 100644
index 0000000..547dbf9
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/Validators/LoginOccupiedValidator.java
@@ -0,0 +1,22 @@
+package ru.redrise.marinesco.Validators;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import ru.redrise.marinesco.data.UserRepository;
+
+public class LoginOccupiedValidator implements ConstraintValidator<LoginOccupiedConstraint, String>{
+    
+    @Autowired
+    private UserRepository userRepo;
+
+    @Override
+    public void initialize(LoginOccupiedConstraint constraintAnnotation) {}
+
+    @Override
+    public boolean isValid(String login, ConstraintValidatorContext context) {
+        return userRepo.findByUsername(login) == null;
+    }
+}
diff --git a/src/main/java/ru/redrise/marinesco/security/ManageUsersController.java b/src/main/java/ru/redrise/marinesco/security/ManageUsersController.java
new file mode 100644
index 0000000..474e994
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/security/ManageUsersController.java
@@ -0,0 +1,61 @@
+package ru.redrise.marinesco.security;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import lombok.extern.slf4j.Slf4j;
+import ru.redrise.marinesco.User;
+import ru.redrise.marinesco.UserGenerified;
+import ru.redrise.marinesco.data.UserRepository;
+
+
+//TODO
+@Slf4j
+@Controller
+@RequestMapping("/manage_users")
+@PreAuthorize("hasRole('ADMIN')")
+public class ManageUsersController {
+
+    private UserRepository userRepository;
+
+    public ManageUsersController(UserRepository userRepository){
+        this.userRepository = userRepository;
+    }
+
+    @ModelAttribute(name = "userGenerified")
+    public UserGenerified taco() {
+        return new UserGenerified();
+    }
+
+    @ModelAttribute
+    public void addUsers(Model model){
+        Iterable<User> users = userRepository.findAll();
+        List<UserGenerified> usersGen = new ArrayList<>();
+        for (User user : users){
+            usersGen.add(new UserGenerified(user)); // TODO: ADD ARRAY INSTEAD OF ONE!
+        }
+        model.addAttribute("USR", usersGen); // TODO: ADD ARRAY INSTEAD OF ONE!
+    }
+
+    @GetMapping
+    public String getPage() {
+        return "manage_users";
+    }
+
+    @PostMapping("/delete")
+    public String processDelete(UserGenerified userGenerified){
+        log.info(userGenerified.toString());
+        
+        userRepository.deleteById(userGenerified.getId());
+
+        return "redirect:/manage_users";
+    }
+}
diff --git a/src/main/java/ru/redrise/marinesco/security/RegistrationController.java b/src/main/java/ru/redrise/marinesco/security/RegistrationController.java
index 5a27943..9bd2899 100644
--- a/src/main/java/ru/redrise/marinesco/security/RegistrationController.java
+++ b/src/main/java/ru/redrise/marinesco/security/RegistrationController.java
@@ -10,9 +10,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
 import ru.redrise.marinesco.data.RolesRepository;
 import ru.redrise.marinesco.data.UserRepository;
+import ru.redrise.marinesco.User;
 
+@Slf4j
 @Controller
 @RequestMapping("/register")
 public class RegistrationController {
@@ -46,7 +49,8 @@ public class RegistrationController {
             return "registration";
         }
 
-        userRepo.save(registerForm.toUser(passwordEncoder, rolesRepo));
+        User user = userRepo.save(registerForm.toUser(passwordEncoder, rolesRepo));
+        log.info("Added user {} {} {}", user.getId(), user.getUsername(), user.getDisplayname());
         return "redirect:/login";
     }
 }
diff --git a/src/main/java/ru/redrise/marinesco/security/RegistrationForm.java b/src/main/java/ru/redrise/marinesco/security/RegistrationForm.java
index 4878494..bfc6b8f 100644
--- a/src/main/java/ru/redrise/marinesco/security/RegistrationForm.java
+++ b/src/main/java/ru/redrise/marinesco/security/RegistrationForm.java
@@ -11,7 +11,7 @@ import ru.redrise.marinesco.data.RolesRepository;
 
 @Data
 public class RegistrationForm {
-    
+
     @NotNull
     @Size(min=3, max=32, message="Username must be at least 3 characters long. Should not exceed 32 characters.")
     private String username;
diff --git a/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java b/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java
index b45111a..1ecba52 100644
--- a/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java
+++ b/src/main/java/ru/redrise/marinesco/security/SecurityConfig.java
@@ -52,11 +52,11 @@ public class SecurityConfig {
                         .requestMatchers(mvc.pattern("/register")).permitAll()
                         .requestMatchers(mvc.pattern("/login")).permitAll()
                         .requestMatchers(mvc.pattern("/error")).permitAll()
+                        .requestMatchers(PathRequest.toH2Console()).permitAll()
                         .requestMatchers(mvc.pattern("/")).hasAnyRole("ADMIN", "USER")
                         .requestMatchers(mvc.pattern("/profile/**")).hasAnyRole("ADMIN", "USER")
-                        .requestMatchers(PathRequest.toH2Console()).permitAll()
                         //.requestMatchers(mvc.pattern("/design/**")).hasRole("USER")
-                        .anyRequest().denyAll())
+                        .anyRequest().authenticated())
                         //.anyRequest().permitAll())
                 .formLogin(formLoginConfigurer -> formLoginConfigurer
                         .loginPage("/login")
diff --git a/src/main/java/ru/redrise/marinesco/security/UserSettingsController.java b/src/main/java/ru/redrise/marinesco/security/UserSettingsController.java
index cb03a4d..b0065f4 100644
--- a/src/main/java/ru/redrise/marinesco/security/UserSettingsController.java
+++ b/src/main/java/ru/redrise/marinesco/security/UserSettingsController.java
@@ -48,18 +48,16 @@ public class UserSettingsController {
         return "redirect:/profile/settings";
     }
 
-
     @GetMapping("/settings")
     public String getSettingsFirstPage(){
         return "user_settings";
     }
 
-
     @PostMapping("/settings")
     public String getSettingsPage(@Valid UserSettingsForm userSettingsForm, 
-        Errors errors, 
-        @AuthenticationPrincipal User user,
-        Model model){
+            Errors errors, 
+            @AuthenticationPrincipal User user,
+            Model model){
         if (errors.hasErrors())     
             return "user_settings";
         if (! user.getDisplayname().equals(userSettingsForm.getDisplayname()))
diff --git a/src/main/java/ru/redrise/marinesco/web/HandyErrorController.java b/src/main/java/ru/redrise/marinesco/web/HandyErrorController.java
index ea7c21f..ef732ee 100644
--- a/src/main/java/ru/redrise/marinesco/web/HandyErrorController.java
+++ b/src/main/java/ru/redrise/marinesco/web/HandyErrorController.java
@@ -8,10 +8,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Controller
 public class HandyErrorController implements ErrorController{
-  
+
     @ModelAttribute(name = "code")
     public String addMisc(HttpServletRequest request){
         return request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE).toString();
diff --git a/src/main/java/ru/redrise/marinesco/web/RoleByIdConverter.java b/src/main/java/ru/redrise/marinesco/web/RoleByIdConverter.java
new file mode 100644
index 0000000..ad05d56
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/web/RoleByIdConverter.java
@@ -0,0 +1,23 @@
+package ru.redrise.marinesco.web;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import ru.redrise.marinesco.data.RolesRepository;
+import ru.redrise.marinesco.security.UserRole;
+
+@Component
+public class RoleByIdConverter implements Converter<Long, UserRole>{
+
+    private RolesRepository rolesRepository;
+
+    public RoleByIdConverter(RolesRepository rolesRepository){
+        this.rolesRepository = rolesRepository;
+    }
+    
+    @Override
+    public UserRole convert(Long id) {
+        return rolesRepository.findById(id).orElse(null);
+    }
+    
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f9babf2..15da86f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,8 @@
-
 spring:
     thymeleaf:
         cache: false
     datasource:
-        driverClassName: org.h2.Driver  
+        driver-class-name: org.h2.Driver  
         generate-unique-name: false
         name: marinesco
         url: jdbc:h2:mem:marinesco
diff --git a/src/main/resources/static/images/logo.svg b/src/main/resources/static/images/logo.svg
index 7b90bd4..f6a4bcd 100644
--- a/src/main/resources/static/images/logo.svg
+++ b/src/main/resources/static/images/logo.svg
@@ -2,12 +2,12 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="133mm"
-   height="27.5mm"
-   viewBox="0 0 133 27.5"
+   width="78mm"
+   height="12.5mm"
+   viewBox="0 0 78 12.5"
    version="1.1"
    id="svg5"
-   sodipodi:docname="marinesco logo.svg"
+   sodipodi:docname="marinesco logo1.svg"
    inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -24,9 +24,9 @@
      inkscape:deskcolor="#505050"
      inkscape:document-units="mm"
      showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="181.54967"
-     inkscape:cy="106.59635"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="167.14236"
+     inkscape:cy="56.656931"
      inkscape:window-width="3755"
      inkscape:window-height="2123"
      inkscape:window-x="1165"
@@ -42,56 +42,21 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.659681;stroke-linejoin:round;paint-order:stroke fill markers"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.340466;stroke-linejoin:round;paint-order:stroke fill markers"
        id="rect15547"
-       width="133.10405"
-       height="27.5"
+       width="78"
+       height="12.5"
        x="0"
        y="0"
-       ry="2.6981504" />
+       ry="1.226432" />
     <path
-       id="rect2054-3-56-9"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.635107,9.1000736 c -4.069468,0.03255 -8.346161,1.0300024 -13.794501,3.2114974 L 6.5975531,17.865938 c -0.4935601,0.191788 -0.9838347,0.36379 -0.9838347,0.815727 v 0.186858 c 0,0.451936 0.4902658,0.427052 0.9838346,0.235263 l 14.749126,-6.106412 c 14.756957,-5.7066219 23.415737,-1.612883 43.946257,10.728165 0,0 0.841119,0.292668 1.285227,0.36734 0.362328,0.06092 1.106533,0.06266 1.106533,0.06266 -0.778699,-0.281365 -1.557399,-0.56273 -2.336098,-0.844095 C 57.175207,16.691742 43.992671,9.0685056 33.635107,9.1000736 Z"
-       sodipodi:nodetypes="cccsscccaccc" />
-    <path
-       id="rect2054-3"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.540144,12.646976 c -4.069467,0.03255 -8.346161,1.030003 -13.7945,3.211499 L 5.4515333,21.412842 C 4.9579732,21.60463 4.4676988,21.776631 4.4676988,22.228568 v 0.186858 c 0,0.451937 0.4902656,0.427052 0.9838345,0.235263 L 19.745644,17.096323 c 12.462727,-4.737552 19.147927,-3.9543 30.338669,1.161303 l 15.113671,6.908906 c 0,0 0.83208,0.367605 1.28523,0.36734 0.451297,-2.65e-4 1.279347,-0.36734 1.279347,-0.36734 l -0.04804,-1.192447 c 0,0 -0.825909,-0.02592 -1.234472,-0.0893 -0.413897,-0.06421 -1.2264,-0.293797 -1.2264,-0.293797 L 50.262163,16.841173 C 43.662433,14.158308 38.772318,12.605125 33.540144,12.646976 Z"
-       sodipodi:nodetypes="sccssccccaccaccs" />
-    <path
-       id="rect2054-3-56"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.635104,10.787441 c -4.069468,0.03255 -8.34616,1.030003 -13.7945,3.211498 L 6.1596884,19.553306 c -0.4935601,0.191788 -0.9838347,0.363789 -0.9838347,0.815726 v 0.186859 c 0,0.451936 0.4902658,0.427051 0.9838347,0.235262 L 19.840604,15.236787 c 18.023542,-6.8094217 20.310357,-2.664449 45.452329,8.43342 0,0 0.832078,0.367606 1.285228,0.36734 l -0.0067,-0.278863 C 66.145911,23.758666 65.9158,23.511571 65.9158,23.511571 56.610459,18.316164 43.926086,10.729521 33.635147,10.787441 Z"
-       sodipodi:nodetypes="cccssccccccc" />
-    <path
-       id="rect2054-3-56-9-0"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 100.99714,9.1071356 c 4.96731,-0.02748 8.34616,1.0300024 13.79449,3.2114974 L 128.20972,17.873 c 0.49355,0.191788 0.98383,0.36379 0.98383,0.815727 v 0.186858 c 0,0.451936 -0.49027,0.427052 -0.98383,0.235263 L 114.79163,13.556481 C 99.40161,6.2280595 89.12455,11.252488 69.339305,23.732601 c 0,0 -0.837922,0.307169 -1.285221,0.36734 -0.319432,0.04297 -0.970777,-0.0083 -0.970777,-0.0083 l 0.955881,-0.301597 1.244491,-0.471564 C 78.094253,16.55472 90.234122,9.1476096 100.99718,9.1071356 Z"
-       sodipodi:nodetypes="cccsscccaccccc" />
-    <path
-       id="rect2054-3-9"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 101.09209,12.654038 c 4.06947,0.03255 9.05576,1.138066 13.79451,3.211499 l 14.29411,5.554367 c 0.49356,0.191788 0.98384,0.363789 0.98384,0.815726 v 0.186858 c 0,0.451937 -0.49027,0.427052 -0.98384,0.235263 L 114.8866,17.103385 c -12.46273,-4.737552 -19.147926,-3.9543 -30.338675,1.161303 L 69.43426,25.173594 c 0,0 -0.832083,0.367605 -1.285229,0.36734 -0.451299,-2.65e-4 -1.279345,-0.36734 -1.279345,-0.36734 l 1.282538,-1.281748 c 0.425526,-1.7e-5 1.226407,-0.293796 1.226407,-0.293796 l 14.991482,-6.749815 c 6.599732,-2.682865 11.489844,-4.236048 16.722017,-4.194197 z"
-       sodipodi:nodetypes="sccssccccaccccss" />
-    <path
-       id="rect2054-3-56-3"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 100.99714,10.794503 c 4.06947,0.03255 8.34617,1.030003 13.79449,3.211498 l 13.68081,5.554367 c 0.49357,0.191788 0.98384,0.363789 0.98384,0.815726 v 0.186859 c 0,0.451936 -0.49027,0.427051 -0.98384,0.235262 l -13.68081,-5.554366 c -18.412603,-6.8141094 -22.492137,-1.640278 -45.452316,8.43342 -2.776303,0.05915 -2.9055,0.657477 -0.540756,-0.155942 9.537019,-5.771739 21.907671,-12.784744 32.198622,-12.726824 z"
-       sodipodi:nodetypes="cccsscccccc" />
-    <path
-       id="rect2054-3-5"
-       style="display:none;fill:#008fc9;fill-opacity:1;stroke:#ffffff;stroke-width:0.0852133;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 96.191624,12.357583 -18.87288,10.854929 c -0.929065,0.389453 -1.978574,0.37484 -2.864572,0.07241 L 55.123883,13.083327 C 47.577069,8.0785026 34.406788,7.0985105 22.485163,11.195846 l -16.523354,5.48195 c 0.0038,-0.0013 -1.1235037,0.363789 -1.1235037,0.815726 v 0.9857 c 0,0.451937 0.5573606,1.003563 1.1235037,0.815726 L 22.485163,13.812999 C 37.587703,8.6538836 43.906467,8.6882677 57.130824,15.70048 l 17.322925,9.185477 c 1.286762,0.379894 1.557099,0.369131 2.864572,-0.07241 l 17.323253,-9.8388 C 106.13569,8.4466193 115.0552,9.0758126 129.28722,13.813374 l 16.32336,5.554366 c 0.56364,0.191791 1.1235,-0.363789 1.1235,-0.815725 v -0.9857 c 0,-0.451937 -0.55987,-0.623939 -1.1235,-0.815727 L 129.28722,11.196222 C 106.86095,5.3664259 103.00828,10.013448 96.191624,12.357583 Z"
-       sodipodi:nodetypes="ccccccssccsccscsssccc" />
-    <path
-       id="rect2350"
-       style="opacity:1;fill:#a82b17;fill-opacity:1;stroke:none;stroke-width:0.0786222;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="M 130.27489,23.682275 75.159916,23.68264 H 72.438446 72.370115 60.772868 1.9729981 c -0.5184215,0 -0.9358165,0.336467 -0.9358165,0.754372 v 0.628522 c 0,0.417905 0.417395,0.754007 0.9358165,0.754007 H 60.772868 c 0.518421,0 1.023153,-0.336102 1.023153,-0.754007 v -0.0197 -0.0197 c 0,-0.0464 0.0547,-0.07075 0.09865,-0.07077 0.04394,-1.3e-5 0.09865,0.02714 0.09865,0.07077 v 0.05435 0.05472 c 0,0.438975 0.525657,0.79231 1.070216,0.79231 h 5.447919 0.405912 1.162078 c 0.544558,0 1.070216,-0.353335 1.070216,-0.79231 v -0.05472 -0.05435 c 0,-0.04363 0.0547,-0.07078 0.09865,-0.07077 0.04394,1.3e-5 0.0982,0.02437 0.0982,0.07077 v 0.0197 0.0197 c 0,0.417905 0.505185,0.754007 1.023606,0.754007 h 0.06833 58.731532 c 0.51842,0 0.93582,-0.336102 0.93582,-0.754007 v -0.628522 c 0,-0.417905 -0.4174,-0.754372 -0.93582,-0.754372 h -0.89056 c -0.002,-6e-6 -0.003,-3.65e-4 -0.004,-3.65e-4 z" />
+       style="color:#000000;fill:#15bade;-inkscape-stroke:none"
+       d="M 27.730628,1.5763661 C 25.036825,1.5596634 22.673126,2.2437308 20.494299,3.0548817 15.52534,4.9047658 11.509661,7.3067267 4.20719,6.2443347 l -0.2382811,-0.03516 -0.2402344,0.01563 c 0,0 -0.571584,0.03161 -1.09375,0.355469 -0.522166,0.323861 -1.0854728,1.181111 -1.1308594,1.90039 -0.031147,0.493776 0.1131821,1.217964 0.5546875,1.7480473 0.4415054,0.530084 1.3378907,0.798828 1.3378907,0.798828 l 0.056641,0.01172 0.056641,0.0078 C 12.15843,12.305276 17.748772,9.2542897 22.18766,7.6017457 c 2.225096,-0.828377 4.129469,-1.332733 6.328125,-1.154297 2.198656,0.178436 4.822312,1.053458 8.382812,3.423828 l 1.878907,1.2500003 0.002,-0.0039 0.002,0.002 1.875,-1.2500003 c 3.560451,-2.370338 6.184021,-3.243543 8.382812,-3.421875 2.198792,-0.178332 4.10494,0.325904 6.330078,1.154297 4.439025,1.652595 10.029323,4.7035173 18.677735,3.4453133 l 0.05078,-0.0078 0.04883,-0.0098 c 0,0 0.902708,-0.265223 1.347656,-0.796875 0.444949,-0.5316513 0.589732,-1.2583183 0.558594,-1.7519533 -0.04553,-0.721911 -0.612608,-1.579806 -1.134765,-1.902343 -0.522158,-0.322538 -1.091797,-0.353516 -1.091797,-0.353516 l -0.240235,-0.01563 -0.238281,0.03516 C 66.045442,7.3067127 62.031754,4.904815 57.062659,3.0548817 54.883831,2.2437293 52.518178,1.5596634 49.824378,1.5763661 c -0.385437,0.00239 -0.775891,0.018721 -1.171875,0.050781 -2.945866,0.2385075 -6.201654,1.4666842 -9.875,3.7734376 -3.672889,-2.3061606 -6.92781,-3.5330278 -9.873047,-3.7714845 -0.396002,-0.032061 -0.788428,-0.050345 -1.173828,-0.052734 z"
+       id="path1154" />
     <path
        id="rect2675"
-       style="opacity:1;fill:#00b185;fill-opacity:1;stroke:#ffffff;stroke-width:0.917842;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-       d="m 75.960365,18.022748 8.686193,-5.283117 c 0.04346,-0.02643 0.08973,0.04381 0.08973,0.09821 v 11.75165 c 0,0.0544 -0.04003,0.09821 -0.08973,0.09821 0,0 -4.343128,-2.045323 -4.343128,-3.840942 0,-0.06402 0,-0.06402 0,0 0,1.794641 -4.343065,3.840942 -4.343065,3.840942 -0.03835,0.03461 -0.08973,-0.04381 -0.08973,-0.09821 V 18.12096 c 0,-0.05441 0.04629,-0.07179 0.08973,-0.09821 z"
-       sodipodi:nodetypes="sssssssssss" />
+       style="opacity:1;fill:#00b185;fill-opacity:1;stroke:#ffffff;stroke-width:0.818;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       d="M 40.69873,4.1910257 47.085,1.9080267 c 0.0479,-0.017123 0.08973,0.04381 0.08973,0.09821 v 8.4513743 c 0,0.0544 -0.04003,0.09821 -0.08973,0.09821 0,0 -3.24318,-2.0452513 -3.24318,-3.8408703 0,-0.06402 0,-0.06402 0,0 0,1.794641 -3.14309,3.8409423 -3.14309,3.8409423 -0.03835,0.03461 -0.08973,-0.04381 -0.08973,-0.09821 V 4.2892377 c 0,-0.05441 0.08973,-0.097032 0.08973,-0.09821 z"
+       sodipodi:nodetypes="sssssssssscs" />
   </g>
 </svg>
diff --git a/src/main/resources/templates/manage_users.html b/src/main/resources/templates/manage_users.html
new file mode 100644
index 0000000..f63e49b
--- /dev/null
+++ b/src/main/resources/templates/manage_users.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Marinesco - Manage users</title>
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <link rel="stylesheet" th:href="@{/styles/styles.css}" />
+</head>
+
+<body>
+    <h1 th:text="${header_text}">Manage users</h1>
+    <br /><a href="/">go back</a>
+    <p>
+    <div th:each="user : ${USR}">
+        <span th:text="${user.id+' '+user.name+' '+user.displayName}+' ROLES: '">user</span>
+        <span th:each="role : ${user.role}">
+            <span th:text="'[ '+${role.id+' '+role.name+' '+role.type}+' ]'">user</span>
+        </span>
+        <form method="POST" th:action="@{/manage_users/delete}" th:object="${userGenerified}">
+            <input type="hidden" th:value="${user.id}" name="id" />
+            <input type="hidden" th:value="${user.name}"  name="name" />
+            <input type="hidden" th:value="${user.displayName}"  name="displayName"  />
+            <span th:each="role : ${user.role}">
+                <input type="hidden" th:value="${role.id}" th:attr="name='role'"  /> 
+            </span>
+        
+            <button>DELETE</button>
+        </form>
+        <br />
+    </div>
+    <!--
+    <form method="POST" th:action="@{/profile/settings}" th:object="${userSettingsForm}">
+        <span class="validationError" th:if="${#fields.hasErrors('displayname')}" th:errors="*{displayname}">Error</span>
+        <br />
+        <label for="displayname">Displayed name: </label>
+        <input type="text" name="displayname" id="displayname" th:value="${userSettingsForm.displayname}" /><br />
+
+        <span class="validationError" th:if="${password_incorrect} != null" th:text="${password_incorrect}">false</span> 
+        <br />
+        <label for="password">New password: </label>
+        <input type="password" name="newPassword" id="newPassword" /><br />
+
+        <input type="submit" value="Save Changes" />
+    </form>
+    -->
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html
index 4b7aa14..1da765e 100644
--- a/src/main/resources/templates/registration.html
+++ b/src/main/resources/templates/registration.html
@@ -5,7 +5,7 @@
     <title>Marinesco - registration form</title>
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
     <link rel="stylesheet" th:href="@{/styles/styles.css}" />
-    <script src="@{/jquery.js}"></script>
+    <script src="/jquery.js"></script>
 </head>
 
 <body>
diff --git a/src/main/resources/templates/root.html b/src/main/resources/templates/root.html
index df62e2f..3346843 100644
--- a/src/main/resources/templates/root.html
+++ b/src/main/resources/templates/root.html
@@ -11,6 +11,10 @@
     <h1>Welcome to Marinesco</h1>
     <img th:src="@{/images/logo.svg}" />
     <br /><a href="/login">Login</a>
+    <br /><a href="/profile">/profile</a>
+    <br /><a href="/manage_users">/manage_users</a>
+    <br />
+    <br /><a href="/logout">Log out</a>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
index f9babf2..15da86f 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -1,9 +1,8 @@
-
 spring:
     thymeleaf:
         cache: false
     datasource:
-        driverClassName: org.h2.Driver  
+        driver-class-name: org.h2.Driver  
         generate-unique-name: false
         name: marinesco
         url: jdbc:h2:mem:marinesco
diff --git a/target/classes/ru/redrise/marinesco/User.class b/target/classes/ru/redrise/marinesco/User.class
index ba7444b8d30287ad7a677589d5a9a9b576756502..b935bd455dde83ec9b299f21ebaa3194f19bef64 100644
GIT binary patch
literal 5365
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
I;AhDF2Y#1wMgRZ+

literal 5303
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

diff --git a/target/classes/ru/redrise/marinesco/UserGenerified.class b/target/classes/ru/redrise/marinesco/UserGenerified.class
new file mode 100644
index 0000000000000000000000000000000000000000..c6a77fde7ed7af91e829f5ab2fb6c73caf2cfe84
GIT binary patch
literal 3908
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
T=I1APpF8=P`!oCkAE5Mq8xIlg

literal 0
HcmV?d00001

diff --git a/target/classes/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.class b/target/classes/ru/redrise/marinesco/Validators/LoginOccupiedConstraint.class
new file mode 100644
index 0000000000000000000000000000000000000000..ebaf18834580c17c98ab25065faefff9e842f301
GIT binary patch
literal 904
zcmb7C-%k@k5S}g26YvKpiYVCA2Lft(CO&9_nkX%iq}Zmdy!2_f8;*tTZnL{ba{rnS
z{sI0`#<|w?npk6e*k3c>H}lQx{P_9pI{>_gFo24HH#UnbC006$hG?ZG7n|r5l}ykZ
z>!OxPrEbS@Hj<Pa8tuGAseJ&80@g0^8Y6`|joN3I6tlG|pjKK@Yva*Nqoa@0tAJog
z&S6RdHum;gCA{ZZKzblxy+k+Y95dwwyc{bDQCY$y4?SLyu7@2(=qSv1p*9zuY-lvq
z1yoaOvXL977|i52ROlS1SnkPGqt7g>*xcLy1M=?q2Sx=W%$31J!0UOK7aaHst;gtk
z(y^k_&V+JM@K<^!voRe>#c8(x(#v|$0RdaxOnW(`Q|aWHqOt{C#M7AyW}4bCaW*9F
zDdAkTd1A^RW5nujm6UwS1-xzj*WXWPf&=Z$m(xd^l4t)CC(5|uXY+AQMTP2qJ|YHJ
zPn!MD?FO@sj+-q$!}+W(c_wj(nX~&3NXIA{=L`(GU%&K^Pnx>|1T64c;^AN5*$v<Z
zzm|)agB3Qc!cC~aEjCo(_QWxOV#@E#IM${PMy-#rci|qNuV4{2_`J_S9}Gamun7<O
VzBPaf!6SHFY}>F?m<XOg?H3Hu1xNq@

literal 0
HcmV?d00001

diff --git a/target/classes/ru/redrise/marinesco/Validators/LoginOccupiedValidator.class b/target/classes/ru/redrise/marinesco/Validators/LoginOccupiedValidator.class
new file mode 100644
index 0000000000000000000000000000000000000000..9e744d0c4dede822a5e43927ad44bf09e6e1a8e4
GIT binary patch
literal 1738
zcmbVMTTc@~6#k|yl$HVo0Y$u^BDMt?Z=j|~f*PNS7^;o&ZMq%GK)c)Q&Vu*{{4>0m
z7>qs`-%R{b#xvWxR9u4iuyc0KoXdB<b7p@0{PGpRBP=EnV_0;3?#i00Jjt8FRkrjj
zhgU>H)r59jkC&XfvezujZz)*|^+_ZcvRh(D@P@GKe66}AEuBO!!_1c07Oob2ryWE&
zHh<#So_2+@br^x6&-bLeE?W*mp%e*&APD}dW92ErvsYx8SodwMnzEuiRc*)>+jg|j
zl*VItP;%Tl_gYj)eZv(^x$C&wyeft5@eN^_2wa2?e8tz!uA=%WZ10k?m0o6u=kgVX
z#1p3`(}-gzgMMTfhDt=vbH7=Y?n^;=8AeKuB^niC&FnkMgx*vEkjRR{@{c2yfTRr$
zMdZDs980-qYK{wZ$aK+EF=~a(AM(WT@V|pn*H@+9bZRezp;t?nicKmnz{Bt~S2`Su
zvNmlflIC9qf{<(ZRu}VcQee1{K@xraxP+-BE;HmJ>5LeV46fiR!{COpYmfKL@YsZt
zfkz<AN7G=Os1H32Gy0~@f0aZf6R`#^1wLhc3<G5?tnF3N>Ws{EH?;2Q3<s5ZnM8r%
zek2Pg&qA6Qoy%YpV@F!lzPG1uQ4;)*``>Q0Npm}c37n@XE<3(!$!E&kl*#B<WZn?V
zkSeRXEwt~F<@+wOPX}%(x|t`FW2*oCj&(+Mxkyt)F9Cf$^u^39l1$OV*-J7_(&*`3
zpml(DoFp^a!Y2%Vpr07Bv>IcO`7o`<)VPh{3`x407$Ym=yg*;f=#DyO1IO|9VaL(9
zj^iw?=g6hUY>bLH??ih|GETbT!beQbe#XTZzN06xAKxcsybIQ75Phm`97Z3;HB3`L
z3V`dFp<p)xKQ<I3OvUINbb{;(m5?J#Q$n8XObMyN>^I~OFnhEV79=ARa+|=-j$46}
d8?0&LHa~ZOTLxq|ccC9??*wOeaW9YyzW_uu)v^Ep

literal 0
HcmV?d00001

diff --git a/target/classes/ru/redrise/marinesco/security/ManageUsersController.class b/target/classes/ru/redrise/marinesco/security/ManageUsersController.class
new file mode 100644
index 0000000000000000000000000000000000000000..7593a7a884de1f34c5d42c54d34b591e910bb1a2
GIT binary patch
literal 3122
zcma)8YgZFj6x}xj2Eu?eRV;{DR7wKk_`s@!+9HUhO%OrjtF0Z9OBftx;><+FzTf|$
zf1qFcw$!z{`nmt1|DvC3_nm|!V5G7Z^T<8->~r?n=briN-{1cL@EX3+5D_@(l?+ej
zJ<FHIn(0}N^mDG^%UsE`f^{QfI%Yv$^`+-exlZ7@wk<skQGu>i^PXwgrc*F3Ev?F2
zAkbvH1%Y_l^$Lb>FORJnX}3_2UP_>|L>CLP==xURdg}ti>4w00GcXMWSF`2r)`^^L
zIaY9v7>Q(7AUfsdWegqIrJ++`?{>r)GpAs5bm0Yowt@`Gkq8VX(zU>+Y}5Bs$)^Ku
zgTRYAn$aS#D@{`7N^48fyJ9ZcGR!b%+F7!t-YY-0OjIHqO+0^U$!rWw=+V)Qn8Mtr
zLqjX`3sx*&;8bHzJ6DH%b!B9*;^yZ~&s>uMYo|P#IagpPk!<W!aeh%c(zBK=nWvAQ
zg_09kYcgy37PFjm95*ln%XR4NOqsDF<x*Hy824T8j&WZu8B3OvH_WQ7kzt+e$sq8o
zrBWd2HtNv4qK6uuhF1g*HB`jbz+xCg4+UZ7^J;;y3?v!`Q?km~sbsbtBN)|iL?F=+
zp@HUf9EBmEEi;`-+ZO01Z#CV_l2cXsl!oIJO1Mx8EZdm$Jaav5`9TcF(9@1FysF_8
z74!679j9@InOMpf#af3Ex(YG)d#WAdn9xA(%3ijt>TG0oMbwcG*nqpYL|JZ2#`p%S
z*)VfOp<?vB65y0T|1+ek>_Q?h;G%{Zmamqw%2vmlm}PIWDgt}zJFF5z@}|n-Z5?T3
zNb8E}&xHZAn{T$_61QGmTxiE-ENWN~=nMOKo4htFs^bc-3g`r@3QJ(R9(9p=a|)@t
zifzWRvsMI}*OXw%#Qz$W%JSP?2U3*<%Nj0I;B3aSMOZdPmTCgE%5HylE7GVt?be?%
z>&4BJ=6D0hi5*;>qqEc7g4n^n)|Dx>vtyAb$DNE>tekTi57T+hgzajpa4s;`kh(^P
z!$ld;Z&8)170WE?S~zWPSE%hMdTvho{<O4thzXqCL7jC$*Eec4s8i1!)V%9gqoN+}
znRbcTnn77G3e_!ZIvnI!<G?NZZ$}Xvig#J-?Sn{%4>o4ha+Z1eZfT85Y-$7y;+~HC
zctAX|JIf}DZ|UT;ON!Jn_E5(M_)s8Lj^_Njvfbi!Q|Q@Nd`t~-v|ApB^EijQn&g|@
z4nA8ibyN~)(Jgs7Ib*50*W2)G;HWwa1V$P%?DKS!Zb0!GweJV2>iH+gg1lRj^(E=p
zmdbcz;LR@>Gp96U6g~Cv5g7BHoGfuTde%cVj=FdhEx5K!3{6gFX6J^I7~mLg;s;U$
zy=wl4Pn^lTxA5AA7}wkRmgHUiwZ+A6(0@Yw2fjqGo7a|bX%F^<zkqMu*vmDwZHD&<
z@3G-Wcxia#7xdQlb%wzE5k)_N4ut!=%hu?_e(vHv^?^W-{d{hwE_o9)eVJwhd~WC4
zLH-}|aX7>~!37m)>thVwc!Z(v`CK36p%6tc+f-0ED4AYU=uqWyFmw$3!^jjNbHhKQ
zcLT!$na4OruP5e?Y~ZB8c=LBS(9^tuvjTtO_3`MaLhXq@!sG^~Be<s4-V*rs$=@UK
zxzP>GH{qJfKN|AZAEuLFj!DEZ%<Blw@;-%8WH^x(pJOZvBdGE*hb*o!#u%n?9XFU;
z922;STZ})+&%bx@F1^3UJ&MV))$OX)`?NB-){Dp!65OIeXt=ClOv42RGY;(AWI9VT
zfhFX)Suw4M$@8v?I?887a#LJx=l4V%zfDzs3s|Y}+sTa<|5tB8__!0gyG{tDk-i@h
zANdvb2HXe~=X@z`V4XRBRKqE&<}`G2)q_->YWk`y^-&F<5T&A;!*m|Or{VRpFq?f0
S=X1V)Q4Qrwe5Ia!eElCJIV&ds

literal 0
HcmV?d00001

diff --git a/target/classes/ru/redrise/marinesco/security/RegistrationController.class b/target/classes/ru/redrise/marinesco/security/RegistrationController.class
index 4961882080f7ce6f599dd9c75a2b49f399e4ff94..80b2c75ac2836534b94985f0178d97982a2d0077 100644
GIT binary patch
delta 1350
zcmZWpO>Y}j6g|%~_V{C(CX?9IP2xI%P}_;?v<+W%Q)tr`3J!sqCUpapsmE~~98Z{W
zTS7tRFGRzp5(}#G1Avf}fI#e!*s(-ng%Cf21>(GM1XdXN&As=%`_4W0o{@iz|B;OT
z{P(v%0GP#xThXgYrD@j%jFRot3vP2|X01@N>-Cyb+`92oCw#WrY_uBfa{@{xyC|T}
z*;Xxz0Ssy|1Rgth>#|vG+s>wrA;bkD^;)}&CNPmHt(kYsLep&33v*4=b&J{m7ma|R
zI)VrZ94>i(i3x8^e3pqq!KjX-=#vS@bZ7`mZ%ju7QRzLdBL;nYG!PKtgqK!MD|w81
zi^@$gv%RZiL^zM4j<cBc{!~*(o);L{AcecOW4ZGUcin7PSHn2(jRez?Ib70kQDDUT
zSQ+v@)xtp?m+_*v61*O{f>$)W%x?U%W9q=LjuK|s>Z<8pava-nqsZe`9SeBP(?Xww
zuHp?1W$!^KuUx~T_e*Fxq~W?ia;rbyx#rfKFm4D8p0});mA=h5eea|0FN!6+spBoY
zEfC}+uUOP6lkFK}$!^t)GVL85CQb^(m?kk><~mhcLRE()_xreivEgns%}sd}!wOb4
z)aM2I4=Sjmfi()<Xsy@+nO@b(ZKuJ4%RLMhZmrd-?P7K@jHah*55uZ#L11|6K|+;G
zywA1YJ1Ui<r2OatQaRsJH{Vh<+8}oip^riyW|XCsPs9-4pnn^QFBt@Igzu1lWFYD9
zfYDJ5^GsfA(yFvWxknhuP3|C-o7zD-*U9f-{6B~UtAW>4UW{ObRYx(1ln<Hf0^kWu
zFo#e+U&&@jerYTqJ;_<Ylk^WMOdwIN7?;3tWSEroV}TrZCfyFEe14~RBB8?HAzyif
z!WZ;=yBhZ?=-r%s3IfwOxsND&KgBz;*F1fRr5L9V!W{2`Q6x-<c>+)2X*MpINt|bB
zpXG`v44$JS9|`;$kL7%<$z7bekAb{#&Uj%D7Zfb9)YKkc61a~L{oL0`P4YF)mEOht
z9$pXNM=YIDze2*OguaJTQIhH|I?LsXDxI6<N>JKc<vr9C81G8zim&Uq|5;3Nnt2#F
zfjIk4vGXy^ph)f}*-Oo5y5#;9$YS2QKM4yh*qjupV*~FIx5#cCxL8op=C+DJJcir!
n_=l08k!|mbI8C?3wZRp@9shmTAC|%Rea4$C^1(8Mi+le7CCl8k

delta 847
zcmZ8fO-~b16g_Xg+Gz*qHv&?i0=Cl@v5IIBq#`PQRZzaf#F$9p!lbb^aoL?~nz!oC
z1QQci8U<2K+_~`|xG-wsAMg(t&zllLoaDZH?wdE~o_pT>?)erEeEs|JGk|GqGy+SF
z=U?Pc@p3}In5#V63_wShgCIfzdOEXWLm=Y7gr!i-fe(I#5)Nzx<etcEztMzoOkk`L
za^;p`m;t2FC4cD;MCN_TNDF@o;|@-uAfK8^aawMf32{cgHV5sqDEe?t;HWHVF*#%T
zO$SprFaMZp)(mESxFE}xJ6b|Pz<&I&Hean)sx`$w=in0N1*~V4<=SRd;6+-_YBTb?
zwP0Vtf)7^((v48O(TtMw8m`OxzH!};o3iHLmQ(f*U56(71Ko9l!vx_#LkB&1!fY_d
z+&y%<*&T%4+zz5{eh2Y)+}F^}H9<c>WZ(#0=s_oX5k(&>z-@oe-CkB?Qr@wLLiCOd
z3eh_n-3Qdsp?hpT?%NEyfqtG!5(ilgFa~QF^5hlxLQ(lYA+^4T;kU$XN$nN`o&=|T
zW?zE92uAk_)v4qBMva;$7VHl_lK!7(_z;hNz~drIsY;mQ$$1<Usk0bkp&mv2iVi3b
zi`iYAXd;}CoQh1eFsWmeopLQq3p8O7yB|;wXSv21(Oq0@;j+e4H<TXTvpPxBfDBg`
z5%!N$carUf_(M&iaLDrFf#pR`e2bze0cG6g><TSniJW(c4QTNo?h@J5l3-Tyc^T?1
dMwrTsMTUlDZ(Z?*j<8;3y+-Qw4Tu`<{R5PyVqyRQ

diff --git a/target/classes/ru/redrise/marinesco/security/SecurityConfig.class b/target/classes/ru/redrise/marinesco/security/SecurityConfig.class
index f7a0cd9ed66ede310cde0466696b1c10d88c11d9..c7269f96936d338645e1a729bf3b0c49e37b5f7c 100644
GIT binary patch
delta 261
zcmbOoyfAo!20u3!LqEerc7_Rz49=4iSwto;5YT7kVVJ})d2)q7fei=4R7M6yeRhWF
zj0^%<iDilUIf;4c`oSednR)3P3^N%SSRGw_J^eTsW-~Idga*3?aWT{|%;jO2$1s0#
z3jZelg^Uc``UOS#X_+~x`dV6(UkE7k@g|m*WTfVmWF{w;q^4{Z7ThKpx`UxFcpF36
z0fw4w40SAf8S)~TwS=Z@V<>`(vhHP=7Rf9$BRG;pXckax4ouAgJZdJ(savydVX$Dh
dF*!~>ka5c74eIHPeVZjT;usnGCzorg0088#PIdqQ

delta 245
zcmZ1&JUe)U2EPplLq8(}qdq&sL`DXIti-ZJ{hY+Sbp7CxqRhN>4u;8$46KeWzMg&@
z3{x2ySVDtcgSZ%K7^d?u%wU)~SzTb0_-sZ7ZvBFy{ItxRRDCTiE{3@b^Vu2ZO*Y{7
zU|ztmaB?+&!Q>YL${g$|sd<%-IXRmp1-FTYY6<miV<-yV#!z;Ep@wxY!-Pm?p-I7!
zEJ9O&V$)dmGUP=vYYELFsAdPl9H=4N80sdgs9UohWw2m)IXOi=kg;#_HuZGIIh*A)
N;usm{POjBd0RVRbN+AFM

diff --git a/target/classes/ru/redrise/marinesco/security/UserSettingsController.class b/target/classes/ru/redrise/marinesco/security/UserSettingsController.class
index 94247045a9c1e864ef0eb3c00e1afbfb4a5d8b0e..dba5b208960ba66b23fcab2c6064521f1eab2ac9 100644
GIT binary patch
delta 67
zcmeBC>QUMd$<JsyIg0<Pp)CU^gB=48gFS;3g9C#SgCm0`gA;=RgENrj0)%c10SxX8
U!3^FEsSG|01q^<Z69m=(0JtU$c>n+a

delta 67
zcmeBC>QUMd$<JsuIg0<Pp*;g9g98H(gCm0!gA;=igENCBgA0QJgDX(P4ao9f2w?DJ
U2xjnQNM-P2C}0SfoFK3U0J~ERlmGw#

diff --git a/target/classes/ru/redrise/marinesco/web/HandyErrorController.class b/target/classes/ru/redrise/marinesco/web/HandyErrorController.class
index c1e31b8826bdbb320115175f0b50a43529b593fe..28fb56dc406ae3145bab7e398798474c2d4e3a1e 100644
GIT binary patch
delta 568
zcmZ9I$x6de6o&tkbV`g?<4|Yo+{wnFPFO`Kxaz`{8&^?lXbA?IBDm@UxGH%B_o4_+
z3wI*;2tI<~!WR%vZUwa$?!Ec%J^%Us+zaJHRbRgzp8#xPy`i4hW!td`deNy`hHD?^
zDn`+<tWtG@5Xm3f<&$!4iy$YGdxSv2IV!1WM>LEMLaf!ZV;<I=>Y0X4bP*J*RBQGk
zOecyJ^VBqK^TaX=w&}VXNrBY=F%=NH8<*LxP+ovl$mrM52et9`P7~fU&4i{f6UMan
zNf~(-2`?_?Ln#euWV{3Eg_gaPT&WWV5k`dnGQg_>mHW1_O7iXxMW=gcH_)$HNa*1;
zB(B=gD^9?QsXsP@ci$LH-67U$i3*F>EWiMhQD-rPVGcjSt~OSqJjYzbMT%`kN_?TE
z_3;NxO1MSxN??D3bc?Qi&AMh+-+?(~xs}1+L1N+OoJWSsd{PIi1)jT$`ydxff;Pto
cet22WwL<#;M3;Xc5>~ia!m8-#zsef$4YBG@asU7T

delta 368
zcmY+9Jx)SF6ot>7frkta#HT(*MFsWAKN~<};s&g2Y&8Z8ETA-T0aj*~U}>X;8ZB&1
zScwf=Ae?y+qQ(6=GxwfvW@MhyW;p)(25^Mdqj@NJoo=r?I2Pzi^<0oRy}i6L(8$<G
zTJ~CgWzC+c$SYtog$;YB8hQ&w`>Z<Nj*nfG>`47c&A#cIdvH&X!UA)eh&HRRCTkxs
zuWS^2W-mU>BFo;N4j_j`DnTAgGzr*esFoQkeXPcACtO!<r5=QzSXX$*_6zmglzeVG
z*Kj&Gb9Iz5_UN_GyQEM!)B#EybEq6u#5lZw^ihdvO=|ac9aR58cohD5xt=i;>SWWe
K5j(msHh~El{v#&<

diff --git a/target/classes/ru/redrise/marinesco/web/RoleByIdConverter.class b/target/classes/ru/redrise/marinesco/web/RoleByIdConverter.class
new file mode 100644
index 0000000000000000000000000000000000000000..02064ced43b92a1067321e404e4f54bf341a7bf1
GIT binary patch
literal 1322
zcmbVMT~8B16g^W4OG~A-Du~~RV!K6FjZYRykVs-u#envG+74xKJJZb0Li*}2(nK-(
zV0iXN8Sg9=D%1ph*tvUm?>+bIxu^Z{^V@d-Pw~h@iorK=U_{HvNCX{jq!Lk62YaFs
zZ0Jxt>%C~LYPBnj6~;rFp|Hbuc@T2d4%QnxqG>&hF+A3$9YkGfZ*Lji5qsLa3!2&p
zI+E_+QJCNek0EbpMzkTiI+9kK9z&%zluwIWo)8)+t}=`*NhR$v!(!<l`pR{N^r~)&
zEJkoHhYTheMoQ&+2K0S7co-*YHIm|0+-V5&hBrdNP^{@D59_3n%li-0c3Vaa3&Y0`
zm63QCUJARdTd%p(ij*Y;uP+qClTz(i<C<3OYI!(%B$~02wimpOgmK%dPGAOCJzQZZ
zpIOEnuHibv_?A>Hw{C{gAc4ar6NQ9RY-Jd%cdgWlht(`@V%Ebg(&qHr9ByNdR;11I
zFe3Tp|BgD~rmBa#R6CUYsqbY-N#a{Lsh5W`!{nbLW@)#T9HubMkloa=X^J)J);e{{
z=ZmhBA+sslird&w(fffBeMM^jWBH{4oMg3U-Rv^CW@aN+R(3>PMv@%3qLjAWt%B_1
z52X{4w}iI6uApCCr>m7vwu)JjVuY?yx>C;V^mpL$46>9@P_{-fMKSAtLC&vyM*bsZ
zDV(Qsl4{+VMxHtfC{i|cSd9y~NE!7ds0^3rew4gTfrQ31l?}od{ZGhOzT$EUY#%oc
zaOVS69*!BK4iMZieDMgrh<V(j_kH+zps+&lbM(l;mkGkL&-j%Cl=k7DL?yo_bKGYy
RBzO0*n8W}ND7x7XfnNq+Uqk=^

literal 0
HcmV?d00001

diff --git a/target/classes/static/images/logo.svg b/target/classes/static/images/logo.svg
index 7b90bd4..f6a4bcd 100644
--- a/target/classes/static/images/logo.svg
+++ b/target/classes/static/images/logo.svg
@@ -2,12 +2,12 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="133mm"
-   height="27.5mm"
-   viewBox="0 0 133 27.5"
+   width="78mm"
+   height="12.5mm"
+   viewBox="0 0 78 12.5"
    version="1.1"
    id="svg5"
-   sodipodi:docname="marinesco logo.svg"
+   sodipodi:docname="marinesco logo1.svg"
    inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -24,9 +24,9 @@
      inkscape:deskcolor="#505050"
      inkscape:document-units="mm"
      showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="181.54967"
-     inkscape:cy="106.59635"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="167.14236"
+     inkscape:cy="56.656931"
      inkscape:window-width="3755"
      inkscape:window-height="2123"
      inkscape:window-x="1165"
@@ -42,56 +42,21 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.659681;stroke-linejoin:round;paint-order:stroke fill markers"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.340466;stroke-linejoin:round;paint-order:stroke fill markers"
        id="rect15547"
-       width="133.10405"
-       height="27.5"
+       width="78"
+       height="12.5"
        x="0"
        y="0"
-       ry="2.6981504" />
+       ry="1.226432" />
     <path
-       id="rect2054-3-56-9"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.635107,9.1000736 c -4.069468,0.03255 -8.346161,1.0300024 -13.794501,3.2114974 L 6.5975531,17.865938 c -0.4935601,0.191788 -0.9838347,0.36379 -0.9838347,0.815727 v 0.186858 c 0,0.451936 0.4902658,0.427052 0.9838346,0.235263 l 14.749126,-6.106412 c 14.756957,-5.7066219 23.415737,-1.612883 43.946257,10.728165 0,0 0.841119,0.292668 1.285227,0.36734 0.362328,0.06092 1.106533,0.06266 1.106533,0.06266 -0.778699,-0.281365 -1.557399,-0.56273 -2.336098,-0.844095 C 57.175207,16.691742 43.992671,9.0685056 33.635107,9.1000736 Z"
-       sodipodi:nodetypes="cccsscccaccc" />
-    <path
-       id="rect2054-3"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.540144,12.646976 c -4.069467,0.03255 -8.346161,1.030003 -13.7945,3.211499 L 5.4515333,21.412842 C 4.9579732,21.60463 4.4676988,21.776631 4.4676988,22.228568 v 0.186858 c 0,0.451937 0.4902656,0.427052 0.9838345,0.235263 L 19.745644,17.096323 c 12.462727,-4.737552 19.147927,-3.9543 30.338669,1.161303 l 15.113671,6.908906 c 0,0 0.83208,0.367605 1.28523,0.36734 0.451297,-2.65e-4 1.279347,-0.36734 1.279347,-0.36734 l -0.04804,-1.192447 c 0,0 -0.825909,-0.02592 -1.234472,-0.0893 -0.413897,-0.06421 -1.2264,-0.293797 -1.2264,-0.293797 L 50.262163,16.841173 C 43.662433,14.158308 38.772318,12.605125 33.540144,12.646976 Z"
-       sodipodi:nodetypes="sccssccccaccaccs" />
-    <path
-       id="rect2054-3-56"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 33.635104,10.787441 c -4.069468,0.03255 -8.34616,1.030003 -13.7945,3.211498 L 6.1596884,19.553306 c -0.4935601,0.191788 -0.9838347,0.363789 -0.9838347,0.815726 v 0.186859 c 0,0.451936 0.4902658,0.427051 0.9838347,0.235262 L 19.840604,15.236787 c 18.023542,-6.8094217 20.310357,-2.664449 45.452329,8.43342 0,0 0.832078,0.367606 1.285228,0.36734 l -0.0067,-0.278863 C 66.145911,23.758666 65.9158,23.511571 65.9158,23.511571 56.610459,18.316164 43.926086,10.729521 33.635147,10.787441 Z"
-       sodipodi:nodetypes="cccssccccccc" />
-    <path
-       id="rect2054-3-56-9-0"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 100.99714,9.1071356 c 4.96731,-0.02748 8.34616,1.0300024 13.79449,3.2114974 L 128.20972,17.873 c 0.49355,0.191788 0.98383,0.36379 0.98383,0.815727 v 0.186858 c 0,0.451936 -0.49027,0.427052 -0.98383,0.235263 L 114.79163,13.556481 C 99.40161,6.2280595 89.12455,11.252488 69.339305,23.732601 c 0,0 -0.837922,0.307169 -1.285221,0.36734 -0.319432,0.04297 -0.970777,-0.0083 -0.970777,-0.0083 l 0.955881,-0.301597 1.244491,-0.471564 C 78.094253,16.55472 90.234122,9.1476096 100.99718,9.1071356 Z"
-       sodipodi:nodetypes="cccsscccaccccc" />
-    <path
-       id="rect2054-3-9"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 101.09209,12.654038 c 4.06947,0.03255 9.05576,1.138066 13.79451,3.211499 l 14.29411,5.554367 c 0.49356,0.191788 0.98384,0.363789 0.98384,0.815726 v 0.186858 c 0,0.451937 -0.49027,0.427052 -0.98384,0.235263 L 114.8866,17.103385 c -12.46273,-4.737552 -19.147926,-3.9543 -30.338675,1.161303 L 69.43426,25.173594 c 0,0 -0.832083,0.367605 -1.285229,0.36734 -0.451299,-2.65e-4 -1.279345,-0.36734 -1.279345,-0.36734 l 1.282538,-1.281748 c 0.425526,-1.7e-5 1.226407,-0.293796 1.226407,-0.293796 l 14.991482,-6.749815 c 6.599732,-2.682865 11.489844,-4.236048 16.722017,-4.194197 z"
-       sodipodi:nodetypes="sccssccccaccccss" />
-    <path
-       id="rect2054-3-56-3"
-       style="fill:#008fc9;fill-opacity:1;stroke:none;stroke-width:0.0797409;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 100.99714,10.794503 c 4.06947,0.03255 8.34617,1.030003 13.79449,3.211498 l 13.68081,5.554367 c 0.49357,0.191788 0.98384,0.363789 0.98384,0.815726 v 0.186859 c 0,0.451936 -0.49027,0.427051 -0.98384,0.235262 l -13.68081,-5.554366 c -18.412603,-6.8141094 -22.492137,-1.640278 -45.452316,8.43342 -2.776303,0.05915 -2.9055,0.657477 -0.540756,-0.155942 9.537019,-5.771739 21.907671,-12.784744 32.198622,-12.726824 z"
-       sodipodi:nodetypes="cccsscccccc" />
-    <path
-       id="rect2054-3-5"
-       style="display:none;fill:#008fc9;fill-opacity:1;stroke:#ffffff;stroke-width:0.0852133;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="m 96.191624,12.357583 -18.87288,10.854929 c -0.929065,0.389453 -1.978574,0.37484 -2.864572,0.07241 L 55.123883,13.083327 C 47.577069,8.0785026 34.406788,7.0985105 22.485163,11.195846 l -16.523354,5.48195 c 0.0038,-0.0013 -1.1235037,0.363789 -1.1235037,0.815726 v 0.9857 c 0,0.451937 0.5573606,1.003563 1.1235037,0.815726 L 22.485163,13.812999 C 37.587703,8.6538836 43.906467,8.6882677 57.130824,15.70048 l 17.322925,9.185477 c 1.286762,0.379894 1.557099,0.369131 2.864572,-0.07241 l 17.323253,-9.8388 C 106.13569,8.4466193 115.0552,9.0758126 129.28722,13.813374 l 16.32336,5.554366 c 0.56364,0.191791 1.1235,-0.363789 1.1235,-0.815725 v -0.9857 c 0,-0.451937 -0.55987,-0.623939 -1.1235,-0.815727 L 129.28722,11.196222 C 106.86095,5.3664259 103.00828,10.013448 96.191624,12.357583 Z"
-       sodipodi:nodetypes="ccccccssccsccscsssccc" />
-    <path
-       id="rect2350"
-       style="opacity:1;fill:#a82b17;fill-opacity:1;stroke:none;stroke-width:0.0786222;stroke-linejoin:round;stroke-opacity:0.624036;paint-order:stroke fill markers"
-       d="M 130.27489,23.682275 75.159916,23.68264 H 72.438446 72.370115 60.772868 1.9729981 c -0.5184215,0 -0.9358165,0.336467 -0.9358165,0.754372 v 0.628522 c 0,0.417905 0.417395,0.754007 0.9358165,0.754007 H 60.772868 c 0.518421,0 1.023153,-0.336102 1.023153,-0.754007 v -0.0197 -0.0197 c 0,-0.0464 0.0547,-0.07075 0.09865,-0.07077 0.04394,-1.3e-5 0.09865,0.02714 0.09865,0.07077 v 0.05435 0.05472 c 0,0.438975 0.525657,0.79231 1.070216,0.79231 h 5.447919 0.405912 1.162078 c 0.544558,0 1.070216,-0.353335 1.070216,-0.79231 v -0.05472 -0.05435 c 0,-0.04363 0.0547,-0.07078 0.09865,-0.07077 0.04394,1.3e-5 0.0982,0.02437 0.0982,0.07077 v 0.0197 0.0197 c 0,0.417905 0.505185,0.754007 1.023606,0.754007 h 0.06833 58.731532 c 0.51842,0 0.93582,-0.336102 0.93582,-0.754007 v -0.628522 c 0,-0.417905 -0.4174,-0.754372 -0.93582,-0.754372 h -0.89056 c -0.002,-6e-6 -0.003,-3.65e-4 -0.004,-3.65e-4 z" />
+       style="color:#000000;fill:#15bade;-inkscape-stroke:none"
+       d="M 27.730628,1.5763661 C 25.036825,1.5596634 22.673126,2.2437308 20.494299,3.0548817 15.52534,4.9047658 11.509661,7.3067267 4.20719,6.2443347 l -0.2382811,-0.03516 -0.2402344,0.01563 c 0,0 -0.571584,0.03161 -1.09375,0.355469 -0.522166,0.323861 -1.0854728,1.181111 -1.1308594,1.90039 -0.031147,0.493776 0.1131821,1.217964 0.5546875,1.7480473 0.4415054,0.530084 1.3378907,0.798828 1.3378907,0.798828 l 0.056641,0.01172 0.056641,0.0078 C 12.15843,12.305276 17.748772,9.2542897 22.18766,7.6017457 c 2.225096,-0.828377 4.129469,-1.332733 6.328125,-1.154297 2.198656,0.178436 4.822312,1.053458 8.382812,3.423828 l 1.878907,1.2500003 0.002,-0.0039 0.002,0.002 1.875,-1.2500003 c 3.560451,-2.370338 6.184021,-3.243543 8.382812,-3.421875 2.198792,-0.178332 4.10494,0.325904 6.330078,1.154297 4.439025,1.652595 10.029323,4.7035173 18.677735,3.4453133 l 0.05078,-0.0078 0.04883,-0.0098 c 0,0 0.902708,-0.265223 1.347656,-0.796875 0.444949,-0.5316513 0.589732,-1.2583183 0.558594,-1.7519533 -0.04553,-0.721911 -0.612608,-1.579806 -1.134765,-1.902343 -0.522158,-0.322538 -1.091797,-0.353516 -1.091797,-0.353516 l -0.240235,-0.01563 -0.238281,0.03516 C 66.045442,7.3067127 62.031754,4.904815 57.062659,3.0548817 54.883831,2.2437293 52.518178,1.5596634 49.824378,1.5763661 c -0.385437,0.00239 -0.775891,0.018721 -1.171875,0.050781 -2.945866,0.2385075 -6.201654,1.4666842 -9.875,3.7734376 -3.672889,-2.3061606 -6.92781,-3.5330278 -9.873047,-3.7714845 -0.396002,-0.032061 -0.788428,-0.050345 -1.173828,-0.052734 z"
+       id="path1154" />
     <path
        id="rect2675"
-       style="opacity:1;fill:#00b185;fill-opacity:1;stroke:#ffffff;stroke-width:0.917842;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-       d="m 75.960365,18.022748 8.686193,-5.283117 c 0.04346,-0.02643 0.08973,0.04381 0.08973,0.09821 v 11.75165 c 0,0.0544 -0.04003,0.09821 -0.08973,0.09821 0,0 -4.343128,-2.045323 -4.343128,-3.840942 0,-0.06402 0,-0.06402 0,0 0,1.794641 -4.343065,3.840942 -4.343065,3.840942 -0.03835,0.03461 -0.08973,-0.04381 -0.08973,-0.09821 V 18.12096 c 0,-0.05441 0.04629,-0.07179 0.08973,-0.09821 z"
-       sodipodi:nodetypes="sssssssssss" />
+       style="opacity:1;fill:#00b185;fill-opacity:1;stroke:#ffffff;stroke-width:0.818;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       d="M 40.69873,4.1910257 47.085,1.9080267 c 0.0479,-0.017123 0.08973,0.04381 0.08973,0.09821 v 8.4513743 c 0,0.0544 -0.04003,0.09821 -0.08973,0.09821 0,0 -3.24318,-2.0452513 -3.24318,-3.8408703 0,-0.06402 0,-0.06402 0,0 0,1.794641 -3.14309,3.8409423 -3.14309,3.8409423 -0.03835,0.03461 -0.08973,-0.04381 -0.08973,-0.09821 V 4.2892377 c 0,-0.05441 0.08973,-0.097032 0.08973,-0.09821 z"
+       sodipodi:nodetypes="sssssssssscs" />
   </g>
 </svg>
diff --git a/target/classes/templates/manage_users.html b/target/classes/templates/manage_users.html
new file mode 100644
index 0000000..f63e49b
--- /dev/null
+++ b/target/classes/templates/manage_users.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Marinesco - Manage users</title>
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <link rel="stylesheet" th:href="@{/styles/styles.css}" />
+</head>
+
+<body>
+    <h1 th:text="${header_text}">Manage users</h1>
+    <br /><a href="/">go back</a>
+    <p>
+    <div th:each="user : ${USR}">
+        <span th:text="${user.id+' '+user.name+' '+user.displayName}+' ROLES: '">user</span>
+        <span th:each="role : ${user.role}">
+            <span th:text="'[ '+${role.id+' '+role.name+' '+role.type}+' ]'">user</span>
+        </span>
+        <form method="POST" th:action="@{/manage_users/delete}" th:object="${userGenerified}">
+            <input type="hidden" th:value="${user.id}" name="id" />
+            <input type="hidden" th:value="${user.name}"  name="name" />
+            <input type="hidden" th:value="${user.displayName}"  name="displayName"  />
+            <span th:each="role : ${user.role}">
+                <input type="hidden" th:value="${role.id}" th:attr="name='role'"  /> 
+            </span>
+        
+            <button>DELETE</button>
+        </form>
+        <br />
+    </div>
+    <!--
+    <form method="POST" th:action="@{/profile/settings}" th:object="${userSettingsForm}">
+        <span class="validationError" th:if="${#fields.hasErrors('displayname')}" th:errors="*{displayname}">Error</span>
+        <br />
+        <label for="displayname">Displayed name: </label>
+        <input type="text" name="displayname" id="displayname" th:value="${userSettingsForm.displayname}" /><br />
+
+        <span class="validationError" th:if="${password_incorrect} != null" th:text="${password_incorrect}">false</span> 
+        <br />
+        <label for="password">New password: </label>
+        <input type="password" name="newPassword" id="newPassword" /><br />
+
+        <input type="submit" value="Save Changes" />
+    </form>
+    -->
+</body>
+</html>
\ No newline at end of file
diff --git a/target/classes/templates/registration.html b/target/classes/templates/registration.html
index 4b7aa14..1da765e 100644
--- a/target/classes/templates/registration.html
+++ b/target/classes/templates/registration.html
@@ -5,7 +5,7 @@
     <title>Marinesco - registration form</title>
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
     <link rel="stylesheet" th:href="@{/styles/styles.css}" />
-    <script src="@{/jquery.js}"></script>
+    <script src="/jquery.js"></script>
 </head>
 
 <body>
diff --git a/target/classes/templates/root.html b/target/classes/templates/root.html
index df62e2f..3346843 100644
--- a/target/classes/templates/root.html
+++ b/target/classes/templates/root.html
@@ -11,6 +11,10 @@
     <h1>Welcome to Marinesco</h1>
     <img th:src="@{/images/logo.svg}" />
     <br /><a href="/login">Login</a>
+    <br /><a href="/profile">/profile</a>
+    <br /><a href="/manage_users">/manage_users</a>
+    <br />
+    <br /><a href="/logout">Log out</a>
 </body>
 
 </html>
\ No newline at end of file