Skip to content

Deployment #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Deployment #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a81934b
* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is …
thomaswoehlke Sep 16, 2020
8c8af7b
* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is …
thomaswoehlke Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,5 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
* fixed #265 make release with maven plugin

## 2.3.24
* issue #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
* fixed #279 Formular Layout Errors
12 changes: 6 additions & 6 deletions src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
}
}

Expand Down Expand Up @@ -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";
Expand All @@ -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";
}
}
}
3 changes: 2 additions & 1 deletion src/main/resources/messages_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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ück setzen
user.resetPasswordConfirmed.password=Neues Passwort
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

41 changes: 41 additions & 0 deletions src/main/resources/templates/user/register/registerConfirmFailed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 ...templates/user/register/registerDone.html → ...ser/register/registerConfirmFinished.html
View file
Open in desktop
File renamed without changes.
93 changes: 93 additions & 0 deletions src/main/resources/templates/user/register/registerConfirmForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<!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.registerConfirmed.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.registerConfirmed.h1}">Register as new User</span>
</h1>
</div>

<div th:fragment="mytwcontent">
<form id="formId" th:action="@{/user/register/confirm/{confirmId}(confirmId=${confirmId})}" th:object="${userAccountForm}" method="post">
<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">
<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" readonly/>
<div>
<div th:each="err : ${#fields.errors('userEmail')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-12 mb-12">
<div class="form-group">
<label th:for="${#ids.next('userFullname')}" class="control-label">
<span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
</label>
<input type="text" th:field="*{userFullname}" class="form-control form-control-lg" />
<div>
<div th:each="err : ${#fields.errors('userFullname')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-12 mb-12">
<div class="form-group">
<label th:for="${#ids.next('userPassword')}" class="control-label">
<span th:utext="#{user.registerConfirmed.userPassword}">Password</span>
</label>
<input type="password" th:field="*{userPassword}" class="form-control form-control-lg" />
<div>
<div th:each="err : ${#fields.errors('userPassword')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-12 mb-12">
<div class="form-group">
<label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
<span th:utext="#{user.registerConfirmed.userPasswordConfirmation}">Password again</span>
</label>
<input type="password" th:field="*{userPasswordConfirmation}" class="form-control form-control-lg" />
<div>
<div th:each="err : ${#fields.errors('userPasswordConfirmation')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card-footer">
<div class="form-row">
<button id="confirmRegistration" type="submit" class="btn btn-primary">
<span th:utext="#{user.registerConfirmed.button}">Confirm Registration</span>
</button>
</div>
</div>
</div>
</form>
</div>


</body>
</html>
41 changes: 41 additions & 0 deletions src/main/resources/templates/user/register/registerConfirmSentMail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
61 changes: 0 additions & 61 deletions src/main/resources/templates/user/register/registerConfirmed.html
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/resources/templates/user/register/registerNotConfirmed.html
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/main/resources/templates/user/register/registerSentMail.html
View file
Open in desktop

This file was deleted.