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

fixes

Browse Source
This commit is contained in:
Igor Lobanov 2022-11-22 04:02:11 +01:00
parent 4b50de13a7
commit ff04a63ebc
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Pages/HomePage.tsx
View File

@ -1,4 +1,4 @@
import { HomeView, PRERENDERED_ARTICLES_COUNT } from '../Views/Home' import { HomeView, PRERENDERED_ARTICLES_COUNT, RANDOM_TOPICS_COUNT } from '../Views/Home'
import { PageWrap } from '../_shared/PageWrap' import { PageWrap } from '../_shared/PageWrap'
import type { PageProps } from '../types' import type { PageProps } from '../types'
import { createSignal, onCleanup, onMount, Show } from 'solid-js' import { createSignal, onCleanup, onMount, Show } from 'solid-js'
@ -15,8 +15,8 @@ export const HomePage = (props: PageProps) => {
return return
} }
await loadShouts({ filters: { visibility: 'public' }, limit: PRERENDERED_ARTICLES_COUNT, offset: 0 }) await loadShouts({ filters: { visibility: 'public' }, limit: PRERENDERED_ARTICLES_COUNT })
await loadRandomTopics() await loadRandomTopics({ amount: RANDOM_TOPICS_COUNT })
setIsLoaded(true) setIsLoaded(true)
}) })

1
src/components/Views/Home.tsx
View File

@ -25,6 +25,7 @@ type HomeProps = {
} }
export const PRERENDERED_ARTICLES_COUNT = 5 export const PRERENDERED_ARTICLES_COUNT = 5
export const RANDOM_TOPICS_COUNT = 12
const CLIENT_LOAD_ARTICLES_COUNT = 29 const CLIENT_LOAD_ARTICLES_COUNT = 29
const LOAD_MORE_PAGE_SIZE = 16 // Row1 + Row3 + Row2 + Beside (3 + 1) + Row1 + Row 2 + Row3 const LOAD_MORE_PAGE_SIZE = 16 // Row1 + Row3 + Row2 + Beside (3 + 1) + Row1 + Row 2 + Row3

2
src/graphql/privateGraphQLClient.ts
View File

@ -32,7 +32,7 @@ const options: ClientOptions = {
// меняем через setToken, например при получении значения с сервера // меняем через setToken, например при получении значения с сервера
// скорее всего придумаем что-нибудь получше со временем // скорее всего придумаем что-нибудь получше со временем
const token = localStorage.getItem(TOKEN_LOCAL_STORAGE_KEY) const token = localStorage.getItem(TOKEN_LOCAL_STORAGE_KEY)
const headers = { Auth: token } const headers = { Authorization: token }
return { headers } return { headers }
}, },
exchanges exchanges

4
src/graphql/query/articles-load.ts
View File

@ -32,8 +32,8 @@ export default gql`
createdAt createdAt
publishedAt publishedAt
stat { stat {
_id: viewed # _id: viewed
viewed # viewed
reacted reacted
rating rating
} }

4
src/pages/index.astro
View File

@ -3,9 +3,9 @@ import Prerendered from '../main.astro'
import { Root } from '../components/Root' import { Root } from '../components/Root'
import { apiClient } from '../utils/apiClient' import { apiClient } from '../utils/apiClient'
import { initRouter } from '../stores/router' import { initRouter } from '../stores/router'
import { PRERENDERED_ARTICLES_COUNT } from '../components/Views/Home' import { PRERENDERED_ARTICLES_COUNT, RANDOM_TOPICS_COUNT } from '../components/Views/Home'
const randomTopics = await apiClient.getRandomTopics({ amount: 12 }) const randomTopics = await apiClient.getRandomTopics({ amount: RANDOM_TOPICS_COUNT })
const articles = await apiClient.getShouts( const articles = await apiClient.getShouts(
{ filters: { visibility: "public" }, limit: PRERENDERED_ARTICLES_COUNT }) { filters: { visibility: "public" }, limit: PRERENDERED_ARTICLES_COUNT })

4
src/stores/zine/topics.ts
View File

@ -94,8 +94,8 @@ export const loadAllTopics = async (): Promise<void> => {
addTopics(topics) addTopics(topics)
} }
export const loadRandomTopics = async (): Promise<void> => { export const loadRandomTopics = async ({ amount }: { amount: number }): Promise<void> => {
const topics = await apiClient.getRandomTopics({ amount: 12 }) const topics = await apiClient.getRandomTopics({ amount })
setRandomTopics(topics) setRandomTopics(topics)
} }