From 2e517cc7f7cfd74fb19684adf60d09b86c068d79 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Tue, 6 Sep 2022 14:46:16 +0300 Subject: [PATCH] fix eslint warnings --- pages/index.tsx | 6 +- src/components/Footer/Author.tsx | 4 +- src/components/Overlay/Transition.tsx | 3 +- src/components/Share/index.tsx | 14 ++-- src/remote/factory.ts | 96 +++++++++++++-------------- 5 files changed, 60 insertions(+), 63 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 895a310d..51700223 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -40,10 +40,8 @@ const Index: NextPage = props => ( ) export const getStaticProps: GetStaticProps = async () => { - const items = await apiGet(createHomeCards) - ('https://hudozka.tmshv.com/home', async () => []) - const menu = await apiGet(createMenu) - ('https://hudozka.tmshv.com/menu', () => []) + const items = await apiGet(createHomeCards)('https://hudozka.tmshv.com/home', async () => []) + const menu = await apiGet(createMenu)('https://hudozka.tmshv.com/menu', () => []) const title = 'Шлиссельбургская ДХШ' const meta = (new MetaBuilder()) diff --git a/src/components/Footer/Author.tsx b/src/components/Footer/Author.tsx index d1c2ab27..208678df 100644 --- a/src/components/Footer/Author.tsx +++ b/src/components/Footer/Author.tsx @@ -1,8 +1,8 @@ export const Author: React.FC = () => ( Разработка и поддержка сайта — - + www.tmshv.ru - + ) diff --git a/src/components/Overlay/Transition.tsx b/src/components/Overlay/Transition.tsx index 790ce69b..96b2ad0a 100644 --- a/src/components/Overlay/Transition.tsx +++ b/src/components/Overlay/Transition.tsx @@ -16,7 +16,8 @@ export const Transition: React.FC = props => { }, [opacity]) const transition = React.useMemo( () => `all ${props.duration}ms`, - [props.duration]) + [props.duration] + ) React.useEffect(() => { if (!props.show) { diff --git a/src/components/Share/index.tsx b/src/components/Share/index.tsx index 8153da47..a12cb1c9 100644 --- a/src/components/Share/index.tsx +++ b/src/components/Share/index.tsx @@ -1,10 +1,8 @@ -import * as React from 'react' - export const Share: React.FC = () => ( -
-
Поделиться
-
Поделиться
-
Отправить
-
Твитнуть
-
+
+
Поделиться
+
Поделиться
+
Отправить
+
Твитнуть
+
) diff --git a/src/remote/factory.ts b/src/remote/factory.ts index cd22ca50..af750acb 100644 --- a/src/remote/factory.ts +++ b/src/remote/factory.ts @@ -34,64 +34,64 @@ export function createEmbed(component: StrapiComponentEmbed): Token { export async function createPageToken(component: StrapiComponent): Promise { switch (component.__component) { - case 'hudozka.text': { - return { - token: 'html', - data: md(component.text), - } + case 'hudozka.text': { + return { + token: 'html', + data: md(component.text), } + } - case 'hudozka.image': { - const data = await createPicFromMedia(component.media, { - alternativeText: component.caption, - caption: component.caption, - }) + case 'hudozka.image': { + const data = await createPicFromMedia(component.media, { + alternativeText: component.caption, + caption: component.caption, + }) - return { - token: 'image', - wide: component.wide, - data, - } + return { + token: 'image', + wide: component.wide, + data, } + } - case 'hudozka.document': { - return { - token: 'file', - data: { - url: component.media.url, - slug: 'jopa', - image_url: component.media.url, - file_url: component.media.url, - title: component.title, - file_size: component.media.size * 1000, - // file_size: component.media.size, - file_format: component.media.mime, - }, - } + case 'hudozka.document': { + return { + token: 'file', + data: { + url: component.media.url, + slug: 'jopa', + image_url: component.media.url, + file_url: component.media.url, + title: component.title, + file_size: component.media.size * 1000, + // file_size: component.media.size, + file_format: component.media.mime, + }, } + } - case 'hudozka.embed': { - return createEmbed(component) + case 'hudozka.embed': { + return createEmbed(component) + } + + case 'hudozka.card-grid': { + const items = await Promise.all(component.items + .filter(Boolean) + .map(createCardGrid) + ) + return { + token: 'grid', + data: { + items, + }, } + } - case 'hudozka.card-grid': { - const items = await Promise.all(component.items - .filter(Boolean) - .map(createCardGrid) - ) - return { - token: 'grid', - data: { - items, - }, - } + default: + return { + token: 'text', + data: ` ${JSON.stringify(component)}`, } - - default: - return { - token: 'text', - data: ` ${JSON.stringify(component)}`, - } } }