Skip to content

Commit 459f881

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #282 from Spring-Framework-Java-Apps/master
Deployment
2 parents 12f71dc + 8c8af7b commit 459f881

File tree

11 files changed

+185
-126
lines changed

11 files changed

+185
-126
lines changed

‎etc/TODO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,5 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
123123
* fixed #265 make release with maven plugin
124124

125125
## 2.3.24
126-
* issue #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
126+
* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
127127
* fixed #279 Formular Layout Errors

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public final String registerPost(
7373
return "user/register/registerForm";
7474
} else {
7575
userRegistrationService.registrationSendEmailTo(userRegistrationForm.getEmail());
76-
return "user/register/registerSentMail";
76+
return "registerConfirmSentMail";
7777
}
7878
} else {
7979
String objectName = "userRegistrationForm";
@@ -106,9 +106,9 @@ public final String registerConfirmGet(
106106
UserAccountForm userAccountForm = new UserAccountForm();
107107
userAccountForm.setUserEmail(o.getEmail());
108108
model.addAttribute("userAccountForm", userAccountForm);
109-
return "user/register/registerConfirmed";
109+
return "registerConfirmForm";
110110
} else {
111-
return "user/register/registerNotConfirmed";
111+
return "registerConfirmFailed";
112112
}
113113
}
114114

@@ -137,7 +137,7 @@ public final String registerConfirmPost(
137137
if (!result.hasErrors() && passwordsMatch) {
138138
userAccountService.createUser(userAccountForm);
139139
userRegistrationService.registrationUserCreated(oUserRegistration);
140-
return "user/register/registerDone";
140+
return "registerConfirmFinished";
141141
} else {
142142
if (!passwordsMatch) {
143143
String objectName = "userAccountForm";
@@ -146,10 +146,10 @@ public final String registerConfirmPost(
146146
FieldError e = new FieldError(objectName, field, defaultMessage);
147147
result.addError(e);
148148
}
149-
return "user/register/registerConfirmed";
149+
return "registerConfirmForm";
150150
}
151151
} else {
152-
return "user/register/registerNotConfirmed";
152+
return "registerConfirmFailed";
153153
}
154154
}
155155
}

‎src/main/resources/messages_de.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ user.registerNotConfirmed.h1=Registration als neuer Benutzer
2121
user.registerForm.button=Registrieren
2222
user.registerForm.h1=Registration als neuer Benutzer
2323
user.registerSentMail.h1=Registration als neuer Benutzer
24-
user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet. Bitte schauen Sie in Ihr Email-Postfach.
24+
user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet.
25+
user.registerSentMail.action= Bitte schauen Sie in Ihr Email-Postfach.
2526
user.resetPasswordConfirmed.button=Neues Passwort speichern
2627
user.resetPasswordConfirmed.h1=Passwort zurück setzen
2728
user.resetPasswordConfirmed.password=Neues Passwort

‎src/main/resources/messages_en.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,5 @@ user.loginForm.email.label=Email
266266
user.loginForm.email.placeholder=Enter your Email
267267
user.loginForm.password.label=Password
268268
user.loginForm.password.placeholder=Enter your Password
269+
user.registerSentMail.action=Please check the Inbox of your Email-Client.
269270

‎src/main/resources/templates/user/register/registerConfirmFailed.html

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!DOCTYPE html>
2+
<html th:lang="${#locale.language}"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:th="http://www.thymeleaf.org"
5+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6+
xmlns:sd="http://www.thymeleaf.org/spring-data">
7+
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8+
<title th:text="'SimpleWorklist | ' + #{user.registerNotConfirmed.h1}">Title</title>
9+
</head>
10+
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11+
12+
<div th:fragment="mytwtitle">
13+
<h1>
14+
<span th:utext="#{user.registerNotConfirmed.h1}">Register as new User</span>
15+
</h1>
16+
</div>
17+
18+
<div th:fragment="mytwcontent">
19+
<div class="card">
20+
<div class="card-header">
21+
<span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
22+
</div>
23+
<div class="card-body">
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<p>
27+
<span th:utext="#{user.registerNotConfirmed.text}">Sorry. There is no registration known for your Request.</span>
28+
</p>
29+
</div>
30+
</div>
31+
</div>
32+
<div class="card-footer">
33+
<div class="form-row">
34+
<span th:utext="#{user.registerSentMail.action}">back</span>
35+
</div>
36+
</div>
37+
</div>
38+
39+
40+
</body>
41+
</html>

‎src/main/resources/templates/user/register/registerDone.html renamed to ‎src/main/resources/templates/user/register/registerConfirmFinished.html

File renamed without changes.

