postmerge
This commit is contained in:
parent
2e82eec82c
commit
af806590fb
|
@ -57,5 +57,5 @@
|
|||
}
|
||||
|
||||
.topicDetailsIcon {
|
||||
|
||||
}
|
||||
display: block;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
import type { Author, Topic } from '../../graphql/schema/core.gen'
|
||||
|
||||
import { clsx } from 'clsx'
|
||||
import { For, Show, createEffect, createSignal } from 'solid-js'
|
||||
import { Show, createEffect, createSignal } from 'solid-js'
|
||||
|
||||
import { useFollowing } from '../../context/following'
|
||||
import { useLocalize } from '../../context/localize'
|
||||
|
@ -11,8 +11,6 @@ import { Button } from '../_shared/Button'
|
|||
|
||||
import { Icon } from '../_shared/Icon'
|
||||
import { Subscribers } from '../_shared/Subscribers'
|
||||
import stylesCard from '../Author/AuthorCard/AuthorCard.module.scss'
|
||||
import { Userpic } from '../Author/Userpic'
|
||||
import styles from './Full.module.scss'
|
||||
|
||||
type Props = {
|
||||
|
@ -57,7 +55,7 @@ export const FullTopic = (props: Props) => {
|
|||
</div>
|
||||
</Show>
|
||||
|
||||
<Subscribers followers={props.topic?.followers} following={props.topic?.following} />
|
||||
<Subscribers followers={props.followers} />
|
||||
</div>
|
||||
|
||||
<div class={clsx(styles.topicActions)}>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import { Match, Switch, createEffect, on, onCleanup } from 'solid-js'
|
||||
import { createEffect, on, onCleanup } from 'solid-js'
|
||||
|
||||
import { AuthGuard } from '../components/AuthGuard'
|
||||
import { Feed } from '../components/Views/Feed'
|
||||
import { PageLayout } from '../components/_shared/PageLayout'
|
||||
import { useLocalize } from '../context/localize'
|
||||
|
@ -43,16 +42,7 @@ export const FeedPage = () => {
|
|||
return (
|
||||
<PageLayout title={t('Feed')}>
|
||||
<ReactionsProvider>
|
||||
<Switch fallback={<Feed loadShouts={handleFeedLoadShouts} />}>
|
||||
<Match when={page().route === 'feed'}>
|
||||
<Feed loadShouts={handleFeedLoadShouts} />
|
||||
</Match>
|
||||
<Match when={page().route === 'feedMy'}>
|
||||
<AuthGuard>
|
||||
<Feed loadShouts={handleMyFeedLoadShouts} />
|
||||
</AuthGuard>
|
||||
</Match>
|
||||
</Switch>
|
||||
<Feed loadShouts={page().route === 'feedMy' ? handleMyFeedLoadShouts : handleFeedLoadShouts} />
|
||||
</ReactionsProvider>
|
||||
</PageLayout>
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue
Block a user