diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 4d903442..a52421fd 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -231,5 +231,7 @@ "Your name will appear on your profile page and as your signature in publications, comments and responses.": "Your name will appear on your profile page and as your signature in publications, comments and responses", "zine": "zine", "By time": "By time", - "New only": "New only" + "New only": "New only", + "Bookmarks": "Bookmarks", + "Logout": "Logout" } diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index edbae3ef..187b38d4 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -249,5 +249,7 @@ "view": "просмотр", "zine": "журнал", "By time": "По порядку", - "New only": "Только новые" + "New only": "Только новые", + "Bookmarks": "Закладки", + "Logout": "Выход" } diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 2a39073f..59963839 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -105,6 +105,14 @@ export const FullArticle = (props: ArticleProps) => { actions: { loadReactionsBy } } = useReactions() + let commentsRef: HTMLDivElement | undefined + const scrollToComments = () => { + if (!isReactionsLoaded()) { + return + } + commentsRef.scrollIntoView({ behavior: 'smooth' }) + } + return ( <> {props.article.title} @@ -195,9 +203,9 @@ export const FullArticle = (props: ArticleProps) => { -
+
scrollToComments()}> - {props.article.stat?.commented || ''} + {/*{props.article.stat?.commented || ''}*/}
@@ -259,13 +267,15 @@ export const FullArticle = (props: ArticleProps) => { )}
- - - +
+ + + +
diff --git a/src/graphql/query/article-load.ts b/src/graphql/query/article-load.ts index 43b0dd4a..6bec8004 100644 --- a/src/graphql/query/article-load.ts +++ b/src/graphql/query/article-load.ts @@ -39,6 +39,7 @@ export default gql` viewed reacted rating + commented } } } diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx index fc6cd6f5..cbbf1c9e 100644 --- a/src/pages/profile/profileSettings.page.tsx +++ b/src/pages/profile/profileSettings.page.tsx @@ -140,7 +140,9 @@ export const ProfileSettingsPage = () => { value={form.slug} class="nolabel" /> -

{t(`${slugError()}`)}

+ +

{t(`${slugError()}`)}

+