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

url-backward-compat

Browse Source
This commit is contained in:
Untone 2024-09-06 07:52:39 +03:00
parent d003df96f2
commit e03971193e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/routes/[slug]/[...tab].tsx
View File

@ -1,6 +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, on, onMount } from 'solid-js'
import { FourOuFourView } from '~/components/Views/FourOuFour'
import { Loading } from '~/components/_shared/Loading'
import { gaIdentity } from '~/config'
@ -28,9 +28,9 @@ export const route: RouteDefinition = {
})
}
type ArticlePageProps = { article?: Shout; comments?: Reaction[]; votes?: Reaction[]; author?: Author }
export type ArticlePageProps = { article?: Shout; comments?: Reaction[]; votes?: Reaction[]; author?: Author }
type SlugPageProps = {
export type SlugPageProps = {
article?: Shout
comments?: Reaction[]
votes?: Reaction[]
@ -38,7 +38,7 @@ type SlugPageProps = {
topics: Topic[]
}
export default (props: RouteSectionProps<SlugPageProps>) => {
export default function ArticlePage(props: RouteSectionProps<SlugPageProps>) {
if (props.params.slug.startsWith('@')) {
console.debug('[routes] [slug]/[...tab] starts with @, render as author page')
const patchedProps = {
@ -66,7 +66,6 @@ export default (props: RouteSectionProps<SlugPageProps>) => {
function 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)))
onMount(async () => {
@ -114,10 +113,9 @@ export default (props: RouteSectionProps<SlugPageProps>) => {
headerTitle={data()?.title || ''}
slug={data()?.slug}
cover={data()?.cover || ''}
scrollToComments={(value) => setScrollToComments(value)}
>
<ReactionsProvider>
<FullArticle article={data() as Shout} scrollToComments={scrollToComments()} />
<FullArticle article={data() as Shout} />
</ReactionsProvider>
</PageLayout>
</Show>
@ -127,3 +125,4 @@ export default (props: RouteSectionProps<SlugPageProps>) => {
}
return <ArticlePage {...props} />
}

3
src/routes/articles/[topic]/[slug].tsx Normal file
View File

@ -0,0 +1,3 @@
import ArticlePage from "~/routes/[slug]/[...tab]"
export default ArticlePage