Ajout article v3

2024-04-24 15:03:17 +02:00
parent be83631053 dbd04fe987
commit 483893de3e
12 changed files with 116 additions and 61 deletions
--- a/src/main/resources/i18n/messages_en.properties
+++ b/src/main/resources/i18n/messages_en.properties
@@ -1 +1,44 @@
-accueil.search.title = Search for an article by name...
+home.search.title = Search for an item by name...
+home.search.cat = All categories
+home.search.button = Search
+
+profil.title = My Profile
+profil.button = Edit
+profil.pseudo = Username:
+profil.surname = First Name:
+profil.name = Last Name:
+profil.email = Email:
+profil.phone = Phone:
+profil.street = Street:
+profil.postal = Zip Code:
+profil.city = City:
+profil.credit = Credits:
+
+edit.profil.currentpassword = Current Password:
+edit.profil.newpassword = New Password:
+edit.profil.confirmnewpassword = Confirm New Password:
+edit.profil.title = Edit My Profile
+edit.profil.button.edit = Save Changes
+edit.profil.button.del = Delete My Account
+
+login.title = To Log In:
+login.id = Username:
+login.password = Password:
+login.save = Remember Me
+login.forgotpassword = Forgot Password
+login.connection = Login
+login.makecompte = Create an Account
+
+register.title = My Profile
+register.button = Edit
+register.pseudo = Username:
+register.surname = First Name:
+register.name = Last Name:
+register.email = Email:
+register.phone = Phone:
+register.street = Street:
+register.postal = Zip Code:
+register.city = City:
+register.credit = Credits:
+register.make = create
+register.cancel = cancel
--- a/src/main/resources/i18n/messages_fr.properties
+++ b/src/main/resources/i18n/messages_fr.properties
@@ -1,6 +1,6 @@
-accueil.search.title = Rechercher un article par nom...
-accueil.search.cat = Toutes les cat\u00e9gories
-accueil.search.button = Recherche
+home.search.title = Rechercher un article par nom...
+home.search.cat = Toutes les cat\u00e9gories
+home.search.button = Recherche

 profil.title = Mon profil
 profil.button = Modifier
--- a/src/main/resources/templates/accueil.html
+++ b/src/main/resources/templates/accueil.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Accueil - ENI-Enchères',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Accueil - ENI-Enchères',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
 </head>
@@ -9,19 +9,23 @@
        <div class="row mb-4">
            <div class="col-12">
                <!-- Formulaire de recherche avec sélection de catégorie -->
-                <form th:action="@{/accueil}" method="post" class="mb-3">
-                    <!-- Barre de recherche -->
-                    <div class="mb-3">
-                        <input type="text" class="form-control" th:attr="placeholder=#{accueil.search.title}" name="searchTitle">
+                <div class="card">
+                    <div class="card-body">
+                        <form th:action="@{/accueil}" method="post" class="row g-3 align-items-center">
+                            <div class="col-md-8">
+                                <!-- Barre de recherche -->
+                                <input type="text" class="form-control" th:attr="placeholder=#{home.search.title}" name="searchTitle">
+                                <select class="form-control mt-2" name="searchCategory">
+                                    <option value="" th:text="#{home.search.cat}"></option>
+                                    <option th:each="category : ${categories}" th:value="${category.id}" th:text="${category.libelle}"></option>
+                                </select>
+                            </div>
+                            <div class="col-md-4 text-center">
+                                <button type="submit" class="btn btn-primary" th:text="#{home.search.button}">Search</button>
+                            </div>
+                        </form>
                    </div>
-                    <div class="mb-3">
-                        <select class="form-control" name="searchCategory">
-                            <option value="" th:text="#{accueil.search.cat}"></option>
-                            <option th:each="category : ${categories}" th:value="${category.id}" th:text="${category.libelle}"></option>
-                        </select>
-                    </div>
-                    <button type="submit" class="btn btn-primary"th:text="#{accueil.search.button}"></button>
-                </form>
+                </div>
            </div>
        </div>
        <div class="row">
