diff --git a/src/components/Pages/AuthorPage.tsx b/src/components/Pages/AuthorPage.tsx index 556fbea3..f84e8314 100644 --- a/src/components/Pages/AuthorPage.tsx +++ b/src/components/Pages/AuthorPage.tsx @@ -8,7 +8,7 @@ import { loadAuthor } from '../../stores/zine/authors' import { Loading } from '../Loading' export const AuthorPage = (props: PageProps) => { - const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts) && Boolean(props.author)) + const [isLoaded, setIsLoaded] = createSignal(Boolean(props.authorShouts) && Boolean(props.author)) const slug = createMemo(() => { const { page: getPage } = useRouter() @@ -38,7 +38,7 @@ export const AuthorPage = (props: PageProps) => { return ( }> - + ) diff --git a/src/components/Pages/HomePage.tsx b/src/components/Pages/HomePage.tsx index 2a22da3c..6d74014f 100644 --- a/src/components/Pages/HomePage.tsx +++ b/src/components/Pages/HomePage.tsx @@ -8,7 +8,7 @@ import { Loading } from '../Loading' import styles from './HomePage.module.scss' export const HomePage = (props: PageProps) => { - const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts) && Boolean(props.randomTopics)) + const [isLoaded, setIsLoaded] = createSignal(Boolean(props.homeShouts) && Boolean(props.randomTopics)) onMount(async () => { if (isLoaded()) { @@ -26,7 +26,7 @@ export const HomePage = (props: PageProps) => { return ( }> - + ) diff --git a/src/components/Pages/LayoutShoutsPage.tsx b/src/components/Pages/LayoutShoutsPage.tsx index b1afd31f..a0872bb6 100644 --- a/src/components/Pages/LayoutShoutsPage.tsx +++ b/src/components/Pages/LayoutShoutsPage.tsx @@ -29,7 +29,7 @@ export const LayoutShoutsPage = (props: PageProps) => { return page.params.layout as LayoutType }) const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false) - const { sortedLayoutShouts, loadLayoutShoutsBy } = useLayoutsStore(layout(), props.shouts) + const { sortedLayoutShouts, loadLayoutShoutsBy } = useLayoutsStore(layout(), props.layoutShouts) const sortedArticles = createMemo(() => sortedLayoutShouts().get(layout()) || []) const loadMoreLayout = async (kind: LayoutType) => { saveScrollPosition() diff --git a/src/components/Pages/TopicPage.tsx b/src/components/Pages/TopicPage.tsx index 1135cdd3..fde8880e 100644 --- a/src/components/Pages/TopicPage.tsx +++ b/src/components/Pages/TopicPage.tsx @@ -8,7 +8,7 @@ import { loadTopic } from '../../stores/zine/topics' import { Loading } from '../Loading' export const TopicPage = (props: PageProps) => { - const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts) && Boolean(props.topic)) + const [isLoaded, setIsLoaded] = createSignal(Boolean(props.topicShouts) && Boolean(props.topic)) const slug = createMemo(() => { const { page: getPage } = useRouter() @@ -38,7 +38,7 @@ export const TopicPage = (props: PageProps) => { return ( }> - + ) diff --git a/src/components/types.ts b/src/components/types.ts index 4016a693..f320273e 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -6,7 +6,10 @@ import type { LayoutType } from '../stores/zine/layouts' export type PageProps = { randomTopics?: Topic[] article?: Shout - shouts?: Shout[] + layoutShouts?: Shout[] + authorShouts?: Shout[] + topicShouts?: Shout[] + homeShouts?: Shout[] author?: Author allAuthors?: Author[] topic?: Topic diff --git a/src/pages/author/[slug]/index.astro b/src/pages/author/[slug]/index.astro index 663d893a..67f9e159 100644 --- a/src/pages/author/[slug]/index.astro +++ b/src/pages/author/[slug]/index.astro @@ -16,5 +16,5 @@ Astro.response.headers.set('Cache-Control', 's-maxage=1, stale-while-revalidate' --- - + diff --git a/src/pages/expo/[...layout].astro b/src/pages/expo/[...layout].astro index c6f5201d..0bc8780f 100644 --- a/src/pages/expo/[...layout].astro +++ b/src/pages/expo/[...layout].astro @@ -15,6 +15,6 @@ initRouter(pathname, search) --- - + diff --git a/src/pages/index.astro b/src/pages/index.astro index e659af95..8d1488a4 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -6,7 +6,7 @@ import { initRouter } from '../stores/router' import { PRERENDERED_ARTICLES_COUNT, RANDOM_TOPICS_COUNT } from '../components/Views/Home' const randomTopics = await apiClient.getRandomTopics({ amount: RANDOM_TOPICS_COUNT }) -const articles = await apiClient.getShouts( +const shouts = await apiClient.getShouts( { filters: { visibility: "public" }, limit: PRERENDERED_ARTICLES_COUNT }) const { pathname, search } = Astro.url @@ -16,6 +16,6 @@ Astro.response.headers.set('Cache-Control', 's-maxage=1, stale-while-revalidate' --- - + diff --git a/src/pages/topic/[slug].astro b/src/pages/topic/[slug].astro index 3fa5c183..35795a0e 100644 --- a/src/pages/topic/[slug].astro +++ b/src/pages/topic/[slug].astro @@ -17,5 +17,5 @@ Astro.response.headers.set('Cache-Control', 's-maxage=1, stale-while-revalidate' --- - +