diff --git a/astro.config.ts b/astro.config.ts index cf758735..c55017c3 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -1,7 +1,7 @@ import { defineConfig, AstroUserConfig } from 'astro/config' import vercel from '@astrojs/vercel/serverless' import solidJs from '@astrojs/solid-js' -import type { CSSOptions } from 'vite' +import type { CSSOptions, PluginOption } from 'vite' import defaultGenerateScopedName from 'postcss-modules/build/generateScopedName' import { isDev } from './src/utils/config' import { visualizer } from 'rollup-plugin-visualizer' @@ -37,6 +37,7 @@ const astroConfig: AstroUserConfig = { adapter: vercel(), vite: { build: { + chunkSizeWarningLimit: 777, rollupOptions: { plugins: [visualizer()], output: { diff --git a/codegen.yml b/codegen.yml index 1e8c8a47..04ea8542 100644 --- a/codegen.yml +++ b/codegen.yml @@ -1,5 +1,5 @@ overwrite: true -schema: 'https://newapi.discours.io/graphql' +schema: 'https://testapi.discours.io/graphql' generates: src/graphql/introspec.gen.ts: plugins: diff --git a/package.json b/package.json index 8c00866d..3acba0ba 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "prosemirror-schema-list": "^1.2.2", "prosemirror-state": "^1.4.2", "prosemirror-view": "^1.29.0", - "rollup": "~2.79.1", + "rollup": "^2.0.0", "rollup-plugin-visualizer": "^5.8.3", "sass": "^1.56.1", "solid-devtools": "^0.22.0", @@ -120,7 +120,7 @@ "solid-social": "^0.9.0", "solid-utils": "^0.8.1", "sort-package-json": "^2.1.0", - "stylelint": "^14.14.1", + "stylelint": "^14.15.0", "stylelint-config-css-modules": "^4.1.0", "stylelint-config-prettier-scss": "^0.0.1", "stylelint-config-standard-scss": "^6.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0514ee4..10b9c291 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,7 +79,7 @@ specifiers: prosemirror-schema-list: ^1.2.2 prosemirror-state: ^1.4.2 prosemirror-view: ^1.29.0 - rollup: ~2.79.1 + rollup: ^2.0.0 rollup-plugin-visualizer: ^5.8.3 sass: ^1.56.1 solid-devtools: ^0.22.0 @@ -89,7 +89,7 @@ specifiers: solid-social: ^0.9.0 solid-utils: ^0.8.1 sort-package-json: ^2.1.0 - stylelint: ^14.14.1 + stylelint: ^14.15.0 stylelint-config-css-modules: ^4.1.0 stylelint-config-prettier-scss: ^0.0.1 stylelint-config-standard-scss: ^6.1.0 @@ -199,12 +199,12 @@ devDependencies: solid-social: 0.9.0_solid-js@1.6.2 solid-utils: 0.8.1_solid-js@1.6.2 sort-package-json: 2.1.0 - stylelint: 14.14.1 - stylelint-config-css-modules: 4.1.0_stylelint@14.14.1 - stylelint-config-prettier-scss: 0.0.1_stylelint@14.14.1 - stylelint-config-standard-scss: 6.1.0_ave2i6l4ingtbwj4aquhd5witq - stylelint-order: 5.0.0_stylelint@14.14.1 - stylelint-scss: 4.3.0_stylelint@14.14.1 + stylelint: 14.15.0 + stylelint-config-css-modules: 4.1.0_stylelint@14.15.0 + stylelint-config-prettier-scss: 0.0.1_stylelint@14.15.0 + stylelint-config-standard-scss: 6.1.0_a37symlv4urgexnspmy4gyeh7i + stylelint-order: 5.0.0_stylelint@14.15.0 + stylelint-scss: 4.3.0_stylelint@14.15.0 swiper: 8.4.4 ts-node: 10.9.1_cbe7ovvae6zqfnmtgctpgpys54 typescript: 4.8.4 @@ -9776,38 +9776,38 @@ packages: inline-style-parser: 0.1.1 dev: true - /stylelint-config-css-modules/4.1.0_stylelint@14.14.1: + /stylelint-config-css-modules/4.1.0_stylelint@14.15.0: resolution: {integrity: sha512-w6d552NscwvpUEaUcmq8GgWXKRv6lVHLbDj6QIHSM2vCWr83qRqRvXBJCfXDyaG/J3Zojw2inU9VvU99ZlXuUw==} peerDependencies: stylelint: ^14.5.1 dependencies: - stylelint: 14.14.1 + stylelint: 14.15.0 optionalDependencies: - stylelint-scss: 4.3.0_stylelint@14.14.1 + stylelint-scss: 4.3.0_stylelint@14.15.0 dev: true - /stylelint-config-prettier-scss/0.0.1_stylelint@14.14.1: + /stylelint-config-prettier-scss/0.0.1_stylelint@14.15.0: resolution: {integrity: sha512-lBAYG9xYOh2LeWEPC/64xeUxwOTnQ8nDyBijQoWoJb10/bMGrUwnokpt8jegGck2Vbtxh6XGwH63z5qBcVHreQ==} engines: {node: '>= 12'} hasBin: true peerDependencies: stylelint: '>=11.0.0' dependencies: - stylelint: 14.14.1 - stylelint-config-prettier: 9.0.4_stylelint@14.14.1 + stylelint: 14.15.0 + stylelint-config-prettier: 9.0.4_stylelint@14.15.0 dev: true - /stylelint-config-prettier/9.0.4_stylelint@14.14.1: + /stylelint-config-prettier/9.0.4_stylelint@14.15.0: resolution: {integrity: sha512-38nIGTGpFOiK5LjJ8Ma1yUgpKENxoKSOhbDNSemY7Ep0VsJoXIW9Iq/2hSt699oB9tReynfWicTAoIHiq8Rvbg==} engines: {node: '>= 12'} hasBin: true peerDependencies: stylelint: '>=11.0.0' dependencies: - stylelint: 14.14.1 + stylelint: 14.15.0 dev: true - /stylelint-config-recommended-scss/8.0.0_ave2i6l4ingtbwj4aquhd5witq: + /stylelint-config-recommended-scss/8.0.0_a37symlv4urgexnspmy4gyeh7i: resolution: {integrity: sha512-BxjxEzRaZoQb7Iinc3p92GS6zRdRAkIuEu2ZFLTxJK2e1AIcCb5B5MXY9KOXdGTnYFZ+KKx6R4Fv9zU6CtMYPQ==} peerDependencies: postcss: ^8.3.3 @@ -9818,20 +9818,20 @@ packages: dependencies: postcss: 8.4.19 postcss-scss: 4.0.5_postcss@8.4.19 - stylelint: 14.14.1 - stylelint-config-recommended: 9.0.0_stylelint@14.14.1 - stylelint-scss: 4.3.0_stylelint@14.14.1 + stylelint: 14.15.0 + stylelint-config-recommended: 9.0.0_stylelint@14.15.0 + stylelint-scss: 4.3.0_stylelint@14.15.0 dev: true - /stylelint-config-recommended/9.0.0_stylelint@14.14.1: + /stylelint-config-recommended/9.0.0_stylelint@14.15.0: resolution: {integrity: sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==} peerDependencies: stylelint: ^14.10.0 dependencies: - stylelint: 14.14.1 + stylelint: 14.15.0 dev: true - /stylelint-config-standard-scss/6.1.0_ave2i6l4ingtbwj4aquhd5witq: + /stylelint-config-standard-scss/6.1.0_a37symlv4urgexnspmy4gyeh7i: resolution: {integrity: sha512-iZ2B5kQT2G3rUzx+437cEpdcnFOQkwnwqXuY8Z0QUwIHQVE8mnYChGAquyKFUKZRZ0pRnrciARlPaR1RBtPb0Q==} peerDependencies: postcss: ^8.3.3 @@ -9841,31 +9841,31 @@ packages: optional: true dependencies: postcss: 8.4.19 - stylelint: 14.14.1 - stylelint-config-recommended-scss: 8.0.0_ave2i6l4ingtbwj4aquhd5witq - stylelint-config-standard: 29.0.0_stylelint@14.14.1 + stylelint: 14.15.0 + stylelint-config-recommended-scss: 8.0.0_a37symlv4urgexnspmy4gyeh7i + stylelint-config-standard: 29.0.0_stylelint@14.15.0 dev: true - /stylelint-config-standard/29.0.0_stylelint@14.14.1: + /stylelint-config-standard/29.0.0_stylelint@14.15.0: resolution: {integrity: sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==} peerDependencies: stylelint: ^14.14.0 dependencies: - stylelint: 14.14.1 - stylelint-config-recommended: 9.0.0_stylelint@14.14.1 + stylelint: 14.15.0 + stylelint-config-recommended: 9.0.0_stylelint@14.15.0 dev: true - /stylelint-order/5.0.0_stylelint@14.14.1: + /stylelint-order/5.0.0_stylelint@14.15.0: resolution: {integrity: sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==} peerDependencies: stylelint: ^14.0.0 dependencies: postcss: 8.4.19 postcss-sorting: 7.0.1_postcss@8.4.19 - stylelint: 14.14.1 + stylelint: 14.15.0 dev: true - /stylelint-scss/4.3.0_stylelint@14.14.1: + /stylelint-scss/4.3.0_stylelint@14.15.0: resolution: {integrity: sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==} peerDependencies: stylelint: ^14.5.1 @@ -9875,11 +9875,11 @@ packages: postcss-resolve-nested-selector: 0.1.1 postcss-selector-parser: 6.0.10 postcss-value-parser: 4.2.0 - stylelint: 14.14.1 + stylelint: 14.15.0 dev: true - /stylelint/14.14.1: - resolution: {integrity: sha512-Jnftu+lSD8cSpcV/+Z2nfgfgFpTIS1FcujezXPngtoIQ6wtwutL22MsNE0dJuMiM1h1790g2qIjAyUZCMrX4sw==} + /stylelint/14.15.0: + resolution: {integrity: sha512-JOgDAo5QRsqiOZPZO+B9rKJvBm64S0xasbuRPAbPs6/vQDgDCnZLIiw6XcAS6GQKk9k1sBWR6rmH3Mfj8OknKg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: diff --git a/src/components/Feed/List.tsx b/src/components/Feed/List.tsx index f5a68aa0..b895d652 100644 --- a/src/components/Feed/List.tsx +++ b/src/components/Feed/List.tsx @@ -39,10 +39,12 @@ export default (props: ArticleListProps) => { setLoadingMore(false) } } - + const x: number = Math.floor(articles().length / 6) + // eslint-disable-next-line unicorn/new-for-builtins + const numbers: number[] = [...Array(x).keys()] return ( {t('Loading')}}> - + {() => } diff --git a/src/components/Pages/LayoutShoutsPage.tsx b/src/components/Pages/LayoutShoutsPage.tsx index fca3481a..ebe178fc 100644 --- a/src/components/Pages/LayoutShoutsPage.tsx +++ b/src/components/Pages/LayoutShoutsPage.tsx @@ -1,45 +1,147 @@ import { PageWrap } from '../Wraps/PageWrap' -import { LayoutType, LayoutView } from '../Views/LayoutView' import type { PageProps } from '../types' -import { createMemo, createSignal, onCleanup, onMount, Show } from 'solid-js' +import { createMemo, createSignal, For, onCleanup, onMount, Show } from 'solid-js' import { resetSortedArticles } from '../../stores/zine/articles' import { useRouter } from '../../stores/router' -import { loadRecentLayoutShouts } from '../../stores/zine/layouts' +import { LayoutType, loadRecentLayoutShouts, useLayoutsStore } from '../../stores/zine/layouts' import { Loading } from '../Loading' +import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' +import type { Shout } from '../../graphql/types.gen' +import { splitToPages } from '../../utils/splitToPages' +import clsx from 'clsx' +import { t } from '../../utils/intl' +import { Row3 } from '../Feed/Row3' +import { Row2 } from '../Feed/Row2' +import { Beside } from '../Feed/Beside' +import Slider from '../Feed/Slider' +import { Row1 } from '../Feed/Row1' +import styles from '../../styles/Topic.module.scss' -const PER_PAGE = 50 +export const PRERENDERED_ARTICLES_COUNT = 21 +const LOAD_MORE_PAGE_SIZE = 9 // Row3 + Row3 + Row3 export const LayoutShoutsPage = (props: PageProps) => { - const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts)) - const layout = createMemo(() => { const { page: getPage } = useRouter() - const page = getPage() - - if (page.route !== 'expo') { - throw new Error('ts guard') - } - + if (page.route !== 'expo') throw new Error('ts guard') return page.params.layout as LayoutType }) + const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false) + const { sortedLayoutShouts } = useLayoutsStore(layout(), props.shouts) + const sortedArticles = createMemo(() => sortedLayoutShouts().get(layout())) + const loadMoreLayout = async (kind: LayoutType) => { + saveScrollPosition() + + const { hasMore } = await loadRecentLayoutShouts({ + layout: kind, + amount: LOAD_MORE_PAGE_SIZE, + offset: sortedArticles().length + }) + setIsLoadMoreButtonVisible(hasMore) + restoreScrollPosition() + } onMount(async () => { - if (isLoaded()) { - return + if (sortedArticles().length === PRERENDERED_ARTICLES_COUNT) { + loadMoreLayout(layout()) } + }) - await loadRecentLayoutShouts({ layout: layout(), amount: PER_PAGE, offset: 0 }) + const title = createMemo(() => { + const l = layout() + if (l === 'audio') return t('Audio') + if (l === 'video') return t('Video') + if (l === 'image') return t('Artworks') + return t('Literature') + }) - setIsLoaded(true) + const pages = createMemo(() => + splitToPages(sortedArticles(), PRERENDERED_ARTICLES_COUNT, LOAD_MORE_PAGE_SIZE) + ) + const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts)) + + onMount(async () => { + if (!isLoaded()) { + await loadRecentLayoutShouts({ layout: layout(), amount: PRERENDERED_ARTICLES_COUNT, offset: 0 }) + setIsLoaded(true) + } }) onCleanup(() => resetSortedArticles()) + const ModeSwitcher = () => ( +
+
+
+ +
+
+
+ {`${t('Show')} `} + {t('All posts')} +
+
+
+
+ ) return ( }> - +
+ +

{title()}

+ + + + + + + 5}> + + + + + + + + + {(page) => ( + <> + + + + + )} + + + +

+ +

+ + +
) diff --git a/src/components/Views/Author.tsx b/src/components/Views/Author.tsx index 59278d34..2114ce1b 100644 --- a/src/components/Views/Author.tsx +++ b/src/components/Views/Author.tsx @@ -23,7 +23,7 @@ type AuthorProps = { } type AuthorPageSearchParams = { - by: '' | 'viewed' | 'rating' | 'commented' | 'recent' + by: '' | 'viewed' | 'rating' | 'commented' | 'recent' | 'followed' } export const PRERENDERED_ARTICLES_COUNT = 12 @@ -76,27 +76,21 @@ export const AuthorView = (props: AuthorProps) => {
    -
  • - +
    • +
  • + +
    • +
  • +
    • - {/*TODO: server sort*/} - {/*
  • */} - {/* */} - {/*
    • */} - {/*
  • */} - {/* */} - {/*
    • */} - {/*
  • */} - {/* */} - {/*
    • */}
diff --git a/src/components/Views/LayoutView.tsx b/src/components/Views/LayoutView.tsx deleted file mode 100644 index 6838459a..00000000 --- a/src/components/Views/LayoutView.tsx +++ /dev/null @@ -1,133 +0,0 @@ -import { For, Show, createMemo, onMount, createSignal } from 'solid-js' -import type { Shout } from '../../graphql/types.gen' -import { Row3 } from '../Feed/Row3' -import { Row2 } from '../Feed/Row2' -import { Beside } from '../Feed/Beside' -import styles from '../../styles/Topic.module.scss' -import { t } from '../../utils/intl' -import { useLayoutsStore } from '../../stores/zine/layouts' -import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' -import { splitToPages } from '../../utils/splitToPages' -import { clsx } from 'clsx' -import Slider from '../Feed/Slider' -import { Row1 } from '../Feed/Row1' -import { loadRecentLayoutShouts } from '../../stores/zine/layouts' - -export type LayoutType = 'article' | 'audio' | 'video' | 'image' | 'literature' - -interface LayoutProps { - layout: LayoutType - shouts: Shout[] -} - -export const PRERENDERED_ARTICLES_COUNT = 21 -const LOAD_MORE_PAGE_SIZE = 9 // Row3 + Row3 + Row3 - -export const LayoutView = (props: LayoutProps) => { - const layout = createMemo(() => props.layout) - const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false) - const { sortedLayoutShouts } = useLayoutsStore(layout(), props.shouts) - const sortedArticles = createMemo(() => sortedLayoutShouts().get(layout())) - const loadMoreLayout = async (kind: LayoutType) => { - saveScrollPosition() - - const { hasMore } = await loadRecentLayoutShouts({ - layout: kind, - amount: LOAD_MORE_PAGE_SIZE, - offset: sortedArticles().length - }) - setIsLoadMoreButtonVisible(hasMore) - restoreScrollPosition() - } - - onMount(async () => { - if (sortedArticles().length === PRERENDERED_ARTICLES_COUNT) { - loadMoreLayout(layout()) - } - }) - - const title = createMemo(() => { - const l = layout() - if (l === 'audio') return t('Audio') - if (l === 'video') return t('Video') - if (l === 'image') return t('Artworks') - return t('Literature') - }) - - const pages = createMemo(() => - splitToPages(sortedArticles(), PRERENDERED_ARTICLES_COUNT, LOAD_MORE_PAGE_SIZE) - ) - - const ModeSwitcher = () => ( -
-
-
- -
-
-
- {`${t('Show')} `} - {t('All posts')} -
-
-
-
- ) - - return ( -
- -

{title()}

- - - - - - - 5}> - - - - - - - - - {(page) => ( - <> - - - - - )} - - - -

- -

- - -
- ) -} diff --git a/src/components/types.ts b/src/components/types.ts index 2a5dce56..d161461d 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -1,5 +1,6 @@ // in a separate file to avoid circular dependencies import type { Author, Chat, Shout, Topic } from '../graphql/types.gen' +import type { LayoutType } from '../stores/zine/layouts' // all the things (she said) that could be passed from the server export type PageProps = { @@ -11,7 +12,7 @@ export type PageProps = { topic?: Topic allTopics?: Topic[] searchQuery?: string - layout?: string + layout?: LayoutType // other types? searchResults?: Shout[] chats?: Chat[] diff --git a/src/graphql/types.gen.ts b/src/graphql/types.gen.ts index 7be17aa5..f03b1ea5 100644 --- a/src/graphql/types.gen.ts +++ b/src/graphql/types.gen.ts @@ -25,18 +25,30 @@ export type Author = { bio?: Maybe caption?: Maybe id: Scalars['Int'] + lastSeen?: Maybe links?: Maybe>> name: Scalars['String'] + roles?: Maybe>> slug: Scalars['String'] + stat?: Maybe userpic?: Maybe } +export type AuthorStat = { + followers?: Maybe + followings?: Maybe + rating?: Maybe + commented?: Maybe +} + export type Chat = { + admins?: Maybe>> createdAt: Scalars['Int'] createdBy: User description?: Maybe id: Scalars['String'] messages: Array> + private?: Maybe title?: Maybe unread?: Maybe updatedAt: Scalars['Int'] @@ -53,8 +65,8 @@ export type ChatMember = { invitedAt?: Maybe invitedBy?: Maybe name: Scalars['String'] - pic?: Maybe slug: Scalars['String'] + userpic?: Maybe } export type Collab = { @@ -130,6 +142,7 @@ export type Mutation = { createReaction: Result createShout: Result createTopic: Result + deleteChat: Result deleteCollection: Result deleteCommunity: Result deleteMessage: Result @@ -193,6 +206,10 @@ export type MutationCreateTopicArgs = { input: TopicInput } +export type MutationDeleteChatArgs = { + chatId: Scalars['String'] +} + export type MutationDeleteCollectionArgs = { slug: Scalars['String'] } @@ -330,7 +347,7 @@ export type ProfileInput = { } export type Query = { - authorsAll: Array> + authorsAll: Array> collectionsAll: Array> getAuthor: User getCollabs: Array> @@ -340,39 +357,46 @@ export type Query = { getTopic: Topic getUserCollections: Array> getUserRoles: Array> - getUsersBySlugs: Array> + getUsersBySlugs: Array> isEmailUsed: Scalars['Boolean'] - loadChat: Result + loadChats: Result + loadMessages: Result markdownBody: Scalars['String'] - myChats: Result reactionsByAuthor: Array> reactionsForShouts: Array> recentAll: Array> recentCandidates: Array> recentCommented: Array> + recentLayoutShouts: Array> recentPublished: Array> recentReacted: Array> + searchChats: Result + searchMessages: Result searchQuery?: Maybe>> + searchUsers: Result shoutsByAuthors: Array> shoutsByCollection: Array> shoutsByCommunities: Array> + shoutsByLayout: Array> shoutsByTopics: Array> shoutsForFeed: Array> signIn: AuthResult signOut: AuthResult topAuthors: Array> topCommented: Array> + topLayoutShouts: Array> topMonth: Array> + topMonthLayoutShouts: Array> topOverall: Array> topPublished: Array> topicsAll: Array> topicsByAuthor: Array> topicsByCommunity: Array> topicsRandom: Array> - userFollowedAuthors: Array> + userFollowedAuthors: Array> userFollowedCommunities: Array> userFollowedTopics: Array> - userFollowers: Array> + userFollowers: Array> userReactedShouts: Array> } @@ -408,7 +432,12 @@ export type QueryIsEmailUsedArgs = { email: Scalars['String'] } -export type QueryLoadChatArgs = { +export type QueryLoadChatsArgs = { + amount?: InputMaybe + offset?: InputMaybe +} + +export type QueryLoadMessagesArgs = { amount?: InputMaybe chatId: Scalars['String'] offset?: InputMaybe @@ -445,6 +474,12 @@ export type QueryRecentCommentedArgs = { offset: Scalars['Int'] } +export type QueryRecentLayoutShoutsArgs = { + amount?: InputMaybe + layout: Scalars['String'] + offset?: InputMaybe +} + export type QueryRecentPublishedArgs = { limit: Scalars['Int'] offset: Scalars['Int'] @@ -455,12 +490,30 @@ export type QueryRecentReactedArgs = { offset: Scalars['Int'] } +export type QuerySearchChatsArgs = { + amount?: InputMaybe + offset?: InputMaybe + q: Scalars['String'] +} + +export type QuerySearchMessagesArgs = { + amount?: InputMaybe + offset?: InputMaybe + q: Scalars['String'] +} + export type QuerySearchQueryArgs = { limit: Scalars['Int'] offset: Scalars['Int'] q?: InputMaybe } +export type QuerySearchUsersArgs = { + amount?: InputMaybe + offset?: InputMaybe + q: Scalars['String'] +} + export type QueryShoutsByAuthorsArgs = { limit: Scalars['Int'] offset: Scalars['Int'] @@ -479,6 +532,12 @@ export type QueryShoutsByCommunitiesArgs = { slugs: Array> } +export type QueryShoutsByLayoutArgs = { + amount: Scalars['Int'] + layout?: InputMaybe + offset: Scalars['Int'] +} + export type QueryShoutsByTopicsArgs = { limit: Scalars['Int'] offset: Scalars['Int'] @@ -506,11 +565,23 @@ export type QueryTopCommentedArgs = { offset: Scalars['Int'] } +export type QueryTopLayoutShoutsArgs = { + amount?: InputMaybe + layout: Scalars['String'] + offset?: InputMaybe +} + export type QueryTopMonthArgs = { limit: Scalars['Int'] offset: Scalars['Int'] } +export type QueryTopMonthLayoutShoutsArgs = { + amount?: InputMaybe + layout: Scalars['String'] + offset?: InputMaybe +} + export type QueryTopOverallArgs = { limit: Scalars['Int'] offset: Scalars['Int'] @@ -619,8 +690,8 @@ export type Resource = { } export type Result = { - author?: Maybe - authors?: Maybe>> + author?: Maybe + authors?: Maybe>> chat?: Maybe chats?: Maybe>> communities?: Maybe>> @@ -633,8 +704,10 @@ export type Result = { reactions?: Maybe>> shout?: Maybe shouts?: Maybe>> + slugs?: Maybe>> topic?: Maybe topics?: Maybe>> + uids?: Maybe>> } export type Role = { @@ -653,7 +726,6 @@ export type Shout = { createdAt: Scalars['DateTime'] deletedAt?: Maybe deletedBy?: Maybe - draft?: Maybe id: Scalars['Int'] lang?: Maybe layout?: Maybe @@ -667,8 +739,8 @@ export type Shout = { topics?: Maybe>> updatedAt?: Maybe updatedBy?: Maybe - versionOf?: Maybe - visibleFor?: Maybe>> + versionOf?: Maybe + visibility?: Maybe } export type ShoutInput = { diff --git a/src/pages/expo/[...layout].astro b/src/pages/expo/[...layout].astro index aa2e67dd..0516163b 100644 --- a/src/pages/expo/[...layout].astro +++ b/src/pages/expo/[...layout].astro @@ -3,16 +3,14 @@ import { Root } from '../../components/Root' import Prerendered from '../../main.astro' import { apiClient } from '../../utils/apiClient' import { initRouter } from '../../stores/router' +import type { LayoutType } from '../../stores/zine/layouts' +import { Layout } from '../../components/EditorExample/components/Layout' -const layout = Astro.params.layout?.toString() -if (layout.endsWith('.map')) { +const layout = (Astro.params.layout?.toString() || 'article') as LayoutType +if (!layout || layout.endsWith('.map')) { return Astro.redirect('/404') } -const LAYOUTS = ['literature', 'audio', 'video', 'artworks'] -if (!LAYOUTS.includes(layout)) { - return Astro.redirect('/404') -} -const shouts = await apiClient.getLayoutShouts({ layout }) +const shouts = await apiClient.getRecentLayoutShouts({ layout }) const { pathname, search } = Astro.url initRouter(pathname, search) --- diff --git a/src/stores/zine/layouts.ts b/src/stores/zine/layouts.ts index e042a210..b13521ba 100644 --- a/src/stores/zine/layouts.ts +++ b/src/stores/zine/layouts.ts @@ -2,9 +2,10 @@ import type { Shout } from '../../graphql/types.gen' import { apiClient } from '../../utils/apiClient' import { useArticlesStore } from './articles' import { createSignal } from 'solid-js' -import type { LayoutType } from '../../components/Views/LayoutView' import { byCreated } from '../../utils/sortby' +export type LayoutType = 'article' | 'audio' | 'video' | 'image' | 'literature' + const [sortedLayoutShouts, setSortedLayoutShouts] = createSignal>(new Map()) const addLayoutShouts = (layout: LayoutType, shouts: Shout[]) => { diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts index 2c41fc67..a062cf9b 100644 --- a/src/utils/apiClient.ts +++ b/src/utils/apiClient.ts @@ -32,7 +32,7 @@ import myChats from '../graphql/query/my-chats' import getRecentByLayout from '../graphql/query/layout-recent' import getTopByLayout from '../graphql/query/layout-top' import getTopMonthByLayout from '../graphql/query/layout-top-month' -import type { LayoutType } from '../components/Views/LayoutView' +import type { LayoutType } from '../stores/zine/layouts' const FEED_SIZE = 50 diff --git a/src/utils/config.ts b/src/utils/config.ts index 97487fb0..1332eea2 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -1,5 +1,5 @@ export const isDev = import.meta.env.MODE === 'development' // export const apiBaseUrl = 'https://newapi.discours.io' -export const apiBaseUrl = 'https://testapi.discours.io' -// export const apiBaseUrl = 'http://localhost:8080' +// export const apiBaseUrl = 'https://testapi.discours.io' +export const apiBaseUrl = 'http://localhost:8080'