From b405ddb76f217ccf7828b422ec4c0f0e15b7dee4 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Fri, 7 Jan 2022 12:33:35 +0100 Subject: chore: add a widget to list all blog topics --- .../Widget/TopicsList/TopicsList.module.scss | 7 +++++ src/components/Widget/TopicsList/TopicsList.tsx | 35 ++++++++++++++++++++++ src/components/Widget/index.tsx | 3 +- src/pages/blog/index.tsx | 3 +- src/services/graphql/queries.ts | 19 ++++++++++++ src/ts/types/app.ts | 2 ++ src/ts/types/taxonomies.ts | 14 ++++++--- 7 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 src/components/Widget/TopicsList/TopicsList.module.scss create mode 100644 src/components/Widget/TopicsList/TopicsList.tsx (limited to 'src') diff --git a/src/components/Widget/TopicsList/TopicsList.module.scss b/src/components/Widget/TopicsList/TopicsList.module.scss new file mode 100644 index 0000000..5f37c7a --- /dev/null +++ b/src/components/Widget/TopicsList/TopicsList.module.scss @@ -0,0 +1,7 @@ +.title { + margin: 0; +} + +.list { + margin: var(--spacing-sm) 0; +} diff --git a/src/components/Widget/TopicsList/TopicsList.tsx b/src/components/Widget/TopicsList/TopicsList.tsx new file mode 100644 index 0000000..fabd40d --- /dev/null +++ b/src/components/Widget/TopicsList/TopicsList.tsx @@ -0,0 +1,35 @@ +import { t } from '@lingui/macro'; +import { getAllSubjects } from '@services/graphql/queries'; +import Link from 'next/link'; +import useSWR from 'swr'; +import styles from './TopicsList.module.scss'; + +const TopicsList = () => { + const { data, error } = useSWR('/api/subjects', getAllSubjects); + + if (error) return
{t`Failed to load.`}
; + if (!data) return
{t`Loading...`}
; + + const sortedSubjects = [...data].sort((a, b) => + a.title.localeCompare(b.title) + ); + + const subjects = sortedSubjects.map((subject) => { + return ( +
  • + + {subject.title} + +
  • + ); + }); + + return ( +
    +

    {t`Topics`}

    + +
    + ); +}; + +export default TopicsList; diff --git a/src/components/Widget/index.tsx b/src/components/Widget/index.tsx index 025b302..e4e346f 100644 --- a/src/components/Widget/index.tsx +++ b/src/components/Widget/index.tsx @@ -1,4 +1,5 @@ import RecentPosts from './RecentPosts/RecentPosts'; import ThematicsList from './ThematicsList/ThematicsList'; +import TopicsList from './TopicsList/TopicsList'; -export { RecentPosts, ThematicsList }; +export { RecentPosts, ThematicsList, TopicsList }; diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index f6aceb6..855e6ce 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -13,7 +13,7 @@ import { Button } from '@components/Buttons'; import { getPublishedPosts } from '@services/graphql/queries'; import PostHeader from '@components/PostHeader/PostHeader'; import styles from '@styles/pages/Listing.module.scss'; -import { ThematicsList } from '@components/Widget'; +import { ThematicsList, TopicsList } from '@components/Widget'; const Blog: NextPageWithLayout = ({ fallback }) => { const getKey = (pageIndex: number, previousData: PostsListData) => { @@ -63,6 +63,7 @@ const Blog: NextPageWithLayout = ({ fallback }) => { diff --git a/src/services/graphql/queries.ts b/src/services/graphql/queries.ts index 26a7869..f5387e5 100644 --- a/src/services/graphql/queries.ts +++ b/src/services/graphql/queries.ts @@ -2,11 +2,13 @@ import { Slug } from '@ts/types/app'; import { Article, PostBy } from '@ts/types/articles'; import { AllPostsSlug, PostsList, RawPostsList } from '@ts/types/blog'; import { + AllSubjects, AllSubjectsSlug, AllThematics, AllThematicsSlug, Subject, SubjectBy, + SubjectPreview, Thematic, ThematicBy, ThematicPreview, @@ -344,6 +346,23 @@ export const getAllSubjectsSlug = async (): Promise => { return response.subjects.nodes; }; +export const getAllSubjects = async (): Promise => { + const query = gql` + query AllSubjects { + subjects { + nodes { + databaseId + slug + title + } + } + } + `; + + const response = await fetchApi(query, null); + return response.subjects.nodes; +}; + //============================================================================== // Thematic query //============================================================================== diff --git a/src/ts/types/app.ts b/src/ts/types/app.ts index 7220ddd..d9bd041 100644 --- a/src/ts/types/app.ts +++ b/src/ts/types/app.ts @@ -6,6 +6,7 @@ import { AllPostsSlug, RawPostsList } from './blog'; import { CommentData, CreateComment } from './comments'; import { ContactData, SendEmail } from './contact'; import { + AllSubjects, AllSubjectsSlug, AllThematics, AllThematicsSlug, @@ -41,6 +42,7 @@ export type VariablesType = T extends PostBy | SubjectBy | ThematicBy export type RequestType = | AllPostsSlug + | AllSubjects | AllSubjectsSlug | AllThematics | AllThematicsSlug diff --git a/src/ts/types/taxonomies.ts b/src/ts/types/taxonomies.ts index 32e1f15..0b2d696 100644 --- a/src/ts/types/taxonomies.ts +++ b/src/ts/types/taxonomies.ts @@ -37,6 +37,12 @@ export type SubjectPreview = TaxonomyPreview & { featuredImage: Cover; }; +export type AllSubjects = { + subjects: { + nodes: SubjectPreview[]; + }; +}; + export type RawSubject = SubjectPreview & { acfSubjects: { officialWebsite: string; @@ -58,6 +64,10 @@ export type AllSubjectsSlug = { }; }; +export type SubjectProps = { + subject: Subject; +}; + //============================================================================== // Thematics //============================================================================== @@ -91,10 +101,6 @@ export type AllThematicsSlug = { }; }; -export type SubjectProps = { - subject: Subject; -}; - export type ThematicProps = { thematic: Thematic; }; -- cgit v1.2.3