diff --git a/api/resolvers/item.js b/api/resolvers/item.js index e82b600a..8c5fa186 100644 --- a/api/resolvers/item.js +++ b/api/resolvers/item.js @@ -77,7 +77,7 @@ export default { } const activeOrMine = () => { - return me ? ` AND (status = 'ACTIVE' OR "userId" = ${me.id}) ` : ' AND status = \'ACTIVE\' ' + return me ? ` AND (status <> 'STOPPED' OR "userId" = ${me.id}) ` : ' AND status <> \'STOPPED\' ' } switch (sort) { @@ -140,8 +140,8 @@ export default { WHERE "parentId" IS NULL AND created_at <= $1 AND "pinId" IS NULL ${subClause(3)} - AND status = 'ACTIVE' - ORDER BY "maxBid" DESC, created_at ASC + AND status <> 'STOPPED' + ORDER BY (CASE WHEN status = 'ACTIVE' THEN "maxBid" ELSE 0 END) DESC, created_at ASC OFFSET $2 LIMIT ${LIMIT}`, decodedCursor.time, decodedCursor.offset, sub) break diff --git a/components/item.js b/components/item.js index 17171e69..ae734dbe 100644 --- a/components/item.js +++ b/components/item.js @@ -28,7 +28,7 @@ export function ItemJob ({ item, rank, children }) { {rank} ) :
} -
+
@@ -60,7 +60,9 @@ export function ItemJob ({ item, rank, children }) {
- {formatSats(item.maxBid)} sats per min + {item.status !== 'NOSATS' + ? {formatSats(item.maxBid)} sats per min + : expired} \ {item.ncomments} comments diff --git a/components/item.module.css b/components/item.module.css index c6bf6f24..92828e9f 100644 --- a/components/item.module.css +++ b/components/item.module.css @@ -50,6 +50,11 @@ a.link:visited { min-width: 0; } +.itemDead { + pointer-events: none; + opacity: .5; +} + .item .cover { top: 4px; }