Fixed #129, Fixed #126, working on 168

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java

@@ -16,7 +16,7 @@
 
 @Slf4j
 @Controller
-@RequestMapping(path = "/user/register")
+@RequestMapping(path = "/user")
 public class UserRegistrationController {
 
     private final UserAccountService userAccountService;
@@ -35,7 +35,7 @@ public UserRegistrationController(UserAccountService userAccountService, UserReg
      * @param model
      * @return Formular for entering Email-Address for Registration
      */
-    @RequestMapping(path = "/", method = RequestMethod.GET)
+    @RequestMapping(path = "/register", method = RequestMethod.GET)
     public final String registerNewUserRequestForm(Model model) {
         UserRegistrationForm userRegistrationForm = new UserRegistrationForm();
         model.addAttribute("userRegistrationForm", userRegistrationForm);
@@ -50,7 +50,7 @@ public final String registerNewUserRequestForm(Model model) {
      * @param model
      * @return info page at success or return to form with error messages.
      */
-    @RequestMapping(path = "/", method = RequestMethod.POST)
+    @RequestMapping(path = "/register", method = RequestMethod.POST)
     public final String registerNewUserRequestStoreAndSendEmailForVerification(
             @Valid UserRegistrationForm userRegistrationForm,
             BindingResult result,
@@ -90,7 +90,7 @@ public final String registerNewUserRequestStoreAndSendEmailForVerification(
      * @param model
      * @return Formular for Entering Account Task or Error Messages.
      */
-    @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.GET)
+    @RequestMapping(path = "/register/confirm/{confirmId}", method = RequestMethod.GET)
     public final String registerNewUserCheckResponseAndRegistrationForm(
         @PathVariable String confirmId,
         Model model
@@ -117,7 +117,7 @@ public final String registerNewUserCheckResponseAndRegistrationForm(
      * @param model
      * @return login page at success or page with error messages.
      */
-    @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.POST)
+    @RequestMapping(path = "/register/confirm/{confirmId}", method = RequestMethod.POST)
     public final String registerNewUserCheckResponseAndRegistrationStore(
         @PathVariable String confirmId,
         @Valid UserAccountForm userAccountForm,

src/main/resources/templates/user/login/loginForm.html

@@ -19,7 +19,7 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
 			<div class="card">
 				<div class="card-header">
 					<span th:utext="#{user.loginForm.login}">Please login or</span>
-					<a th:href="@{/register}">
+					<a th:href="@{/user/register}">
 						<span th:utext="#{user.loginForm.register}">register as new user</span>
 					</a>.
 				</div>
@@ -42,7 +42,7 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
 						<i class="fas fa-sign-in-alt"></i>
 						<span th:utext="#{user.loginForm.loginButton}"></span>
 					</button>
-					<a th:href="@{/resetPassword}" class="btn btn-secondary" role="button">
+					<a th:href="@{/user/resetPassword}" class="btn btn-secondary" role="button">
 						<i class="fas fa-question-circle"></i>
 						<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
 					</a>