-
diff --git a/src/components/Views/Topic.tsx b/src/components/Views/Topic.tsx
index 8945c5ed..3bc4bba2 100644
--- a/src/components/Views/Topic.tsx
+++ b/src/components/Views/Topic.tsx
@@ -1,10 +1,6 @@
-import { Author, AuthorsBy, LoadShoutsOptions, Shout, Topic } from '~/graphql/schema/core.gen'
-
-import { Meta } from '@solidjs/meta'
+import { useSearchParams } from '@solidjs/router'
import { clsx } from 'clsx'
import { For, Show, createEffect, createMemo, createSignal, on, onMount } from 'solid-js'
-
-import { useSearchParams } from '@solidjs/router'
import { useAuthors } from '~/context/authors'
import { useFeed } from '~/context/feed'
import { useGraphQL } from '~/context/graphql'
@@ -14,12 +10,8 @@ import getRandomTopShoutsQuery from '~/graphql/query/core/articles-load-random-t
import loadShoutsRandomQuery from '~/graphql/query/core/articles-load-random-topic'
import loadAuthorsByQuery from '~/graphql/query/core/authors-load-by'
import getTopicFollowersQuery from '~/graphql/query/core/topic-followers'
-import enKeywords from '~/intl/locales/en/keywords.json'
-import ruKeywords from '~/intl/locales/ru/keywords.json'
-import { getImageUrl } from '~/lib/getImageUrl'
-import { capitalize } from '~/utils/capitalize'
+import { Author, AuthorsBy, LoadShoutsOptions, Shout, Topic } from '~/graphql/schema/core.gen'
import { getUnixtime } from '~/utils/getServerDate'
-import { getArticleDescription } from '~/utils/meta'
import { restoreScrollPosition, saveScrollPosition } from '~/utils/scroll'
import { splitToPages } from '~/utils/splitToPages'
import styles from '../../styles/Topic.module.scss'
@@ -45,7 +37,7 @@ export const PRERENDERED_ARTICLES_COUNT = 28
const LOAD_MORE_PAGE_SIZE = 9 // Row3 + Row3 + Row3
export const TopicView = (props: Props) => {
- const { t, lang } = useLocalize()
+ const { t } = useLocalize()
const { query } = useGraphQL()
const [searchParams, changeSearchParams] = useSearchParams (bodyEl = el)}>
-
{ogTitle()}
+
+
@@ -55,7 +27,7 @@ export const StaticPage = (props: Props) => {
{props.title}
{props.children}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/_shared/PageLayout.tsx b/src/components/_shared/PageLayout.tsx
index 7e804f70..de24c9bb 100644
--- a/src/components/_shared/PageLayout.tsx
+++ b/src/components/_shared/PageLayout.tsx
@@ -1,20 +1,24 @@
-import type { JSX } from 'solid-js'
-
-import { Title } from '@solidjs/meta'
+import { Meta, Title } from '@solidjs/meta'
+import { useLocation } from '@solidjs/router'
import { clsx } from 'clsx'
-import { Show, createEffect, createSignal } from 'solid-js'
-
+import type { JSX } from 'solid-js'
+import { Show, createEffect, createMemo, createSignal } from 'solid-js'
+import { useLocalize } from '~/context/localize'
+import { Shout } from '~/graphql/schema/core.gen'
+import enKeywords from '~/intl/locales/en/keywords.json'
+import ruKeywords from '~/intl/locales/ru/keywords.json'
+import { getImageUrl, getOpenGraphImageUrl } from '~/lib/getImageUrl'
+import { getArticleKeywords } from '~/utils/meta'
import { FooterView } from '../Discours/Footer'
import { Header } from '../Nav/Header'
-
-import '../../styles/app.scss'
import styles from './PageLayout.module.scss'
-type Props = {
+type PageLayoutProps = {
title: string
+ desc?: string
headerTitle?: string
slug?: string
- articleBody?: string
+ article?: Shout
cover?: string
children: JSX.Element
isHeaderFixed?: boolean
@@ -23,29 +27,56 @@ type Props = {
withPadding?: boolean
zeroBottomPadding?: boolean
scrollToComments?: (value: boolean) => void
+ key?: string
}
-export const PageLayout = (props: Props) => {
- const isHeaderFixed = props.isHeaderFixed === undefined ? true : props.isHeaderFixed
+export const PageLayout = (props: PageLayoutProps) => {
+ const isHeaderFixed = props.isHeaderFixed === undefined ? true : props.isHeaderFixed // FIXME: выглядит как костылек
+ const loc = useLocation()
+ const { t, lang } = useLocalize()
+ const imageUrl = props.cover ? getImageUrl(props.cover) : 'production/image/logo_image.png'
+ const ogImage = createMemo(() =>
+ // NOTE: preview generation logic works only for one article view
+ props.article
+ ? getOpenGraphImageUrl(imageUrl, {
+ title: props.title,
+ topic: props.article?.topics?.[0]?.title || '',
+ author: props.article?.authors?.[0]?.name || '',
+ width: 1200
+ })
+ : imageUrl
+ )
+ const ogTitle = createMemo(() => t(props.title))
+ const description = createMemo(() => (props.desc ? t(props.desc) : ''))
+ const keypath = createMemo(() => (props.key || loc?.pathname.split('/')[0]) as keyof typeof ruKeywords)
+ const keywords = createMemo(
+ () =>
+ (props.article && getArticleKeywords(props.article as Shout)) ||
+ (lang() === 'ru' ? ruKeywords[keypath()] : enKeywords[keypath()])
+ )
const [scrollToComments, setScrollToComments] = createSignal(false)
-
- createEffect(() => {
- if (props.scrollToComments) {
- props.scrollToComments(scrollToComments())
- }
- })
-
+ createEffect(() => props.scrollToComments?.(scrollToComments()))
return (
<>
{props.title}
setScrollToComments(value)}
/>
+
+
+
+
+
+
+
+
+
+
{
})}
classList={{ 'main-content--no-padding': !isHeaderFixed }}
>
- {props.children}
+
=> {
- const fetcher = await loadReactions({ ...opts })
+ const fetcher = await loadReactions(opts)
const result = (await fetcher()) || []
const newReactionsByShout: Record = {}
const newReactionEntities = result.reduce(
diff --git a/src/graphql/api/public.ts b/src/graphql/api/public.ts
index cb7dc5c0..8c9c98c4 100644
--- a/src/graphql/api/public.ts
+++ b/src/graphql/api/public.ts
@@ -60,7 +60,7 @@ export const loadReactions = (options: QueryLoad_Reactions_ByArgs) => {
const filter = new URLSearchParams(options.by as Record)
console.debug(options)
return cache(async () => {
- const resp = await defaultClient.query(loadReactionsByQuery, { ...options }).toPromise()
+ const resp = await defaultClient.query(loadReactionsByQuery, options).toPromise()
const result = resp?.data?.load_reactions_by
if (result) return result as Reaction[]
}, `reactions-${filter}-${page}`)
diff --git a/src/intl/locales/en/keywords.json b/src/intl/locales/en/keywords.json
index 366a311f..d77521c2 100644
--- a/src/intl/locales/en/keywords.json
+++ b/src/intl/locales/en/keywords.json
@@ -1,7 +1,7 @@
{
"dogma": "Discours.io, dogma, editorial principles, code of ethics, journalism, community",
"guide": "discours.io, guide, help, how to start, reference, tutorial",
- "": "Discours.io, Discours magazine, Discours, culture, science, art, society, independent journalism, literature, music, cinema, video, photography",
+ "home": "Discours.io, Discours magazine, Discours, culture, science, art, society, independent journalism, literature, music, cinema, video, photography",
"principles": "Discours.io, communities, values, editorial rules, polyphony, creation",
"terms-of-use": "Discours.io, site rules, terms of use",
"topic": "{topic}, Discours.io, articles, journalism, research"
diff --git a/src/intl/locales/ru/keywords.json b/src/intl/locales/ru/keywords.json
index b542b3c1..a2c7ca63 100644
--- a/src/intl/locales/ru/keywords.json
+++ b/src/intl/locales/ru/keywords.json
@@ -1,7 +1,7 @@
{
"dogma": "discours.io, догма, принципы редактирования, этический кодекс, журналистика, сообщество",
"guide": "discours.io, гид, помощь, как начать, справочник, туториал",
- "": "discours.io, Дискурс журнал, Дискурс, культура, наука, искусство, общество, независимая журналистика, литература, музыка, кино, видео, фотография",
+ "home": "discours.io, Дискурс журнал, Дискурс, культура, наука, искусство, общество, независимая журналистика, литература, музыка, кино, видео, фотография",
"principles": "discours.io, сообщества, ценности, принципы редактировани, плюрализм мнений, сотворчество",
"terms-of-use": "discours.io, правила сайта, правила, пользовательское соглашение",
"topic": "discours.io, Дискурс, статьи, журналистика, исследование"
diff --git a/src/routes/(home).tsx b/src/routes/(home).tsx
index d7340e40..f406eb45 100644
--- a/src/routes/(home).tsx
+++ b/src/routes/(home).tsx
@@ -114,7 +114,7 @@ export default function HomePage(props: RouteSectionProps) {
onMount(async () => await loadMoreFeatured())
return (
-
+
setScrollToComments(value)}
>
diff --git a/src/routes/author/(all-authors).tsx b/src/routes/author/(all-authors).tsx
index 55c4015a..8b0d6aa1 100644
--- a/src/routes/author/(all-authors).tsx
+++ b/src/routes/author/(all-authors).tsx
@@ -2,6 +2,7 @@ import { RouteDefinition, RouteLoadFuncArgs, type RouteSectionProps, createAsync
import { Suspense, createEffect, on } from 'solid-js'
import { AllAuthors } from '~/components/Views/AllAuthors'
import { AUTHORS_PER_PAGE } from '~/components/Views/AllAuthors/AllAuthors'
+import styles from '~/components/Views/AllAuthors/AllAuthors.module.scss'
import { Loading } from '~/components/_shared/Loading'
import { PageLayout } from '~/components/_shared/PageLayout'
import { useAuthors } from '~/context/authors'
@@ -27,13 +28,13 @@ export const route = {
const isAll = !by || by === 'name'
return {
authors: isAll && (await fetchAllAuthors()),
- topFollowedAuthors: await fetchAuthorsWithStat(10, 'followers'),
- topShoutsAuthors: await fetchAuthorsWithStat(10, 'shouts')
+ authorsByFollowers: await fetchAuthorsWithStat(10, 'followers'),
+ authorsByShouts: await fetchAuthorsWithStat(10, 'shouts')
} as AllAuthorsData
}
} satisfies RouteDefinition
-type AllAuthorsData = { authors: Author[]; topFollowedAuthors: Author[]; topShoutsAuthors: Author[] }
+type AllAuthorsData = { authors: Author[]; authorsByFollowers: Author[]; authorsByShouts: Author[] }
// addAuthors to context
@@ -46,8 +47,8 @@ export default function AllAuthorsPage(props: RouteSectionProps)
if (props.data) return props.data
return {
authors: await fetchAllAuthors(),
- topFollowedAuthors: await fetchAuthorsWithStat(10, 'followers'),
- topShoutsAuthors: await fetchAuthorsWithStat(10, 'shouts')
+ authorsByFollowers: await fetchAuthorsWithStat(10, 'followers'),
+ authorsByShouts: await fetchAuthorsWithStat(10, 'shouts')
} as AllAuthorsData
})
@@ -58,8 +59,8 @@ export default function AllAuthorsPage(props: RouteSectionProps)
([data, aa]) => {
if (data && aa) {
aa(data.authors as Author[])
- aa(data.topFollowedAuthors as Author[])
- aa(data.topShoutsAuthors as Author[])
+ aa(data.authorsByFollowers as Author[])
+ aa(data.authorsByShouts as Author[])
console.debug('[routes.author] added all authors:', data.authors)
}
},
@@ -68,14 +69,19 @@ export default function AllAuthorsPage(props: RouteSectionProps)
)
return (
-
+
diff --git a/src/routes/author/[slug]/[tab].tsx b/src/routes/author/[slug]/[tab].tsx
index 29e2c1ad..fb150d0f 100644
--- a/src/routes/author/[slug]/[tab].tsx
+++ b/src/routes/author/[slug]/[tab].tsx
@@ -9,6 +9,7 @@ import { useLocalize } from '~/context/localize'
import { ReactionsProvider } from '~/context/reactions'
import { loadShouts } from '~/graphql/api/public'
import { Author, LoadShoutsOptions, Shout } from '~/graphql/schema/core.gen'
+import { getImageUrl } from '~/lib/getImageUrl'
import { SHOUTS_PER_PAGE } from '../../(home)'
const fetchAuthorShouts = async (slug: string, offset?: number) => {
@@ -47,6 +48,12 @@ export default (props: RouteSectionProps<{ articles: Shout[] }>) => {
})
}
})
+
+ const cover = createMemo(() =>
+ author()?.pic
+ ? getImageUrl(author()?.pic || '', { width: 1200 })
+ : getImageUrl('production/image/logo_image.png')
+ )
return (
{
- const { t, lang } = useLocalize()
- const ogImage = getImageUrl('production/image/logo_image.png')
- const ogTitle = createMemo(() => t('Choose a post type'))
- const description = createMemo(() =>
- t('Participate in the Discours: share information, join the editorial team')
- )
+ const { t } = useLocalize()
const client = useGraphQL()
const navigate = useNavigate()
const handleCreate = async (layout: LayoutType) => {
@@ -32,17 +22,11 @@ export default () => {
}
}
return (
-
-
-
-
-
-
-
-
-
-
-
+
) => {
return (
-
)
diff --git a/src/routes/feed/[feed].tsx b/src/routes/feed/[feed].tsx
index bd93cf03..28056a0b 100644
--- a/src/routes/feed/[feed].tsx
+++ b/src/routes/feed/[feed].tsx
@@ -125,7 +125,12 @@ export default (props: RouteSectionProps) => {
}
createEffect(() => setIsLoadMoreButtonVisible(offset() < (shouts()?.length || 0)))
return (
-
+
diff --git a/src/routes/topic/(all-topics).tsx b/src/routes/topic/(all-topics).tsx
index 35c10d9f..daf202f3 100644
--- a/src/routes/topic/(all-topics).tsx
+++ b/src/routes/topic/(all-topics).tsx
@@ -22,7 +22,12 @@ export default (props: RouteSectionProps<{ topics: Topic[] }>) => {
const { addTopics } = useTopics()
createEffect(() => addTopics(topics() || []))
return (
-
+
{props.children}