diff --git a/src/components/Feed/Sidebar/Sidebar.tsx b/src/components/Feed/Sidebar/Sidebar.tsx
index 01f83d31..c78b2169 100644
--- a/src/components/Feed/Sidebar/Sidebar.tsx
+++ b/src/components/Feed/Sidebar/Sidebar.tsx
@@ -1,7 +1,6 @@
+import { A, useLocation, useParams } from '@solidjs/router'
import { clsx } from 'clsx'
import { For, Show, createSignal } from 'solid-js'
-
-import { A, useMatch } from '@solidjs/router'
import { Icon } from '~/components/_shared/Icon'
import { useFeed } from '~/context/feed'
import { useFollowing } from '~/context/following'
@@ -15,10 +14,8 @@ export const Sidebar = () => {
const { follows } = useFollowing()
const { feedByTopic, feedByAuthor, seen } = useFeed()
const [isSubscriptionsVisible, setSubscriptionsVisible] = createSignal(true)
- const matchFeed = useMatch(() => '/feed')
- const matchFeedMy = useMatch(() => '/feed/followed')
- const matchFeedCollabs = useMatch(() => '/feed/coauthored')
- const matchFeedDiscussions = useMatch(() => '/feed/discussed')
+ const loc = useLocation()
+ const params = useParams()
const checkTopicIsSeen = (topicSlug: string) => {
return feedByTopic()[topicSlug]?.every((article) => Boolean(seen()[article.slug]))
}
@@ -32,9 +29,9 @@ export const Sidebar = () => {
-
-
-
-
-
-
+
{t('My feed')}
@@ -485,7 +485,7 @@ export const Header = (props: Props) => {
-
-
+
{t('Participation')}
@@ -493,7 +493,7 @@ export const Header = (props: Props) => {
-
-
+
{t('Discussions')}
diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx
index 21a4643a..d8df5169 100644
--- a/src/components/Views/Feed/Feed.tsx
+++ b/src/components/Views/Feed/Feed.tsx
@@ -35,7 +35,7 @@ export type PeriodType = 'week' | 'month' | 'year'
export type FeedProps = {
shouts: Shout[]
- mode?: 'followed' | 'discussed' | 'coauthored' | 'unrated'
+ mode?: 'followed' | 'discussed' | 'coauthored' | 'unrated' | 'all'
order?: '' | 'likes' | 'hot'
}
@@ -143,8 +143,8 @@ export const FeedView = (props: FeedProps) => {
navigate(`/feed/${mode.value}`)}
/>
diff --git a/src/intl/locales/ru/translation.json b/src/intl/locales/ru/translation.json
index 2198e455..d1c9ca93 100644
--- a/src/intl/locales/ru/translation.json
+++ b/src/intl/locales/ru/translation.json
@@ -256,6 +256,7 @@
"Language": "Язык",
"Last rev.": "Посл. изм.",
"Let's log in": "Давайте авторизуемся",
+ "Liked": "Популярное",
"Link copied": "Ссылка скопирована",
"Link copied to clipboard": "Ссылка скопирована в буфер обмена",
"Link sent, check your email": "Ссылка отправлена, проверьте почту",
diff --git a/src/routes/feed/my/[...mode]/[...order].tsx b/src/routes/feed/my/[...mode]/[...order].tsx
index a8da2159..f3883f88 100644
--- a/src/routes/feed/my/[...mode]/[...order].tsx
+++ b/src/routes/feed/my/[...mode]/[...order].tsx
@@ -114,7 +114,7 @@ export default (props: RouteSectionProps<{ shouts: Shout[]; topics: Topic[] }>)