@@ -39,7 +43,7 @@
                                    <div>
                                        <h6>Prix de vente: <span th:text="${article.prixVente}"></span> €</h6>

-                                        <h6>Vendeur: <span th:text="${article.utilisateur.getPseudo()}"></span> </h6>
+                                        <h6>Vendeur: <span th:text="${article.pseudoUtilisateur}"></span> </h6>
                                    </div>
                                </div>
                                </br>
--- a/src/main/resources/templates/admin.html
+++ b/src/main/resources/templates/admin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Panel administrateur',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Panel administrateur',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
 </head>
--- a/src/main/resources/templates/article.html
+++ b/src/main/resources/templates/article.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Article - NOMARTICLE',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Article - NOMARTICLE',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
 </head>
--- a/src/main/resources/templates/editProfil.html
+++ b/src/main/resources/templates/editProfil.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Modifier votre profile' , ~{::#link}, ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Modifier votre profile' , ~{::#link}, ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
    <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet">
@@ -110,7 +110,7 @@
                    <span th:text="#{profil.credit}"></span> <span th:text="${userProfile.credit}"></span>
                </div>
                <input type="hidden" th:field="*{id}" id="userId" th:value="${userProfile.id}">
-                <button type="submit" class="btn btn-primary" th:text="#{edit.profil.button.edit}"></button>
+                <button type="submit" class="btn btn-primary border-right" th:text="#{edit.profil.button.edit}"></button>
            </div>
        </div>
    </form>
--- a/src/main/resources/templates/inscription.html
+++ b/src/main/resources/templates/inscription.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Inscription',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Inscription',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
 </head>
@@ -107,7 +107,7 @@
                </span>
            </div>
            <div class="champ-saisie">
-                <label for="password">Mot de passe: </label>
+                <label for="password" th:text="#{re}">Mot de passe: </label>
                <div>
                    <input type="password" th:field="*{password}" id="password" />
                </div>
@@ -118,7 +118,7 @@
                </span>
            </div>
            <div class="champ-saisie">
-                <label for="confirmPassword">Confirmation du mot de passe: </label>
+                <label for="confirmPassword" th:text="#{}">Confirmation du mot de passe: </label>
                <div>
                    <input type="password" id="confirmPassword" />
                </div>
--- a/src/main/resources/templates/modele-page.html
+++ b/src/main/resources/templates/modele-page.html
@@ -38,12 +38,14 @@
                        <a class="btn btn-primary" href="/login" role="button" style="background-color: #1B4463;">S'inscrire / Se connecter</a>
                    </li>
                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-expanded="false">
-                            <i class="fa-solid fa-earth-americas"></i>
-                        </a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
-                            <a class="dropdown-item" th:href="@{/change-language(lang='en')}">English</a>
-                            <a class="dropdown-item" th:href="@{/change-language(lang='fr')}">Français</a>
+                        <div class="dropdown">
+                            <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-expanded="false">
+                                <i class="fa-solid fa-earth-americas"></i>
+                            </a>
+                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink" role="menu">
+                                <a class="dropdown-item" th:href="@{/change-language(lang='en')}">English</a>
+                                <a class="dropdown-item" th:href="@{/change-language(lang='fr')}">Français</a>
+                            </div>
                        </div>
                    </li>
                </ul>
@@ -101,6 +103,7 @@
            © 2024 Copyright:
        </div>
    </footer>
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
    <script src="/js/bootstrap/bootstrap.min.js"></script>
 </body>
 </html>
--- a/src/main/resources/templates/profil.html
+++ b/src/main/resources/templates/profil.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr" th:replace="~{modele-page :: layout('Votre profile',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html th:replace="~{modele-page :: layout('Votre profile',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta charset="UTF-8">
 </head>