aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArmand Philippot <git@armandphilippot.com>2022-05-15 16:36:58 +0200
committerArmand Philippot <git@armandphilippot.com>2022-05-15 16:36:58 +0200
commit235fe67d770f83131c9ec10b99012319440db690 (patch)
tree3b96e2c8a5877fe15a9cfa6bff46130fa7a04a65 /src
parentfe2252ced2bb895e26179640553b5a6c02957d54 (diff)
chore: add Search page
Diffstat (limited to 'src')
-rw-r--r--src/components/organisms/forms/search-form.stories.tsx9
-rw-r--r--src/components/organisms/forms/search-form.test.tsx4
-rw-r--r--src/components/organisms/forms/search-form.tsx14
-rw-r--r--src/components/organisms/layout/header.stories.tsx9
-rw-r--r--src/components/organisms/layout/header.test.tsx12
-rw-r--r--src/components/organisms/layout/header.tsx21
-rw-r--r--src/components/organisms/modals/search-modal.stories.tsx11
-rw-r--r--src/components/organisms/modals/search-modal.test.tsx2
-rw-r--r--src/components/organisms/modals/search-modal.tsx8
-rw-r--r--src/components/organisms/toolbar/search.stories.tsx10
-rw-r--r--src/components/organisms/toolbar/search.test.tsx6
-rw-r--r--src/components/organisms/toolbar/search.tsx12
-rw-r--r--src/components/organisms/toolbar/toolbar.stories.tsx11
-rw-r--r--src/components/organisms/toolbar/toolbar.test.tsx2
-rw-r--r--src/components/organisms/toolbar/toolbar.tsx7
-rw-r--r--src/components/templates/layout/layout.tsx3
-rw-r--r--src/pages/blog/index.tsx4
-rw-r--r--src/pages/recherche/index.tsx324
-rw-r--r--src/services/graphql/api.ts15
-rw-r--r--src/services/graphql/articles.query.ts4
-rw-r--r--src/services/graphql/articles.ts3
-rw-r--r--src/services/graphql/contact.ts4
-rw-r--r--src/utils/hooks/use-data-from-api.tsx23
-rw-r--r--src/utils/hooks/use-pagination.tsx3
24 files changed, 436 insertions, 85 deletions
diff --git a/src/components/organisms/forms/search-form.stories.tsx b/src/components/organisms/forms/search-form.stories.tsx
index 7f4c7c0..6ea6122 100644
--- a/src/components/organisms/forms/search-form.stories.tsx
+++ b/src/components/organisms/forms/search-form.stories.tsx
@@ -1,5 +1,4 @@
import { ComponentMeta, ComponentStory } from '@storybook/react';
-import { IntlProvider } from 'react-intl';
import SearchForm from './search-form';
/**
@@ -10,6 +9,7 @@ export default {
component: SearchForm,
args: {
hideLabel: false,
+ searchPage: '#',
},
argTypes: {
className: {
@@ -40,13 +40,6 @@ export default {
},
},
},
- decorators: [
- (Story) => (
- <IntlProvider locale="en">
- <Story />
- </IntlProvider>
- ),
- ],
} as ComponentMeta<typeof SearchForm>;
const Template: ComponentStory<typeof SearchForm> = (args) => (
diff --git a/src/components/organisms/forms/search-form.test.tsx b/src/components/organisms/forms/search-form.test.tsx
index 4e3d285..59a2f68 100644
--- a/src/components/organisms/forms/search-form.test.tsx
+++ b/src/components/organisms/forms/search-form.test.tsx
@@ -3,14 +3,14 @@ import SearchForm from './search-form';
describe('SearchForm', () => {
it('renders a search input', () => {
- render(<SearchForm />);
+ render(<SearchForm searchPage="#" />);
expect(
screen.getByRole('searchbox', { name: 'Search for:' })
).toBeInTheDocument();
});
it('renders a submit button', () => {
- render(<SearchForm />);
+ render(<SearchForm searchPage="#" />);
expect(screen.getByRole('button', { name: 'Search' })).toBeInTheDocument();
});
});
diff --git a/src/components/organisms/forms/search-form.tsx b/src/components/organisms/forms/search-form.tsx
index 18b7c08..56d3895 100644
--- a/src/components/organisms/forms/search-form.tsx
+++ b/src/components/organisms/forms/search-form.tsx
@@ -4,18 +4,24 @@ import MagnifyingGlass from '@components/atoms/icons/magnifying-glass';
import LabelledField, {
type LabelledFieldProps,
} from '@components/molecules/forms/labelled-field';
+import { useRouter } from 'next/router';
import { FC, useState } from 'react';
import { useIntl } from 'react-intl';
import styles from './search-form.module.scss';
-export type SearchFormProps = Pick<LabelledFieldProps, 'hideLabel'>;
+export type SearchFormProps = Pick<LabelledFieldProps, 'hideLabel'> & {
+ /**
+ * The search page url.
+ */
+ searchPage: string;
+};
/**
* SearchForm component
*
* Render a search form.
*/
-const SearchForm: FC<SearchFormProps> = ({ hideLabel }) => {
+const SearchForm: FC<SearchFormProps> = ({ hideLabel, searchPage }) => {
const intl = useIntl();
const fieldLabel = intl.formatMessage({
defaultMessage: 'Search for:',
@@ -28,10 +34,12 @@ const SearchForm: FC<SearchFormProps> = ({ hideLabel }) => {
id: 'WMqQrv',
});
+ const router = useRouter();
const [value, setValue] = useState<string>('');
const submitHandler = () => {
- return;
+ router.push({ pathname: searchPage, query: { s: value } });
+ setValue('');
};
return (
diff --git a/src/components/organisms/layout/header.stories.tsx b/src/components/organisms/layout/header.stories.tsx
index c58c344..98d6377 100644
--- a/src/components/organisms/layout/header.stories.tsx
+++ b/src/components/organisms/layout/header.stories.tsx
@@ -1,5 +1,4 @@
import { ComponentMeta, ComponentStory } from '@storybook/react';
-import { IntlProvider } from 'react-intl';
import HeaderComponent from './header';
/**
@@ -10,6 +9,7 @@ export default {
component: HeaderComponent,
args: {
isHome: false,
+ searchPage: '#',
withLink: false,
},
argTypes: {
@@ -95,13 +95,6 @@ export default {
},
},
},
- decorators: [
- (Story) => (
- <IntlProvider locale="en">
- <Story />
- </IntlProvider>
- ),
- ],
parameters: {
layout: 'fullscreen',
},
diff --git a/src/components/organisms/layout/header.test.tsx b/src/components/organisms/layout/header.test.tsx
index 05baaec..a9896f8 100644
--- a/src/components/organisms/layout/header.test.tsx
+++ b/src/components/organisms/layout/header.test.tsx
@@ -14,14 +14,22 @@ const title = 'Assumenda quis quod';
describe('Header', () => {
it('renders the website title', () => {
- render(<Header title={title} photo={photo} nav={nav} isHome={true} />);
+ render(
+ <Header
+ searchPage="#"
+ title={title}
+ photo={photo}
+ nav={nav}
+ isHome={true}
+ />
+ );
expect(
screen.getByRole('heading', { level: 1, name: title })
).toBeInTheDocument();
});
it('renders the main nav', () => {
- render(<Header title={title} photo={photo} nav={nav} />);
+ render(<Header searchPage="#" title={title} photo={photo} nav={nav} />);
expect(screen.getByRole('navigation')).toBeInTheDocument();
});
});
diff --git a/src/components/organisms/layout/header.tsx b/src/components/organisms/layout/header.tsx
index f6ebc9c..18ebb31 100644
--- a/src/components/organisms/layout/header.tsx
+++ b/src/components/organisms/layout/header.tsx
@@ -5,28 +5,25 @@ import { FC } from 'react';
import Toolbar, { type ToolbarProps } from '../toolbar/toolbar';
import styles from './header.module.scss';
-export type HeaderProps = BrandingProps & {
- /**
- * Set additional classnames to the header element.
- */
- className?: string;
- /**
- * The main nav items.
- */
- nav: ToolbarProps['nav'];
-};
+export type HeaderProps = BrandingProps &
+ Pick<ToolbarProps, 'nav' | 'searchPage'> & {
+ /**
+ * Set additional classnames to the header element.
+ */
+ className?: string;
+ };
/**
* Header component
*
* Render the website header.
*/
-const Header: FC<HeaderProps> = ({ className, nav, ...props }) => {
+const Header: FC<HeaderProps> = ({ className, nav, searchPage, ...props }) => {
return (
<header className={`${styles.wrapper} ${className}`}>
<div className={styles.body}>
<Branding {...props} />
- <Toolbar nav={nav} className={styles.toolbar} />
+ <Toolbar nav={nav} searchPage={searchPage} className={styles.toolbar} />
</div>
</header>
);
diff --git a/src/components/organisms/modals/search-modal.stories.tsx b/src/components/organisms/modals/search-modal.stories.tsx
index 3ad6abd..f40696c 100644
--- a/src/components/organisms/modals/search-modal.stories.tsx
+++ b/src/components/organisms/modals/search-modal.stories.tsx
@@ -1,5 +1,4 @@
import { ComponentMeta, ComponentStory } from '@storybook/react';
-import { IntlProvider } from 'react-intl';
import SearchModal from './search-modal';
/**
@@ -8,6 +7,9 @@ import SearchModal from './search-modal';
export default {
title: 'Organisms/Modals',
component: SearchModal,
+ args: {
+ searchPage: '#',
+ },
argTypes: {
className: {
control: {
@@ -23,13 +25,6 @@ export default {
},
},
},
- decorators: [
- (Story) => (
- <IntlProvider locale="en">
- <Story />
- </IntlProvider>
- ),
- ],
} as ComponentMeta<typeof SearchModal>;
const Template: ComponentStory<typeof SearchModal> = (args) => (
diff --git a/src/components/organisms/modals/search-modal.test.tsx b/src/components/organisms/modals/search-modal.test.tsx
index 249c523..7ba08c0 100644
--- a/src/components/organisms/modals/search-modal.test.tsx
+++ b/src/components/organisms/modals/search-modal.test.tsx
@@ -3,7 +3,7 @@ import SearchModal from './search-modal';
describe('SearchModal', () => {
it('renders a search modal', () => {
- render(<SearchModal />);
+ render(<SearchModal searchPage="#" />);
expect(screen.getByText('Search')).toBeInTheDocument();
});
});
diff --git a/src/components/organisms/modals/search-modal.tsx b/src/components/organisms/modals/search-modal.tsx
index 0e0ceed..866bc25 100644
--- a/src/components/organisms/modals/search-modal.tsx
+++ b/src/components/organisms/modals/search-modal.tsx
@@ -1,10 +1,10 @@
import Modal, { type ModalProps } from '@components/molecules/modals/modal';
import { FC } from 'react';
import { useIntl } from 'react-intl';
-import SearchForm from '../forms/search-form';
+import SearchForm, { SearchFormProps } from '../forms/search-form';
import styles from './search-modal.module.scss';
-export type SearchModalProps = {
+export type SearchModalProps = Pick<SearchFormProps, 'searchPage'> & {
/**
* Set additional classnames to modal wrapper.
*/
@@ -16,7 +16,7 @@ export type SearchModalProps = {
*
* Render a search form modal.
*/
-const SearchModal: FC<SearchModalProps> = ({ className }) => {
+const SearchModal: FC<SearchModalProps> = ({ className, searchPage }) => {
const intl = useIntl();
const modalTitle = intl.formatMessage({
defaultMessage: 'Search',
@@ -26,7 +26,7 @@ const SearchModal: FC<SearchModalProps> = ({ className }) => {
return (
<Modal title={modalTitle} className={`${styles.wrapper} ${className}`}>
- <SearchForm hideLabel={true} />
+ <SearchForm hideLabel={true} searchPage={searchPage} />
</Modal>
);
};
diff --git a/src/components/organisms/toolbar/search.stories.tsx b/src/components/organisms/toolbar/search.stories.tsx
index 0421c8c..c6063a0 100644
--- a/src/components/organisms/toolbar/search.stories.tsx
+++ b/src/components/organisms/toolbar/search.stories.tsx
@@ -9,6 +9,9 @@ import Search from './search';
export default {
title: 'Organisms/Toolbar/Search',
component: Search,
+ args: {
+ searchPage: '#',
+ },
argTypes: {
className: {
control: {
@@ -44,13 +47,6 @@ export default {
},
},
},
- decorators: [
- (Story) => (
- <IntlProvider locale="en">
- <Story />
- </IntlProvider>
- ),
- ],
} as ComponentMeta<typeof Search>;
const Template: ComponentStory<typeof Search> = ({
diff --git a/src/components/organisms/toolbar/search.test.tsx b/src/components/organisms/toolbar/search.test.tsx
index 0ce09d8..a18b679 100644
--- a/src/components/organisms/toolbar/search.test.tsx
+++ b/src/components/organisms/toolbar/search.test.tsx
@@ -3,17 +3,17 @@ import Search from './search';
describe('Search', () => {
it('renders a button to open search modal', () => {
- render(<Search isActive={false} setIsActive={() => null} />);
+ render(<Search searchPage="#" isActive={false} setIsActive={() => null} />);
expect(screen.getByRole('checkbox')).toHaveAccessibleName('Open search');
});
it('renders a button to close search modal', () => {
- render(<Search isActive={true} setIsActive={() => null} />);
+ render(<Search searchPage="#" isActive={true} setIsActive={() => null} />);
expect(screen.getByRole('checkbox')).toHaveAccessibleName('Close search');
});
it('renders a search form', () => {
- render(<Search isActive={true} setIsActive={() => null} />);
+ render(<Search searchPage="#" isActive={true} setIsActive={() => null} />);
expect(screen.getByRole('searchbox')).toBeInTheDocument();
});
});
diff --git a/src/components/organisms/toolbar/search.tsx b/src/components/organisms/toolbar/search.tsx
index 72cd576..a1471ef 100644
--- a/src/components/organisms/toolbar/search.tsx
+++ b/src/components/organisms/toolbar/search.tsx
@@ -17,12 +17,21 @@ export type SearchProps = {
*/
isActive: CheckboxProps['value'];
/**
+ * A callback function to execute search.
+ */
+ searchPage: SearchModalProps['searchPage'];
+ /**
* A callback function to handle button state.
*/
setIsActive: CheckboxProps['setValue'];
};
-const Search: FC<SearchProps> = ({ className = '', isActive, setIsActive }) => {
+const Search: FC<SearchProps> = ({
+ className = '',
+ isActive,
+ searchPage,
+ setIsActive,
+}) => {
const intl = useIntl();
const label = isActive
? intl.formatMessage({
@@ -53,6 +62,7 @@ const Search: FC<SearchProps> = ({ className = '', isActive, setIsActive }) => {
<MagnifyingGlass />
</Label>
<SearchModal
+ searchPage={searchPage}
className={`${sharedStyles.modal} ${searchStyles.modal} ${className}`}
/>
</div>
diff --git a/src/components/organisms/toolbar/toolbar.stories.tsx b/src/components/organisms/toolbar/toolbar.stories.tsx
index 4f9a3de..477cb55 100644
--- a/src/components/organisms/toolbar/toolbar.stories.tsx
+++ b/src/components/organisms/toolbar/toolbar.stories.tsx
@@ -1,5 +1,4 @@
import { ComponentMeta, ComponentStory } from '@storybook/react';
-import { IntlProvider } from 'react-intl';
import ToolbarComponent from './toolbar';
/**
@@ -8,6 +7,9 @@ import ToolbarComponent from './toolbar';
export default {
title: 'Organisms/Toolbar',
component: ToolbarComponent,
+ args: {
+ searchPage: '#',
+ },
argTypes: {
className: {
control: {
@@ -31,13 +33,6 @@ export default {
},
},
},
- decorators: [
- (Story) => (
- <IntlProvider locale="en">
- <Story />
- </IntlProvider>
- ),
- ],
parameters: {
layout: 'fullscreen',
},
diff --git a/src/components/organisms/toolbar/toolbar.test.tsx b/src/components/organisms/toolbar/toolbar.test.tsx
index 4bfe8a8..05e84ff 100644
--- a/src/components/organisms/toolbar/toolbar.test.tsx
+++ b/src/components/organisms/toolbar/toolbar.test.tsx
@@ -10,7 +10,7 @@ const nav = [
describe('Toolbar', () => {
it('renders a navigation menu', () => {
- render(<Toolbar nav={nav} />);
+ render(<Toolbar nav={nav} searchPage="#" />);
expect(screen.getByRole('navigation')).toBeInTheDocument();
});
});
diff --git a/src/components/organisms/toolbar/toolbar.tsx b/src/components/organisms/toolbar/toolbar.tsx
index f1ce530..6593055 100644
--- a/src/components/organisms/toolbar/toolbar.tsx
+++ b/src/components/organisms/toolbar/toolbar.tsx
@@ -1,10 +1,10 @@
import { FC, useState } from 'react';
import MainNav, { type MainNavProps } from '../toolbar/main-nav';
-import Search from '../toolbar/search';
+import Search, { type SearchProps } from '../toolbar/search';
import Settings from '../toolbar/settings';
import styles from './toolbar.module.scss';
-export type ToolbarProps = {
+export type ToolbarProps = Pick<SearchProps, 'searchPage'> & {
/**
* Set additional classnames to the toolbar wrapper.
*/
@@ -20,7 +20,7 @@ export type ToolbarProps = {
*
* Render the website toolbar.
*/
-const Toolbar: FC<ToolbarProps> = ({ className = '', nav }) => {
+const Toolbar: FC<ToolbarProps> = ({ className = '', nav, searchPage }) => {
const [isNavOpened, setIsNavOpened] = useState<boolean>(false);
const [isSettingsOpened, setIsSettingsOpened] = useState<boolean>(false);
const [isSearchOpened, setIsSearchOpened] = useState<boolean>(false);
@@ -34,6 +34,7 @@ const Toolbar: FC<ToolbarProps> = ({ className = '', nav }) => {
className={styles.modal}
/>
<Search
+ searchPage={searchPage}
isActive={isSearchOpened}
setIsActive={setIsSearchOpened}
className={`${styles.modal} ${styles['modal--search']}`}
diff --git a/src/components/templates/layout/layout.tsx b/src/components/templates/layout/layout.tsx
index e1be1af..bfb918b 100644
--- a/src/components/templates/layout/layout.tsx
+++ b/src/components/templates/layout/layout.tsx
@@ -171,9 +171,10 @@ const Layout: FC<LayoutProps> = ({ children, isHome, ...props }) => {
baseline={baseline}
photo={picture}
nav={mainNav}
+ searchPage="/recherche"
isHome={isHome}
- className={styles.header}
withLink={true}
+ className={styles.header}
/>
<Main id="main" className={styles.main}>
<article {...props}>{children}</article>
diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx
index 3acf6a9..38fabd5 100644
--- a/src/pages/blog/index.tsx
+++ b/src/pages/blog/index.tsx
@@ -1,9 +1,7 @@
import Notice from '@components/atoms/layout/notice';
import { type BreadcrumbItem } from '@components/molecules/nav/breadcrumb';
import PostsList, { type Post } from '@components/organisms/layout/posts-list';
-import LinksListWidget, {
- LinksListItems,
-} from '@components/organisms/widgets/links-list-widget';
+import LinksListWidget from '@components/organisms/widgets/links-list-widget';
import PageLayout from '@components/templates/page/page-layout';
import { type EdgesResponse } from '@services/graphql/api';
import {
diff --git a/src/pages/recherche/index.tsx b/src/pages/recherche/index.tsx
new file mode 100644
index 0000000..bf14861
--- /dev/null
+++ b/src/pages/recherche/index.tsx
@@ -0,0 +1,324 @@
+import Notice from '@components/atoms/layout/notice';
+import Spinner from '@components/atoms/loaders/spinner';
+import { type BreadcrumbItem } from '@components/molecules/nav/breadcrumb';
+import PostsList, { type Post } from '@components/organisms/layout/posts-list';
+import LinksListWidget from '@components/organisms/widgets/links-list-widget';
+import PageLayout from '@components/templates/page/page-layout';
+import { type EdgesResponse } from '@services/graphql/api';
+import {
+ getArticleFromRawData,
+ getArticles,
+ getTotalArticles,
+} from '@services/graphql/articles';
+import {
+ getThematicsPreview,
+ getTotalThematics,
+} from '@services/graphql/thematics';
+import { getTopicsPreview, getTotalTopics } from '@services/graphql/topics';
+import { type Article, type Meta } from '@ts/types/app';
+import {
+ RawThematicPreview,
+ RawTopicPreview,
+ type RawArticle,
+} from '@ts/types/raw-data';
+import { loadTranslation, type Messages } from '@utils/helpers/i18n';
+import {
+ getLinksListItems,
+ getPageLinkFromRawData,
+} from '@utils/helpers/pages';
+import useDataFromAPI from '@utils/hooks/use-data-from-api';
+import usePagination from '@utils/hooks/use-pagination';
+import useSettings from '@utils/hooks/use-settings';
+import { GetStaticProps, NextPage } from 'next';
+import Head from 'next/head';
+import { useRouter } from 'next/router';
+import Script from 'next/script';
+import { useIntl } from 'react-intl';
+import { Blog, Graph, WebPage } from 'schema-dts';
+
+type SearchPageProps = {
+ thematicsList: RawThematicPreview[];
+ topicsList: RawTopicPreview[];
+ translation: Messages;
+};
+
+/**
+ * Search page.
+ */
+const SearchPage: NextPage<SearchPageProps> = ({
+ thematicsList,
+ topicsList,
+}) => {
+ const intl = useIntl();
+ const { asPath, query } = useRouter();
+ const title = query.s
+ ? intl.formatMessage(
+ {
+ defaultMessage: 'Search results for {query}',
+ description: 'SearchPage: SEO - Page title',
+ id: 'ZNBhDP',
+ },
+ { query: query.s as string }
+ )
+ : intl.formatMessage({
+ defaultMessage: 'Search',
+ description: 'SearchPage: SEO - Page title',
+ id: 'WDwNDl',
+ });
+ const homeLabel = intl.formatMessage({
+ defaultMessage: 'Home',
+ description: 'Breadcrumb: home label',
+ id: 'j5k9Fe',
+ });
+ const blogLabel = intl.formatMessage({
+ defaultMessage: 'Blog',
+ description: 'Breadcrumb: blog label',
+ id: 'Es52wh',
+ });
+ const breadcrumb: BreadcrumbItem[] = [
+ { id: 'home', name: homeLabel, url: '/' },
+ { id: 'blog', name: blogLabel, url: '/blog' },
+ { id: 'search', name: title, url: '/recherche' },
+ ];
+
+ const { blog, website } = useSettings();
+ const pageTitle = `${title} - ${website.name}`;
+ const pageDescription = query.s
+ ? intl.formatMessage(
+ {
+ defaultMessage:
+ 'Discover search results for {query} on {websiteName}.',
+ description: 'SearchPage: SEO - Meta description',
+ id: 'pg26sn',
+ },
+ { query: query.s as string, websiteName: website.name }
+ )
+ : intl.formatMessage(
+ {
+ defaultMessage: 'Search for a post on {websiteName}.',
+ description: 'SearchPage: SEO - Meta description',
+ id: 'npisb3',
+ },
+ { websiteName: website.name }
+ );
+ const pageUrl = `${website.url}${asPath}`;
+
+ const webpageSchema: WebPage = {
+ '@id': `${pageUrl}`,
+ '@type': 'WebPage',
+ breadcrumb: { '@id': `${website.url}/#breadcrumb` },
+ name: pageTitle,
+ description: pageDescription,
+ inLanguage: website.locales.default,
+ reviewedBy: { '@id': `${website.url}/#branding` },
+ url: `${website.url}`,
+ isPartOf: {
+ '@id': `${website.url}`,
+ },
+ };
+
+ const blogSchema: Blog = {
+ '@id': `${website.url}/#blog`,
+ '@type': 'Blog',
+ author: { '@id': `${website.url}/#branding` },
+ creator: { '@id': `${website.url}/#branding` },
+ editor: { '@id': `${website.url}/#branding` },
+ inLanguage: website.locales.default,
+ license: 'https://creativecommons.org/licenses/by-sa/4.0/deed.fr',
+ mainEntityOfPage: { '@id': `${pageUrl}` },
+ };
+
+ const schemaJsonLd: Graph = {
+ '@context': 'https://schema.org',
+ '@graph': [webpageSchema, blogSchema],
+ };
+
+ const {
+ data,
+ error,
+ isLoadingInitialData,
+ isLoadingMore,
+ hasNextPage,
+ setSize,
+ } = usePagination<RawArticle>({
+ fallbackData: [],
+ fetcher: getArticles,
+ perPage: blog.postsPerPage,
+ search: query.s as string,
+ });
+
+ const totalArticles = useDataFromAPI<number>(() =>
+ getTotalArticles(query.s as string)
+ );
+
+ const postsCount = intl.formatMessage(
+ {
+ defaultMessage:
+ '{postsCount, plural, =0 {No articles} one {# article} other {# articles}}',
+ id: 'LtsVOx',
+ description: 'SearchPage: posts count meta',
+ },
+ { postsCount: totalArticles || 0 }
+ );
+
+ /**
+ * Retrieve the formatted meta.
+ *
+ * @param {Meta<'article'>} meta - The article meta.
+ * @returns {Post['meta']} The formatted meta.
+ */
+ const getPostMeta = (meta: Meta<'article'>): Post['meta'] => {
+ const { commentsCount, dates, thematics, wordsCount } = meta;
+
+ return {
+ commentsCount,
+ dates,
+ readingTime: { wordsCount: wordsCount || 0, onlyMinutes: true },
+ thematics: thematics?.map((thematic) => {
+ return { ...thematic, url: `/thematique/${thematic.slug}` };
+ }),
+ };
+ };
+
+ /**
+ * Retrieve the formatted posts.
+ *
+ * @param {Article[]} posts - An array of articles.
+ * @returns {Post[]} An array of formatted posts.
+ */
+ const getPosts = (posts: Article[]): Post[] => {
+ return posts.map((post) => {
+ return {
+ ...post,
+ cover: post.meta.cover,
+ excerpt: post.intro,
+ meta: getPostMeta(post.meta),
+ url: `/article/${post.slug}`,
+ };
+ });
+ };
+
+ /**
+ * Retrieve the posts list from raw data.
+ *
+ * @param {EdgesResponse<RawArticle>[]} rawData - The raw data.
+ * @returns {Post[]} An array of posts.
+ */
+ const getPostsList = (rawData: EdgesResponse<RawArticle>[]): Post[] => {
+ const articlesList: RawArticle[] = [];
+ rawData.forEach((articleData) =>
+ articleData.edges.forEach((edge) => {
+ articlesList.push(edge.node);
+ })
+ );
+
+ return getPosts(
+ articlesList.map((article) => getArticleFromRawData(article))
+ );
+ };
+
+ /**
+ * Load more posts handler.
+ */
+ const loadMore = () => {
+ setSize((prevSize) => prevSize + 1);
+ };
+
+ const thematicsListTitle = intl.formatMessage({
+ defaultMessage: 'Thematics',
+ description: 'SearchPage: thematics list widget title',
+ id: 'Dq6+WH',
+ });
+
+ const topicsListTitle = intl.formatMessage({
+ defaultMessage: 'Topics',
+ description: 'SearchPage: topics list widget title',
+ id: 'N804XO',
+ });
+
+ return (
+ <>
+ <Head>
+ <title>{pageTitle}</title>
+ <meta name="description" content={pageDescription} />
+ <meta property="og:url" content={`${pageUrl}`} />
+ <meta property="og:type" content="website" />
+ <meta property="og:title" content={title} />
+ <meta property="og:description" content={pageDescription} />
+ </Head>
+ <Script
+ id="schema-blog"
+ type="application/ld+json"
+ dangerouslySetInnerHTML={{ __html: JSON.stringify(schemaJsonLd) }}
+ />
+ <PageLayout
+ title={title}
+ breadcrumb={breadcrumb}
+ headerMeta={{ total: postsCount }}
+ widgets={[
+ <LinksListWidget
+ key="thematics-list"
+ items={getLinksListItems(
+ thematicsList.map(getPageLinkFromRawData),
+ 'thematic'
+ )}
+ title={thematicsListTitle}
+ level={2}
+ />,
+ <LinksListWidget
+ key="topics-list"
+ items={getLinksListItems(
+ topicsList.map(getPageLinkFromRawData),
+ 'topic'
+ )}
+ title={topicsListTitle}
+ level={2}
+ />,
+ ]}
+ >
+ {data && data.length > 0 ? (
+ <PostsList
+ byYear={true}
+ isLoading={isLoadingMore || isLoadingInitialData}
+ loadMore={loadMore}
+ posts={getPostsList(data)}
+ showLoadMoreBtn={hasNextPage}
+ total={totalArticles || 0}
+ />
+ ) : (
+ <Spinner />
+ )}
+ {error && (
+ <Notice
+ kind="error"
+ message={intl.formatMessage({
+ defaultMessage: 'Failed to load.',
+ description: 'SearchPage: failed to load text',
+ id: 'fOe8rH',
+ })}
+ />
+ )}
+ </PageLayout>
+ </>
+ );
+};
+
+export const getStaticProps: GetStaticProps<SearchPageProps> = async ({
+ locale,
+}) => {
+ const totalThematics = await getTotalThematics();
+ const thematics = await getThematicsPreview({ first: totalThematics });
+ const totalTopics = await getTotalTopics();
+ const topics = await getTopicsPreview({ first: totalTopics });
+ const translation = await loadTranslation(locale);
+
+ return {
+ props: {
+ thematicsList: thematics.edges.map((edge) => edge.node),
+ topicsList: topics.edges.map((edge) => edge.node),
+ translation,
+ },
+ };
+};
+
+export default SearchPage;
diff --git a/src/services/graphql/api.ts b/src/services/graphql/api.ts
index 5bed9f9..171ab23 100644
--- a/src/services/graphql/api.ts
+++ b/src/services/graphql/api.ts
@@ -48,7 +48,7 @@ export type ArticlesResponse<T> = {
};
export type CommentsResponse<T> = {
- comments: T[];
+ comments: T;
};
export type SendMailResponse<T> = {
@@ -147,7 +147,14 @@ export type ByContentIdVar = {
contentId: number;
};
-export type sendMailVars = {
+export type SearchVar = {
+ /**
+ * A search term.
+ */
+ search?: string;
+};
+
+export type SendMailVars = {
body: string;
clientMutationId: string;
replyTo: string;
@@ -160,14 +167,14 @@ export type VariablesMap = {
[articlesQuery]: EdgesVars;
[articlesSlugQuery]: EdgesVars;
[commentsQuery]: ByContentIdVar;
- [sendMailMutation]: sendMailVars;
+ [sendMailMutation]: SendMailVars;
[thematicBySlugQuery]: BySlugVar;
[thematicsListQuery]: EdgesVars;
[thematicsSlugQuery]: EdgesVars;
[topicBySlugQuery]: BySlugVar;
[topicsListQuery]: EdgesVars;
[topicsSlugQuery]: EdgesVars;
- [totalArticlesQuery]: null;
+ [totalArticlesQuery]: SearchVar;
[totalThematicsQuery]: null;
[totalTopicsQuery]: null;
};
diff --git a/src/services/graphql/articles.query.ts b/src/services/graphql/articles.query.ts
index e62835d..d65bc9e 100644
--- a/src/services/graphql/articles.query.ts
+++ b/src/services/graphql/articles.query.ts
@@ -166,8 +166,8 @@ export const articlesSlugQuery = `query ArticlesSlug($first: Int = 10, $after: S
/**
* Query the total number of articles.
*/
-export const totalArticlesQuery = `query PostsTotal {
- posts {
+export const totalArticlesQuery = `query PostsTotal($search: String = "") {
+ posts(where: {search: $search}) {
pageInfo {
total
}
diff --git a/src/services/graphql/articles.ts b/src/services/graphql/articles.ts
index 1eb112e..41052c4 100644
--- a/src/services/graphql/articles.ts
+++ b/src/services/graphql/articles.ts
@@ -21,10 +21,11 @@ import {
*
* @returns {Promise<number>} - The articles total number.
*/
-export const getTotalArticles = async (): Promise<number> => {
+export const getTotalArticles = async (search?: string): Promise<number> => {
const response = await fetchAPI<TotalItems, typeof totalArticlesQuery>({
api: getAPIUrl(),
query: totalArticlesQuery,
+ variables: { search },
});
return response.posts.pageInfo.total;
diff --git a/src/services/graphql/contact.ts b/src/services/graphql/contact.ts
index fca718f..00c6ca2 100644
--- a/src/services/graphql/contact.ts
+++ b/src/services/graphql/contact.ts
@@ -1,4 +1,4 @@
-import { fetchAPI, getAPIUrl, sendMailVars } from './api';
+import { fetchAPI, getAPIUrl, SendMailVars } from './api';
import { sendMailMutation } from './contact.mutation';
export type SentEmail = {
@@ -15,7 +15,7 @@ export type SentEmail = {
* @param {sendMailVars} data - The mail data.
* @returns {Promise<SentEmail>} The mutation response.
*/
-export const sendMail = async (data: sendMailVars): Promise<SentEmail> => {
+export const sendMail = async (data: SendMailVars): Promise<SentEmail> => {
const response = await fetchAPI<SentEmail, typeof sendMailMutation>({
api: getAPIUrl(),
query: sendMailMutation,
diff --git a/src/utils/hooks/use-data-from-api.tsx b/src/utils/hooks/use-data-from-api.tsx
new file mode 100644
index 0000000..7082941
--- /dev/null
+++ b/src/utils/hooks/use-data-from-api.tsx
@@ -0,0 +1,23 @@
+import { useEffect, useState } from 'react';
+
+/**
+ * Fetch data from an API.
+ *
+ * This hook is a wrapper to `setState` + `useEffect`.
+ *
+ * @param fetcher - A function to fetch data from API.
+ * @returns {T | undefined} The requested data.
+ */
+const useDataFromAPI = <T extends unknown>(
+ fetcher: () => Promise<T>
+): T | undefined => {
+ const [data, setData] = useState<T>();
+
+ useEffect(() => {
+ fetcher().then((apiData) => setData(apiData));
+ }, [fetcher]);
+
+ return data;
+};
+
+export default useDataFromAPI;
diff --git a/src/utils/hooks/use-pagination.tsx b/src/utils/hooks/use-pagination.tsx
index 1e24b75..a80a539 100644
--- a/src/utils/hooks/use-pagination.tsx
+++ b/src/utils/hooks/use-pagination.tsx
@@ -99,7 +99,8 @@ const usePagination = <T extends object>({
isLoadingInitialData ||
(size > 0 && data && typeof data[size - 1] === 'undefined');
const isRefreshing = isValidating && data && data.length === size;
- const hasNextPage = data && data[data.length - 1].pageInfo.hasNextPage;
+ const hasNextPage =
+ data && data.length > 0 && data[data.length - 1].pageInfo.hasNextPage;
return {
data,