From 18fd0f9e309a38cc3be4c061b47c7de55f0026a6 Mon Sep 17 00:00:00 2001 From: tuaans18 Date: Wed, 18 Mar 2026 23:54:34 +0700 Subject: [PATCH] feat: add you may like section and book in series on book detail (#43,#42) --- .../resources/messages/messages_vi.properties | 3 +- .../resources/static/css/book-details.css | 51 +++- .../resources/templates/book-details.html | 272 +++++++++--------- .../service/WebBookControllerService.java | 38 ++- .../web/controller/view/StoreController.java | 17 ++ 5 files changed, 238 insertions(+), 143 deletions(-) diff --git a/book-store/book-store-theme/src/main/resources/messages/messages_vi.properties b/book-store/book-store-theme/src/main/resources/messages/messages_vi.properties index 367d2cf..00cfdb1 100644 --- a/book-store/book-store-theme/src/main/resources/messages/messages_vi.properties +++ b/book-store/book-store-theme/src/main/resources/messages/messages_vi.properties @@ -33,4 +33,5 @@ sold_amount=S\u1ED1 l\u01B0\u1EE3ng b\u00E1n store=C\u1EEDa h\u00E0ng author=T\u00E1c gi\u1EA3 view_detail=Xem chi ti\u1EBFt - +books_in_series=S\u00E1ch trong b\u1ED9 +you_may_also_like=C\u00F3 th\u1EC3 b\u1EA1n c\u0169ng th\u00EDch diff --git a/book-store/book-store-theme/src/main/resources/static/css/book-details.css b/book-store/book-store-theme/src/main/resources/static/css/book-details.css index 0793735..537dae6 100644 --- a/book-store/book-store-theme/src/main/resources/static/css/book-details.css +++ b/book-store/book-store-theme/src/main/resources/static/css/book-details.css @@ -19,10 +19,9 @@ padding: 12px; border-radius: 12px; border: 1px solid #e2e8f0; - box-shadow: 0 1px 3px rgba(0,0,0,0.05); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); } - .book-gallery-main { width: 100%; height: 400px; @@ -78,16 +77,19 @@ display: block; } -.book-gallery-prev, .book-gallery-next { +.book-gallery-prev, +.book-gallery-next { color: #1e293b; - background: rgba(255,255,255,0.8); + background: rgba(255, 255, 255, 0.8); width: 32px; height: 32px; border-radius: 50%; - box-shadow: 0 2px 4px rgba(0,0,0,0.1); + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); backdrop-filter: blur(2px); } -.book-gallery-prev:after, .book-gallery-next:after { + +.book-gallery-prev:after, +.book-gallery-next:after { font-size: 14px; font-weight: bold; } @@ -97,6 +99,7 @@ .book-gallery-main { height: 300px; } + .book-gallery-thumbs .swiper-slide { height: 60px !important; } @@ -202,6 +205,7 @@ flex: 1 1 200px; } } + .book-authors { margin-top: 20px; display: flex; @@ -306,3 +310,38 @@ margin-top: 2px; } +html, +body { + overflow-x: clip !important; + overflow-y: visible !important; +} + +.book-details, +.container, +.main-content-wrapper { + overflow: visible !important; +} + +@media (min-width: 992px) { + .sticky-sidebar { + position: -webkit-sticky; + position: sticky; + top: 20px; + z-index: 10; + align-self: flex-start; + + height: auto; + width: 100%; + } +} + +.book-details-description { + position: relative; +} + +.description-body { + height: auto; + mask-image: none; + -webkit-mask-image: none; + overflow: visible; +} \ No newline at end of file diff --git a/book-store/book-store-theme/src/main/resources/templates/book-details.html b/book-store/book-store-theme/src/main/resources/templates/book-details.html index 4053ae8..1537a81 100644 --- a/book-store/book-store-theme/src/main/resources/templates/book-details.html +++ b/book-store/book-store-theme/src/main/resources/templates/book-details.html @@ -1,160 +1,168 @@ - + + -
-
-
-
- - -
-
-
- book image +
+
+
+
+ +
+
+
+
+ book image +
+
+
+
+
+ +
+
+
+ thumb +
+
+
+
+ +
+
[[#{author}]]
+
+
+ + Avatar +
+ +
+ +
+ + [[${author.displayName}]] + +
+
-
-
+
- -
-
-
- thumb -
+
+
+
+

[[#{book_details}]]

+

[[${book.name}]]

+
+ +
+

[[#{description}]]

+
- -
- -
[[#{author}]]
- -
-
- - Avatar -
- -
- -
- - [[${author.displayName}]] - +
+
+ +
+
+
[[${book.formattedPriceIncludeSymbol}]]
+
+ + [[${book.formattedOriginalPriceIncludeSymbol}]] + + + [[${'- ' + book.discountPercent + ' %'}]] + +
+
+

+ Secure checkout · Instant access +

+
+ +
+
-
-
-
-

[[#{book_details}]]

-

[[${book_name}]]

-
-
-

[[#{description}]]

-
-
+ + +

[[#{books_in_series}]]

+
+ + +
-
-
-
-
-
[[${book.formattedPriceIncludeSymbol}]]
-
- - [[${book.formattedOriginalPriceIncludeSymbol}]] - - - [[${'- ' + book.discountPercent + ' %'}]] - -
-
-

- Secure checkout · Instant access -

-
- - -
+ + + +

[[#{you_may_also_like}]]

+
+ + +
-
-
-
-
-

[[#{more_by_this_author}]]

+ + +

[[#{more_by_this_author}]]

- +
-
- + - + \ No newline at end of file diff --git a/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/service/WebBookControllerService.java b/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/service/WebBookControllerService.java index a4aa3d0..c1b69bb 100644 --- a/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/service/WebBookControllerService.java +++ b/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/service/WebBookControllerService.java @@ -11,6 +11,8 @@ import org.youngmonkeys.ecommerce.pagination.*; import org.youngmonkeys.ecommerce.service.PaginationProductPriceService; import org.youngmonkeys.ecommerce.service.PaginationProductService; +import org.youngmonkeys.ecommerce.service.SetProductService; +import org.youngmonkeys.ecommerce.service.UpsellProductService; import org.youngmonkeys.ecommerce.web.service.WebProductCategoryProductService; import org.youngmonkeys.ecommerce.web.service.WebProductCategoryService; import org.youngmonkeys.ecommerce.web.service.WebProductService; @@ -37,10 +39,10 @@ public class WebBookControllerService { private final PaginationProductService paginationProductService; private final PaginationProductPriceService paginationProductPriceService; private final WebBookModelDecorator bookModelDecorator; - private final ProductPaginationParameterConverter - productPaginationParameterConverter; - private final ProductPricePaginationParameterConverter - productPricePaginationParameterConverter; + private final ProductPaginationParameterConverter productPaginationParameterConverter; + private final ProductPricePaginationParameterConverter productPricePaginationParameterConverter; + private final SetProductService setProductService; + private final UpsellProductService upsellProductService; public List getHighlightBooks( ProductCurrencyModel currency, @@ -137,6 +139,33 @@ public WebBookDetailsResponse getBookDetailsByCode( ); } + public List getSetProductBooks( + long bookId, + ProductCurrencyModel currency, + int limit + ) { + List bookIds = setProductService.getSetProductIdsByProductIdAAndProductBStatuses( + bookId, + Collections.singletonList(ProductStatus.PUBLISHED.toString()), + 0, + limit + ); + return getBooksByIds(bookIds, currency); + } + + public List getUpsellProductBooks( + long bookId, + ProductCurrencyModel currency, + int limit + ) { + List bookIds = upsellProductService.getUpsellProductIdsByMainProductId( + bookId, + 0, + limit + ); + return getBooksByIds(bookIds, currency); + } + public PaginationModel getBookPagination( ProductFilter productFilter, ProductPriceFilter productPriceFilter, @@ -231,4 +260,5 @@ public PaginationModel getBookPagination( productItemById.get(it.getProductId()) ); } + } diff --git a/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/view/StoreController.java b/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/view/StoreController.java index c878b31..f36218f 100644 --- a/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/view/StoreController.java +++ b/book-store/book-store-web-plugin/src/main/java/org/youngmonkeys/bookstore/web/controller/view/StoreController.java @@ -20,6 +20,7 @@ import org.youngmonkeys.ecommerce.pagination.DefaultProductFilter; import org.youngmonkeys.ecommerce.pagination.DefaultProductPriceFilter; import org.youngmonkeys.ecommerce.web.controller.service.WebProductCategoryControllerService; +import org.youngmonkeys.ecommerce.web.controller.service.WebProductControllerService; import org.youngmonkeys.ecommerce.web.service.WebProductCurrencyService; import org.youngmonkeys.ecommerce.web.validator.WebProductCategoryValidator; import org.youngmonkeys.ezyplatform.model.PaginationModel; @@ -177,6 +178,22 @@ public View storeBooksBookIdGet( DEFAULT_BOOKS_LIMIT ) ) + .addVariable( + "setProductBooks", + bookControllerService.getSetProductBooks( + bookId, + currency, + DEFAULT_BOOKS_LIMIT + ) + ) + .addVariable( + "upsellProductBooks", + bookControllerService.getUpsellProductBooks( + bookId, + currency, + DEFAULT_BOOKS_LIMIT + ) + ) .build(); }