From 95612eb7b8d4ca9a53071b56491d2465c7fb728f Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Sat, 13 Jul 2024 13:33:49 +0300
Subject: [PATCH] topic-outing+fixes

---
 src/components/Views/Topic.tsx       |  2 +-
 src/routes/[slug]/[...tab].tsx       | 22 ++++++++++------------
 src/routes/topic/[slug]/[...tab].tsx |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/components/Views/Topic.tsx b/src/components/Views/Topic.tsx
index 920421c4..f46a4654 100644
--- a/src/components/Views/Topic.tsx
+++ b/src/components/Views/Topic.tsx
@@ -39,7 +39,7 @@ export const TopicView = (props: Props) => {
   const { feedByTopic, addFeed } = useFeed()
   const { topicEntities } = useTopics()
   const { authorsByTopic } = useAuthors()
-  const [searchParams, changeSearchParams] = useSearchParams<{by: TopicFeedSortBy}>()
+  const [searchParams, changeSearchParams] = useSearchParams<{ by: TopicFeedSortBy }>()
   const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false)
   const [favoriteTopArticles, setFavoriteTopArticles] = createSignal<Shout[]>([])
   const [reactedTopMonthArticles, setReactedTopMonthArticles] = createSignal<Shout[]>([])
diff --git a/src/routes/[slug]/[...tab].tsx b/src/routes/[slug]/[...tab].tsx
index 4df13c5a..9a7d80a2 100644
--- a/src/routes/[slug]/[...tab].tsx
+++ b/src/routes/[slug]/[...tab].tsx
@@ -1,14 +1,6 @@
 import { RouteDefinition, RouteSectionProps, createAsync, useLocation } from '@solidjs/router'
 import { HttpStatusCode } from '@solidjs/start'
-import {
-  ErrorBoundary,
-  Show,
-  Suspense,
-  createEffect,
-  createSignal,
-  on,
-  onMount
-} from 'solid-js'
+import { ErrorBoundary, Show, Suspense, createEffect, createSignal, on, onMount } from 'solid-js'
 import { FourOuFourView } from '~/components/Views/FourOuFour'
 import { Loading } from '~/components/_shared/Loading'
 import { gaIdentity } from '~/config'
@@ -41,7 +33,7 @@ export const ArticlePage = (props: RouteSectionProps<ArticlePageProps>) => {
   const loc = useLocation()
   const { t } = useLocalize()
   const [scrollToComments, setScrollToComments] = createSignal<boolean>(false)
-  const data = createAsync(async () => props.data?.article || await fetchShout(props.params.slug))
+  const data = createAsync(async () => props.data?.article || (await fetchShout(props.params.slug)))
 
   onMount(async () => {
     if (gaIdentity && data()?.id) {
@@ -82,7 +74,7 @@ export const ArticlePage = (props: RouteSectionProps<ArticlePageProps>) => {
           }
         >
           <PageLayout
-            title={`${t('Discours')}${data()?.title ? ' :: ' : ''}${data()?.title||''}`}
+            title={`${t('Discours')}${data()?.title ? ' :: ' : ''}${data()?.title || ''}`}
             desc={descFromBody(data()?.body || '')}
             keywords={keywordsFromTopics(data()?.topics as { title: string }[])}
             headerTitle={data()?.title || ''}
@@ -100,7 +92,13 @@ export const ArticlePage = (props: RouteSectionProps<ArticlePageProps>) => {
   )
 }
 
-type SlugPageProps = { article?: Shout; comments?: Reaction[]; votes?: Reaction[]; author?: Author, topics: Topic[] }
+type SlugPageProps = {
+  article?: Shout
+  comments?: Reaction[]
+  votes?: Reaction[]
+  author?: Author
+  topics: Topic[]
+}
 
 export default (props: RouteSectionProps<SlugPageProps>) => {
   if (props.params.slug.startsWith('@')) {
diff --git a/src/routes/topic/[slug]/[...tab].tsx b/src/routes/topic/[slug]/[...tab].tsx
index 62510216..15a2c2a7 100644
--- a/src/routes/topic/[slug]/[...tab].tsx
+++ b/src/routes/topic/[slug]/[...tab].tsx
@@ -34,7 +34,7 @@ export const route = {
     }
   }
 }
-export type TopicPageProps = { articles?: Shout[]; topics: Topic[], authors?: Author[] }
+export type TopicPageProps = { articles?: Shout[]; topics: Topic[]; authors?: Author[] }
 
 export default function TopicPage(props: RouteSectionProps<TopicPageProps>) {
   const { t } = useLocalize()