From 84f45ea1a2d727fe17c428f049651444a71b70d9 Mon Sep 17 00:00:00 2001
From: Igor Lobanov <bniwredyc@gmail.com>
Date: Tue, 13 Sep 2022 15:38:26 +0200
Subject: [PATCH] review fixes

---
 src/components/Topic/Card.tsx       | 2 --
 src/components/Views/Author.tsx     | 7 +++++--
 src/components/Views/Feed.tsx       | 5 +++--
 src/components/Views/Home.tsx       | 1 +
 src/components/Views/Search.tsx     | 5 +----
 src/graphql/mutation/my-session.ts  | 2 +-
 src/pages/author/[slug]/index.astro | 2 ++
 src/stores/ui.ts                    | 2 +-
 src/stores/zine/authors.ts          | 8 ++++++--
 src/stores/zine/common.ts           | 1 +
 src/stores/zine/topics.ts           | 9 +++++++--
 src/utils/apiClient.ts              | 3 ++-
 src/utils/sortby.ts                 | 1 +
 13 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/components/Topic/Card.tsx b/src/components/Topic/Card.tsx
index cbf85556..1bebbb9a 100644
--- a/src/components/Topic/Card.tsx
+++ b/src/components/Topic/Card.tsx
@@ -32,10 +32,8 @@ export const TopicCard = (props: TopicProps) => {
   const subscribe = async (really = true) => {
     if (really) {
       follow({ what: FollowingEntity.Topic, slug: topic().slug })
-      // TODO: setSubscribers(topic().stat?.followers as number + 1)
     } else {
       unfollow({ what: FollowingEntity.Topic, slug: topic().slug })
-      // TODO: setSubscribers(topic().stat?.followers as number - 1)
     }
   }
   return (
diff --git a/src/components/Views/Author.tsx b/src/components/Views/Author.tsx
index bdb11661..59ce7e66 100644
--- a/src/components/Views/Author.tsx
+++ b/src/components/Views/Author.tsx
@@ -1,5 +1,5 @@
 import { Show, createMemo } from 'solid-js'
-import type { Author, Shout } from '../../graphql/types.gen'
+import type { Author, Reaction, Shout } from '../../graphql/types.gen'
 import Row2 from '../Feed/Row2'
 import Row3 from '../Feed/Row3'
 import Beside from '../Feed/Beside'
@@ -13,13 +13,16 @@ import '../../styles/Topic.scss'
 import { useStore } from '@nanostores/solid'
 import { useTopicsStore } from '../../stores/zine/topics'
 
+// TODO: load reactions on client
 type AuthorProps = {
   authorArticles: Shout[]
   author: Author
+  // FIXME author topics fro server
+  // topics: Topic[]
 }
 
 export const AuthorPage = (props: AuthorProps) => {
-  const { getSortedArticles: articles, getArticlesByAuthor } = useArticlesStore({
+  const { getSortedArticles: articles } = useArticlesStore({
     sortedArticles: props.authorArticles
   })
   const { getAuthorEntities: authors } = useAuthorsStore({ authors: [props.author] })
diff --git a/src/components/Views/Feed.tsx b/src/components/Views/Feed.tsx
index 83fcff65..b983f0b1 100644
--- a/src/components/Views/Feed.tsx
+++ b/src/components/Views/Feed.tsx
@@ -55,6 +55,7 @@ export const FeedPage = (props: FeedProps) => {
   // })
 
   const loadMore = () => {
+    // FIXME
     const page = (props.page || 1) + 1
     loadRecentArticles({ page })
   }
@@ -98,7 +99,7 @@ export const FeedPage = (props: FeedProps) => {
               </div>
 
               <ul class="beside-column">
-                <For each={getTopAuthors()}>
+                <For each={getTopAuthors().slice(0, 5)}>
                   {(author) => (
                     <li>
                       <AuthorCard author={author} compact={true} hasLink={true} />
@@ -127,7 +128,7 @@ export const FeedPage = (props: FeedProps) => {
             <Show when={getTopTopics().length > 0}>
               <section class="feed-topics">
                 <h4>{t('Topics')}</h4>
-                <For each={getTopTopics()}>
+                <For each={getTopTopics().slice(0, 5)}>
                   {(topic) => <TopicCard topic={topic} subscribeButtonBottom={true} />}
                 </For>
               </section>
diff --git a/src/components/Views/Home.tsx b/src/components/Views/Home.tsx
index debbc123..4560aba7 100644
--- a/src/components/Views/Home.tsx
+++ b/src/components/Views/Home.tsx
@@ -92,6 +92,7 @@ export const HomePage = (props: HomeProps) => {
   // }, [byLayout()])
 
   const loadMore = () => {
+    // FIXME
     const page = (props.page || 1) + 1
     loadPublishedArticles({ page })
   }
diff --git a/src/components/Views/Search.tsx b/src/components/Views/Search.tsx
index 646682de..2a26e160 100644
--- a/src/components/Views/Search.tsx
+++ b/src/components/Views/Search.tsx
@@ -31,16 +31,13 @@ export const SearchPage = (props: Props) => {
     <div class="search-page wide-container">
       <form action="/search" class="search-form row">
         <div class="col-sm-9">
+          {/*FIXME t*/}
           <input type="search" name="q" onChange={handleQueryChange} placeholder="Введите текст..." />
-          <input type="search" name="q" placeholder="Введите текст..." />
         </div>
         <div class="col-sm-3">
           <button class="button" type="submit" onClick={handleSubmit}>
             {t('Search')}
           </button>
-          <button class="button" type="submit">
-            {t('Search')}
-          </button>
         </div>
       </form>
 
diff --git a/src/graphql/mutation/my-session.ts b/src/graphql/mutation/my-session.ts
index 02964603..49c95baa 100644
--- a/src/graphql/mutation/my-session.ts
+++ b/src/graphql/mutation/my-session.ts
@@ -1,7 +1,7 @@
 import { gql } from '@urql/core'
 
 export default gql`
-  query RefreshSessionQuery {
+  mutation RefreshSessionMutation {
     refreshSession {
       error
       token
diff --git a/src/pages/author/[slug]/index.astro b/src/pages/author/[slug]/index.astro
index 941a3d2b..3b87f0e2 100644
--- a/src/pages/author/[slug]/index.astro
+++ b/src/pages/author/[slug]/index.astro
@@ -5,6 +5,8 @@ import { apiClient } from '../../../utils/apiClient'
 
 const slug = Astro.params.slug.toString()
 const articles = await apiClient.getArticlesForAuthors({ authorSlugs: [slug] })
+
+// FIXME get author by slugs
 const author = articles[0].authors.find((a) => a.slug === slug)
 
 Astro.response.headers.set('Cache-Control', 's-maxage=1, stale-while-revalidate')
diff --git a/src/stores/ui.ts b/src/stores/ui.ts
index 5ed1fb67..e3bff0d4 100644
--- a/src/stores/ui.ts
+++ b/src/stores/ui.ts
@@ -1,5 +1,5 @@
 import { persistentAtom } from '@nanostores/persistent'
-import { action, atom } from 'nanostores'
+import { atom } from 'nanostores'
 import { useStore } from '@nanostores/solid'
 
 export const locale = persistentAtom<string>('locale', 'ru')
diff --git a/src/stores/zine/authors.ts b/src/stores/zine/authors.ts
index 733831bb..f8e3500f 100644
--- a/src/stores/zine/authors.ts
+++ b/src/stores/zine/authors.ts
@@ -7,7 +7,7 @@ import { byCreated, byStat } from '../../utils/sortby'
 
 export type AuthorsSortBy = 'created' | 'name'
 
-const sortByStore = atom<AuthorsSortBy>('created')
+const sortAllByStore = atom<AuthorsSortBy>('created')
 
 let authorEntitiesStore: WritableAtom<{ [authorSlug: string]: Author }>
 let authorsByTopicStore: WritableAtom<{ [topicSlug: string]: Author[] }>
@@ -21,7 +21,7 @@ const initStore = (initial: { [authorSlug: string]: Author }) => {
 
   authorEntitiesStore = atom(initial)
 
-  sortedAuthorsStore = computed([authorEntitiesStore, sortByStore], (authorEntities, sortBy) => {
+  sortedAuthorsStore = computed([authorEntitiesStore, sortAllByStore], (authorEntities, sortBy) => {
     const authors = Object.values(authorEntities)
     switch (sortBy) {
       case 'created': {
@@ -42,6 +42,10 @@ const initStore = (initial: { [authorSlug: string]: Author }) => {
   })
 }
 
+export const setSortAllBy = (sortBy: AuthorsSortBy) => {
+  sortAllByStore.set(sortBy)
+}
+
 const addAuthors = (authors: Author[]) => {
   const newAuthorEntities = authors.reduce((acc, author) => {
     acc[author.slug] = author
diff --git a/src/stores/zine/common.ts b/src/stores/zine/common.ts
index 1f62a9b7..5b950248 100644
--- a/src/stores/zine/common.ts
+++ b/src/stores/zine/common.ts
@@ -3,6 +3,7 @@ import { apiClient } from '../../utils/apiClient'
 
 export const follow = async ({ what, slug }: { what: FollowingEntity; slug: string }) => {
   await apiClient.follow({ what, slug })
+  // refresh session
   // TODO: _store update code
 }
 export const unfollow = async ({ what, slug }: { what: FollowingEntity; slug: string }) => {
diff --git a/src/stores/zine/topics.ts b/src/stores/zine/topics.ts
index 95546dc7..dfef8a2a 100644
--- a/src/stores/zine/topics.ts
+++ b/src/stores/zine/topics.ts
@@ -4,10 +4,11 @@ import { atom, computed } from 'nanostores'
 import type { Topic } from '../../graphql/types.gen'
 import { useStore } from '@nanostores/solid'
 import { byCreated, byStat } from '../../utils/sortby'
+import type { AuthorsSortBy } from './authors'
 
 export type TopicsSortBy = 'created' | 'name'
 
-const sortByStore = atom<TopicsSortBy>('created')
+const sortAllByStore = atom<TopicsSortBy>('created')
 
 let topicEntitiesStore: WritableAtom<{ [topicSlug: string]: Topic }>
 let sortedTopicsStore: ReadableAtom<Topic[]>
@@ -22,7 +23,7 @@ const initStore = (initial?: Record<string, Topic>) => {
 
   topicEntitiesStore = atom<Record<string, Topic>>(initial)
 
-  sortedTopicsStore = computed([topicEntitiesStore, sortByStore], (topicEntities, sortBy) => {
+  sortedTopicsStore = computed([topicEntitiesStore, sortAllByStore], (topicEntities, sortBy) => {
     const topics = Object.values(topicEntities)
     switch (sortBy) {
       case 'created': {
@@ -48,6 +49,10 @@ const initStore = (initial?: Record<string, Topic>) => {
   })
 }
 
+export const setSortAllBy = (sortBy: TopicsSortBy) => {
+  sortAllByStore.set(sortBy)
+}
+
 const addTopics = (...args: Topic[][]) => {
   const allTopics = args.flatMap((topics) => topics || [])
 
diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts
index 88f8881e..175a59fd 100644
--- a/src/utils/apiClient.ts
+++ b/src/utils/apiClient.ts
@@ -33,7 +33,8 @@ import authorsBySlugs from '../graphql/query/authors-by-slugs'
 
 const log = getLogger('api-client')
 
-const DEFAULT_AUTHOR_ARTICLES_PAGE_SIZE = 50
+// TODO: paging
+const DEFAULT_AUTHOR_ARTICLES_PAGE_SIZE = 999999
 const DEFAULT_TOPIC_ARTICLES_PAGE_SIZE = 50
 const DEFAULT_RECENT_ARTICLES_PAGE_SIZE = 50
 const DEFAULT_REACTIONS_PAGE_SIZE = 50
diff --git a/src/utils/sortby.ts b/src/utils/sortby.ts
index da8f8050..ba25824b 100644
--- a/src/utils/sortby.ts
+++ b/src/utils/sortby.ts
@@ -24,6 +24,7 @@ export const byLength = (a: any[], b: any[]) => {
   return 0
 }
 
+// FIXME keyof TopicStat
 export const byStat = (metric: keyof Stat) => {
   return (a, b) => {
     const x = (a?.stat && a.stat[metric]) || 0