From 6724a97352a55aa2d7f484e1ce7bd9875d945f0e Mon Sep 17 00:00:00 2001 From: dm1sh Date: Mon, 31 Jul 2023 15:03:56 +0300 Subject: [PATCH] Added poetry display on userPage --- front/src/api/poetry/index.ts | 18 +++++ front/src/api/poetry/types.ts | 23 ++++++ front/src/components/Poetry.tsx | 39 ++++++++++ front/src/components/index.ts | 1 + front/src/hooks/api/index.ts | 1 + front/src/hooks/api/usePoetry.ts | 122 +++++++++++++++++++++++++++++++ front/src/pages/UserPage.tsx | 5 +- 7 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 front/src/api/poetry/index.ts create mode 100644 front/src/api/poetry/types.ts create mode 100644 front/src/components/Poetry.tsx create mode 100644 front/src/hooks/api/usePoetry.ts diff --git a/front/src/api/poetry/index.ts b/front/src/api/poetry/index.ts new file mode 100644 index 0000000..36e60b3 --- /dev/null +++ b/front/src/api/poetry/index.ts @@ -0,0 +1,18 @@ +import { API_URL } from '../../config' +import { PoetryResponse, Poetry } from './types' + +const initialPoetry: Poetry = { + title: '', + text: '', + author: '', +} + +const composePoetryURL = () => ( + API_URL + '/poetry?' +) + +const processPoetry = (data: PoetryResponse): Poetry => { + return data +} + +export { initialPoetry, composePoetryURL, processPoetry } diff --git a/front/src/api/poetry/types.ts b/front/src/api/poetry/types.ts new file mode 100644 index 0000000..d3855dc --- /dev/null +++ b/front/src/api/poetry/types.ts @@ -0,0 +1,23 @@ +import { isObject } from '../../utils/types' + +type PoetryResponse = { + title: string, + text: string, + author: string, +} + +const isPoetryResponse = (obj: unknown): obj is PoetryResponse => ( + isObject(obj, { + 'title': 'string', + 'text': 'string', + 'author': 'string', + }) +) + +type Poetry = PoetryResponse + +const isPoetry = isPoetryResponse + +export type { PoetryResponse, Poetry } + +export { isPoetryResponse, isPoetry } diff --git a/front/src/components/Poetry.tsx b/front/src/components/Poetry.tsx new file mode 100644 index 0000000..c8473cd --- /dev/null +++ b/front/src/components/Poetry.tsx @@ -0,0 +1,39 @@ +import { CSSProperties } from 'react' +import { usePoetry } from '../hooks/api' +import { gotError, gotResponse } from '../hooks/useFetch' + +const styles = { + container: { + paddingBottom: 8, + } as CSSProperties, +} + +function Poetry() { + const poetry = usePoetry() + + return ( +
+

Поэзия

{ + gotResponse(poetry) ? ( + gotError(poetry) ? ( +
+
Ошибка получения стиха
+

{poetry.error}

+
+ ) : ( + <> +
{poetry.data.title}
+

+

{poetry.data.author}

+ + ) + ) : ( +
Загрузка...
+ ) + } + +
+ ) +} + +export default Poetry diff --git a/front/src/components/index.ts b/front/src/components/index.ts index 4ec2ca0..2edd60d 100644 --- a/front/src/components/index.ts +++ b/front/src/components/index.ts @@ -12,3 +12,4 @@ export { default as CategoryPreview } from './CategoryPreview' export { default as StoriesPreview } from './StoriesPreview' export { default as Points } from './Points' export { default as SignOut } from './SignOut' +export { default as Poetry } from './Poetry' diff --git a/front/src/hooks/api/index.ts b/front/src/hooks/api/index.ts index 86aca11..7931b1e 100644 --- a/front/src/hooks/api/index.ts +++ b/front/src/hooks/api/index.ts @@ -7,3 +7,4 @@ export { default as useUser } from './useUser' export { default as useRemoveAnnouncement } from './useRemoveAnnouncement' export { default as useSignIn } from './useSignIn' export { default as useSignUp } from './useSignUp' +export { default as usePoetry } from './usePoetry' diff --git a/front/src/hooks/api/usePoetry.ts b/front/src/hooks/api/usePoetry.ts new file mode 100644 index 0000000..6547f63 --- /dev/null +++ b/front/src/hooks/api/usePoetry.ts @@ -0,0 +1,122 @@ +import { Poetry } from '../../api/poetry/types' +import { UseFetchReturn } from '../useFetch' + +const testPoetry: Poetry = { + title: 'The Mouse\'s Tale', + text: `
"Fury said to
+
a mouse, That
+
he met
+
in the
+
house,
+
'Let us
+
both go
+
to law:
+
I will
+
prosecute
+
you.—
+
Come, I'll
+
take no
+
denial;
+
We must
+
have a
+
trial:
+
For
+
really
+
this
+
morning
+
I've
+
nothing
+
to do.'
+
Said the
+
mouse to
+
the cur,
+
'Such a
+
trial,
+
dear sir,
+
With no
+
jury or
+
judge,
+
would be
+
wasting
+
our breath.'
+
'I'll be
+
judge,
+
I'll be
+
jury,'
+
Said
+
cunning
+
old Fury;
+
'I'll try
+
the whole
+
cause,
+
and
+
condemn
+
you
+
to
+
death.' "
`, + author: 'Lewis Carroll', +} + +function usePoetry(): UseFetchReturn { + return ( + // useFetch( + // composePoetryURL(), + // 'GET', + // false, + // isPoetryResponse, + // processPoetry, + // initialPoetry, + // ) + + { + data: testPoetry, + loading: false, + error: null, + refetch: () => { return }, + } + + // { + // data: undefined, + // loading: false, + // error: 'хе-хе', + // refetch: () => { return }, + // } + + // { + // data: undefined, + // loading: true, + // error: null, + // refetch: () => { return }, + // } + ) +} + +export default usePoetry diff --git a/front/src/pages/UserPage.tsx b/front/src/pages/UserPage.tsx index f3c4007..f02bcc1 100644 --- a/front/src/pages/UserPage.tsx +++ b/front/src/pages/UserPage.tsx @@ -2,7 +2,7 @@ import { Container } from 'react-bootstrap' import { useUser } from '../hooks/api' import { userCategories } from '../assets/userCategories' -import { BackHeader, CategoryPreview, Points, SignOut } from '../components' +import { BackHeader, CategoryPreview, Poetry, Points, SignOut } from '../components' import { gotError, gotResponse } from '../hooks/useFetch' function UserPage() { @@ -31,9 +31,12 @@ function UserPage() { 'Загрузка...' ) } /> + {userCategories.map(cat => ( ))} + + ) }