johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/marvin'

Browse Source
This commit is contained in:
mepiphana2023
2024-04-23 15:48:51 +02:00
parent c201ebd919 3839b6db1e
commit be9d74c337
5 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/templates/accueil.html
View File

@@ -43,9 +43,12 @@
<div class="d-flex justify-content-between align-items-center">
<div>
<h6>Prix de vente: <span th:text="${article.prixVente}"></span> €</h6>
<h6 class="text-muted">Fin de l'enchere: <span th:text="${#dates.format(article.dateFinEnch, 'dd/MM/yyyy')}"></span></h6>
<h6>Vendeur: <span th:text="${article.utilisateur.getPseudo()}"></span> </h6>
</div>
</div>
</br>
<h6 class="text-muted">Fin de l'enchere: <span th:text="${#dates.format(article.dateFinEnch, 'dd/MM/yyyy')}"></span></h6>
</div>
</div>
</div>

2
src/main/resources/templates/modele-page.html
View File

@@ -10,7 +10,7 @@
<body>
<header>
<nav class="navbar navbar-expand-lg navbar navbar-dark bg-dark navbar-">
<a class="navbar-brand" href="#">
<a class="navbar-brand" href="/accueil">
<img src="img/logo.png" width="70" height="70" alt="Logo">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">