From 9602925a319419357d616c75d857c720a3cd48df Mon Sep 17 00:00:00 2001
From: ilya-bkv <i.yablokov@ccmp.me>
Date: Mon, 5 Dec 2022 13:45:53 +0300
Subject: [PATCH] Chats is working!

---
 src/components/Author/Card.tsx     | 6 ++++--
 src/components/Views/Inbox.tsx     | 2 +-
 src/context/session.tsx            | 1 +
 src/graphql/mutation/my-session.ts | 1 +
 src/graphql/types.gen.ts           | 3 +--
 src/stores/zine/common.ts          | 1 +
 src/styles/Inbox.scss              | 2 +-
 src/utils/apiClient.ts             | 5 +++--
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/Author/Card.tsx b/src/components/Author/Card.tsx
index 6440827e..b0aacd95 100644
--- a/src/components/Author/Card.tsx
+++ b/src/components/Author/Card.tsx
@@ -9,6 +9,7 @@ import { locale } from '../../stores/ui'
 import { follow, unfollow } from '../../stores/zine/common'
 import { clsx } from 'clsx'
 import { useSession } from '../../context/session'
+import { FollowingEntity } from '../../graphql/types.gen'
 
 interface AuthorCardProps {
   caption?: string
@@ -84,7 +85,8 @@ export const AuthorCard = (props: AuthorCardProps) => {
               when={subscribed()}
               fallback={
                 <button
-                  onClick={() => follow}
+                  // TODO: change button view reactivity
+                  onclick={() => follow({ what: FollowingEntity.Author, slug: props.author.slug })}
                   class={clsx('button', styles.button)}
                   classList={{
                     [styles.buttonSubscribe]: !props.isAuthorsList,
@@ -101,7 +103,7 @@ export const AuthorCard = (props: AuthorCardProps) => {
               }
             >
               <button
-                onClick={() => unfollow}
+                onclick={() => follow({ what: FollowingEntity.Author, slug: props.author.slug })}
                 classList={{
                   [styles.buttonSubscribe]: !props.isAuthorsList,
                   'button--subscribe': !props.isAuthorsList,
diff --git a/src/components/Views/Inbox.tsx b/src/components/Views/Inbox.tsx
index 6e6c9b8e..ff975949 100644
--- a/src/components/Views/Inbox.tsx
+++ b/src/components/Views/Inbox.tsx
@@ -37,7 +37,7 @@ export const InboxView = () => {
   const [sortByPerToPer, setSortByPerToPer] = createSignal<boolean>(false)
   const [currentDialog, setCurrentDialog] = createSignal<Chat>()
   const { session } = useSession()
-  const currentUserId = createMemo(() => session()?.user?.id)
+  const currentUserId = createMemo(() => session()?.user.id)
 
   // Поиск по диалогам
   const getQuery = (query) => {
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 966d8d6f..d603149c 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -23,6 +23,7 @@ const getSession = async (): Promise<AuthResult> => {
     if (!authResult) {
       return null
     }
+    console.log('!!! authResult:', authResult)
     setToken(authResult.token)
     return authResult
   } catch (error) {
diff --git a/src/graphql/mutation/my-session.ts b/src/graphql/mutation/my-session.ts
index 53de7144..0102b07b 100644
--- a/src/graphql/mutation/my-session.ts
+++ b/src/graphql/mutation/my-session.ts
@@ -7,6 +7,7 @@ export default gql`
       token
       user {
         _id: slug
+        id
         name
         slug
         bio
diff --git a/src/graphql/types.gen.ts b/src/graphql/types.gen.ts
index 64a2d200..5dd514cf 100644
--- a/src/graphql/types.gen.ts
+++ b/src/graphql/types.gen.ts
@@ -78,7 +78,6 @@ export type ChatMember = {
   id: Scalars['Int']
   lastSeen?: Maybe<Scalars['DateTime']>
   name: Scalars['String']
-  online?: Maybe<Scalars['Boolean']>
   slug: Scalars['String']
   userpic?: Maybe<Scalars['String']>
 }
@@ -140,7 +139,7 @@ export type LoadShoutsOptions = {
 }
 
 export type Message = {
-  author: Scalars['Int']
+  author: Scalars['String']
   body: Scalars['String']
   chatId: Scalars['String']
   createdAt: Scalars['Int']
diff --git a/src/stores/zine/common.ts b/src/stores/zine/common.ts
index 5b950248..49e570c5 100644
--- a/src/stores/zine/common.ts
+++ b/src/stores/zine/common.ts
@@ -2,6 +2,7 @@ import type { FollowingEntity } from '../../graphql/types.gen'
 import { apiClient } from '../../utils/apiClient'
 
 export const follow = async ({ what, slug }: { what: FollowingEntity; slug: string }) => {
+  console.log('!!! follow:')
   await apiClient.follow({ what, slug })
   // refresh session
   // TODO: _store update code
diff --git a/src/styles/Inbox.scss b/src/styles/Inbox.scss
index cda39ebb..f793dcc3 100644
--- a/src/styles/Inbox.scss
+++ b/src/styles/Inbox.scss
@@ -16,7 +16,7 @@ main {
   display: flex;
   flex: 1;
   flex-direction: column;
-  position: fixed;
+  position: absolute;
 
   .row {
     flex: 1;
diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts
index 33e66cb0..f1f3032c 100644
--- a/src/utils/apiClient.ts
+++ b/src/utils/apiClient.ts
@@ -167,11 +167,12 @@ export const apiClient = {
   // subscribe
 
   follow: async ({ what, slug }: { what: FollowingEntity; slug: string }) => {
-    const response = await privateGraphQLClient.query(followMutation, { what, slug }).toPromise()
+    const response = await privateGraphQLClient.mutation(followMutation, { what, slug }).toPromise()
+    console.debug('!!! [follow]:', response)
     return response.data.follow
   },
   unfollow: async ({ what, slug }: { what: FollowingEntity; slug: string }) => {
-    const response = await privateGraphQLClient.query(unfollowMutation, { what, slug }).toPromise()
+    const response = await privateGraphQLClient.mutation(unfollowMutation, { what, slug }).toPromise()
     return response.data.unfollow
   },