diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx
index 9c0423ba..c5a44e98 100644
--- a/src/components/Views/Author/Author.tsx
+++ b/src/components/Views/Author/Author.tsx
@@ -27,6 +27,7 @@ import { Loading } from '../../_shared/Loading'
import { MODALS, hideModal } from '../../../stores/ui'
import { byCreated } from '../../../utils/sortby'
import stylesArticle from '../../Article/Article.module.scss'
+import { Placeholder } from '../../Feed/Placeholder'
import styles from './Author.module.scss'
type Props = {
@@ -259,6 +260,10 @@ export const AuthorView = (props: Props) => {
+
+
@@ -279,46 +284,56 @@ export const AuthorView = (props: Props) => {
-
-
+
+
-
-
-
+ 0}>
+
+
+
-
-
-
+
+
+
- 3}>
-
-
-
-
-
-
+
+
+
-
- {(page) => (
- <>
-
-
-
-
-
-
-
- )}
-
-
+ 3}>
+
+
+
+
+
+
-
-
-
-
+
+ {(page) => (
+ <>
+
+
+
+
+
+
+
+ )}
+
+
+
+
+
+
+
+
diff --git a/src/components/Views/Feed/Feed.module.scss b/src/components/Views/Feed/Feed.module.scss
index 3cb18604..61e1c161 100644
--- a/src/components/Views/Feed/Feed.module.scss
+++ b/src/components/Views/Feed/Feed.module.scss
@@ -175,6 +175,7 @@
-webkit-line-clamp: 1;
a {
+ border: none;
color: rgb(0 0 0 / 65%);
&:hover {
diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx
index b2fc5dfe..f050871d 100644
--- a/src/components/Views/Feed/Feed.tsx
+++ b/src/components/Views/Feed/Feed.tsx
@@ -20,6 +20,7 @@ import { getShareUrl } from '../../Article/SharePopup'
import { AuthorBadge } from '../../Author/AuthorBadge'
import { AuthorLink } from '../../Author/AuthorLink'
import { ArticleCard } from '../../Feed/ArticleCard'
+import { Placeholder } from '../../Feed/Placeholder'
import { Sidebar } from '../../Feed/Sidebar'
import { Modal } from '../../Nav/Modal'
import { DropDown } from '../../_shared/DropDown'
@@ -100,7 +101,7 @@ export const FeedView = (props: Props) => {
const { page, searchParams, changeSearchParams } = useRouter
()
const [isLoading, setIsLoading] = createSignal(false)
const [isRightColumnLoaded, setIsRightColumnLoaded] = createSignal(false)
- const { session } = useSession()
+ const { author, session } = useSession()
const { loadReactionsBy } = useReactions()
const { sortedArticles } = useArticlesStore()
const { topTopics } = useTopics()
@@ -234,107 +235,112 @@ export const FeedView = (props: Props) => {
-
-
- -
- {t('Recent')}
-
- {/*- */}
- {/* {t('Most read')}*/}
- {/*
*/}
- -
- changeSearchParams({ by: 'likes' })}>
- {t('Top rated')}
-
-
- -
- changeSearchParams({ by: 'last_comment' })}>
- {t('Most commented')}
-
-
-
-
-
+ }
+ >
+
+
+ -
+ {t('Recent')}
+
+ {/*- */}
+ {/* {t('Most read')}*/}
+ {/*
*/}
+ -
+ changeSearchParams({ by: 'likes' })}>
+ {t('Top rated')}
+
+
+ -
+ changeSearchParams({ by: 'last_comment' })}>
+ {t('Most commented')}
+
+
+
+
+
+ changeSearchParams({ period: period.value })}
+ />
+
changeSearchParams({ period: period.value })}
+ onChange={(visibility: VisibilityItem) =>
+ changeSearchParams({ visibility: visibility.value })
+ }
/>
-
-
- changeSearchParams({ visibility: visibility.value })
- }
- />
+
-
}>
-
0}>
-
- {(article) => (
- handleShare(shared)}
- onInvite={() => showModal('inviteMembers')}
- article={article}
- settings={{ isFeedMode: true }}
- desktopCoverSize="M"
- />
- )}
-
+ }>
+ 0}>
+
+ {(article) => (
+ handleShare(shared)}
+ onInvite={() => showModal('inviteMembers')}
+ article={article}
+ settings={{ isFeedMode: true }}
+ desktopCoverSize="M"
+ />
+ )}
+
-
-
-
{t('Popular authors')}
-
- {t('All authors')}
-
-
+
+
+
+
+
+ {(author) => (
+ -
+
+
+ )}
+
+
-
-
- {(author) => (
- -
-
-
- )}
-
-
-
+
+ {(article) => (
+
+ )}
+
+
-
- {(article) => (
-
- )}
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts
index bbfa00f4..cb9f4719 100644
--- a/src/graphql/client/core.ts
+++ b/src/graphql/client/core.ts
@@ -5,6 +5,7 @@ import type {
LoadShoutsOptions,
MutationDelete_ShoutArgs,
ProfileInput,
+ QueryGet_Topic_FollowersArgs,
QueryLoad_Authors_ByArgs,
QueryLoad_Shouts_Random_TopArgs,
QueryLoad_Shouts_SearchArgs,
@@ -44,6 +45,7 @@ import authorsAll from '../query/core/authors-all'
import authorsLoadBy from '../query/core/authors-load-by'
import reactionsLoadBy from '../query/core/reactions-load-by'
import topicBySlug from '../query/core/topic-by-slug'
+import topicFollowers from '../query/core/topic-followers'
import topicsAll from '../query/core/topics-all'
import topicsRandomQuery from '../query/core/topics-random'
@@ -129,6 +131,11 @@ export const apiClient = {
return response.data.get_author_followers
},
+ getTopicFollowers: async ({ slug }: QueryGet_Topic_FollowersArgs): Promise
=> {
+ const response = await publicGraphQLClient.query(topicFollowers, { slug }).toPromise()
+ return response.data.get_topic_followers
+ },
+
getAuthorFollows: async (params: {
slug?: string
author_id?: number
diff --git a/src/graphql/query/core/topic-followers.ts b/src/graphql/query/core/topic-followers.ts
new file mode 100644
index 00000000..1ec60ead
--- /dev/null
+++ b/src/graphql/query/core/topic-followers.ts
@@ -0,0 +1,25 @@
+import { gql } from '@urql/core'
+
+export default gql`
+ query TopicFollowersQuery($slug: String) {
+ get_topic_followers(slug: $slug) {
+ id
+ slug
+ name
+ bio
+ about
+ pic
+ # communities
+ links
+ created_at
+ last_seen
+ stat {
+ shouts
+ authors
+ followers
+ rating
+ comments
+ }
+ }
+ }
+`
diff --git a/src/pages/about/discussionRules.page.tsx b/src/pages/about/discussionRules.page.tsx
index 917beb61..899dfd5e 100644
--- a/src/pages/about/discussionRules.page.tsx
+++ b/src/pages/about/discussionRules.page.tsx
@@ -40,7 +40,7 @@ export const DiscussionRulesPage = () => {
людей рождается истина.
- За что можно получить дырку в карме и выиграть бан в сообществе
+ За что можно получить дырку в карме и выиграть бан в сообществе
-
+