show count in trades

Coflnet · Nov 27, 2023 · 8c8639a · 8c8639a
1 parent 8853173
commit 8c8639a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 43 deletions.
diff --git a/api/ApiHelper.tsx b/api/ApiHelper.tsx
@@ -1963,6 +1963,7 @@ export function initAPI(returnSSRResponse: boolean = false): API {
                 },
                 data: '',
                 resolve: data => {
+                    console.log(data)
                     resolve(data ? (data as TradeObject[]).slice(Math.max(data.length - 36, 0)).map(parseInventoryData) : [])
                 },
                 reject: (error: any) => {

diff --git a/components/PlayerInventory/PlayerInventory.tsx b/components/PlayerInventory/PlayerInventory.tsx
@@ -37,48 +37,53 @@ export default function PlayerInventory(props: Props) {
         let isTradeable = !isSouldbound && item.tag !== 'SKYBLOCK_MENU'
         return (
             <div className={styles.gridCell}>
-                <Tooltip
-                    type="hover"
-                    className={styles.hoverElement}
-                    hoverPlacement="bottom"
-                    id={styles.tooltipHoverId}
-                    content={
-                        <img
-                            title={removeMinecraftColorCoding(item.itemName)}
-                            className={styles.image}
-                            src={api.getItemImageUrl({ tag: item.tag })}
-                            alt=""
-                            crossOrigin="anonymous"
-                            height={48}
-                            style={isTradeable ? { cursor: 'pointer' } : {}}
-                            onClick={() => {
-                                if (!isTradeable) {
-                                    return
-                                }
-                                if (props.onItemClick) {
-                                    props.onItemClick(item)
-                                }
-                            }}
-                        />
-                    }
-                    tooltipContent={
-                        <div style={{ maxWidth: '100%' }}>
-                            {isSouldbound ? <p>{getMinecraftColorCodedElement(`§4§lNot tradeable - Item is Soulbound`)}</p> : null}
-                            <p>
-                                <img
-                                    title={convertTagToName(item.tag)}
-                                    className={styles.image}
-                                    src={api.getItemImageUrl(item)}
-                                    alt=""
-                                    crossOrigin="anonymous"
-                                    height={24}
-                                />
-                                {getMinecraftColorCodedElement(`${item.itemName}`)}
-                            </p>
-                            {getMinecraftColorCodedElement(item.description, false)}
-                        </div>
-                    }
-                />
+                <div style={{ position: 'relative', height: '100%' }}>
+                    <Tooltip
+                        type="hover"
+                        className={styles.hoverElement}
+                        hoverPlacement="bottom"
+                        id={styles.tooltipHoverId}
+                        content={
+                            <img
+                                title={removeMinecraftColorCoding(item.itemName)}
+                                className={styles.image}
+                                src={api.getItemImageUrl({ tag: item.tag })}
+                                alt=""
+                                crossOrigin="anonymous"
+                                height={48}
+                                style={isTradeable ? { cursor: 'pointer', position: 'absolute', top: 0, left: 0 } : {}}
+                                onClick={() => {
+                                    if (!isTradeable) {
+                                        return
+                                    }
+                                    if (props.onItemClick) {
+                                        props.onItemClick(item)
+                                    }
+                                }}
+                            />
+                        }
+                        tooltipContent={
+                            <div style={{ maxWidth: '100%' }}>
+                                {isSouldbound ? <p>{getMinecraftColorCodedElement(`§4§lNot tradeable - Item is Soulbound`)}</p> : null}
+                                <p>
+                                    <img
+                                        title={convertTagToName(item.tag)}
+                                        className={styles.image}
+                                        src={api.getItemImageUrl(item)}
+                                        alt=""
+                                        crossOrigin="anonymous"
+                                        height={24}
+                                    />
+                                    {getMinecraftColorCodedElement(`${item.itemName}`)}
+                                </p>
+                                {getMinecraftColorCodedElement(item.description, false)}
+                            </div>
+                        }
+                    />
+                    {item.count !== 1 ? (
+                        <span style={{ position: 'absolute', fontWeight: 'bold', bottom: 0, right: 0, fontSize: '24px' }}>{item.count}</span>
+                    ) : null}
+                </div>
             </div>
         )
     }

diff --git a/components/TradeCreate/TradeCreate.tsx b/components/TradeCreate/TradeCreate.tsx
@@ -116,7 +116,7 @@ export default function TradeCreate(props: Props) {
                                                 crossOrigin="anonymous"
                                                 height={24}
                                             />
-                                            {getMinecraftColorCodedElement(`${offer.itemName}`)}
+                                            {offer.count !== 1 ? `${offer.count}x` : null} {getMinecraftColorCodedElement(`${offer.itemName}`)}
                                         </Card.Title>
                                     </Card.Header>
                                     <Card.Body>{getMinecraftColorCodedElement(offer.description, false)}</Card.Body>

diff --git a/components/TradeList/TradeList.tsx b/components/TradeList/TradeList.tsx
@@ -117,6 +117,7 @@ export default function TradeList(props: Props) {
                                                           crossOrigin="anonymous"
                                                           height={24}
                                                       />
+                                                      {trade.item.count !== 1 ? `${trade.item.count}x` : null}{' '}
                                                       {getMinecraftColorCodedElement(`${trade.item.itemName}`)}
                                                   </Card.Title>
                                               </Card.Header>