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

Merge remote-tracking branch 'refs/remotes/origin/Johan' into marvin

Browse Source 
# Conflicts:
#	src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
This commit is contained in:
mepiphana2023
2024-04-24 10:33:38 +02:00
parent 915e3356fc 9281a2984f
commit 86bcf8c022
6 changed files with 151 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/resources/templates/editProfil.html
View File

@@ -108,34 +108,41 @@
</ul>
</span>
</div>
<!-- Champ Mot de passe-->
<!-- Champ Mot de passe actuel-->
<div class="champ-saisie">
<label for="password">Mot de passe actuel: </label>
<label for="currentPassword">Mot de passe actuel: </label>
<div>
<input type="password" th:field="*{password}" id="password" />
<input type="password" th:field="*{currentPassword}" id="currentPassword" />
</div>
<span style="color: red;" th:if="${#fields.hasErrors('password')}">
<ul>
<li th:each="erreur: ${#fields.errors('password')}" th:text="${erreur}"></li>
</ul>
</span>
<span style="color: red;" th:if="${#fields.hasErrors('currentPassword')}">
<ul>
<li th:each="erreur: ${#fields.errors('currentPassword')}" th:text="${erreur}"></li>
</ul>
</span>
</div>
<!-- Champ Nouveau mot de passe-->
<div class="champ-saisie">
<label for="password">Nouveau mot de passe: </label>
<label for="newPassword">Nouveau mot de passe: </label>
<div>
<input type="password" th:field="*{password}" id="password" />
<input type="password" th:field="*{newPassword}" id="newPassword" />
</div>
<span style="color: red;" th:if="${#fields.hasErrors('password')}">
<ul>
<li th:each="erreur: ${#fields.errors('password')}" th:text="${erreur}"></li>
</ul>
</span>
<span style="color: red;" th:if="${#fields.hasErrors('newPassword')}">
<ul>
<li th:each="erreur: ${#fields.errors('newPassword')}" th:text="${erreur}"></li>
</ul>
</span>
</div>
<!-- Champ Confirmation du nouveau mot de passe-->
<div class="champ-saisie">
<label for="password">Confirmation: </label>
<label for="confirmPassword">Confirmation du nouveau mot de passe: </label>
<div>
<input type="password" id="password" />
<input type="password" th:field="*{confirmPassword}" id="confirmPassword" />
</div>
<span style="color: red;" th:if="${#fields.hasErrors('confirmPassword')}">
<ul>
<li th:each="erreur: ${#fields.errors('confirmPassword')}" th:text="${erreur}"></li>
</ul>
</span>
</div>
<div>Crédits: <span th:text="${userProfile.credit}"></span></div>
<!-- Input cacher qui permet de stocker l'id du compte utilisateur à mettre à jour -->

70
src/main/resources/templates/newArticle.html
View File

@@ -5,7 +5,77 @@
</head>
<body>
<div id="container-main">
<h1>Nouvelle vente</h1>
<form action="/articles/add" method="post" enctype="multipart/form-data">
<!-- Nom de l'article -->
<div>
<label for="nom">Article:</label>
<input type="text" id="nom" name="nom" required>
</div>
<!-- Description -->
<div>
<label for="description">Description:</label>
<textarea id="description" name="description" required></textarea>
</div>
<!-- Catégorie -->
<div>
<label for="categorie">Catégorie:</label>
<select id="categorie" name="categorie" required>
<option value="categorie1">Catégorie 1</option>
<option value="categorie2">Catégorie 2</option>
<!-- Ajoutez d'autres options si nécessaire -->
</select>
</div>
<!-- Photo -->
<div>
<label for="photo">Photo de l'article:</label>
<input type="file" id="photo" name="photo" accept="image/jpeg" required>
</div>
<!-- Mise à prix -->
<div>
<label for="prix">Mise à prix:</label>
<input type="number" id="prix" name="prix" min="0" required>
</div>
<!-- Date début enchère -->
<div>
<label for="dateDebut">Date début enchère:</label>
<input type="date" id="dateDebut" name="dateDebut" min="<?php echo date('Y-m-d'); ?>" required>
</div>
<!-- Date fin enchère -->
<div>
<label for="dateFin">Date fin enchère:</label>
<input type="date" id="dateFin" name="dateFin" required>
</div>
<!-- Lieu de retrait -->
<h2>Retrait</h2>
<div>
<label for="rue">Rue:</label>
<input type="text" id="rue" name="rue" required>
</div>
<div>
<label for="codePostal">Code postal:</label>
<input type="text" id="codePostal" name="codePostal" required>
</div>
<div>
<label for="ville">Ville:</label>
<input type="text" id="ville" name="ville" required>
</div>
<!-- Bouton Enregistrer -->
<div>
<button type="submit">Enregistrer</button>
</div>
</form>
<form th:action="@{/accueil}" method="post">
<button type="submit">Annuler</button>
</form>
</div>
</body>
</html>