Skip to content

Commit

Permalink
Modified a couple stuff of visuals
Browse files Browse the repository at this point in the history
  • Loading branch information
Pelayori committed Mar 4, 2024
1 parent 2940287 commit 798f516
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ navbar.profile=Perfil
navbar.logout=Cerrar sesión

# -------------------Statements for the footer.html file---------------------
footer.copyright=ASW - Grupo 04 B

footer.copyright=© ASW - Grupo 04 B
footer.nav=Menú de navegación

# -------------------Statements for the error.html file---------------------
error.page.title=Error!
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ navbar.profile=Profile
navbar.logout=Log Out

# -------------------Statements for the footer.html file---------------------
footer.copyright=ASW - Group 04 B
footer.copyright=© ASW - Group 04 B
footer.nav=Navigation

# -------------------Statements for the error.html file---------------------
error.page.title=Error!
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/messages_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ navbar.logout=Cerrar sesión


# -------------------Statements for the footer.html file---------------------
footer.copyright=ASW - Grupo 04 B
footer.copyright=© ASW - Grupo 04 B
footer.nav=Menú de navegación

# -------------------Statements for the error.html file---------------------
error.page.title=Error!
Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/static/css/api.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.api-table th, .api-table td {
vertical-align: top;
text-align: left;
}
.example-response {
background-color: #f0f4f8; /* Light grey-blue background for readability */
border-radius: 0.25rem; /* Rounded corners */
padding: 1rem; /* Padding inside the box */
border: 1px solid #d3d3d3; /* Light grey border */
}
4 changes: 2 additions & 2 deletions src/main/resources/static/css/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
.footer {
position: absolute;
bottom: 0;
min-height: 75px;
width: 100%;
height: 60px;
margin: 0; /* Eliminar margen */
margin-top: 10%; /* Eliminar margen */
background: linear-gradient(45deg, #283048, #586776); /* Gradiente de fondo */
color: #fff; /* Texto blanco */
padding: 0; /* Eliminar relleno */
Expand Down
6 changes: 5 additions & 1 deletion src/main/resources/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ html {
/* Estilo para el contenedor principal */
.container {
max-width: 960px; /* Ancho máximo del contenido */
margin: 50px auto; /* Centrar el contenido y agregar un margen superior e inferior */
margin: 5% auto; /* Centrar el contenido y agregar un margen superior e inferior */
}

.container-fluid {
margin: 5% auto; /* Centrar el contenido y agregar un margen superior e inferior */
}

/* Estilo para los títulos */
Expand Down
17 changes: 3 additions & 14 deletions src/main/resources/templates/api/apiHome.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,14 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head}">
<body>
<style>
.api-table th, .api-table td {
vertical-align: top;
text-align: left;
}
.example-response {
background-color: #f0f4f8; /* Light grey-blue background for readability */
border-radius: 0.25rem; /* Rounded corners */
padding: 1rem; /* Padding inside the box */
border: 1px solid #d3d3d3; /* Light grey border */
}
</style>
<link rel="stylesheet" th:href="@{/css/api.css}" />
<nav th:replace="~{fragments/nav}"></nav>

<div class="container-fluid mt-5">
<h2 th:text="#{api.doc.title}"></h2>
<div class="row">
<!-- Lateral Navigation Sidebar -->
<div class="col-md-2">
<h2 th:text="#{api.doc.title}"></h2>
<div class="col-md-2 pr-md-3">
<p th:text="#{api.doc.description}"></p>
<div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
<a class="nav-link active" id="v-pills-players-tab" data-toggle="pill" href="#v-pills-players" role="tab" aria-controls="v-pills-players" aria-selected="true">/api/players</a>
Expand Down
18 changes: 17 additions & 1 deletion src/main/resources/templates/fragments/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<!-- footer.html -->
<footer class="footer bg-primary">
<div class="container">
<span class="text-white bg-primary">&copy; ASW - Grupo 04 B</span>
<!-- Navigation Menu to the left -->
<div class="row">
<div class="col-md-4">
<nav class="nav flex-column">
<a class="nav-link text-white" href="/api">API docs</a>
</nav>
</div>

<!-- Centered Copyright Notice -->
<div class="col-md-4 text-center">
<span class="text-white" th:text="#{footer.copyright}"></span>
</div>

<div class="col-md-4"></div>
</div>
</div>
</footer>


4 changes: 2 additions & 2 deletions src/main/resources/templates/player/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<h2 th:text="#{login.title}"> </h2>
<form class="form-horizontal" method="post" action="/login">
<div class="form-group">
<label class="control-label col-sm-2" for="username" th:text="#{login.username.label}"></label>
<label class="control-label col-sm-10" for="username" th:text="#{login.username.label}"></label>
<div class="col-sm-10">
<input type="text" class="form-control" id="username" name="username"
th:placeholder="#{login.username.placeholder}" required="true" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="password" th:text="#{login.password.label}"></label>
<label class="control-label col-sm-10" for="password" th:text="#{login.password.label}"></label>
<div class="col-sm-10">
<input type="password" class="form-control" id="password" name="password"
th:placeholder="#{login.password.placeholder}" required="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/player/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@
<h2 th:text="#{signup.title}"></h2>
<form class="form-horizontal" th:object="${user}" method="post" action="/signup">
<div class="form-group">
<label class="control-label col-sm-2" for="username" th:text="#{signup.username.label}"> </label>
<label class="control-label col-sm-10" for="username" th:text="#{signup.username.label}"> </label>
<div class="col-sm-10">
<input type="text" class="form-control" id="username" name="username"
th:placeholder="#{signup.username.placeholder}" required="true"/>
<span class="text-danger" th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></span>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="email" th:text="#{signup.email.label}"></label>
<label class="control-label col-sm-10" for="email" th:text="#{signup.email.label}"></label>
<div class="col-sm-10">
<input type="text" class="form-control" id="email" name="email"
th:placeholder="#{signup.email.placeholder}" required="true" />
<span class="text-danger" th:if="${#fields.hasErrors('email')}" th:errors="*{email}"></span>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="password" th:text="#{signup.password.label}"></label>
<label class="control-label col-sm-10" for="password" th:text="#{signup.password.label}"></label>
<div class="col-sm-10">
<input type="password" id="password" class="form-control" name="password"
th:placeholder="#{signup.password.placeholder}" />
<span class="text-danger" th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></span>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="passwordConfirm" th:text="#{signup.passwordConfirm.label}"></label>
<label class="control-label col-sm-10" for="passwordConfirm" th:text="#{signup.passwordConfirm.label}"></label>
<div class="col-sm-10">
<input type="password" id="passwordConfirm" class="form-control" name="passwordConfirm"
th:placeholder="#{signup.passwordConfirm.placeholder}" />
Expand Down

0 comments on commit 798f516

Please sign in to comment.