diff --git a/src/components/Item.js b/src/components/Item.js index c38e60f..47579d5 100644 --- a/src/components/Item.js +++ b/src/components/Item.js @@ -94,21 +94,21 @@ const Item = ({
{!forInvoice && ( //
- { - currentTarget.onerror = null; // prevents looping - currentTarget.src = - "https://png.pngtree.com/png-vector/20221125/ourmid/pngtree-no-image-available-icon-flatvector-illustration-pic-design-profile-vector-png-image_40966566.jpg"; - }} - alt={itemName} - style={{ - filter: !isAvailable ? "grayscale(100%)" : "none", - }} - className={styles.imageContainer} - /> + { + currentTarget.onerror = null; // prevents looping + currentTarget.src = + "https://png.pngtree.com/png-vector/20221125/ourmid/pngtree-no-image-available-icon-flatvector-illustration-pic-design-profile-vector-png-image_40966566.jpg"; + }} + alt={itemName} + style={{ + filter: !isAvailable ? "grayscale(100%)" : "none", + }} + className={styles.imageContainer} + /> //
)}
@@ -142,17 +142,17 @@ const Item = ({ disabled={!blank && !isBeingEdit} /> */}

- {itemName} -

+ textTransform: 'capitalize', + margin: '5px 0px 10px 10px', + fontSize: '16px', + display: '-webkit-box', + WebkitBoxOrient: 'vertical', + overflow: 'hidden', + WebkitLineClamp: 2, + textOverflow: 'ellipsis' + }}> + {itemName} + {forInvoice && ( <>

x

@@ -224,7 +224,7 @@ const Item = ({ }}>{initialPrice}
- } + }
)} @@ -300,7 +300,7 @@ const Item = ({ ))} {forInvoice && ( -

Rp {itemQty * itemPrice}

+

Rp {itemQty * (promoPrice > 0? promoPrice : itemPrice)}

)} {forCart && ( @@ -316,13 +316,14 @@ const Item = ({ {itemDescription && itemDescription != 'undefined' && itemDescription?.length &&
-

{itemDescription}

+ display: '-webkit-box', + WebkitBoxOrient: 'vertical', + overflow: 'hidden', + WebkitLineClamp: 2, + textOverflow: 'ellipsis', color: '#5f5f5f', fontSize: '14px', padding: '5px', margin: 0 + }}>{itemDescription}

} diff --git a/src/components/Item.module.css b/src/components/Item.module.css index 3c6b497..85ff8b3 100644 --- a/src/components/Item.module.css +++ b/src/components/Item.module.css @@ -52,10 +52,6 @@ position: relative; width: 26vw; height: 26vw; - border-radius: 10px; - margin-right: 10px; - object-fit: cover; - position: relative; } .overlay { @@ -145,7 +141,6 @@ font-family: "Plus Jakarta Sans", sans-serif; font-style: normal; font-weight: 600; - width: calc(100% - 15px); /* Adjust the width to prevent overflow */ font-size: 0.9rem; margin-left: 5px; color: #d9c61c; diff --git a/src/components/MusicPlayer.css b/src/components/MusicPlayer.css index a2c16cf..17b53ed 100644 --- a/src/components/MusicPlayer.css +++ b/src/components/MusicPlayer.css @@ -25,7 +25,7 @@ /* filter: blur(1.5px); -webkit-filter: blur(1.5px); */ /* border-radius: 13px 13px 0 0; */ - background-color: #8ec781; + background-color: #6ec35a; /* Rounded corners at the top */ text-align: right; text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7); diff --git a/src/pages/CafePage.js b/src/pages/CafePage.js index 214932e..1b0dc80 100644 --- a/src/pages/CafePage.js +++ b/src/pages/CafePage.js @@ -296,7 +296,7 @@ function CafePage({ {cartItemsLength > 0 &&
-
+
{cartItemsLength} item
Rp{totalPrice} @@ -311,7 +311,7 @@ function CafePage({
}
-
KEDAIMASTER
+
KEDAIMASTER
) diff --git a/src/pages/Cart.js b/src/pages/Cart.js index 0696338..17f5277 100644 --- a/src/pages/Cart.js +++ b/src/pages/Cart.js @@ -189,7 +189,7 @@ export default function Invoice({ shopId, table, sendParam, deviceType, socket } setEmail(event.target.value); }; return ( -
0 ? '': 'calc(100vh - 75px)'), minHeight: (getItemsByCafeId(shopId).length > 0 ? 'calc(100vh - 210px)': '') }}> +
0 ? '': '100vh'), minHeight: (getItemsByCafeId(shopId).length > 0 ? 'calc(100vh - 210px)': '') }}>

Keranjang