Skip to content

Commit 26f2183

Browse files
committed
work
1 parent aa953eb commit 26f2183

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

etc/build.sh renamed to build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ function composeDown() {
1111
./mvnw docker-compose:down
1212
}
1313

14+
function showSettings() {
15+
echo $JAVA_HOME
16+
}
17+
1418
function firstSetup() {
1519
export JAVA_OPTS=$JAVA_OPTS_RUN_DEFAULT
1620
showSettings
@@ -56,9 +60,9 @@ function boot_run() {
5660

5761
function main() {
5862
# firstSetup
59-
#setupTravis
63+
setupTravis
6064
#buildJar
61-
boot_run
65+
#boot_run
6266
}
6367

6468
main

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@
13501350
<file>${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md</file>
13511351
<file>${project.basedir}/src/site/markdown/TODO.md</file>
13521352
<file>${project.basedir}/src/site/site.xml</file>
1353-
<file>${project.basedir}/etc/build.sh</file>
1353+
<file>${project.basedir}/build.sh</file>
13541354
<file>${project.basedir}/etc/run.sh</file>
13551355
<file>${project.basedir}/src/main/bash/psql.sh</file>
13561356
<file>${project.basedir}/etc/docker-start.sh</file>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
2626
</div>
2727
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
2828
<label for="j_username" th:text="#{user.loginForm.email.label}" class="form-label">Email</label>
29-
<div class="m-2 input-group">
29+
<div class="m-2 pe-3 input-group">
3030
<span class="input-group-text"><i class="fa-solid fa-user"></i></span>
3131
<input id="j_username" type="email" class="form-control" name="j_username"
3232
th:placeholder="#{user.loginForm.email.placeholder}"/>
3333
</div>
3434
<label for="j_password" th:text="#{user.loginForm.password.label}" class="form-label">Password</label>
35-
<div class="m-2 input-group">
35+
<div class="m-2 pe-3 input-group">
3636
<span class="input-group-text"><i class="fa-solid fa-lock"></i></span>
3737
<input id="j_password" type="password" class="form-control" name="j_password"
3838
th:placeholder="#{user.loginForm.password.placeholder}"/>
3939
</div>
4040
</div>
4141
<div class="card-footer">
4242
<div class="row">
43-
<div class="col m-2 p-1">
43+
<div class="col m-2 p-1 ps-3">
4444
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
4545
<i class="fas fa-sign-in-alt"></i>
4646
<span th:utext="#{user.loginForm.loginButton}"></span>

0 commit comments

Comments
 (0)