diff --git a/.gitignore b/.gitignore index 2fb625c..5c8d148 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ build/ ### STS ### .apt_generated .classpath -.log +*.log .factorypath .project .settings diff --git a/src/main/java/fr/eni/enchere/bll/FileService.java b/src/main/java/fr/eni/enchere/bll/FileService.java index 928dc52..f921fb9 100644 --- a/src/main/java/fr/eni/enchere/bll/FileService.java +++ b/src/main/java/fr/eni/enchere/bll/FileService.java @@ -1,12 +1,18 @@ package fr.eni.enchere.bll; +import org.springframework.stereotype.Service; + import java.nio.file.Files; import java.nio.file.Paths; +@Service public class FileService { public boolean fileExists(String filePath) { - return Files.exists(Paths.get(filePath)); + return Files.exists(Paths.get("src/main/resources/static"+filePath)); } } + + +// src/main/resources/static/images/articles/12.jpg \ No newline at end of file diff --git a/src/main/java/fr/eni/enchere/controllers/AccueilController.java b/src/main/java/fr/eni/enchere/controllers/AccueilController.java index 7cfe759..deece3c 100644 --- a/src/main/java/fr/eni/enchere/controllers/AccueilController.java +++ b/src/main/java/fr/eni/enchere/controllers/AccueilController.java @@ -76,8 +76,9 @@ public class AccueilController { // Pagination Page
articlePage = articleService.searchArticlePageable(critere, PageRequest.of(page, size)); - model.addAttribute("articles", articlePage.getContent()); + model.addAttribute("articles", articlePage.getContent()); + model.addAttribute("fileService", fileService); int currentPage = page + 1; model.addAttribute("currentPage", currentPage); model.addAttribute("critere", critere); diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties index 32e81e7..9991f86 100644 --- a/src/main/resources/i18n/messages_fr.properties +++ b/src/main/resources/i18n/messages_fr.properties @@ -120,7 +120,7 @@ article.details.label.amount = Montant article.details.button.bid = Ench\u00E9rir article.details.address.unknown = Adresse inconnue article.details.validation.amount.required = Le montant de l'ench\u00E8re est requis. -article.details.retrait = Retrait effectu\u00E8 +article.details.retrait = Retrait effectu\u00E9 edit.article.title = Modifier mon article diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 3774042..a8bd740 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -119,7 +119,7 @@
- Image de l'article + Image de l'article Image de l'article