diff --git a/components/comment.js b/components/comment.js index 54c2a04e..b58719aa 100644 --- a/components/comment.js +++ b/components/comment.js @@ -18,6 +18,7 @@ import Flag from '../svgs/flag-fill.svg' import { abbrNum } from '../lib/format' import Share from './share' import ItemInfo from './item-info' +import { Badge } from 'react-bootstrap' function Parent ({ item, rootText }) { const ParentFrag = () => ( @@ -40,6 +41,10 @@ function Parent ({ item, rootText }) { {rootText || 'on:'} {item.root.title} + {item.root.sub?.name && + + {' '}{item.root.sub?.name} + } ) } diff --git a/components/header.js b/components/header.js index 77e84bc1..d441ab6c 100644 --- a/components/header.js +++ b/components/header.js @@ -264,7 +264,7 @@ export default function Header ({ sub }) { - + diff --git a/components/item-info.js b/components/item-info.js index 5fec1ba5..287bcfb8 100644 --- a/components/item-info.js +++ b/components/item-info.js @@ -65,14 +65,19 @@ export default function ItemInfo ({ item, commentsText, className, embellishUser } + {item.sub?.name && + + {' '}{item.sub?.name} + } {(item.outlawed && !item.mine && - {' '}OUTLAWED - ) || (item.freebie && !item.mine && + {' '}outlawed + ) || + (item.freebie && !item.mine && - {' '}FREEBIE + {' '}freebie - )} + )} {canEdit && !item.deletedAt && <> \ diff --git a/pages/post.js b/pages/post.js index 377f68ae..36522f5d 100644 --- a/pages/post.js +++ b/pages/post.js @@ -11,6 +11,7 @@ import { PollForm } from '../components/poll-form' import { BountyForm } from '../components/bounty-form' import { Form, Select } from '../components/form' import { useEffect, useState } from 'react' +import Info from '../components/info' export const getServerSideProps = getGetServerSideProps() @@ -74,7 +75,7 @@ export function SubSelect ({ children }) { return (
+ +
+
The sub your post will go in ...
+
    +
  • If it's bitcoin related, put it in the bitcoin sub.
  • +
  • If it's nostr related, put it in the nostr sub.
  • +
  • If it's a job, put it in the jobs sub.
  • +
+
+
{children}
diff --git a/pages/search.js b/pages/search.js index 45ca0699..508d1e2d 100644 --- a/pages/search.js +++ b/pages/search.js @@ -4,6 +4,7 @@ import { ITEM_SEARCH } from '../fragments/items' import SearchItems from '../components/search-items' import { useRouter } from 'next/router' import { SeoSearch } from '../components/seo' +import Down from '../svgs/arrow-down-line.svg' export const getServerSideProps = getGetServerSideProps(ITEM_SEARCH) @@ -13,11 +14,15 @@ export default function Index ({ data: { search: { items, cursor } } }) { return ( - {router.query?.q && - } + {router.query?.q + ? + : ( +
+ search for something +
)}
) } diff --git a/svgs/arrow-down-line.svg b/svgs/arrow-down-line.svg new file mode 100644 index 00000000..938163e4 --- /dev/null +++ b/svgs/arrow-down-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/worker/repin.js b/worker/repin.js index e87a6cbe..e826d6ec 100644 --- a/worker/repin.js +++ b/worker/repin.js @@ -34,6 +34,7 @@ function repin ({ models }) { text: current.text, url: current.url, userId: current.userId, + subName: current.subName, pinId } })