From 0634dd65bb708fbf0833a4865b456ec87ee9b95a Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 16 Nov 2022 14:32:59 +0700 Subject: Fix product card layout --- src/components/ProductCard.js | 9 ++++++--- src/pages/shop/search.js | 12 ++++++++---- src/styles/globals.css | 26 ++++++++++++++++---------- 3 files changed, 30 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/components/ProductCard.js b/src/components/ProductCard.js index 77f902e0..23cc0665 100644 --- a/src/components/ProductCard.js +++ b/src/components/ProductCard.js @@ -10,8 +10,11 @@ export default function ProductCard({ data }) { let product = data; return (
- + + {product.variant_total > 1 ? ( +
{product.variant_total} Varian
+ ) : ''}
@@ -24,7 +27,7 @@ export default function ProductCard({ data }) { {product.name}
-
+
{product.lowest_price.discount_percentage > 0 ? (
{product.lowest_price.discount_percentage}% @@ -41,7 +44,7 @@ export default function ProductCard({ data }) { )} {product.stock_total > 0 ? ( -
Ready Stock
+
Ready Stock {product.stock_total > 5 ? '> 5' : '< 5'}
) : ''}
diff --git a/src/pages/shop/search.js b/src/pages/shop/search.js index a8809918..9b085ad0 100644 --- a/src/pages/shop/search.js +++ b/src/pages/shop/search.js @@ -25,10 +25,14 @@ export default function ShopSearch({ searchResults, q, page }) { {productFound > 0 ? ( <> Menampilkan  - {productStart + 1}-{ - (productStart + productRows) > productFound ? productFound : productStart + productRows - } -  dari  + {pageCount > 1 ? ( + <> + {productStart + 1}-{ + (productStart + productRows) > productFound ? productFound : productStart + productRows + } +  dari  + + ) : ''} {searchResults.response.numFound}  produk untuk pencarian {q} diff --git a/src/styles/globals.css b/src/styles/globals.css index 20a86ec4..4d8c7971 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -30,13 +30,21 @@ html, body { } @layer components { - .badge-red { + .badge-red, + .badge-yellow, + .badge-green { @apply text-xs font-medium px-1 py-0.5 rounded + w-fit + ; + } + + .badge-red { + @apply bg-red-300 text-red-900 ; @@ -44,16 +52,18 @@ html, body { .badge-yellow { @apply - text-xs - font-medium - px-1 - py-0.5 - rounded bg-yellow-300 text-yellow-900 ; } + .badge-green { + @apply + bg-green-200 + text-green-700 + ; + } + .form-label { @apply text-sm @@ -132,10 +142,7 @@ html, body { @apply p-2 pb-3 - flex - flex-col flex-1 - justify-between ; } @@ -143,7 +150,6 @@ html, body { @apply text-sm text-gray-900 - h-[60px] ; } -- cgit v1.2.3