discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

postmerge

Browse Source
This commit is contained in:
Untone 2024-05-18 19:55:24 +03:00
parent 2e82eec82c
commit af806590fb
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Topic/Full.module.scss
View File

@ -57,5 +57,5 @@
} }
.topicDetailsIcon { .topicDetailsIcon {
display: block;
} }

6
src/components/Topic/Full.tsx
View File

@ -1,7 +1,7 @@
import type { Author, Topic } from '../../graphql/schema/core.gen' import type { Author, Topic } from '../../graphql/schema/core.gen'
import { clsx } from 'clsx' 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 { useFollowing } from '../../context/following'
import { useLocalize } from '../../context/localize' import { useLocalize } from '../../context/localize'
@ -11,8 +11,6 @@ import { Button } from '../_shared/Button'
import { Icon } from '../_shared/Icon' import { Icon } from '../_shared/Icon'
import { Subscribers } from '../_shared/Subscribers' import { Subscribers } from '../_shared/Subscribers'
import stylesCard from '../Author/AuthorCard/AuthorCard.module.scss'
import { Userpic } from '../Author/Userpic'
import styles from './Full.module.scss' import styles from './Full.module.scss'
type Props = { type Props = {
@ -57,7 +55,7 @@ export const FullTopic = (props: Props) => {
</div> </div>
</Show> </Show>
<Subscribers followers={props.topic?.followers} following={props.topic?.following} /> <Subscribers followers={props.followers} />
</div> </div>
<div class={clsx(styles.topicActions)}> <div class={clsx(styles.topicActions)}>

14
src/pages/feed.page.tsx
View File

@ -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 { Feed } from '../components/Views/Feed'
import { PageLayout } from '../components/_shared/PageLayout' import { PageLayout } from '../components/_shared/PageLayout'
import { useLocalize } from '../context/localize' import { useLocalize } from '../context/localize'
@ -43,16 +42,7 @@ export const FeedPage = () => {
return ( return (
<PageLayout title={t('Feed')}> <PageLayout title={t('Feed')}>
<ReactionsProvider> <ReactionsProvider>
<Switch fallback={<Feed loadShouts={handleFeedLoadShouts} />}> <Feed loadShouts={page().route === 'feedMy' ? handleMyFeedLoadShouts : handleFeedLoadShouts} />
<Match when={page().route === 'feed'}>
<Feed loadShouts={handleFeedLoadShouts} />
</Match>
<Match when={page().route === 'feedMy'}>
<AuthGuard>
<Feed loadShouts={handleMyFeedLoadShouts} />
</AuthGuard>
</Match>
</Switch>
</ReactionsProvider> </ReactionsProvider>
</PageLayout> </PageLayout>
) )