diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index 4e90ad0..dd6f8d9 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -68,6 +68,12 @@ public class ArticleController { Optional maxMontantEnchere = lastEnchere.stream() .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère .max(Float::compareTo); + UserProfil currentUser = userService.utilisateurByName(authentication.getName()); + boolean isArticleCurrentUser = false; + if (currentUser.getId() == user.getId()) { + isArticleCurrentUser = true; + } + model.addAttribute("isArticleCurrentUser", isArticleCurrentUser); model.addAttribute("article", article); model.addAttribute("username", user); model.addAttribute("cate", cate.getLibelle()); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 1fc8f6f..5e6a048 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -30,3 +30,7 @@ .navbar-nav .nav-item.active .nav-link { color: white; } + +#container-main { + padding-bottom: 40px; +} diff --git a/src/main/resources/static/images/articles/11.jpg b/src/main/resources/static/images/articles/11.jpg deleted file mode 100644 index e0c9e81..0000000 Binary files a/src/main/resources/static/images/articles/11.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/12.jpg b/src/main/resources/static/images/articles/12.jpg deleted file mode 100644 index 73a0dfb..0000000 Binary files a/src/main/resources/static/images/articles/12.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/13.jpg b/src/main/resources/static/images/articles/13.jpg deleted file mode 100644 index 1877e01..0000000 Binary files a/src/main/resources/static/images/articles/13.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/14.jpg b/src/main/resources/static/images/articles/14.jpg deleted file mode 100644 index 9a7b54f..0000000 Binary files a/src/main/resources/static/images/articles/14.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/15.jpg b/src/main/resources/static/images/articles/15.jpg deleted file mode 100644 index 850c8e1..0000000 Binary files a/src/main/resources/static/images/articles/15.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/16.jpg b/src/main/resources/static/images/articles/16.jpg deleted file mode 100644 index ceae02c..0000000 Binary files a/src/main/resources/static/images/articles/16.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/17.jpg b/src/main/resources/static/images/articles/17.jpg deleted file mode 100644 index 259c6ba..0000000 Binary files a/src/main/resources/static/images/articles/17.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/18.jpg b/src/main/resources/static/images/articles/18.jpg deleted file mode 100644 index 744d455..0000000 Binary files a/src/main/resources/static/images/articles/18.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/19.jpg b/src/main/resources/static/images/articles/19.jpg deleted file mode 100644 index c286b1d..0000000 Binary files a/src/main/resources/static/images/articles/19.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/20.jpg b/src/main/resources/static/images/articles/20.jpg deleted file mode 100644 index 90d841d..0000000 Binary files a/src/main/resources/static/images/articles/20.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/21.jpg b/src/main/resources/static/images/articles/21.jpg deleted file mode 100644 index 60eb353..0000000 Binary files a/src/main/resources/static/images/articles/21.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/22.jpg b/src/main/resources/static/images/articles/22.jpg deleted file mode 100644 index 60eb353..0000000 Binary files a/src/main/resources/static/images/articles/22.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/23.jpg b/src/main/resources/static/images/articles/23.jpg deleted file mode 100644 index 60eb353..0000000 Binary files a/src/main/resources/static/images/articles/23.jpg and /dev/null differ diff --git a/src/main/resources/static/images/articles/24.jpg b/src/main/resources/static/images/articles/24.jpg deleted file mode 100644 index 60eb353..0000000 Binary files a/src/main/resources/static/images/articles/24.jpg and /dev/null differ diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 1afb727..5ceb2c8 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -144,10 +144,11 @@ -
+