diff --git a/src/components/ArticleGrid/index.tsx b/src/components/ArticleGrid/index.tsx index b165ebdc..780ad842 100644 --- a/src/components/ArticleGrid/index.tsx +++ b/src/components/ArticleGrid/index.tsx @@ -12,56 +12,64 @@ export type ArticleGridProps = { prevPage: number | null } -export const ArticleGrid: React.FC = ({ articles, nextPage, prevPage, ...props }) => ( - <> - - {articles.map((article, i) => { - const gridColumn = article.featured ? 'span 2' : 'auto' - const layout: CardLayout = article.featured ? 'featured' : 'simple' - const srcSet = article.preview.set.map(({ url, density }) => `${url} ${density}x`).join(' ') +export const ArticleGrid: React.FC = ({ articles, nextPage, prevPage, ...props }) => { + const nextHref = nextPage ? `/articles/${nextPage}` : null + let prevHref = prevPage ? `/articles/${prevPage}` : null + if (prevPage === 1) { + prevHref = '/' + } - const content = !article.featured - ? ( - + + {articles.map((article, i) => { + const gridColumn = article.featured ? 'span 2' : 'auto' + const layout: CardLayout = article.featured ? 'featured' : 'simple' + const srcSet = article.preview.set.map(({ url, density }) => `${url} ${density}x`).join(' ') + + const content = !article.featured + ? ( + + {article.title} + + {article.date} + + ) : ( + article.title + ) + + return ( + - {article.title} - - {article.date} - - ) : ( - article.title + {content} + ) + })} + - return ( - - {content} - - ) - })} - - - - -) + + + ) +}