diff --git a/src/context/inbox.tsx b/src/context/inbox.tsx index 882bc23b..ab4f8f8a 100644 --- a/src/context/inbox.tsx +++ b/src/context/inbox.tsx @@ -59,7 +59,7 @@ export const InboxProvider = (props: { children: JSX.Element }) => { const loadChats = async () => { try { - const newChats = await inboxClient.getChats({ limit: 50, offset: 0 }) + const newChats = await inboxClient.loadChats({ limit: 50, offset: 0 }) setChats(newChats) } catch (error) { console.log(error) diff --git a/src/graphql/query/chat-recipients.ts b/src/graphql/query/chat-recipients.ts index 579686bb..67194ef4 100644 --- a/src/graphql/query/chat-recipients.ts +++ b/src/graphql/query/chat-recipients.ts @@ -1,7 +1,7 @@ import { gql } from '@urql/core' export default gql` - query GetChatsQuery($limit: Int, $offset: Int) { + query GetChatMembersQuery($limit: Int, $offset: Int) { loadRecipients(limit: $limit, offset: $offset) { members { id diff --git a/src/main.astro b/src/main.astro deleted file mode 100644 index 05fc5dc3..00000000 --- a/src/main.astro +++ /dev/null @@ -1,33 +0,0 @@ ---- -import './styles/app.scss' -import { Seo } from "astro-seo-meta" - -const ln = Astro.url.searchParams.get('lng') || 'ru' -const { protocol, host } = Astro.url -const title = ln === 'ru' ? 'Дискурс' : 'Discours' -const imageUrl = Astro.props.imageUrl ?? `${protocol}${host}/public/bonfire.png` -const description = ln === 'ru' ? 'Горизонтальная платформа коллаборативной журналистики' : 'Horizontal collaborative journalistic platform' ---- - - - - - - - - - - - - diff --git a/src/pages/confirm/[token].astro b/src/pages/confirm/[token].astro deleted file mode 100644 index 4b5fca0b..00000000 --- a/src/pages/confirm/[token].astro +++ /dev/null @@ -1,12 +0,0 @@ ---- -import { Confirmed } from '../../components/Nav/Confirmed' -import { t } from 'i18next' - -const token = Astro.params.token?.toString() || '' ---- - -{t('Discours')} - - - - diff --git a/src/pages/confirm/index.astro b/src/pages/confirm/index.astro deleted file mode 100644 index 2620df8f..00000000 --- a/src/pages/confirm/index.astro +++ /dev/null @@ -1,10 +0,0 @@ ---- -import i18next, { t } from "i18next" -import { Confirmed } from '../../components/Nav/Confirmed' ---- - -{t('Discours')} - - - - diff --git a/src/pages/topic/[slug].astro b/src/pages/topic/[slug].astro deleted file mode 100644 index 35795a0e..00000000 --- a/src/pages/topic/[slug].astro +++ /dev/null @@ -1,21 +0,0 @@ ---- -import { Root } from '../../components/Root' -import Prerendered from '../../main.astro' -import { apiClient } from '../../utils/apiClient' -import { PRERENDERED_ARTICLES_COUNT } from '../../components/Views/Topic' - -const slug = Astro.params.slug?.toString() || '' -const shouts = await apiClient.getShouts({ filters: { topic: slug }, limit: PRERENDERED_ARTICLES_COUNT }) -const topic = await apiClient.getTopic({ slug }) - -import { initRouter } from '../../stores/router' - -const { pathname, search } = Astro.url -initRouter(pathname, search) - -Astro.response.headers.set('Cache-Control', 's-maxage=1, stale-while-revalidate') ---- - - - - diff --git a/src/stores/inbox.ts b/src/stores/inbox.ts index 08c764a7..653604b6 100644 --- a/src/stores/inbox.ts +++ b/src/stores/inbox.ts @@ -1,10 +1,10 @@ -import { apiClient } from '../utils/apiClient' +import { inboxClient } from '../utils/apiClient' import type { MessagesBy } from '../graphql/types.gen' export const loadRecipients = async (by = {}): Promise => { - return await apiClient.getRecipients(by) + return await inboxClient.loadRecipients(by) } export const loadMessages = async (by: MessagesBy): Promise => { - return await apiClient.getChatMessages({ by, limit: 50, offset: 0 }) + return await inboxClient.loadChatMessages({ by, limit: 50, offset: 0 }) } diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts index 3e16ad58..2eee2cb2 100644 --- a/src/utils/apiClient.ts +++ b/src/utils/apiClient.ts @@ -352,7 +352,7 @@ export const apiClient = { } export const inboxClient = { - getChats: async (options: QueryLoadChatsArgs): Promise => { + loadChats: async (options: QueryLoadChatsArgs): Promise => { const resp = await privateInboxGraphQLClient.query(myChats, options).toPromise() return resp.data.loadChats.chats }, @@ -367,11 +367,11 @@ export const inboxClient = { return resp.data.createMessage.message }, - getChatMessages: async (options: QueryLoadMessagesByArgs) => { + loadChatMessages: async (options: QueryLoadMessagesByArgs) => { const resp = await privateInboxGraphQLClient.query(chatMessagesLoadBy, options).toPromise() return resp.data.loadMessagesBy.messages }, - getRecipients: async (options: QueryLoadRecipientsArgs) => { + loadRecipients: async (options: QueryLoadRecipientsArgs) => { const resp = await privateInboxGraphQLClient.query(loadRecipients, options).toPromise() return resp.data.loadRecipients.members }