* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)

thomaswoehlke · thomaswoehlke · commit 8c8af7b20781 · 2020-09-16T19:46:58.000+02:00
* fixed #279 Formular Layout Errors
diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
@@ -73,7 +73,7 @@ public final String registerPost(
                     return "user/register/registerForm";
                 } else {
                     userRegistrationService.registrationSendEmailTo(userRegistrationForm.getEmail());
-                    return "user/register/registerSentMail";
+                    return "registerConfirmSentMail";
                 }
             } else {
                 String objectName = "userRegistrationForm";
@@ -106,9 +106,9 @@ public final String registerConfirmGet(
             UserAccountForm userAccountForm = new UserAccountForm();
             userAccountForm.setUserEmail(o.getEmail());
             model.addAttribute("userAccountForm", userAccountForm);
-            return "user/register/registerConfirmed";
+            return "registerConfirmForm";
         } else {
-            return "user/register/registerNotConfirmed";
+            return "registerConfirmFailed";
         }
     }
 
@@ -137,7 +137,7 @@ public final String registerConfirmPost(
             if (!result.hasErrors() && passwordsMatch) {
                 userAccountService.createUser(userAccountForm);
                 userRegistrationService.registrationUserCreated(oUserRegistration);
-                return "user/register/registerDone";
+                return "registerConfirmFinished";
             } else {
                 if (!passwordsMatch) {
                     String objectName = "userAccountForm";
@@ -146,10 +146,10 @@ public final String registerConfirmPost(
                     FieldError e = new FieldError(objectName, field, defaultMessage);
                     result.addError(e);
                 }
-                return "user/register/registerConfirmed";
+                return "registerConfirmForm";
             }
         } else {
-            return "user/register/registerNotConfirmed";
+            return "registerConfirmFailed";
         }
     }
 }
diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties
@@ -21,7 +21,8 @@ user.registerNotConfirmed.h1=Registration als neuer Benutzer
 user.registerForm.button=Registrieren
 user.registerForm.h1=Registration als neuer Benutzer
 user.registerSentMail.h1=Registration als neuer Benutzer
-user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet. Bitte schauen Sie in Ihr Email-Postfach.
+user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet.
+user.registerSentMail.action= Bitte schauen Sie in Ihr Email-Postfach.
 user.resetPasswordConfirmed.button=Neues Passwort speichern
 user.resetPasswordConfirmed.h1=Passwort zur&uuml;ck setzen
 user.resetPasswordConfirmed.password=Neues Passwort
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
@@ -266,4 +266,5 @@ user.loginForm.email.label=Email
 user.loginForm.email.placeholder=Enter your Email
 user.loginForm.password.label=Password
 user.loginForm.password.placeholder=Enter your Password
+user.registerSentMail.action=Please check the Inbox of your Email-Client.
 
diff --git a/src/main/resources/templates/user/register/registerConfirmFailed.html b/src/main/resources/templates/user/register/registerConfirmFailed.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+	  xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:th="http://www.thymeleaf.org"
+	  xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+	  xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+	<title th:text="'SimpleWorklist | ' + #{user.registerNotConfirmed.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+	<div th:fragment="mytwtitle">
+		<h1>
+			<span th:utext="#{user.registerNotConfirmed.h1}">Register as new User</span>
+		</h1>
+	</div>
+
+	<div th:fragment="mytwcontent">
+        <div class="card">
+            <div class="card-header">
+                <span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
+            </div>
+            <div class="card-body">
+                <div class="form-row">
+                    <div class="col-md-12 mb-12">
+                        <p>
+                            <span th:utext="#{user.registerNotConfirmed.text}">Sorry. There is no registration known for your Request.</span>
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div class="card-footer">
+                <div class="form-row">
+                    <span th:utext="#{user.registerSentMail.action}">back</span>
+                </div>
+            </div>
+	</div>
+
+
+</body>
+</html>
diff --git a/src/main/resources/templates/user/register/registerConfirmFinished.html b/src/main/resources/templates/user/register/registerConfirmFinished.html
diff --git a/src/main/resources/templates/user/register/registerConfirmForm.html b/src/main/resources/templates/user/register/registerConfirmForm.html
@@ -26,7 +26,7 @@ <h1>
                     <div class="col-md-12 mb-12">
                         <div class="form-group">
                             <label th:for="${#ids.next('userEmail')}" class="control-label">Email</label>
