From 516f8256a4f72c7a01752d9aa4e035276fb08b51 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Wed, 15 Dec 2021 17:08:00 +0100 Subject: chore: add pagination (load more) to blog page --- src/components/PostsList/PostsList.tsx | 102 +++++++++++++++++++++++++-------- src/pages/blog/index.tsx | 15 +++-- src/services/graphql/blog.ts | 6 +- src/ts/types/blog.ts | 12 ++-- 4 files changed, 96 insertions(+), 39 deletions(-) diff --git a/src/components/PostsList/PostsList.tsx b/src/components/PostsList/PostsList.tsx index ca3e788..55ca232 100644 --- a/src/components/PostsList/PostsList.tsx +++ b/src/components/PostsList/PostsList.tsx @@ -1,36 +1,88 @@ import Link from 'next/link'; +import useSWRInfinite from 'swr/infinite'; +import { t } from '@lingui/macro'; +import { config } from '@config/website'; +import { getPublishedPosts } from '@services/graphql/blog'; import { ArticlePreview } from '@ts/types/articles'; +import { PageInfo } from '@ts/types/pagination'; import styles from './PostsList.module.scss'; type TitleLevel = 2 | 3 | 4 | 5 | 6; -const PostsList = ({ - posts, - titleLevel, -}: { - posts: ArticlePreview[]; - titleLevel: TitleLevel; -}) => { +type DataType = { + posts: ArticlePreview; + pageInfo: PageInfo; +}; + +const PostsList = ({ titleLevel }: { titleLevel: TitleLevel }) => { const TitleTag = `h${titleLevel}` as keyof JSX.IntrinsicElements; - const postsList = posts.map((post) => { - return ( -
  • - -
  • - ); - }); - - return
      {postsList}
    ; + const getKey = (pageIndex: number, previousData: DataType) => { + if (previousData && !previousData.posts) return null; + + const args = + pageIndex === 0 + ? { first: config.postsPerPage } + : { + first: config.postsPerPage, + after: previousData.pageInfo.endCursor, + }; + + return args; + }; + + const { data, error, size, setSize } = useSWRInfinite( + getKey, + getPublishedPosts + ); + + const isLoadingInitialData = !data && !error; + const isLoadingMore: boolean = + isLoadingInitialData || + (size > 0 && data !== undefined && typeof data[size - 1] === 'undefined'); + + const getPostsList = () => { + if (error) return
    {t`Failed to load.`}
    ; + if (!data) return
    {t`Loading...`}
    ; + + return data.map((page) => { + if (page.posts.length === 0) { + return t`No results found.`; + } else { + return page.posts.map((post) => { + return ( +
  • + +
  • + ); + }); + } + }); + }; + + const hasNextPage = data && data[data.length - 1].pageInfo.hasNextPage; + + return ( +
      + {getPostsList()} + {hasNextPage && ( + + )} +
    + ); }; export default PostsList; diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index 7057982..083ad97 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -10,10 +10,9 @@ import { NextPageWithLayout } from '@ts/types/app'; import { BlogPageProps } from '@ts/types/blog'; import { loadTranslation } from '@utils/helpers/i18n'; import PostsList from '@components/PostsList/PostsList'; +import { SWRConfig } from 'swr'; -const Blog: NextPageWithLayout = ({ data }) => { - const { posts, pageInfo } = data; - +const Blog: NextPageWithLayout = ({ fallback }) => { return ( <> @@ -21,7 +20,9 @@ const Blog: NextPageWithLayout = ({ data }) => {

    {t`Blog`}

    - + + + ); }; @@ -35,11 +36,13 @@ export const getStaticProps: GetStaticProps = async (context) => { context.locale!, process.env.NODE_ENV === 'production' ); - const data = await getPublishedPosts(config.postsPerPage); + const data = await getPublishedPosts({ first: config.postsPerPage }); return { props: { - data, + fallback: { + '/api/posts': data, + }, translation, }, }; diff --git a/src/services/graphql/blog.ts b/src/services/graphql/blog.ts index 266af87..1cfdd44 100644 --- a/src/services/graphql/blog.ts +++ b/src/services/graphql/blog.ts @@ -85,10 +85,10 @@ export const fetchPublishedPosts: fetchPostsListReturn = async ( } }; -export const getPublishedPosts: getPostsListReturn = async ( +export const getPublishedPosts: getPostsListReturn = async ({ first = 10, - after = '' -) => { + after = '', +}) => { const rawPostsList = await fetchPublishedPosts(first, after); const postsList: ArticlePreview[] = rawPostsList.posts.edges.map((post) => { const { diff --git a/src/ts/types/blog.ts b/src/ts/types/blog.ts index 345deed..366231e 100644 --- a/src/ts/types/blog.ts +++ b/src/ts/types/blog.ts @@ -23,11 +23,13 @@ export type fetchPostsListReturn = ( after?: string ) => Promise; -export type getPostsListReturn = ( - first?: number, - after?: string -) => Promise; +type PostsListProps = { + first?: number; + after?: string; +}; + +export type getPostsListReturn = (props: PostsListProps) => Promise; export type BlogPageProps = { - data: PostsList; + fallback: PostsList; }; -- cgit v1.2.3