‎src/main/resources/templates/user/register/registerConfirmForm.html

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<!DOCTYPE html>
2+
<html th:lang="${#locale.language}"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:th="http://www.thymeleaf.org"
5+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6+
xmlns:sd="http://www.thymeleaf.org/spring-data">
7+
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8+
<title th:text="'SimpleWorklist | ' + #{user.registerConfirmed.h1}">Title</title>
9+
</head>
10+
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11+
12+
<div th:fragment="mytwtitle">
13+
<h1>
14+
<span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
15+
</h1>
16+
</div>
17+
18+
<div th:fragment="mytwcontent">
19+
<form id="formId" th:action="@{/user/register/confirm/{confirmId}(confirmId=${confirmId})}" th:object="${userAccountForm}" method="post">
20+
<div class="card">
21+
<div class="card-header">
22+
<span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
23+
</div>
24+
<div class="card-body">
25+
<div class="form-row">
26+
<div class="col-md-12 mb-12">
27+
<div class="form-group">
28+
<label th:for="${#ids.next('userEmail')}" class="control-label">Email</label>
29+
<input type="email" th:field="*{userEmail}" class="form-control form-control-lg" readonly/>
30+
<div>
31+
<div th:each="err : ${#fields.errors('userEmail')}" th:text="${err}" class="alert alert-danger" >
32+
</div>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
<div class="form-row">
38+
<div class="col-md-12 mb-12">
39+
<div class="form-group">
40+
<label th:for="${#ids.next('userFullname')}" class="control-label">
41+
<span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
42+
</label>
43+
<input type="text" th:field="*{userFullname}" class="form-control form-control-lg" />
44+
<div>
45+
<div th:each="err : ${#fields.errors('userFullname')}" th:text="${err}" class="alert alert-danger" >
46+
</div>
47+
</div>
48+
</div>
49+
</div>
50+
</div>
51+
<div class="form-row">
52+
<div class="col-md-12 mb-12">
53+
<div class="form-group">
54+
<label th:for="${#ids.next('userPassword')}" class="control-label">
55+
<span th:utext="#{user.registerConfirmed.userPassword}">Password</span>
56+
</label>
57+
<input type="password" th:field="*{userPassword}" class="form-control form-control-lg" />
58+
<div>
59+
<div th:each="err : ${#fields.errors('userPassword')}" th:text="${err}" class="alert alert-danger" >
60+
</div>
61+
</div>
62+
</div>
63+
</div>
64+
</div>
65+
<div class="form-row">
66+
<div class="col-md-12 mb-12">
67+
<div class="form-group">
68+
<label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
69+
<span th:utext="#{user.registerConfirmed.userPasswordConfirmation}">Password again</span>
70+
</label>
71+
<input type="password" th:field="*{userPasswordConfirmation}" class="form-control form-control-lg" />
72+
<div>
73+
<div th:each="err : ${#fields.errors('userPasswordConfirmation')}" th:text="${err}" class="alert alert-danger" >
74+
</div>
75+
</div>
76+
</div>
77+
</div>
78+
</div>
79+
</div>
80+
<div class="card-footer">
81+
<div class="form-row">
82+
<button id="confirmRegistration" type="submit" class="btn btn-primary">
83+
<span th:utext="#{user.registerConfirmed.button}">Confirm Registration</span>
84+
</button>
85+
</div>
86+
</div>
87+
</div>
88+
</form>
89+
</div>
90+
91+
92+
</body>
93+
</html>

‎src/main/resources/templates/user/register/registerConfirmSentMail.html

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!DOCTYPE html>
2+
<html th:lang="${#locale.language}"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:th="http://www.thymeleaf.org"
5+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6+
xmlns:sd="http://www.thymeleaf.org/spring-data">
7+
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8+
<title th:text="'SimpleWorklist | ' + #{user.registerSentMail.h1}">Title</title>
9+
</head>
10+
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11+
12+
<div th:fragment="mytwtitle">
13+
<h1>
14+
<span th:utext="#{user.registerSentMail.h1}">Register as new User</span>
15+
</h1>
16+
</div>
17+
18+
<div th:fragment="mytwcontent">
19+
<div class="card">
20+
<div class="card-header">
21+
<span th:utext="#{user.registerConfirmed.h1}">Register as new User</span>
22+
</div>
23+
<div class="card-body">
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<p>
27+
<span th:utext="#{user.registerSentMail.text}">Verification needed. Sent an email to the given address.</span>
28+
</p>
29+
</div>
30+
</div>
31+
</div>
32+
<div class="card-footer">
33+
<div class="form-row">
34+
<span th:utext="#{user.registerSentMail.action}">Please check the Inbox of your Email-Client.</span>
35+
</div>
36+
</div>
37+
</div>
38+
</div>
39+
40+
</body>
41+
</html>

‎src/main/resources/templates/user/register/registerConfirmed.html

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/main/resources/templates/user/register/registerNotConfirmed.html

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/main/resources/templates/user/register/registerSentMail.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)