-                            <input type="email" th:field="*{userEmail}" class="form-control form-control-lg" />
+                            <input type="email" th:field="*{userEmail}" class="form-control form-control-lg" readonly/>
                             <div>
                                 <div th:each="err : ${#fields.errors('userEmail')}" th:text="${err}" class="alert alert-danger" >
                                 </div>
diff --git a/src/main/resources/templates/user/register/registerConfirmSentMail.html b/src/main/resources/templates/user/register/registerConfirmSentMail.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+  <title th:text="'SimpleWorklist | ' + #{user.registerSentMail.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+  <div th:fragment="mytwtitle">
+    <h1>
+      <span th:utext="#{user.registerSentMail.h1}">Register as new User</span>
+    </h1>
+  </div>
+
+  <div th:fragment="mytwcontent">
+      <div class="card">
+          <div class="card-header">
+              <span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
+          </div>
+          <div class="card-body">
+              <div class="form-row">
+                  <div class="col-md-12 mb-12">
+                    <p>
+                        <span th:utext="#{user.registerSentMail.text}">Verification needed. Sent an email to the given address.</span>
+                    </p>
+                </div>
+              </div>
+          </div>
+          <div class="card-footer">
+              <div class="form-row">
+                  <span th:utext="#{user.registerSentMail.action}">Please check the Inbox of your Email-Client.</span>
+              </div>
+          </div>
+      </div>
+  </div>
+
+</body>
+</html>
diff --git a/src/main/resources/templates/user/register/registerNotConfirmed.html b/src/main/resources/templates/user/register/registerNotConfirmed.html
diff --git a/src/main/resources/templates/user/register/registerSentMail.html b/src/main/resources/templates/user/register/registerSentMail.html

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public final String registerPost(`
`73`	`73`	`return "user/register/registerForm";`
`74`	`74`	`} else {`
`75`	`75`	`userRegistrationService.registrationSendEmailTo(userRegistrationForm.getEmail());`
`76`		`- return "user/register/registerSentMail";`
	`76`	`+ return "registerConfirmSentMail";`
`77`	`77`	`}`
`78`	`78`	`} else {`
`79`	`79`	`String objectName = "userRegistrationForm";`
`@@ -106,9 +106,9 @@ public final String registerConfirmGet(`
`106`	`106`	`UserAccountForm userAccountForm = new UserAccountForm();`
`107`	`107`	`userAccountForm.setUserEmail(o.getEmail());`
`108`	`108`	`model.addAttribute("userAccountForm", userAccountForm);`
`109`		`- return "user/register/registerConfirmed";`
	`109`	`+ return "registerConfirmForm";`
`110`	`110`	`} else {`
`111`		`- return "user/register/registerNotConfirmed";`
	`111`	`+ return "registerConfirmFailed";`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`@@ -137,7 +137,7 @@ public final String registerConfirmPost(`
`137`	`137`	`if (!result.hasErrors() && passwordsMatch) {`
`138`	`138`	`userAccountService.createUser(userAccountForm);`
`139`	`139`	`userRegistrationService.registrationUserCreated(oUserRegistration);`
`140`		`- return "user/register/registerDone";`
	`140`	`+ return "registerConfirmFinished";`
`141`	`141`	`} else {`
`142`	`142`	`if (!passwordsMatch) {`
`143`	`143`	`String objectName = "userAccountForm";`
`@@ -146,10 +146,10 @@ public final String registerConfirmPost(`
`146`	`146`	`FieldError e = new FieldError(objectName, field, defaultMessage);`
`147`	`147`	`result.addError(e);`
`148`	`148`	`}`
`149`		`- return "user/register/registerConfirmed";`
	`149`	`+ return "registerConfirmForm";`
`150`	`150`	`}`
`151`	`151`	`} else {`
`152`		`- return "user/register/registerNotConfirmed";`
	`152`	`+ return "registerConfirmFailed";`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`