From 89bf1e53fda306d271676bda4605794567b7f3b6 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Thu, 16 Dec 2021 22:46:07 +0100 Subject: refactor: move SWR to blog page This way I can reuse PostsList component with another posts fetcher. --- src/components/PostsList/PostsList.tsx | 75 ++++++++++++++-------------------- src/pages/blog/index.tsx | 45 +++++++++++++++++--- 2 files changed, 70 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/components/PostsList/PostsList.tsx b/src/components/PostsList/PostsList.tsx index 6e56c24..03e8834 100644 --- a/src/components/PostsList/PostsList.tsx +++ b/src/components/PostsList/PostsList.tsx @@ -1,45 +1,20 @@ -import useSWRInfinite from 'swr/infinite'; import { t } from '@lingui/macro'; -import { config } from '@config/website'; -import { getPublishedPosts } from '@services/graphql/blog'; import { PostsList as PostsListData } from '@ts/types/blog'; import styles from './PostsList.module.scss'; import PostPreview from '@components/PostPreview/PostPreview'; -import { Button } from '@components/Buttons'; import { Fragment } from 'react'; import { sortPostsByYear } from '@utils/helpers/sort'; -const PostsList = ({ showYears }: { showYears: boolean }) => { +const PostsList = ({ + data, + showYears, +}: { + data: PostsListData[]; + showYears: boolean; +}) => { const titleLevel = showYears ? 3 : 2; - const getKey = (pageIndex: number, previousData: PostsListData) => { - 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'); - - if (error) return
{t`Failed to load.`}
; - if (!data) return
{t`Loading...`}
; - - const getPostsList = () => { + const getPostsListByYear = () => { const posts = sortPostsByYear(data); const years = Object.keys(posts).reverse(); @@ -61,19 +36,29 @@ const PostsList = ({ showYears }: { showYears: boolean }) => { }); }; - const hasNextPage = data && data[data.length - 1].pageInfo.hasNextPage; + const getPostsList = () => { + return data.map((page) => { + if (page.posts.length === 0) { + return

{t`No results found.`}

; + } else { + return ( + +
    + {page.posts.map((post) => { + return ( +
  1. + +
  2. + ); + })} +
+
+ ); + } + }); + }; - return ( - <> - {getPostsList()} - {hasNextPage && ( - - )} - - ); + return <>{showYears ? getPostsListByYear() : getPostsList()}; }; export default PostsList; diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index 1c3a5d9..29e7770 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -7,12 +7,43 @@ import { seo } from '@config/seo'; import { config } from '@config/website'; import { getPublishedPosts } from '@services/graphql/blog'; import { NextPageWithLayout } from '@ts/types/app'; -import { BlogPageProps } from '@ts/types/blog'; +import { BlogPageProps, PostsList as PostsListData } from '@ts/types/blog'; import { loadTranslation } from '@utils/helpers/i18n'; import PostsList from '@components/PostsList/PostsList'; -import { SWRConfig } from 'swr'; +import useSWRInfinite from 'swr/infinite'; +import { Button } from '@components/Buttons'; const Blog: NextPageWithLayout = ({ fallback }) => { + const getKey = (pageIndex: number, previousData: PostsListData) => { + 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, + { fallback } + ); + + const isLoadingInitialData = !data && !error; + const isLoadingMore: boolean = + isLoadingInitialData || + (size > 0 && data !== undefined && typeof data[size - 1] === 'undefined'); + + if (error) return
{t`Failed to load.`}
; + if (!data) return
{t`Loading...`}
; + + const hasNextPage = data && data[data.length - 1].pageInfo.hasNextPage; + return ( <> @@ -20,9 +51,13 @@ const Blog: NextPageWithLayout = ({ fallback }) => {

{t`Blog`}

- - - + + {hasNextPage && ( + + )} ); }; -- cgit v1.2.3