From ff04a63ebcf9bef095cd8e25882ed0b3bd6ff4ba Mon Sep 17 00:00:00 2001
From: Igor Lobanov <igor.lobanov@onetwotrip.com>
Date: Tue, 22 Nov 2022 04:02:11 +0100
Subject: [PATCH] fixes

---
 src/components/Pages/HomePage.tsx   | 6 +++---
 src/components/Views/Home.tsx       | 1 +
 src/graphql/privateGraphQLClient.ts | 2 +-
 src/graphql/query/articles-load.ts  | 4 ++--
 src/pages/index.astro               | 4 ++--
 src/stores/zine/topics.ts           | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/Pages/HomePage.tsx b/src/components/Pages/HomePage.tsx
index 670374a2..2a22da3c 100644
--- a/src/components/Pages/HomePage.tsx
+++ b/src/components/Pages/HomePage.tsx
@@ -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 type { PageProps } from '../types'
 import { createSignal, onCleanup, onMount, Show } from 'solid-js'
@@ -15,8 +15,8 @@ export const HomePage = (props: PageProps) => {
       return
     }
 
-    await loadShouts({ filters: { visibility: 'public' }, limit: PRERENDERED_ARTICLES_COUNT, offset: 0 })
-    await loadRandomTopics()
+    await loadShouts({ filters: { visibility: 'public' }, limit: PRERENDERED_ARTICLES_COUNT })
+    await loadRandomTopics({ amount: RANDOM_TOPICS_COUNT })
 
     setIsLoaded(true)
   })
diff --git a/src/components/Views/Home.tsx b/src/components/Views/Home.tsx
index 1378b453..c3520ef0 100644
--- a/src/components/Views/Home.tsx
+++ b/src/components/Views/Home.tsx
@@ -25,6 +25,7 @@ type HomeProps = {
 }
 
 export const PRERENDERED_ARTICLES_COUNT = 5
+export const RANDOM_TOPICS_COUNT = 12
 const CLIENT_LOAD_ARTICLES_COUNT = 29
 const LOAD_MORE_PAGE_SIZE = 16 // Row1 + Row3 + Row2 + Beside (3 + 1) + Row1 + Row 2 + Row3
 
diff --git a/src/graphql/privateGraphQLClient.ts b/src/graphql/privateGraphQLClient.ts
index 0beff1ec..c6863898 100644
--- a/src/graphql/privateGraphQLClient.ts
+++ b/src/graphql/privateGraphQLClient.ts
@@ -32,7 +32,7 @@ const options: ClientOptions = {
     // меняем через setToken, например при получении значения с сервера
     // скорее всего придумаем что-нибудь получше со временем
     const token = localStorage.getItem(TOKEN_LOCAL_STORAGE_KEY)
-    const headers = { Auth: token }
+    const headers = { Authorization: token }
     return { headers }
   },
   exchanges
diff --git a/src/graphql/query/articles-load.ts b/src/graphql/query/articles-load.ts
index 276ef97e..32c45179 100644
--- a/src/graphql/query/articles-load.ts
+++ b/src/graphql/query/articles-load.ts
@@ -32,8 +32,8 @@ export default gql`
       createdAt
       publishedAt
       stat {
-        _id: viewed
-        viewed
+        # _id: viewed
+        # viewed
         reacted
         rating
       }
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 929af43a..e659af95 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,9 +3,9 @@ import Prerendered from '../main.astro'
 import { Root } from '../components/Root'
 import { apiClient } from '../utils/apiClient'
 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(
   { filters: { visibility: "public" }, limit: PRERENDERED_ARTICLES_COUNT })
 
diff --git a/src/stores/zine/topics.ts b/src/stores/zine/topics.ts
index beaee83e..568695b0 100644
--- a/src/stores/zine/topics.ts
+++ b/src/stores/zine/topics.ts
@@ -94,8 +94,8 @@ export const loadAllTopics = async (): Promise<void> => {
   addTopics(topics)
 }
 
-export const loadRandomTopics = async (): Promise<void> => {
-  const topics = await apiClient.getRandomTopics({ amount: 12 })
+export const loadRandomTopics = async ({ amount }: { amount: number }): Promise<void> => {
+  const topics = await apiClient.getRandomTopics({ amount })
   setRandomTopics(topics)
 }