Skip to content

Deployment #280

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 4 commits into from
Sep 16, 2020
Merged

Deployment #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c429244
added script for localdev env
thomaswoehlke Sep 16, 2020
d558b5a
Layout Changes
thomaswoehlke Sep 16, 2020
492d5b9
Layout Changes
thomaswoehlke Sep 16, 2020
f5022d0
fixed #279 Formular Layout Errors
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
4 changes: 3 additions & 1 deletion etc/TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,6 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
* fixed #272 prepare Release 2.3.23
* 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 #279 Formular Layout Errors
9 changes: 9 additions & 0 deletions src/main/bash/stop_services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

sudo systemctl stop mysql
sudo systemctl stop apache2
sudo systemctl stop docker
sudo systemctl stop docker-registry
sudo systemctl stop virtualbox
sudo systemctl stop openvpn
sudo systemctl stop crtmpserver

44 changes: 23 additions & 21 deletions src/main/resources/templates/user/login/loginForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,30 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
</div>
</div>
</div>
<div class="card-footer form-row">
<div class="col-md-4 mb-4">
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
<i class="fas fa-sign-in-alt"></i>
<span th:utext="#{user.loginForm.loginButton}"></span>
</button>
</div>
<div class="col-md-4 mb-4">
<a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
class="btn btn-block btn-secondary">
<i class="fas fa-question-circle"></i>
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
</a>
</div>
<div class="col-md-4 mb-4">
<a id="registerButton" th:href="@{/user/register}" role="button"
class="btn btn-block btn-secondary">
<i class="fas fa-user"></i>
<span th:utext="#{user.loginForm.register}">register as new user</span>
</a>
<div class="card-footer">
<div class="form-row">
<div class="col-md-4 mb-4">
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
<i class="fas fa-sign-in-alt"></i>
<span th:utext="#{user.loginForm.loginButton}"></span>
</button>
</div>
<div class="col-md-4 mb-4">
<a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
class="btn btn-block btn-secondary">
<i class="fas fa-question-circle"></i>
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
</a>
</div>
<div class="col-md-4 mb-4">
<a id="registerButton" th:href="@{/user/register}" role="button"
class="btn btn-block btn-secondary">
<i class="fas fa-user"></i>
<span th:utext="#{user.loginForm.register}">register as new user</span>
</a>
</div>
</div>
</div>
</div>
</div>
</form>
<div id="user-login-form-more-information">
Expand Down
43 changes: 28 additions & 15 deletions src/main/resources/templates/user/register/registerForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,34 @@ <h1>
</div>

<div th:fragment="mytwcontent">
<div class="card card-body">
<form id="formId" th:action="@{/user/register}" th:object="${userRegistrationForm}" method="post">
<div class="form-group form-control-lg">
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
<input type="email" th:field="*{email}" class="form-control" />
<div>
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
<button id="registerButton" type="submit" class="btn btn-primary">
<span th:utext="#{user.registerForm.button}">Register</span>
</button>
</form>
</div>
<form id="formId" th:action="@{/user/register}" th:object="${userRegistrationForm}" method="post">
<div class="card">
<div class="card-header">
<span th:utext="#{user.loginForm.register}">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('email')}" class="control-label">Email</label>
<input type="email" th:field="*{email}" class="form-control form-control-lg" />
<div>
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card-footer">
<div class="form-row">
<button id="registerButton" type="submit" class="btn btn-primary">
<span th:utext="#{user.registerForm.button}">Register</span>
</button>
</div>
</div>
</div>
</form>
</div>


Expand Down
37 changes: 25 additions & 12 deletions src/main/resources/templates/user/resetPassword/resetPasswordForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,34 @@ <h1>
</div>

<div th:fragment="mytwcontent">
<div class="card card-body">
<form id="formId" th:action="@{/user/resetPassword}" th:object="${userRegistrationForm}" method="post">
<div class="form-group form-control-lg">
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
<input type="email" th:field="*{email}" class="form-control" />
<div>
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
<form id="formId" th:action="@{/user/resetPassword}" th:object="${userRegistrationForm}" method="post">
<div class="card">
<div class="card-header">
<span th:utext="#{user.resetPasswordForm.h1}">Password Reset</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('email')}" class="control-label">Email</label>
<input type="email" th:field="*{email}" class="form-control form-control-lg" />
<div>
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
</div>
</div>
</div>
</div>
</div>
</div>
<button id="requestPasswordReset" type="submit" class="btn btn-primary">
<span th:utext="#{user.resetPasswordForm.button}">Request Password Reset</span>
</button>
</form>
</div>
<div class="card-footer">
<div class="form-row">
<button id="requestPasswordReset" type="submit" class="btn btn-primary">
<span th:utext="#{user.resetPasswordForm.button}">Request Password Reset</span>
</button>
</div>
</div>
</div>
</form>
</div>


Expand Down