From 7e5df429d7c7a1cfcf4195e9b98ddf39f0f4daa0 Mon Sep 17 00:00:00 2001 From: Untone Date: Sun, 4 Feb 2024 14:25:21 +0300 Subject: [PATCH] sorted imports --- biome.json | 3 +- src/components/App.tsx | 2 +- .../Article/AudioHeader/AudioHeader.tsx | 4 +-- .../Article/AudioPlayer/AudioPlayer.tsx | 2 +- .../Article/AudioPlayer/PlayerHeader.tsx | 2 +- .../Article/AudioPlayer/PlayerPlaylist.tsx | 2 +- src/components/Article/Comment/Comment.tsx | 6 ++-- src/components/Article/CommentsTree.tsx | 2 +- .../Article/CoverImage/CoverImage.tsx | 6 ++-- src/components/Article/FullArticle.tsx | 16 +++++----- src/components/Article/ShoutRatingControl.tsx | 2 +- src/components/Article/Tooltip.tsx | 2 +- src/components/AuthGuard/AuthGuard.tsx | 2 +- .../Author/AuthorBadge/AuthorBadge.tsx | 4 +-- .../Author/AuthorCard/AuthorCard.tsx | 10 +++---- src/components/Author/Userpic/Userpic.tsx | 2 +- src/components/Discours/Footer.tsx | 2 +- .../Editor/AudioUploader/AudioUploader.tsx | 2 +- .../Editor/BubbleMenu/FigureBubbleMenu.tsx | 2 +- .../Editor/BubbleMenu/IncutBubbleMenu.tsx | 2 +- src/components/Editor/Editor.tsx | 4 +-- .../EditorFloatingMenu/EditorFloatingMenu.tsx | 6 ++-- src/components/Editor/Panel/Panel.tsx | 2 +- src/components/Editor/SimplifiedEditor.tsx | 8 ++--- .../Editor/TextBubbleMenu/TextBubbleMenu.tsx | 2 +- .../Editor/TopicSelect/TopicSelect.tsx | 2 +- .../UploadModalContent/UploadModalContent.tsx | 4 +-- .../Editor/VideoUploader/VideoUploader.tsx | 2 +- .../Editor/extensions/Figcaption.ts | 2 +- src/components/Editor/extensions/Figure.ts | 2 +- src/components/Editor/extensions/Footnote.ts | 2 +- .../Feed/ArticleCard/ArticleCard.tsx | 12 ++++---- src/components/Feed/Beside.tsx | 4 +-- .../FeedArticlePopup/FeedArticlePopup.tsx | 2 +- src/components/Feed/Group.tsx | 2 +- src/components/Feed/Row2.tsx | 2 +- src/components/Feed/Row3.tsx | 2 +- src/components/Feed/Sidebar/Sidebar.tsx | 4 +-- src/components/Inbox/CreateModalContent.tsx | 2 +- src/components/Inbox/DialogCard.tsx | 2 +- src/components/Inbox/Message.tsx | 4 +-- src/components/Inbox/MessageActionsPopup.tsx | 2 +- .../Nav/AuthModal/ChangePasswordForm.tsx | 2 +- src/components/Nav/AuthModal/EmailConfirm.tsx | 4 +-- .../Nav/AuthModal/ForgotPasswordForm.tsx | 2 +- src/components/Nav/AuthModal/LoginForm.tsx | 4 +-- .../AuthModal/PasswordField/PasswordField.tsx | 2 +- src/components/Nav/AuthModal/RegisterForm.tsx | 4 +-- src/components/Nav/AuthModal/index.tsx | 2 +- src/components/Nav/Header/Header.tsx | 8 ++--- src/components/Nav/Header/Link.tsx | 2 +- src/components/Nav/HeaderAuth.tsx | 4 +-- src/components/Nav/Modal/Modal.tsx | 2 +- src/components/Nav/Modal/Opener.tsx | 2 +- .../Nav/SearchModal/SearchModal.tsx | 4 +-- .../NotificationView/NotificationGroup.tsx | 4 +-- .../NotificationsPanel/NotificationsPanel.tsx | 2 +- .../ProfileSettings/ProfileSettings.tsx | 8 ++--- .../TableOfContents/TableOfContents.tsx | 4 +-- src/components/Topic/Card.tsx | 6 ++-- src/components/Topic/Full.tsx | 2 +- .../Topic/TopicBadge/TopicBadge.tsx | 2 +- src/components/Views/AllAuthors.tsx | 4 +-- src/components/Views/AllTopics.tsx | 4 +-- src/components/Views/Author/Author.tsx | 6 ++-- .../Views/DraftsView/DraftsView.tsx | 2 +- src/components/Views/Edit.tsx | 12 ++++---- src/components/Views/Expo/Expo.tsx | 4 +-- src/components/Views/Feed/Feed.tsx | 16 +++++----- src/components/Views/Home.tsx | 6 ++-- src/components/Views/Inbox/Inbox.tsx | 8 ++--- .../ProfileSubscriptions.tsx | 6 ++-- .../Views/PublishSettings/PublishSettings.tsx | 8 ++--- src/components/Views/Search.tsx | 4 +-- src/components/Views/StaticPage.tsx | 2 +- src/components/Views/Topic.tsx | 4 +-- .../_shared/CheckButton/CheckButton.tsx | 2 +- src/components/_shared/DropArea/DropArea.tsx | 2 +- src/components/_shared/DropDown/DropDown.tsx | 2 +- .../_shared/DropdownSelect/DropdownSelect.tsx | 2 +- .../GrowingTextarea/GrowingTextarea.tsx | 2 +- src/components/_shared/Icon/Icon.tsx | 2 +- .../_shared/ImageCropper/ImageCropper.tsx | 2 +- .../_shared/InviteMembers/InviteMembers.tsx | 2 +- src/components/_shared/Lightbox/Lightbox.tsx | 2 +- src/components/_shared/PageLayout.tsx | 2 +- src/components/_shared/Popover/Popover.tsx | 2 +- src/components/_shared/Popup/Popup.tsx | 2 +- .../_shared/ShareLinks/ShareLinks.tsx | 4 +-- src/components/_shared/ShowOnlyOnClient.tsx | 2 +- .../SocialNetworkInput/SocialNetworkInput.tsx | 2 +- .../_shared/SolidSwiper/ArticleCardSwiper.tsx | 2 +- .../_shared/SolidSwiper/EditorSwiper.tsx | 2 +- .../_shared/SolidSwiper/ImageSwiper.tsx | 2 +- .../_shared/SolidSwiper/swiper.d.ts | 2 +- .../_shared/Subscribe/Subscribe.tsx | 2 +- .../_shared/VideoPlayer/VideoPlayer.tsx | 2 +- src/context/connect.tsx | 6 ++-- src/context/editor.tsx | 2 +- src/context/following.tsx | 2 +- src/context/inbox.tsx | 2 +- src/context/localize.tsx | 2 +- src/context/notifications.tsx | 2 +- src/context/profile.tsx | 2 +- src/context/session.tsx | 16 +++++----- src/graphql/client/core.ts | 30 +++++++++---------- src/graphql/createGraphQLClient.ts | 2 +- src/pages/about/manifest.page.tsx | 2 +- src/pages/allAuthors.page.server.ts | 2 +- src/pages/allAuthors.page.tsx | 2 +- src/pages/allTopics.page.server.ts | 2 +- src/pages/allTopics.page.tsx | 2 +- src/pages/article.page.server.ts | 2 +- src/pages/article.page.tsx | 6 ++-- src/pages/author.page.server.ts | 2 +- src/pages/author.page.tsx | 4 +-- src/pages/connect.page.tsx | 2 +- src/pages/create.page.tsx | 2 +- src/pages/drafts.page.tsx | 2 +- src/pages/edit.page.tsx | 4 +-- src/pages/expo/expo.page.tsx | 2 +- src/pages/feed.page.tsx | 4 +-- src/pages/fourOuFour.page.tsx | 2 +- src/pages/inbox.page.tsx | 2 +- src/pages/index.page.server.ts | 2 +- src/pages/index.page.tsx | 4 +-- src/pages/profile/profileSecurity.page.tsx | 4 +-- src/pages/profile/profileSettings.page.tsx | 2 +- .../profile/profileSubscriptions.page.tsx | 2 +- src/pages/search.page.server.ts | 2 +- src/pages/search.page.tsx | 4 +-- src/pages/topic.page.server.ts | 2 +- src/pages/topic.page.tsx | 4 +-- src/renderer/_default.page.client.tsx | 2 +- src/renderer/_default.page.server.tsx | 4 +-- src/renderer/types.ts | 2 +- src/stores/zine/articles.ts | 2 +- src/stores/zine/layouts.ts | 2 +- src/utils/getImageUrl.ts | 2 +- 139 files changed, 250 insertions(+), 249 deletions(-) diff --git a/biome.json b/biome.json index ff4fc495..4cba8093 100644 --- a/biome.json +++ b/biome.json @@ -5,7 +5,8 @@ "useIgnoreFile": true }, "organizeImports": { - "enabled": true + "enabled": true, + "ignore": ["./api", "./gen"] }, "formatter": { "indentStyle": "space", diff --git a/src/components/App.tsx b/src/components/App.tsx index eae090f0..b024f194 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -43,7 +43,7 @@ import { ProfileSubscriptionsPage } from '../pages/profile/profileSubscriptions. import { SearchPage } from '../pages/search.page' import { TopicPage } from '../pages/topic.page' import { ROUTES, useRouter } from '../stores/router' -import { hideModal, MODALS, showModal } from '../stores/ui' +import { MODALS, hideModal, showModal } from '../stores/ui' // TODO: lazy load // const SomePage = lazy(() => import('./Pages/SomePage')) diff --git a/src/components/Article/AudioHeader/AudioHeader.tsx b/src/components/Article/AudioHeader/AudioHeader.tsx index bcc29e62..325bd4be 100644 --- a/src/components/Article/AudioHeader/AudioHeader.tsx +++ b/src/components/Article/AudioHeader/AudioHeader.tsx @@ -1,11 +1,11 @@ import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { Topic } from '../../../graphql/schema/core.gen' import { MediaItem } from '../../../pages/types' +import { CardTopic } from '../../Feed/CardTopic' import { Icon } from '../../_shared/Icon' import { Image } from '../../_shared/Image' -import { CardTopic } from '../../Feed/CardTopic' import styles from './AudioHeader.module.scss' diff --git a/src/components/Article/AudioPlayer/AudioPlayer.tsx b/src/components/Article/AudioPlayer/AudioPlayer.tsx index ddbe8e40..00bebe9d 100644 --- a/src/components/Article/AudioPlayer/AudioPlayer.tsx +++ b/src/components/Article/AudioPlayer/AudioPlayer.tsx @@ -1,4 +1,4 @@ -import { createEffect, createMemo, createSignal, on, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, on, onMount } from 'solid-js' import { MediaItem } from '../../../pages/types' diff --git a/src/components/Article/AudioPlayer/PlayerHeader.tsx b/src/components/Article/AudioPlayer/PlayerHeader.tsx index eb5f7502..37d020cb 100644 --- a/src/components/Article/AudioPlayer/PlayerHeader.tsx +++ b/src/components/Article/AudioPlayer/PlayerHeader.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { MediaItem } from '../../../pages/types' import { useOutsideClickHandler } from '../../../utils/useOutsideClickHandler' diff --git a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx index b4eec25f..ff0661c9 100644 --- a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx +++ b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx @@ -1,5 +1,5 @@ import { gtag } from 'ga-gtag' -import { createSignal, For, lazy, Show } from 'solid-js' +import { For, Show, createSignal, lazy } from 'solid-js' import { useLocalize } from '../../../context/localize' import { MediaItem } from '../../../pages/types' diff --git a/src/components/Article/Comment/Comment.tsx b/src/components/Article/Comment/Comment.tsx index edd2a4fd..17c19c48 100644 --- a/src/components/Article/Comment/Comment.tsx +++ b/src/components/Article/Comment/Comment.tsx @@ -1,6 +1,6 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { Show, createMemo, createSignal, For, lazy, Suspense } from 'solid-js' +import { For, Show, Suspense, createMemo, createSignal, lazy } from 'solid-js' import { useConfirm } from '../../../context/confirm' import { useLocalize } from '../../../context/localize' @@ -9,10 +9,10 @@ import { useSession } from '../../../context/session' import { useSnackbar } from '../../../context/snackbar' import { Author, Reaction, ReactionKind } from '../../../graphql/schema/core.gen' import { router } from '../../../stores/router' -import { Icon } from '../../_shared/Icon' -import { ShowIfAuthenticated } from '../../_shared/ShowIfAuthenticated' import { AuthorLink } from '../../Author/AuthorLink' import { Userpic } from '../../Author/Userpic' +import { Icon } from '../../_shared/Icon' +import { ShowIfAuthenticated } from '../../_shared/ShowIfAuthenticated' import { CommentDate } from '../CommentDate' import { CommentRatingControl } from '../CommentRatingControl' diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx index a5d5166a..c44a312b 100644 --- a/src/components/Article/CommentsTree.tsx +++ b/src/components/Article/CommentsTree.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { Show, createMemo, createSignal, onMount, For, lazy } from 'solid-js' +import { For, Show, createMemo, createSignal, lazy, onMount } from 'solid-js' import { useLocalize } from '../../context/localize' import { useReactions } from '../../context/reactions' diff --git a/src/components/Article/CoverImage/CoverImage.tsx b/src/components/Article/CoverImage/CoverImage.tsx index afbff23f..970d2636 100644 --- a/src/components/Article/CoverImage/CoverImage.tsx +++ b/src/components/Article/CoverImage/CoverImage.tsx @@ -1,9 +1,6 @@ import type { CoverImageProps } from './types' import { CoverImage1 } from './images/CoverImage1' -import { CoverImage10 } from './images/CoverImage10' -import { CoverImage11 } from './images/CoverImage11' -import { CoverImage12 } from './images/CoverImage12' import { CoverImage2 } from './images/CoverImage2' import { CoverImage3 } from './images/CoverImage3' import { CoverImage4 } from './images/CoverImage4' @@ -12,6 +9,9 @@ import { CoverImage6 } from './images/CoverImage6' import { CoverImage7 } from './images/CoverImage7' import { CoverImage8 } from './images/CoverImage8' import { CoverImage9 } from './images/CoverImage9' +import { CoverImage10 } from './images/CoverImage10' +import { CoverImage11 } from './images/CoverImage11' +import { CoverImage12 } from './images/CoverImage12' // not pretty, but I don't want to use dynamic imports const coverImages = [ diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 9c737f8d..8db423d5 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -5,7 +5,7 @@ import { createPopper } from '@popperjs/core' import { Link, Meta } from '@solidjs/meta' import { clsx } from 'clsx' import { install } from 'ga-gtag' -import { createEffect, For, createMemo, onMount, Show, createSignal, onCleanup, on } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js' import { isServer } from 'solid-js/web' import { useLocalize } from '../../context/localize' @@ -18,6 +18,11 @@ import { capitalize } from '../../utils/capitalize' import { isCyrillic } from '../../utils/cyrillic' import { getImageUrl, getOpenGraphImageUrl } from '../../utils/getImageUrl' import { getDescription, getKeywords } from '../../utils/meta' +import { AuthorBadge } from '../Author/AuthorBadge' +import { CardTopic } from '../Feed/CardTopic' +import { FeedArticlePopup } from '../Feed/FeedArticlePopup' +import { Modal } from '../Nav/Modal' +import { TableOfContents } from '../TableOfContents' import { Icon } from '../_shared/Icon' import { Image } from '../_shared/Image' import { InviteMembers } from '../_shared/InviteMembers' @@ -26,20 +31,15 @@ import { Popover } from '../_shared/Popover' import { ShareModal } from '../_shared/ShareModal' import { ImageSwiper } from '../_shared/SolidSwiper' import { VideoPlayer } from '../_shared/VideoPlayer' -import { AuthorBadge } from '../Author/AuthorBadge' -import { CardTopic } from '../Feed/CardTopic' -import { FeedArticlePopup } from '../Feed/FeedArticlePopup' -import { Modal } from '../Nav/Modal' -import { TableOfContents } from '../TableOfContents' import { AudioHeader } from './AudioHeader' import { AudioPlayer } from './AudioPlayer' import { CommentsTree } from './CommentsTree' -import { getShareUrl, SharePopup } from './SharePopup' +import { SharePopup, getShareUrl } from './SharePopup' import { ShoutRatingControl } from './ShoutRatingControl' -import styles from './Article.module.scss' import stylesHeader from '../Nav/Header/Header.module.scss' +import styles from './Article.module.scss' type Props = { article: Shout diff --git a/src/components/Article/ShoutRatingControl.tsx b/src/components/Article/ShoutRatingControl.tsx index 7fcb2c19..f309b5f2 100644 --- a/src/components/Article/ShoutRatingControl.tsx +++ b/src/components/Article/ShoutRatingControl.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createMemo, createSignal, Show } from 'solid-js' +import { Show, createMemo, createSignal } from 'solid-js' import { useLocalize } from '../../context/localize' import { useReactions } from '../../context/reactions' diff --git a/src/components/Article/Tooltip.tsx b/src/components/Article/Tooltip.tsx index 37e14dd6..b4761d3b 100644 --- a/src/components/Article/Tooltip.tsx +++ b/src/components/Article/Tooltip.tsx @@ -1,5 +1,5 @@ +import { JSX, createSignal } from 'solid-js' import './Tooltip.scss' -import { createSignal, JSX } from 'solid-js' interface TooltipProps { children?: JSX.Element diff --git a/src/components/AuthGuard/AuthGuard.tsx b/src/components/AuthGuard/AuthGuard.tsx index 86b10f95..f07e3dbf 100644 --- a/src/components/AuthGuard/AuthGuard.tsx +++ b/src/components/AuthGuard/AuthGuard.tsx @@ -1,4 +1,4 @@ -import { createEffect, JSX, Show } from 'solid-js' +import { JSX, Show, createEffect } from 'solid-js' import { useSession } from '../../context/session' import { RootSearchParams } from '../../pages/types' diff --git a/src/components/Author/AuthorBadge/AuthorBadge.tsx b/src/components/Author/AuthorBadge/AuthorBadge.tsx index 24e885e7..b774fb9b 100644 --- a/src/components/Author/AuthorBadge/AuthorBadge.tsx +++ b/src/components/Author/AuthorBadge/AuthorBadge.tsx @@ -1,6 +1,6 @@ import { openPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, Match, on, Show, Switch } from 'solid-js' +import { Match, Show, Switch, createEffect, createMemo, createSignal, on } from 'solid-js' import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' @@ -16,8 +16,8 @@ import { ConditionalWrapper } from '../../_shared/ConditionalWrapper' import { Icon } from '../../_shared/Icon' import { Userpic } from '../Userpic' -import styles from './AuthorBadge.module.scss' import stylesButton from '../../_shared/Button/Button.module.scss' +import styles from './AuthorBadge.module.scss' type FollowedInfo = { value?: boolean diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx index 2b513057..5ac3dedf 100644 --- a/src/components/Author/AuthorCard/AuthorCard.tsx +++ b/src/components/Author/AuthorCard/AuthorCard.tsx @@ -2,7 +2,7 @@ import type { Author, Community } from '../../../graphql/schema/core.gen' import { openPage, redirectPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, For, on, onMount, Show } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, on, onMount } from 'solid-js' import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' @@ -13,16 +13,16 @@ import { router, useRouter } from '../../../stores/router' import { isCyrillic } from '../../../utils/cyrillic' import { isAuthor } from '../../../utils/isAuthor' import { translit } from '../../../utils/ru2en' -import { Button } from '../../_shared/Button' -import { ShowOnlyOnClient } from '../../_shared/ShowOnlyOnClient' -import { getShareUrl, SharePopup } from '../../Article/SharePopup' +import { SharePopup, getShareUrl } from '../../Article/SharePopup' import { Modal } from '../../Nav/Modal' import { TopicBadge } from '../../Topic/TopicBadge' +import { Button } from '../../_shared/Button' +import { ShowOnlyOnClient } from '../../_shared/ShowOnlyOnClient' import { AuthorBadge } from '../AuthorBadge' import { Userpic } from '../Userpic' -import styles from './AuthorCard.module.scss' import stylesButton from '../../_shared/Button/Button.module.scss' +import styles from './AuthorCard.module.scss' type Props = { author: Author diff --git a/src/components/Author/Userpic/Userpic.tsx b/src/components/Author/Userpic/Userpic.tsx index ca763838..d04e5c0b 100644 --- a/src/components/Author/Userpic/Userpic.tsx +++ b/src/components/Author/Userpic/Userpic.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createMemo, Show } from 'solid-js' +import { Show, createMemo } from 'solid-js' import { ConditionalWrapper } from '../../_shared/ConditionalWrapper' import { Image } from '../../_shared/Image' diff --git a/src/components/Discours/Footer.tsx b/src/components/Discours/Footer.tsx index c24fe9c9..452d0da0 100644 --- a/src/components/Discours/Footer.tsx +++ b/src/components/Discours/Footer.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createMemo, For } from 'solid-js' +import { For, createMemo } from 'solid-js' import { useLocalize } from '../../context/localize' import { Icon } from '../_shared/Icon' diff --git a/src/components/Editor/AudioUploader/AudioUploader.tsx b/src/components/Editor/AudioUploader/AudioUploader.tsx index ef8fced2..59fa52bd 100644 --- a/src/components/Editor/AudioUploader/AudioUploader.tsx +++ b/src/components/Editor/AudioUploader/AudioUploader.tsx @@ -6,8 +6,8 @@ import { Show } from 'solid-js' import { useLocalize } from '../../../context/localize' import { MediaItem } from '../../../pages/types' import { composeMediaItems } from '../../../utils/composeMediaItems' -import { DropArea } from '../../_shared/DropArea' import { AudioPlayer } from '../../Article/AudioPlayer' +import { DropArea } from '../../_shared/DropArea' import styles from './AudioUploader.module.scss' diff --git a/src/components/Editor/BubbleMenu/FigureBubbleMenu.tsx b/src/components/Editor/BubbleMenu/FigureBubbleMenu.tsx index d8b3e69d..138934a7 100644 --- a/src/components/Editor/BubbleMenu/FigureBubbleMenu.tsx +++ b/src/components/Editor/BubbleMenu/FigureBubbleMenu.tsx @@ -3,9 +3,9 @@ import type { Editor } from '@tiptap/core' import { useLocalize } from '../../../context/localize' import { UploadedFile } from '../../../pages/types' import { renderUploadedImage } from '../../../utils/renderUploadedImage' +import { Modal } from '../../Nav/Modal' import { Icon } from '../../_shared/Icon' import { Popover } from '../../_shared/Popover' -import { Modal } from '../../Nav/Modal' import { UploadModalContent } from '../UploadModalContent' import styles from './BubbleMenu.module.scss' diff --git a/src/components/Editor/BubbleMenu/IncutBubbleMenu.tsx b/src/components/Editor/BubbleMenu/IncutBubbleMenu.tsx index 78feb15d..6470857d 100644 --- a/src/components/Editor/BubbleMenu/IncutBubbleMenu.tsx +++ b/src/components/Editor/BubbleMenu/IncutBubbleMenu.tsx @@ -1,7 +1,7 @@ import type { Editor } from '@tiptap/core' import { clsx } from 'clsx' -import { createSignal, Show, For } from 'solid-js' +import { For, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { Icon } from '../../_shared/Icon' diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx index 211d22e8..98a52fdd 100644 --- a/src/components/Editor/Editor.tsx +++ b/src/components/Editor/Editor.tsx @@ -38,8 +38,9 @@ import { useSession } from '../../context/session' import { useSnackbar } from '../../context/snackbar' import { handleImageUpload } from '../../utils/handleImageUpload' -import { FigureBubbleMenu, BlockquoteBubbleMenu, IncutBubbleMenu } from './BubbleMenu' +import { BlockquoteBubbleMenu, FigureBubbleMenu, IncutBubbleMenu } from './BubbleMenu' import { EditorFloatingMenu } from './EditorFloatingMenu' +import { TextBubbleMenu } from './TextBubbleMenu' import Article from './extensions/Article' import { CustomBlockquote } from './extensions/CustomBlockquote' import { Figcaption } from './extensions/Figcaption' @@ -49,7 +50,6 @@ import { Iframe } from './extensions/Iframe' import { Span } from './extensions/Span' import { ToggleTextWrap } from './extensions/ToggleTextWrap' import { TrailingNode } from './extensions/TrailingNode' -import { TextBubbleMenu } from './TextBubbleMenu' import './Prosemirror.scss' diff --git a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx index 673da091..3b617f6b 100644 --- a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx +++ b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx @@ -1,15 +1,15 @@ -import type { MenuItem } from './Menu/Menu' import type { Editor } from '@tiptap/core' +import type { MenuItem } from './Menu/Menu' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { UploadedFile } from '../../../pages/types' import { showModal } from '../../../stores/ui' import { renderUploadedImage } from '../../../utils/renderUploadedImage' import { useOutsideClickHandler } from '../../../utils/useOutsideClickHandler' -import { Icon } from '../../_shared/Icon' import { Modal } from '../../Nav/Modal' +import { Icon } from '../../_shared/Icon' import { InlineForm } from '../InlineForm' import { UploadModalContent } from '../UploadModalContent' diff --git a/src/components/Editor/Panel/Panel.tsx b/src/components/Editor/Panel/Panel.tsx index 3366f8b7..0eb4a095 100644 --- a/src/components/Editor/Panel/Panel.tsx +++ b/src/components/Editor/Panel/Panel.tsx @@ -1,6 +1,6 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useEditorHTML } from 'solid-tiptap' import Typograf from 'typograf' diff --git a/src/components/Editor/SimplifiedEditor.tsx b/src/components/Editor/SimplifiedEditor.tsx index cf981623..5e5220c4 100644 --- a/src/components/Editor/SimplifiedEditor.tsx +++ b/src/components/Editor/SimplifiedEditor.tsx @@ -10,7 +10,7 @@ import { Paragraph } from '@tiptap/extension-paragraph' import { Placeholder } from '@tiptap/extension-placeholder' import { Text } from '@tiptap/extension-text' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, onCleanup, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, onCleanup, onMount } from 'solid-js' import { Portal } from 'solid-js/web' import { createEditorTransaction, @@ -24,17 +24,17 @@ import { useEditorContext } from '../../context/editor' import { useLocalize } from '../../context/localize' import { UploadedFile } from '../../pages/types' import { hideModal, showModal } from '../../stores/ui' +import { Modal } from '../Nav/Modal' import { Button } from '../_shared/Button' import { Icon } from '../_shared/Icon' import { Popover } from '../_shared/Popover' import { ShowOnlyOnClient } from '../_shared/ShowOnlyOnClient' -import { Modal } from '../Nav/Modal' -import { Figcaption } from './extensions/Figcaption' -import { Figure } from './extensions/Figure' import { LinkBubbleMenuModule } from './LinkBubbleMenu' import { TextBubbleMenu } from './TextBubbleMenu' import { UploadModalContent } from './UploadModalContent' +import { Figcaption } from './extensions/Figcaption' +import { Figure } from './extensions/Figure' import styles from './SimplifiedEditor.module.scss' diff --git a/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx b/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx index a3ccea46..ff16e6b3 100644 --- a/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx +++ b/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx @@ -1,7 +1,7 @@ import type { Editor } from '@tiptap/core' import { clsx } from 'clsx' -import { Switch, Match, createSignal, Show, onMount, onCleanup, createEffect, lazy } from 'solid-js' +import { Match, Show, Switch, createEffect, createSignal, lazy, onCleanup, onMount } from 'solid-js' import { createEditorTransaction } from 'solid-tiptap' import { useLocalize } from '../../../context/localize' diff --git a/src/components/Editor/TopicSelect/TopicSelect.tsx b/src/components/Editor/TopicSelect/TopicSelect.tsx index 8ab5034e..ffb44c82 100644 --- a/src/components/Editor/TopicSelect/TopicSelect.tsx +++ b/src/components/Editor/TopicSelect/TopicSelect.tsx @@ -1,6 +1,6 @@ import type { Topic } from '../../../graphql/schema/core.gen' -import { createOptions, Select } from '@thisbeyond/solid-select' +import { Select, createOptions } from '@thisbeyond/solid-select' import { clsx } from 'clsx' import { createSignal } from 'solid-js' diff --git a/src/components/Editor/UploadModalContent/UploadModalContent.tsx b/src/components/Editor/UploadModalContent/UploadModalContent.tsx index bd2284e8..03029907 100644 --- a/src/components/Editor/UploadModalContent/UploadModalContent.tsx +++ b/src/components/Editor/UploadModalContent/UploadModalContent.tsx @@ -1,6 +1,6 @@ -import { createDropzone, createFileUploader, UploadFile } from '@solid-primitives/upload' +import { UploadFile, createDropzone, createFileUploader } from '@solid-primitives/upload' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { UploadedFile } from '../../../pages/types' diff --git a/src/components/Editor/VideoUploader/VideoUploader.tsx b/src/components/Editor/VideoUploader/VideoUploader.tsx index 2f21639a..4cfb1a03 100644 --- a/src/components/Editor/VideoUploader/VideoUploader.tsx +++ b/src/components/Editor/VideoUploader/VideoUploader.tsx @@ -2,7 +2,7 @@ import type { MediaItem } from '../../../pages/types' import { createDropzone } from '@solid-primitives/upload' import { clsx } from 'clsx' -import { createSignal, For, Show } from 'solid-js' +import { For, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSnackbar } from '../../../context/snackbar' diff --git a/src/components/Editor/extensions/Figcaption.ts b/src/components/Editor/extensions/Figcaption.ts index b26e522b..214869b5 100644 --- a/src/components/Editor/extensions/Figcaption.ts +++ b/src/components/Editor/extensions/Figcaption.ts @@ -1,4 +1,4 @@ -import { mergeAttributes, Node } from '@tiptap/core' +import { Node, mergeAttributes } from '@tiptap/core' declare module '@tiptap/core' { interface Commands { diff --git a/src/components/Editor/extensions/Figure.ts b/src/components/Editor/extensions/Figure.ts index c67bebc2..ab44e04f 100644 --- a/src/components/Editor/extensions/Figure.ts +++ b/src/components/Editor/extensions/Figure.ts @@ -1,4 +1,4 @@ -import { mergeAttributes, Node } from '@tiptap/core' +import { Node, mergeAttributes } from '@tiptap/core' import { Plugin } from '@tiptap/pm/state' declare module '@tiptap/core' { diff --git a/src/components/Editor/extensions/Footnote.ts b/src/components/Editor/extensions/Footnote.ts index 4bad4fc0..1293e60a 100644 --- a/src/components/Editor/extensions/Footnote.ts +++ b/src/components/Editor/extensions/Footnote.ts @@ -1,4 +1,4 @@ -import { mergeAttributes, Node } from '@tiptap/core' +import { Node, mergeAttributes } from '@tiptap/core' declare module '@tiptap/core' { interface Commands { diff --git a/src/components/Feed/ArticleCard/ArticleCard.tsx b/src/components/Feed/ArticleCard/ArticleCard.tsx index a14aa66c..5e68bae7 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.tsx +++ b/src/components/Feed/ArticleCard/ArticleCard.tsx @@ -2,25 +2,25 @@ import type { Author, Shout, Topic } from '../../../graphql/schema/core.gen' import { getPagePath, openPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createMemo, createSignal, For, Show } from 'solid-js' +import { For, Show, createMemo, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' import { router, useRouter } from '../../../stores/router' import { capitalize } from '../../../utils/capitalize' import { getDescription } from '../../../utils/meta' +import { CoverImage } from '../../Article/CoverImage' +import { SharePopup, getShareUrl } from '../../Article/SharePopup' +import { ShoutRatingControl } from '../../Article/ShoutRatingControl' +import { AuthorLink } from '../../Author/AuthorLink' import { Icon } from '../../_shared/Icon' import { Image } from '../../_shared/Image' import { Popover } from '../../_shared/Popover' -import { CoverImage } from '../../Article/CoverImage' -import { getShareUrl, SharePopup } from '../../Article/SharePopup' -import { ShoutRatingControl } from '../../Article/ShoutRatingControl' -import { AuthorLink } from '../../Author/AuthorLink' import { CardTopic } from '../CardTopic' import { FeedArticlePopup } from '../FeedArticlePopup' -import styles from './ArticleCard.module.scss' import stylesHeader from '../../Nav/Header/Header.module.scss' +import styles from './ArticleCard.module.scss' export type ArticleCardProps = { // TODO: refactor this, please diff --git a/src/components/Feed/Beside.tsx b/src/components/Feed/Beside.tsx index f11de91c..44b07f2f 100644 --- a/src/components/Feed/Beside.tsx +++ b/src/components/Feed/Beside.tsx @@ -3,13 +3,13 @@ import type { Author, Shout, Topic } from '../../graphql/schema/core.gen' import { clsx } from 'clsx' -import { createEffect, createSignal, For, Show } from 'solid-js' +import { For, Show, createEffect, createSignal } from 'solid-js' import { useFollowing } from '../../context/following' import { useLocalize } from '../../context/localize' -import { Icon } from '../_shared/Icon' import { AuthorBadge } from '../Author/AuthorBadge' import { TopicCard } from '../Topic/Card' +import { Icon } from '../_shared/Icon' import { ArticleCard } from './ArticleCard' diff --git a/src/components/Feed/FeedArticlePopup/FeedArticlePopup.tsx b/src/components/Feed/FeedArticlePopup/FeedArticlePopup.tsx index 98e8822f..2a3bb496 100644 --- a/src/components/Feed/FeedArticlePopup/FeedArticlePopup.tsx +++ b/src/components/Feed/FeedArticlePopup/FeedArticlePopup.tsx @@ -1,7 +1,7 @@ import type { PopupProps } from '../../_shared/Popup' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { Popup } from '../../_shared/Popup' diff --git a/src/components/Feed/Group.tsx b/src/components/Feed/Group.tsx index b222524b..45ad725c 100644 --- a/src/components/Feed/Group.tsx +++ b/src/components/Feed/Group.tsx @@ -1,5 +1,5 @@ -import type { Shout } from '../../graphql/schema/core.gen' import type { JSX } from 'solid-js/jsx-runtime' +import type { Shout } from '../../graphql/schema/core.gen' import { For, Show } from 'solid-js' diff --git a/src/components/Feed/Row2.tsx b/src/components/Feed/Row2.tsx index 5fa5a6be..660326a9 100644 --- a/src/components/Feed/Row2.tsx +++ b/src/components/Feed/Row2.tsx @@ -1,6 +1,6 @@ import type { Shout } from '../../graphql/schema/core.gen' -import { createSignal, createEffect, For, Show } from 'solid-js' +import { For, Show, createEffect, createSignal } from 'solid-js' import { ArticleCard } from './ArticleCard' diff --git a/src/components/Feed/Row3.tsx b/src/components/Feed/Row3.tsx index 96d1da4f..8c1befc8 100644 --- a/src/components/Feed/Row3.tsx +++ b/src/components/Feed/Row3.tsx @@ -1,5 +1,5 @@ -import type { Shout } from '../../graphql/schema/core.gen' import type { JSX } from 'solid-js/jsx-runtime' +import type { Shout } from '../../graphql/schema/core.gen' import { For, Show } from 'solid-js' diff --git a/src/components/Feed/Sidebar/Sidebar.tsx b/src/components/Feed/Sidebar/Sidebar.tsx index a2e4a6f4..9fed7c61 100644 --- a/src/components/Feed/Sidebar/Sidebar.tsx +++ b/src/components/Feed/Sidebar/Sidebar.tsx @@ -1,6 +1,6 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { createSignal, For, Show } from 'solid-js' +import { For, Show, createSignal } from 'solid-js' import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' @@ -8,8 +8,8 @@ import { Author } from '../../../graphql/schema/core.gen' import { router, useRouter } from '../../../stores/router' import { useArticlesStore } from '../../../stores/zine/articles' import { useSeenStore } from '../../../stores/zine/seen' -import { Icon } from '../../_shared/Icon' import { Userpic } from '../../Author/Userpic' +import { Icon } from '../../_shared/Icon' import styles from './Sidebar.module.scss' diff --git a/src/components/Inbox/CreateModalContent.tsx b/src/components/Inbox/CreateModalContent.tsx index 195f3c3b..3f661931 100644 --- a/src/components/Inbox/CreateModalContent.tsx +++ b/src/components/Inbox/CreateModalContent.tsx @@ -1,6 +1,6 @@ import type { Author } from '../../graphql/schema/core.gen' -import { createSignal, For, createEffect } from 'solid-js' +import { For, createEffect, createSignal } from 'solid-js' import { useInbox } from '../../context/inbox' import { useLocalize } from '../../context/localize' diff --git a/src/components/Inbox/DialogCard.tsx b/src/components/Inbox/DialogCard.tsx index f2359dee..6c455b12 100644 --- a/src/components/Inbox/DialogCard.tsx +++ b/src/components/Inbox/DialogCard.tsx @@ -1,7 +1,7 @@ import type { ChatMember } from '../../graphql/schema/chat.gen' import { clsx } from 'clsx' -import { Show, Switch, Match, createMemo } from 'solid-js' +import { Match, Show, Switch, createMemo } from 'solid-js' import { useLocalize } from '../../context/localize' import { Author } from '../../graphql/schema/core.gen' diff --git a/src/components/Inbox/Message.tsx b/src/components/Inbox/Message.tsx index 5af7e75d..7428f550 100644 --- a/src/components/Inbox/Message.tsx +++ b/src/components/Inbox/Message.tsx @@ -1,7 +1,7 @@ -import type { Message as MessageType, ChatMember } from '../../graphql/schema/chat.gen' +import type { ChatMember, Message as MessageType } from '../../graphql/schema/chat.gen' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useLocalize } from '../../context/localize' import { Icon } from '../_shared/Icon' diff --git a/src/components/Inbox/MessageActionsPopup.tsx b/src/components/Inbox/MessageActionsPopup.tsx index 512f71cd..f2dfdd79 100644 --- a/src/components/Inbox/MessageActionsPopup.tsx +++ b/src/components/Inbox/MessageActionsPopup.tsx @@ -1,6 +1,6 @@ import type { PopupProps } from '../_shared/Popup' -import { createEffect, createSignal, For } from 'solid-js' +import { For, createEffect, createSignal } from 'solid-js' import { useLocalize } from '../../context/localize' import { Popup } from '../_shared/Popup' diff --git a/src/components/Nav/AuthModal/ChangePasswordForm.tsx b/src/components/Nav/AuthModal/ChangePasswordForm.tsx index 84cffc3c..a7002be7 100644 --- a/src/components/Nav/AuthModal/ChangePasswordForm.tsx +++ b/src/components/Nav/AuthModal/ChangePasswordForm.tsx @@ -1,7 +1,7 @@ import type { AuthModalSearchParams } from './types' import { clsx } from 'clsx' -import { createSignal, JSX, Show } from 'solid-js' +import { JSX, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' diff --git a/src/components/Nav/AuthModal/EmailConfirm.tsx b/src/components/Nav/AuthModal/EmailConfirm.tsx index 302780e8..1bd88086 100644 --- a/src/components/Nav/AuthModal/EmailConfirm.tsx +++ b/src/components/Nav/AuthModal/EmailConfirm.tsx @@ -1,12 +1,12 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' import { useRouter } from '../../../stores/router' import { hideModal } from '../../../stores/ui' -import { setEmail, email } from './sharedLogic' +import { email, setEmail } from './sharedLogic' import styles from './AuthModal.module.scss' diff --git a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx index 13722601..9d6ce6f2 100644 --- a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx +++ b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx @@ -1,7 +1,7 @@ import type { AuthModalSearchParams } from './types' import { clsx } from 'clsx' -import { createSignal, JSX, Show } from 'solid-js' +import { JSX, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' diff --git a/src/components/Nav/AuthModal/LoginForm.tsx b/src/components/Nav/AuthModal/LoginForm.tsx index c8c7bd5f..bbe86fa0 100644 --- a/src/components/Nav/AuthModal/LoginForm.tsx +++ b/src/components/Nav/AuthModal/LoginForm.tsx @@ -1,7 +1,7 @@ import type { AuthModalSearchParams } from './types' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' @@ -12,8 +12,8 @@ import { validateEmail } from '../../../utils/validateEmail' import { AuthModalHeader } from './AuthModalHeader' import { PasswordField } from './PasswordField' -import { email, setEmail } from './sharedLogic' import { SocialProviders } from './SocialProviders' +import { email, setEmail } from './sharedLogic' import styles from './AuthModal.module.scss' diff --git a/src/components/Nav/AuthModal/PasswordField/PasswordField.tsx b/src/components/Nav/AuthModal/PasswordField/PasswordField.tsx index 3bf06f73..e96f6439 100644 --- a/src/components/Nav/AuthModal/PasswordField/PasswordField.tsx +++ b/src/components/Nav/AuthModal/PasswordField/PasswordField.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, on, Show } from 'solid-js' +import { Show, createEffect, createSignal, on } from 'solid-js' import { useLocalize } from '../../../../context/localize' import { Icon } from '../../../_shared/Icon' diff --git a/src/components/Nav/AuthModal/RegisterForm.tsx b/src/components/Nav/AuthModal/RegisterForm.tsx index 194b6f58..0a0094e7 100644 --- a/src/components/Nav/AuthModal/RegisterForm.tsx +++ b/src/components/Nav/AuthModal/RegisterForm.tsx @@ -1,5 +1,5 @@ -import type { AuthModalSearchParams } from './types' import type { JSX } from 'solid-js' +import type { AuthModalSearchParams } from './types' import { clsx } from 'clsx' import { Show, createSignal } from 'solid-js' @@ -13,8 +13,8 @@ import { validateEmail } from '../../../utils/validateEmail' import { AuthModalHeader } from './AuthModalHeader' import { PasswordField } from './PasswordField' -import { email, setEmail } from './sharedLogic' import { SocialProviders } from './SocialProviders' +import { email, setEmail } from './sharedLogic' import styles from './AuthModal.module.scss' diff --git a/src/components/Nav/AuthModal/index.tsx b/src/components/Nav/AuthModal/index.tsx index 838b891c..083fd584 100644 --- a/src/components/Nav/AuthModal/index.tsx +++ b/src/components/Nav/AuthModal/index.tsx @@ -1,7 +1,7 @@ import type { AuthModalMode, AuthModalSearchParams } from './types' import { clsx } from 'clsx' -import { Show, Component, createEffect, createMemo } from 'solid-js' +import { Component, Show, createEffect, createMemo } from 'solid-js' import { Dynamic } from 'solid-js/web' import { useLocalize } from '../../../context/localize' diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx index 04e1860e..db7bd32f 100644 --- a/src/components/Nav/Header/Header.tsx +++ b/src/components/Nav/Header/Header.tsx @@ -2,18 +2,18 @@ import type { Topic } from '../../../graphql/schema/core.gen' import { getPagePath, redirectPage } from '@nanostores/router' import { clsx } from 'clsx' -import { Show, createSignal, createEffect, onMount, onCleanup, For } from 'solid-js' +import { For, Show, createEffect, createSignal, onCleanup, onMount } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' import { apiClient } from '../../../graphql/client/core' -import { router, ROUTES, useRouter } from '../../../stores/router' +import { ROUTES, router, useRouter } from '../../../stores/router' import { useModalStore } from '../../../stores/ui' import { getDescription } from '../../../utils/meta' +import { SharePopup, getShareUrl } from '../../Article/SharePopup' +import { RANDOM_TOPICS_COUNT } from '../../Views/Home' import { Icon } from '../../_shared/Icon' import { Subscribe } from '../../_shared/Subscribe' -import { getShareUrl, SharePopup } from '../../Article/SharePopup' -import { RANDOM_TOPICS_COUNT } from '../../Views/Home' import { AuthModal } from '../AuthModal' import { ConfirmModal } from '../ConfirmModal' import { HeaderAuth } from '../HeaderAuth' diff --git a/src/components/Nav/Header/Link.tsx b/src/components/Nav/Header/Link.tsx index 67cf5318..c041c4d0 100644 --- a/src/components/Nav/Header/Link.tsx +++ b/src/components/Nav/Header/Link.tsx @@ -1,7 +1,7 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { router, ROUTES, useRouter } from '../../../stores/router' +import { ROUTES, router, useRouter } from '../../../stores/router' import { ConditionalWrapper } from '../../_shared/ConditionalWrapper' import styles from './Header.module.scss' diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx index d8ca5f6b..205ac2cf 100644 --- a/src/components/Nav/HeaderAuth.tsx +++ b/src/components/Nav/HeaderAuth.tsx @@ -1,6 +1,6 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { createMemo, createSignal, onCleanup, onMount, Show } from 'solid-js' +import { Show, createMemo, createSignal, onCleanup, onMount } from 'solid-js' import { useEditorContext } from '../../context/editor' import { useLocalize } from '../../context/localize' @@ -8,11 +8,11 @@ import { useNotifications } from '../../context/notifications' import { useSession } from '../../context/session' import { router, useRouter } from '../../stores/router' import { showModal } from '../../stores/ui' +import { Userpic } from '../Author/Userpic' import { Button } from '../_shared/Button' import { Icon } from '../_shared/Icon' import { Popover } from '../_shared/Popover' import { ShowOnlyOnClient } from '../_shared/ShowOnlyOnClient' -import { Userpic } from '../Author/Userpic' import { ProfilePopup } from './ProfilePopup' diff --git a/src/components/Nav/Modal/Modal.tsx b/src/components/Nav/Modal/Modal.tsx index 3885895b..96cf7013 100644 --- a/src/components/Nav/Modal/Modal.tsx +++ b/src/components/Nav/Modal/Modal.tsx @@ -2,7 +2,7 @@ import type { JSX } from 'solid-js' import { redirectPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal } from 'solid-js' import { useMediaQuery } from '../../../context/mediaQuery' import { router } from '../../../stores/router' diff --git a/src/components/Nav/Modal/Opener.tsx b/src/components/Nav/Modal/Opener.tsx index a56d7f69..a1cf3686 100644 --- a/src/components/Nav/Modal/Opener.tsx +++ b/src/components/Nav/Modal/Opener.tsx @@ -1,5 +1,5 @@ -import type { ModalType } from '../../../stores/ui' import type { JSX } from 'solid-js/jsx-runtime' +import type { ModalType } from '../../../stores/ui' import { showModal } from '../../../stores/ui' diff --git a/src/components/Nav/SearchModal/SearchModal.tsx b/src/components/Nav/SearchModal/SearchModal.tsx index 64faaee7..93211251 100644 --- a/src/components/Nav/SearchModal/SearchModal.tsx +++ b/src/components/Nav/SearchModal/SearchModal.tsx @@ -1,15 +1,15 @@ import type { Shout } from '../../../graphql/schema/core.gen' -import { createResource, createSignal, For, onCleanup, Show } from 'solid-js' +import { For, Show, createResource, createSignal, onCleanup } from 'solid-js' import { debounce } from 'throttle-debounce' import { useLocalize } from '../../../context/localize' import { loadShoutsSearch } from '../../../stores/zine/articles' import { restoreScrollPosition, saveScrollPosition } from '../../../utils/scroll' import { byScore } from '../../../utils/sortby' +import { FEED_PAGE_SIZE } from '../../Views/Feed/Feed' import { Button } from '../../_shared/Button' import { Icon } from '../../_shared/Icon' -import { FEED_PAGE_SIZE } from '../../Views/Feed/Feed' import { SearchResultItem } from './SearchResultItem' diff --git a/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx b/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx index 3a21b513..e9a13a29 100644 --- a/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx +++ b/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx @@ -5,10 +5,10 @@ import { For, Show } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useNotifications } from '../../../context/notifications' import { NotificationGroup as Group } from '../../../graphql/schema/notifier.gen' -import { useRouter, router } from '../../../stores/router' +import { router, useRouter } from '../../../stores/router' +import { ArticlePageSearchParams } from '../../Article/FullArticle' import { GroupAvatar } from '../../_shared/GroupAvatar' import { TimeAgo } from '../../_shared/TimeAgo' -import { ArticlePageSearchParams } from '../../Article/FullArticle' import styles from './NotificationView.module.scss' diff --git a/src/components/NotificationsPanel/NotificationsPanel.tsx b/src/components/NotificationsPanel/NotificationsPanel.tsx index dc66a230..e9d5fa1b 100644 --- a/src/components/NotificationsPanel/NotificationsPanel.tsx +++ b/src/components/NotificationsPanel/NotificationsPanel.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, on, onCleanup, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js' import { throttle } from 'throttle-debounce' import { useLocalize } from '../../context/localize' diff --git a/src/components/ProfileSettings/ProfileSettings.tsx b/src/components/ProfileSettings/ProfileSettings.tsx index 29382f3b..de5f5bf6 100644 --- a/src/components/ProfileSettings/ProfileSettings.tsx +++ b/src/components/ProfileSettings/ProfileSettings.tsx @@ -1,7 +1,7 @@ import { createFileUploader } from '@solid-primitives/upload' import { clsx } from 'clsx' import deepEqual from 'fast-deep-equal' -import { createEffect, createSignal, For, lazy, Match, onCleanup, onMount, Show, Switch } from 'solid-js' +import { For, Match, Show, Switch, createEffect, createSignal, lazy, onCleanup, onMount } from 'solid-js' import { createStore } from 'solid-js/store' import { useConfirm } from '../../context/confirm' @@ -9,20 +9,20 @@ import { useLocalize } from '../../context/localize' import { useProfileForm } from '../../context/profile' import { useSession } from '../../context/session' import { useSnackbar } from '../../context/snackbar' -import { showModal, hideModal } from '../../stores/ui' +import { hideModal, showModal } from '../../stores/ui' import { clone } from '../../utils/clone' import { getImageUrl } from '../../utils/getImageUrl' import { handleImageUpload } from '../../utils/handleImageUpload' import { profileSocialLinks } from '../../utils/profileSocialLinks' import { validateUrl } from '../../utils/validateUrl' +import { Modal } from '../Nav/Modal' +import { ProfileSettingsNavigation } from '../Nav/ProfileSettingsNavigation' import { Button } from '../_shared/Button' import { Icon } from '../_shared/Icon' import { ImageCropper } from '../_shared/ImageCropper' import { Loading } from '../_shared/Loading' import { Popover } from '../_shared/Popover' import { SocialNetworkInput } from '../_shared/SocialNetworkInput' -import { Modal } from '../Nav/Modal' -import { ProfileSettingsNavigation } from '../Nav/ProfileSettingsNavigation' import styles from '../../pages/profile/Settings.module.scss' diff --git a/src/components/TableOfContents/TableOfContents.tsx b/src/components/TableOfContents/TableOfContents.tsx index 0fa245dd..f7000e20 100644 --- a/src/components/TableOfContents/TableOfContents.tsx +++ b/src/components/TableOfContents/TableOfContents.tsx @@ -1,6 +1,6 @@ import { clsx } from 'clsx' -import { For, Show, createSignal, createEffect, on, onMount, onCleanup } from 'solid-js' -import { throttle, debounce } from 'throttle-debounce' +import { For, Show, createEffect, createSignal, on, onCleanup, onMount } from 'solid-js' +import { debounce, throttle } from 'throttle-debounce' import { useLocalize } from '../../context/localize' import { DEFAULT_HEADER_OFFSET } from '../../stores/router' diff --git a/src/components/Topic/Card.tsx b/src/components/Topic/Card.tsx index 917aa396..99e9b5f9 100644 --- a/src/components/Topic/Card.tsx +++ b/src/components/Topic/Card.tsx @@ -1,19 +1,19 @@ import { clsx } from 'clsx' -import { createMemo, createSignal, Show } from 'solid-js' +import { Show, createMemo, createSignal } from 'solid-js' import { useFollowing } from '../../context/following' import { useLocalize } from '../../context/localize' import { useSession } from '../../context/session' import { FollowingEntity, type Topic } from '../../graphql/schema/core.gen' import { capitalize } from '../../utils/capitalize' +import { CardTopic } from '../Feed/CardTopic' import { Button } from '../_shared/Button' import { CheckButton } from '../_shared/CheckButton' import { Icon } from '../_shared/Icon' import { ShowOnlyOnClient } from '../_shared/ShowOnlyOnClient' -import { CardTopic } from '../Feed/CardTopic' -import styles from './Card.module.scss' import stylesButton from '../_shared/Button/Button.module.scss' +import styles from './Card.module.scss' interface TopicProps { topic: Topic diff --git a/src/components/Topic/Full.tsx b/src/components/Topic/Full.tsx index 6ee7e206..2abcee33 100644 --- a/src/components/Topic/Full.tsx +++ b/src/components/Topic/Full.tsx @@ -1,7 +1,7 @@ import type { Topic } from '../../graphql/schema/core.gen' import { clsx } from 'clsx' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { useFollowing } from '../../context/following' import { useLocalize } from '../../context/localize' diff --git a/src/components/Topic/TopicBadge/TopicBadge.tsx b/src/components/Topic/TopicBadge/TopicBadge.tsx index 9de4e234..fe4913b4 100644 --- a/src/components/Topic/TopicBadge/TopicBadge.tsx +++ b/src/components/Topic/TopicBadge/TopicBadge.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' diff --git a/src/components/Views/AllAuthors.tsx b/src/components/Views/AllAuthors.tsx index 5007c366..354df3e0 100644 --- a/src/components/Views/AllAuthors.tsx +++ b/src/components/Views/AllAuthors.tsx @@ -2,7 +2,7 @@ import type { Author } from '../../graphql/schema/core.gen' import { Meta } from '@solidjs/meta' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, For, Show } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal } from 'solid-js' import { useLocalize } from '../../context/localize' import { useRouter } from '../../stores/router' @@ -13,9 +13,9 @@ import { dummyFilter } from '../../utils/dummyFilter' import { getImageUrl } from '../../utils/getImageUrl' import { translit } from '../../utils/ru2en' import { scrollHandler } from '../../utils/scroll' +import { AuthorBadge } from '../Author/AuthorBadge' import { Loading } from '../_shared/Loading' import { SearchField } from '../_shared/SearchField' -import { AuthorBadge } from '../Author/AuthorBadge' import styles from './AllAuthors.module.scss' diff --git a/src/components/Views/AllTopics.tsx b/src/components/Views/AllTopics.tsx index 0fc38077..bf8f57ee 100644 --- a/src/components/Views/AllTopics.tsx +++ b/src/components/Views/AllTopics.tsx @@ -2,7 +2,7 @@ import type { Topic } from '../../graphql/schema/core.gen' import { Meta } from '@solidjs/meta' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, For, Show } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal } from 'solid-js' import { useFollowing } from '../../context/following' import { useLocalize } from '../../context/localize' @@ -12,9 +12,9 @@ import { capitalize } from '../../utils/capitalize' import { dummyFilter } from '../../utils/dummyFilter' import { getImageUrl } from '../../utils/getImageUrl' import { scrollHandler } from '../../utils/scroll' +import { TopicCard } from '../Topic/Card' import { Loading } from '../_shared/Loading' import { SearchField } from '../_shared/SearchField' -import { TopicCard } from '../Topic/Card' import styles from './AllTopics.module.scss' diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index 8be99570..64d1c05c 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -3,7 +3,7 @@ import type { Author, Reaction, Shout, Topic } from '../../../graphql/schema/cor import { getPagePath } from '@nanostores/router' import { Meta, Title } from '@solidjs/meta' import { clsx } from 'clsx' -import { Show, createMemo, createSignal, Switch, onMount, For, Match, createEffect } from 'solid-js' +import { For, Match, Show, Switch, createEffect, createMemo, createSignal, onMount } from 'solid-js' import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' @@ -15,16 +15,16 @@ import { getImageUrl } from '../../../utils/getImageUrl' import { getDescription } from '../../../utils/meta' import { restoreScrollPosition, saveScrollPosition } from '../../../utils/scroll' import { splitToPages } from '../../../utils/splitToPages' -import { Loading } from '../../_shared/Loading' import { Comment } from '../../Article/Comment' import { AuthorCard } from '../../Author/AuthorCard' import { AuthorShoutsRating } from '../../Author/AuthorShoutsRating' import { Row1 } from '../../Feed/Row1' import { Row2 } from '../../Feed/Row2' import { Row3 } from '../../Feed/Row3' +import { Loading } from '../../_shared/Loading' -import styles from './Author.module.scss' import stylesArticle from '../../Article/Article.module.scss' +import styles from './Author.module.scss' type Props = { shouts: Shout[] diff --git a/src/components/Views/DraftsView/DraftsView.tsx b/src/components/Views/DraftsView/DraftsView.tsx index 16d977ec..953cc0ee 100644 --- a/src/components/Views/DraftsView/DraftsView.tsx +++ b/src/components/Views/DraftsView/DraftsView.tsx @@ -1,6 +1,6 @@ import { openPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createSignal, createEffect, For, Show } from 'solid-js' +import { For, Show, createEffect, createSignal } from 'solid-js' import { useEditorContext } from '../../../context/editor' import { useSession } from '../../../context/session' diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx index c0498cf4..a1998d2e 100644 --- a/src/components/Views/Edit.tsx +++ b/src/components/Views/Edit.tsx @@ -1,6 +1,6 @@ import { clsx } from 'clsx' import deepEqual from 'fast-deep-equal' -import { Accessor, createMemo, createSignal, lazy, onCleanup, onMount, Show } from 'solid-js' +import { Accessor, Show, createMemo, createSignal, lazy, onCleanup, onMount } from 'solid-js' import { createStore } from 'solid-js/store' import { ShoutForm, useEditorContext } from '../../context/editor' @@ -12,17 +12,17 @@ import { clone } from '../../utils/clone' import { getImageUrl } from '../../utils/getImageUrl' import { isDesktop } from '../../utils/media-query' import { slugify } from '../../utils/slugify' -import { DropArea } from '../_shared/DropArea' -import { Icon } from '../_shared/Icon' -import { InviteMembers } from '../_shared/InviteMembers' -import { Popover } from '../_shared/Popover' -import { EditorSwiper } from '../_shared/SolidSwiper' import { Editor, Panel } from '../Editor' import { AudioUploader } from '../Editor/AudioUploader' import { AutoSaveNotice } from '../Editor/AutoSaveNotice' import { VideoUploader } from '../Editor/VideoUploader' import { Modal } from '../Nav/Modal' import { TableOfContents } from '../TableOfContents' +import { DropArea } from '../_shared/DropArea' +import { Icon } from '../_shared/Icon' +import { InviteMembers } from '../_shared/InviteMembers' +import { Popover } from '../_shared/Popover' +import { EditorSwiper } from '../_shared/SolidSwiper' import { PublishSettings } from './PublishSettings' diff --git a/src/components/Views/Expo/Expo.tsx b/src/components/Views/Expo/Expo.tsx index acd67f83..6dbe995b 100644 --- a/src/components/Views/Expo/Expo.tsx +++ b/src/components/Views/Expo/Expo.tsx @@ -1,6 +1,6 @@ import { getPagePath } from '@nanostores/router' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, For, on, onCleanup, onMount, Show } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js' import { useLocalize } from '../../../context/localize' import { apiClient } from '../../../graphql/client/core' @@ -11,11 +11,11 @@ import { loadShouts, resetSortedArticles, useArticlesStore } from '../../../stor import { getUnixtime } from '../../../utils/getServerDate' import { restoreScrollPosition, saveScrollPosition } from '../../../utils/scroll' import { splitToPages } from '../../../utils/splitToPages' +import { ArticleCard } from '../../Feed/ArticleCard' import { Button } from '../../_shared/Button' import { ConditionalWrapper } from '../../_shared/ConditionalWrapper' import { Loading } from '../../_shared/Loading' import { ArticleCardSwiper } from '../../_shared/SolidSwiper/ArticleCardSwiper' -import { ArticleCard } from '../../Feed/ArticleCard' import styles from './Expo.module.scss' diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx index bfd76067..e44cb21e 100644 --- a/src/components/Views/Feed/Feed.tsx +++ b/src/components/Views/Feed/Feed.tsx @@ -1,7 +1,7 @@ import { getPagePath } from '@nanostores/router' import { Meta } from '@solidjs/meta' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, For, on, onMount, Show } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, on, onMount } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useReactions } from '../../../context/reactions' @@ -15,15 +15,10 @@ import { } from '../../../graphql/schema/core.gen' import { router, useRouter } from '../../../stores/router' import { showModal } from '../../../stores/ui' -import { useArticlesStore, resetSortedArticles } from '../../../stores/zine/articles' +import { resetSortedArticles, useArticlesStore } from '../../../stores/zine/articles' import { useTopAuthorsStore } from '../../../stores/zine/topAuthors' import { useTopicsStore } from '../../../stores/zine/topics' import { getImageUrl } from '../../../utils/getImageUrl' -import { DropDown } from '../../_shared/DropDown' -import { Icon } from '../../_shared/Icon' -import { InviteMembers } from '../../_shared/InviteMembers' -import { Loading } from '../../_shared/Loading' -import { ShareModal } from '../../_shared/ShareModal' import { CommentDate } from '../../Article/CommentDate' import { getShareUrl } from '../../Article/SharePopup' import { AuthorBadge } from '../../Author/AuthorBadge' @@ -31,10 +26,15 @@ import { AuthorLink } from '../../Author/AuthorLink' import { ArticleCard } from '../../Feed/ArticleCard' import { Sidebar } from '../../Feed/Sidebar' import { Modal } from '../../Nav/Modal' +import { DropDown } from '../../_shared/DropDown' +import { Icon } from '../../_shared/Icon' +import { InviteMembers } from '../../_shared/InviteMembers' +import { Loading } from '../../_shared/Loading' +import { ShareModal } from '../../_shared/ShareModal' -import styles from './Feed.module.scss' import stylesBeside from '../../Feed/Beside.module.scss' import stylesTopic from '../../Feed/CardTopic.module.scss' +import styles from './Feed.module.scss' export const FEED_PAGE_SIZE = 20 const UNRATED_ARTICLES_COUNT = 5 diff --git a/src/components/Views/Home.tsx b/src/components/Views/Home.tsx index ac1d3b2b..200434b5 100644 --- a/src/components/Views/Home.tsx +++ b/src/components/Views/Home.tsx @@ -1,5 +1,5 @@ import { getPagePath } from '@nanostores/router' -import { batch, createMemo, createSignal, For, onMount, Show } from 'solid-js' +import { For, Show, batch, createMemo, createSignal, onMount } from 'solid-js' import { useLocalize } from '../../context/localize' import { apiClient } from '../../graphql/client/core' @@ -16,8 +16,6 @@ import { useTopicsStore } from '../../stores/zine/topics' import { capitalize } from '../../utils/capitalize' import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' import { splitToPages } from '../../utils/splitToPages' -import { Icon } from '../_shared/Icon' -import { ArticleCardSwiper } from '../_shared/SolidSwiper/ArticleCardSwiper' import Banner from '../Discours/Banner' import Hero from '../Discours/Hero' import { Beside } from '../Feed/Beside' @@ -28,6 +26,8 @@ import { Row3 } from '../Feed/Row3' import { Row5 } from '../Feed/Row5' import RowShort from '../Feed/RowShort' import { Topics } from '../Nav/Topics' +import { Icon } from '../_shared/Icon' +import { ArticleCardSwiper } from '../_shared/SolidSwiper/ArticleCardSwiper' import styles from './Home.module.scss' diff --git a/src/components/Views/Inbox/Inbox.tsx b/src/components/Views/Inbox/Inbox.tsx index 5409e824..7ee9cac0 100644 --- a/src/components/Views/Inbox/Inbox.tsx +++ b/src/components/Views/Inbox/Inbox.tsx @@ -2,7 +2,7 @@ import type { Chat, Message as MessageType } from '../../../graphql/schema/chat. import type { Author } from '../../../graphql/schema/core.gen' import { clsx } from 'clsx' -import { For, createSignal, Show, onMount, createEffect, createMemo, on } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, on, onMount } from 'solid-js' import { useInbox } from '../../../context/inbox' import { useLocalize } from '../../../context/localize' @@ -10,9 +10,6 @@ import { useSession } from '../../../context/session' import { useRouter } from '../../../stores/router' import { showModal } from '../../../stores/ui' import { useAuthorsStore } from '../../../stores/zine/authors' -import { Icon } from '../../_shared/Icon' -import { InviteMembers } from '../../_shared/InviteMembers' -import { Popover } from '../../_shared/Popover' import SimplifiedEditor from '../../Editor/SimplifiedEditor' import DialogCard from '../../Inbox/DialogCard' import DialogHeader from '../../Inbox/DialogHeader' @@ -20,6 +17,9 @@ import { Message } from '../../Inbox/Message' import MessagesFallback from '../../Inbox/MessagesFallback' import Search from '../../Inbox/Search' import { Modal } from '../../Nav/Modal' +import { Icon } from '../../_shared/Icon' +import { InviteMembers } from '../../_shared/InviteMembers' +import { Popover } from '../../_shared/Popover' import styles from './Inbox.module.scss' diff --git a/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx b/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx index c41b549f..8c342356 100644 --- a/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx +++ b/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, For, onMount, Show } from 'solid-js' +import { For, Show, createEffect, createSignal, onMount } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' @@ -9,11 +9,11 @@ import { SubscriptionFilter } from '../../../pages/types' import { dummyFilter } from '../../../utils/dummyFilter' // TODO: refactor styles import { isAuthor } from '../../../utils/isAuthor' -import { Loading } from '../../_shared/Loading' -import { SearchField } from '../../_shared/SearchField' import { AuthorBadge } from '../../Author/AuthorBadge' import { ProfileSettingsNavigation } from '../../Nav/ProfileSettingsNavigation' import { TopicBadge } from '../../Topic/TopicBadge' +import { Loading } from '../../_shared/Loading' +import { SearchField } from '../../_shared/SearchField' import styles from '../../../pages/profile/Settings.module.scss' import stylesSettings from '../../../styles/FeedSettings.module.scss' diff --git a/src/components/Views/PublishSettings/PublishSettings.tsx b/src/components/Views/PublishSettings/PublishSettings.tsx index 1fe168be..cdffb7d6 100644 --- a/src/components/Views/PublishSettings/PublishSettings.tsx +++ b/src/components/Views/PublishSettings/PublishSettings.tsx @@ -1,6 +1,6 @@ import { redirectPage } from '@nanostores/router' import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, lazy, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, lazy, onMount } from 'solid-js' import { createStore } from 'solid-js/store' import { ShoutForm, useEditorContext } from '../../../context/editor' @@ -11,14 +11,14 @@ import { UploadedFile } from '../../../pages/types' import { router } from '../../../stores/router' import { hideModal, showModal } from '../../../stores/ui' import { loadAllTopics, useTopicsStore } from '../../../stores/zine/topics' +import { TopicSelect, UploadModalContent } from '../../Editor' +import { Modal } from '../../Nav/Modal' import { Button } from '../../_shared/Button' import { Icon } from '../../_shared/Icon' import { Image } from '../../_shared/Image' -import { TopicSelect, UploadModalContent } from '../../Editor' -import { Modal } from '../../Nav/Modal' -import styles from './PublishSettings.module.scss' import stylesBeside from '../../Feed/Beside.module.scss' +import styles from './PublishSettings.module.scss' const SimplifiedEditor = lazy(() => import('../../Editor/SimplifiedEditor')) const GrowingTextarea = lazy(() => import('../../_shared/GrowingTextarea/GrowingTextarea')) diff --git a/src/components/Views/Search.tsx b/src/components/Views/Search.tsx index 64734735..a2cec274 100644 --- a/src/components/Views/Search.tsx +++ b/src/components/Views/Search.tsx @@ -1,11 +1,11 @@ import type { SearchResult } from '../../graphql/schema/core.gen' -import { Show, For, createSignal, onMount } from 'solid-js' +import { For, Show, createSignal, onMount } from 'solid-js' -import '../../styles/Search.scss' import { useLocalize } from '../../context/localize' import { useRouter } from '../../stores/router' import { loadShoutsSearch, useArticlesStore } from '../../stores/zine/articles' +import '../../styles/Search.scss' import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' import { ArticleCard } from '../Feed/ArticleCard' diff --git a/src/components/Views/StaticPage.tsx b/src/components/Views/StaticPage.tsx index c8e1f2f3..26886285 100644 --- a/src/components/Views/StaticPage.tsx +++ b/src/components/Views/StaticPage.tsx @@ -1,7 +1,7 @@ import { JSX } from 'solid-js' -import { PageLayout } from '../_shared/PageLayout' import { TableOfContents } from '../TableOfContents' +import { PageLayout } from '../_shared/PageLayout' type Props = { title: string diff --git a/src/components/Views/Topic.tsx b/src/components/Views/Topic.tsx index 1b3d059a..6f9a6cf3 100644 --- a/src/components/Views/Topic.tsx +++ b/src/components/Views/Topic.tsx @@ -2,7 +2,7 @@ import type { Shout, Topic } from '../../graphql/schema/core.gen' import { Meta } from '@solidjs/meta' import { clsx } from 'clsx' -import { For, Show, createMemo, onMount, createSignal, createEffect } from 'solid-js' +import { For, Show, createEffect, createMemo, createSignal, onMount } from 'solid-js' import { useLocalize } from '../../context/localize' import { useRouter } from '../../stores/router' @@ -14,12 +14,12 @@ import { getImageUrl } from '../../utils/getImageUrl' import { getDescription } from '../../utils/meta' import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' import { splitToPages } from '../../utils/splitToPages' -import { ArticleCardSwiper } from '../_shared/SolidSwiper/ArticleCardSwiper' import { Beside } from '../Feed/Beside' import { Row1 } from '../Feed/Row1' import { Row2 } from '../Feed/Row2' import { Row3 } from '../Feed/Row3' import { FullTopic } from '../Topic/Full' +import { ArticleCardSwiper } from '../_shared/SolidSwiper/ArticleCardSwiper' import styles from '../../styles/Topic.module.scss' diff --git a/src/components/_shared/CheckButton/CheckButton.tsx b/src/components/_shared/CheckButton/CheckButton.tsx index a129296f..e4f2c419 100644 --- a/src/components/_shared/CheckButton/CheckButton.tsx +++ b/src/components/_shared/CheckButton/CheckButton.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { Icon } from '../Icon' diff --git a/src/components/_shared/DropArea/DropArea.tsx b/src/components/_shared/DropArea/DropArea.tsx index 4b8b3c12..6e4db3d2 100644 --- a/src/components/_shared/DropArea/DropArea.tsx +++ b/src/components/_shared/DropArea/DropArea.tsx @@ -2,7 +2,7 @@ import type { FileTypeToUpload } from '../../../pages/types' import { createDropzone, createFileUploader } from '@solid-primitives/upload' import { clsx } from 'clsx' -import { createSignal, JSX, Show } from 'solid-js' +import { JSX, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { UploadedFile } from '../../../pages/types' diff --git a/src/components/_shared/DropDown/DropDown.tsx b/src/components/_shared/DropDown/DropDown.tsx index 7ac40e12..48115e5b 100644 --- a/src/components/_shared/DropDown/DropDown.tsx +++ b/src/components/_shared/DropDown/DropDown.tsx @@ -1,7 +1,7 @@ import type { PopupProps } from '../Popup' import { clsx } from 'clsx' -import { createSignal, For, Show } from 'solid-js' +import { For, Show, createSignal } from 'solid-js' import { Popup } from '../Popup' diff --git a/src/components/_shared/DropdownSelect/DropdownSelect.tsx b/src/components/_shared/DropdownSelect/DropdownSelect.tsx index e258b9a6..73892f42 100644 --- a/src/components/_shared/DropdownSelect/DropdownSelect.tsx +++ b/src/components/_shared/DropdownSelect/DropdownSelect.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createSignal, For, Show } from 'solid-js' +import { For, Show, createSignal } from 'solid-js' import { useOutsideClickHandler } from '../../../utils/useOutsideClickHandler' diff --git a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx index 4541e1b2..972768cc 100644 --- a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx +++ b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { ShowOnlyOnClient } from '../ShowOnlyOnClient' diff --git a/src/components/_shared/Icon/Icon.tsx b/src/components/_shared/Icon/Icon.tsx index 166f081f..5e0dedc2 100644 --- a/src/components/_shared/Icon/Icon.tsx +++ b/src/components/_shared/Icon/Icon.tsx @@ -1,7 +1,7 @@ import type { JSX } from 'solid-js' import { clsx } from 'clsx' -import { mergeProps, Show } from 'solid-js' +import { Show, mergeProps } from 'solid-js' import styles from './Icon.module.scss' diff --git a/src/components/_shared/ImageCropper/ImageCropper.tsx b/src/components/_shared/ImageCropper/ImageCropper.tsx index e0cd0f7a..d8146224 100644 --- a/src/components/_shared/ImageCropper/ImageCropper.tsx +++ b/src/components/_shared/ImageCropper/ImageCropper.tsx @@ -2,7 +2,7 @@ import 'cropperjs/dist/cropper.css' import { UploadFile } from '@solid-primitives/upload' import Cropper from 'cropperjs' -import { createSignal, onMount, Show } from 'solid-js' +import { Show, createSignal, onMount } from 'solid-js' import { useLocalize } from '../../../context/localize' import { Button } from '../Button' diff --git a/src/components/_shared/InviteMembers/InviteMembers.tsx b/src/components/_shared/InviteMembers/InviteMembers.tsx index 5315298e..1647c918 100644 --- a/src/components/_shared/InviteMembers/InviteMembers.tsx +++ b/src/components/_shared/InviteMembers/InviteMembers.tsx @@ -1,6 +1,6 @@ import { createInfiniteScroll } from '@solid-primitives/pagination' import { clsx } from 'clsx' -import { createEffect, createSignal, For, on, Show } from 'solid-js' +import { For, Show, createEffect, createSignal, on } from 'solid-js' import { useInbox } from '../../../context/inbox' import { useLocalize } from '../../../context/localize' diff --git a/src/components/_shared/Lightbox/Lightbox.tsx b/src/components/_shared/Lightbox/Lightbox.tsx index 7bafd080..07619603 100644 --- a/src/components/_shared/Lightbox/Lightbox.tsx +++ b/src/components/_shared/Lightbox/Lightbox.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { Show, createEffect, on, createMemo, createSignal, onCleanup } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, on, onCleanup } from 'solid-js' import { getImageUrl } from '../../../utils/getImageUrl' import { useEscKeyDownHandler } from '../../../utils/useEscKeyDownHandler' diff --git a/src/components/_shared/PageLayout.tsx b/src/components/_shared/PageLayout.tsx index ec587dc9..1cd7abc9 100644 --- a/src/components/_shared/PageLayout.tsx +++ b/src/components/_shared/PageLayout.tsx @@ -2,7 +2,7 @@ import type { JSX } from 'solid-js' import { Title } from '@solidjs/meta' import { clsx } from 'clsx' -import { createEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createSignal } from 'solid-js' import { Footer } from '../Discours/Footer' import { Header } from '../Nav/Header' diff --git a/src/components/_shared/Popover/Popover.tsx b/src/components/_shared/Popover/Popover.tsx index dbadcb76..ed4f6962 100644 --- a/src/components/_shared/Popover/Popover.tsx +++ b/src/components/_shared/Popover/Popover.tsx @@ -1,4 +1,4 @@ -import { createSignal, JSX, onMount, Show } from 'solid-js' +import { JSX, Show, createSignal, onMount } from 'solid-js' import usePopper from 'solid-popper' import styles from './Popover.module.scss' diff --git a/src/components/_shared/Popup/Popup.tsx b/src/components/_shared/Popup/Popup.tsx index d2c97a2b..e9e2a49c 100644 --- a/src/components/_shared/Popup/Popup.tsx +++ b/src/components/_shared/Popup/Popup.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, JSX, Show } from 'solid-js' +import { JSX, Show, createEffect, createSignal } from 'solid-js' import { useOutsideClickHandler } from '../../../utils/useOutsideClickHandler' diff --git a/src/components/_shared/ShareLinks/ShareLinks.tsx b/src/components/_shared/ShareLinks/ShareLinks.tsx index b2fd07c3..950bc073 100644 --- a/src/components/_shared/ShareLinks/ShareLinks.tsx +++ b/src/components/_shared/ShareLinks/ShareLinks.tsx @@ -1,6 +1,6 @@ -import { createSocialShare, FACEBOOK, TELEGRAM, TWITTER, VK } from '@solid-primitives/share' +import { FACEBOOK, TELEGRAM, TWITTER, VK, createSocialShare } from '@solid-primitives/share' import { clsx } from 'clsx' -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSnackbar } from '../../../context/snackbar' diff --git a/src/components/_shared/ShowOnlyOnClient.tsx b/src/components/_shared/ShowOnlyOnClient.tsx index 061d2e54..5307eb66 100644 --- a/src/components/_shared/ShowOnlyOnClient.tsx +++ b/src/components/_shared/ShowOnlyOnClient.tsx @@ -1,6 +1,6 @@ import type { JSX } from 'solid-js' -import { createSignal, onMount, Show } from 'solid-js' +import { Show, createSignal, onMount } from 'solid-js' const [isClient, setIsClient] = createSignal(false) diff --git a/src/components/_shared/SocialNetworkInput/SocialNetworkInput.tsx b/src/components/_shared/SocialNetworkInput/SocialNetworkInput.tsx index c47b0597..607d6a54 100644 --- a/src/components/_shared/SocialNetworkInput/SocialNetworkInput.tsx +++ b/src/components/_shared/SocialNetworkInput/SocialNetworkInput.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { onMount, Show } from 'solid-js' +import { Show, onMount } from 'solid-js' import { Icon } from '../Icon' diff --git a/src/components/_shared/SolidSwiper/ArticleCardSwiper.tsx b/src/components/_shared/SolidSwiper/ArticleCardSwiper.tsx index 3a7c660c..e8f76d6a 100644 --- a/src/components/_shared/SolidSwiper/ArticleCardSwiper.tsx +++ b/src/components/_shared/SolidSwiper/ArticleCardSwiper.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { For, onMount, Show } from 'solid-js' +import { For, Show, onMount } from 'solid-js' import SwiperCore from 'swiper' import { Manipulation, Navigation, Pagination } from 'swiper/modules' diff --git a/src/components/_shared/SolidSwiper/EditorSwiper.tsx b/src/components/_shared/SolidSwiper/EditorSwiper.tsx index 6c5c7670..c966fe4d 100644 --- a/src/components/_shared/SolidSwiper/EditorSwiper.tsx +++ b/src/components/_shared/SolidSwiper/EditorSwiper.tsx @@ -1,6 +1,6 @@ import { createFileUploader } from '@solid-primitives/upload' import { clsx } from 'clsx' -import { createEffect, createSignal, For, Show, on, onMount, lazy } from 'solid-js' +import { For, Show, createEffect, createSignal, lazy, on, onMount } from 'solid-js' import SwiperCore from 'swiper' import { Manipulation, Navigation, Pagination } from 'swiper/modules' diff --git a/src/components/_shared/SolidSwiper/ImageSwiper.tsx b/src/components/_shared/SolidSwiper/ImageSwiper.tsx index 188a95f8..1de1fe65 100644 --- a/src/components/_shared/SolidSwiper/ImageSwiper.tsx +++ b/src/components/_shared/SolidSwiper/ImageSwiper.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, For, Show, on, onMount, onCleanup } from 'solid-js' +import { For, Show, createEffect, createSignal, on, onCleanup, onMount } from 'solid-js' import SwiperCore from 'swiper' import { Manipulation, Navigation, Pagination } from 'swiper/modules' import { throttle } from 'throttle-debounce' diff --git a/src/components/_shared/SolidSwiper/swiper.d.ts b/src/components/_shared/SolidSwiper/swiper.d.ts index 4c92cdeb..aa4e4685 100644 --- a/src/components/_shared/SolidSwiper/swiper.d.ts +++ b/src/components/_shared/SolidSwiper/swiper.d.ts @@ -1,5 +1,5 @@ import 'solid-js' -import { SwiperOptions, AutoplayOptions } from 'swiper' +import { AutoplayOptions, SwiperOptions } from 'swiper' import { SwiperSlideProps } from 'swiper/react' type Kebab = T extends `${infer F}${infer R}` diff --git a/src/components/_shared/Subscribe/Subscribe.tsx b/src/components/_shared/Subscribe/Subscribe.tsx index ee4bd243..af9f695c 100644 --- a/src/components/_shared/Subscribe/Subscribe.tsx +++ b/src/components/_shared/Subscribe/Subscribe.tsx @@ -1,4 +1,4 @@ -import { createSignal, JSX, Show } from 'solid-js' +import { JSX, Show, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSnackbar } from '../../../context/snackbar' diff --git a/src/components/_shared/VideoPlayer/VideoPlayer.tsx b/src/components/_shared/VideoPlayer/VideoPlayer.tsx index e9c701ea..0cc11d50 100644 --- a/src/components/_shared/VideoPlayer/VideoPlayer.tsx +++ b/src/components/_shared/VideoPlayer/VideoPlayer.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx' -import { createEffect, createSignal, Match, Switch, Show } from 'solid-js' +import { Match, Show, Switch, createEffect, createSignal } from 'solid-js' import { useLocalize } from '../../../context/localize' import { Button } from '../Button' diff --git a/src/context/connect.tsx b/src/context/connect.tsx index b5f7daed..a86f443f 100644 --- a/src/context/connect.tsx +++ b/src/context/connect.tsx @@ -1,12 +1,12 @@ import type { Accessor, JSX } from 'solid-js' -import type { Author, Topic, Reaction, Shout } from '../graphql/schema/core.gen' +import type { Author, Reaction, Shout, Topic } from '../graphql/schema/core.gen' import { EventStreamContentType, fetchEventSource } from '@microsoft/fetch-event-source' -import { createContext, useContext, createSignal, createEffect } from 'solid-js' +import { createContext, createEffect, createSignal, useContext } from 'solid-js' -import { useSession } from './session' import { Chat, Message } from '../graphql/schema/chat.gen' +import { useSession } from './session' const RECONNECT_TIMES = 2 diff --git a/src/context/editor.tsx b/src/context/editor.tsx index 3a9bc07e..491e0be2 100644 --- a/src/context/editor.tsx +++ b/src/context/editor.tsx @@ -3,7 +3,7 @@ import type { JSX } from 'solid-js' import { openPage } from '@nanostores/router' import { Editor } from '@tiptap/core' import { Accessor, createContext, createSignal, useContext } from 'solid-js' -import { createStore, SetStoreFunction } from 'solid-js/store' +import { SetStoreFunction, createStore } from 'solid-js/store' import { apiClient } from '../graphql/client/core' import { Topic, TopicInput } from '../graphql/schema/core.gen' diff --git a/src/context/following.tsx b/src/context/following.tsx index 9b87b140..09d34d92 100644 --- a/src/context/following.tsx +++ b/src/context/following.tsx @@ -1,4 +1,4 @@ -import { createEffect, createSignal, createContext, Accessor, useContext, JSX } from 'solid-js' +import { Accessor, JSX, createContext, createEffect, createSignal, useContext } from 'solid-js' import { createStore } from 'solid-js/store' import { apiClient } from '../graphql/client/core' diff --git a/src/context/inbox.tsx b/src/context/inbox.tsx index f3505efe..d692cad0 100644 --- a/src/context/inbox.tsx +++ b/src/context/inbox.tsx @@ -1,5 +1,5 @@ -import type { Chat, Message, MessagesBy, MutationCreate_MessageArgs } from '../graphql/schema/chat.gen' import type { Accessor, JSX } from 'solid-js' +import type { Chat, Message, MessagesBy, MutationCreate_MessageArgs } from '../graphql/schema/chat.gen' import { createContext, createSignal, useContext } from 'solid-js' diff --git a/src/context/localize.tsx b/src/context/localize.tsx index 8dcc6cd5..897b0fac 100644 --- a/src/context/localize.tsx +++ b/src/context/localize.tsx @@ -6,7 +6,7 @@ import TimeAgo from 'javascript-time-ago' import en from 'javascript-time-ago/locale/en' import ru from 'javascript-time-ago/locale/ru' import Cookie from 'js-cookie' -import { createContext, createEffect, createMemo, createSignal, Show, useContext } from 'solid-js' +import { Show, createContext, createEffect, createMemo, createSignal, useContext } from 'solid-js' import { useRouter } from '../stores/router' diff --git a/src/context/notifications.tsx b/src/context/notifications.tsx index bdbc1bb2..767403e2 100644 --- a/src/context/notifications.tsx +++ b/src/context/notifications.tsx @@ -5,8 +5,8 @@ import { createContext, createMemo, createSignal, onMount, useContext } from 'so import { createStore } from 'solid-js/store' import { Portal } from 'solid-js/web' -import { ShowIfAuthenticated } from '../components/_shared/ShowIfAuthenticated' import { NotificationsPanel } from '../components/NotificationsPanel' +import { ShowIfAuthenticated } from '../components/_shared/ShowIfAuthenticated' import { notifierClient } from '../graphql/client/notifier' import { NotificationGroup, QueryLoad_NotificationsArgs } from '../graphql/schema/notifier.gen' diff --git a/src/context/profile.tsx b/src/context/profile.tsx index f77a5e0c..8ff5c196 100644 --- a/src/context/profile.tsx +++ b/src/context/profile.tsx @@ -1,6 +1,6 @@ import type { ProfileInput } from '../graphql/schema/core.gen' -import { createContext, createEffect, JSX, useContext } from 'solid-js' +import { JSX, createContext, createEffect, useContext } from 'solid-js' import { createStore } from 'solid-js/store' import { apiClient } from '../graphql/client/core' diff --git a/src/context/session.tsx b/src/context/session.tsx index 8ef42faa..d1cd2817 100644 --- a/src/context/session.tsx +++ b/src/context/session.tsx @@ -1,19 +1,19 @@ +import type { Accessor, JSX, Resource } from 'solid-js' import type { AuthModalSource } from '../components/Nav/AuthModal/types' import type { Author } from '../graphql/schema/core.gen' -import type { Accessor, JSX, Resource } from 'solid-js' import { - VerifyEmailInput, - LoginInput, + ApiResponse, AuthToken, + AuthorizeResponse, Authorizer, ConfigType, - SignupInput, - AuthorizeResponse, - ApiResponse, - GenericResponse, - ForgotPasswordResponse, ForgotPasswordInput, + ForgotPasswordResponse, + GenericResponse, + LoginInput, + SignupInput, + VerifyEmailInput, } from '@authorizerdev/authorizer-js' import { createContext, diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts index c4db6b26..c80fe931 100644 --- a/src/graphql/client/core.ts +++ b/src/graphql/client/core.ts @@ -1,19 +1,19 @@ import type { + Author, + CommonResult, + Community, FollowingEntity, + LoadShoutsOptions, + MutationDelete_ShoutArgs, + ProfileInput, + QueryLoad_Authors_ByArgs, + QueryLoad_Shouts_Random_TopArgs, + QueryLoad_Shouts_SearchArgs, + ReactionBy, + ReactionInput, + Shout, ShoutInput, Topic, - Author, - LoadShoutsOptions, - ProfileInput, - ReactionInput, - ReactionBy, - Shout, - CommonResult, - QueryLoad_Authors_ByArgs, - QueryLoad_Shouts_SearchArgs, - QueryLoad_Shouts_Random_TopArgs, - Community, - MutationDelete_ShoutArgs, } from '../schema/core.gen' import { createGraphQLClient } from '../createGraphQLClient' @@ -21,12 +21,12 @@ import createArticle from '../mutation/core/article-create' import deleteShout from '../mutation/core/article-delete' import updateArticle from '../mutation/core/article-update' import rateAuthor from '../mutation/core/author-rate' +import updateAuthor from '../mutation/core/author-update' import followMutation from '../mutation/core/follow' import reactionCreate from '../mutation/core/reaction-create' import reactionDestroy from '../mutation/core/reaction-destroy' import reactionUpdate from '../mutation/core/reaction-update' import unfollowMutation from '../mutation/core/unfollow' -import updateAuthor from '../mutation/core/author-update' import shoutLoad from '../query/core/article-load' import shoutsLoadBy from '../query/core/articles-load-by' import draftsLoad from '../query/core/articles-load-drafts' @@ -39,14 +39,14 @@ import authorBy from '../query/core/author-by' import authorFollowers from '../query/core/author-followers' import authorId from '../query/core/author-id' import authorsAll from '../query/core/authors-all' +import authorFollowedAuthors from '../query/core/authors-followed-by' import authorsLoadBy from '../query/core/authors-load-by' +import authorFollowedCommunities from '../query/core/communities-followed-by' import mySubscriptions from '../query/core/my-followed' import reactionsLoadBy from '../query/core/reactions-load-by' import topicBySlug from '../query/core/topic-by-slug' import topicsAll from '../query/core/topics-all' -import authorFollowedAuthors from '../query/core/authors-followed-by' import authorFollowedTopics from '../query/core/topics-followed-by' -import authorFollowedCommunities from '../query/core/communities-followed-by' import topicsRandomQuery from '../query/core/topics-random' const publicGraphQLClient = createGraphQLClient('core') diff --git a/src/graphql/createGraphQLClient.ts b/src/graphql/createGraphQLClient.ts index 5ef9a114..62755e9a 100644 --- a/src/graphql/createGraphQLClient.ts +++ b/src/graphql/createGraphQLClient.ts @@ -1,4 +1,4 @@ -import { ClientOptions, dedupExchange, fetchExchange, Exchange, createClient } from '@urql/core' +import { ClientOptions, Exchange, createClient, dedupExchange, fetchExchange } from '@urql/core' import { devtoolsExchange } from '@urql/devtools' import { isDev } from '../utils/config' diff --git a/src/pages/about/manifest.page.tsx b/src/pages/about/manifest.page.tsx index 034a1fb5..a2885488 100644 --- a/src/pages/about/manifest.page.tsx +++ b/src/pages/about/manifest.page.tsx @@ -1,10 +1,10 @@ import { Meta } from '@solidjs/meta' -import { Subscribe } from '../../components/_shared/Subscribe' import { Feedback } from '../../components/Discours/Feedback' import { Modal } from '../../components/Nav/Modal' import Opener from '../../components/Nav/Modal/Opener' import { StaticPage } from '../../components/Views/StaticPage' +import { Subscribe } from '../../components/_shared/Subscribe' import { useLocalize } from '../../context/localize' import { getImageUrl } from '../../utils/getImageUrl' diff --git a/src/pages/allAuthors.page.server.ts b/src/pages/allAuthors.page.server.ts index a8e31794..dcc8681b 100644 --- a/src/pages/allAuthors.page.server.ts +++ b/src/pages/allAuthors.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { apiClient } from '../graphql/client/core' diff --git a/src/pages/allAuthors.page.tsx b/src/pages/allAuthors.page.tsx index 0384eb7c..87a427b2 100644 --- a/src/pages/allAuthors.page.tsx +++ b/src/pages/allAuthors.page.tsx @@ -2,8 +2,8 @@ import type { PageProps } from './types' import { createSignal, onMount } from 'solid-js' -import { PageLayout } from '../components/_shared/PageLayout' import { AllAuthorsView } from '../components/Views/AllAuthors' +import { PageLayout } from '../components/_shared/PageLayout' import { useLocalize } from '../context/localize' import { loadAllAuthors } from '../stores/zine/authors' diff --git a/src/pages/allTopics.page.server.ts b/src/pages/allTopics.page.server.ts index 4f181070..6e4ce93b 100644 --- a/src/pages/allTopics.page.server.ts +++ b/src/pages/allTopics.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { apiClient } from '../graphql/client/core' diff --git a/src/pages/allTopics.page.tsx b/src/pages/allTopics.page.tsx index 08b7f9fe..fa2daa37 100644 --- a/src/pages/allTopics.page.tsx +++ b/src/pages/allTopics.page.tsx @@ -2,8 +2,8 @@ import type { PageProps } from './types' import { createSignal, onMount } from 'solid-js' -import { PageLayout } from '../components/_shared/PageLayout' import { AllTopicsView } from '../components/Views/AllTopics' +import { PageLayout } from '../components/_shared/PageLayout' import { useLocalize } from '../context/localize' import { loadAllTopics } from '../stores/zine/topics' diff --git a/src/pages/article.page.server.ts b/src/pages/article.page.server.ts index dda2e456..6eadb8b2 100644 --- a/src/pages/article.page.server.ts +++ b/src/pages/article.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { render } from 'vike/abort' diff --git a/src/pages/article.page.tsx b/src/pages/article.page.tsx index f212cc46..6b29507d 100644 --- a/src/pages/article.page.tsx +++ b/src/pages/article.page.tsx @@ -1,12 +1,12 @@ -import type { PageProps } from './types' import type { Shout } from '../graphql/schema/core.gen' +import type { PageProps } from './types' import { redirectPage } from '@nanostores/router' -import { createMemo, createSignal, onMount, Show } from 'solid-js' +import { Show, createMemo, createSignal, onMount } from 'solid-js' +import { FullArticle } from '../components/Article/FullArticle' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { FullArticle } from '../components/Article/FullArticle' import { ReactionsProvider } from '../context/reactions' import { router, useRouter } from '../stores/router' import { loadShout, useArticlesStore } from '../stores/zine/articles' diff --git a/src/pages/author.page.server.ts b/src/pages/author.page.server.ts index 405298e2..da0ea15b 100644 --- a/src/pages/author.page.server.ts +++ b/src/pages/author.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { render } from 'vike/abort' diff --git a/src/pages/author.page.tsx b/src/pages/author.page.tsx index 3a357acb..39c4dc28 100644 --- a/src/pages/author.page.tsx +++ b/src/pages/author.page.tsx @@ -1,10 +1,10 @@ import type { PageProps } from './types' -import { createEffect, createMemo, createSignal, on, onCleanup, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js' +import { AuthorView, PRERENDERED_ARTICLES_COUNT } from '../components/Views/Author' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { AuthorView, PRERENDERED_ARTICLES_COUNT } from '../components/Views/Author' import { useLocalize } from '../context/localize' import { ReactionsProvider } from '../context/reactions' import { useRouter } from '../stores/router' diff --git a/src/pages/connect.page.tsx b/src/pages/connect.page.tsx index 7d731ccf..7c5a5151 100644 --- a/src/pages/connect.page.tsx +++ b/src/pages/connect.page.tsx @@ -1,4 +1,4 @@ -import { createSignal, Show } from 'solid-js' +import { Show, createSignal } from 'solid-js' import { PageLayout } from '../components/_shared/PageLayout' diff --git a/src/pages/create.page.tsx b/src/pages/create.page.tsx index ddfc1bb7..ea5c27f2 100644 --- a/src/pages/create.page.tsx +++ b/src/pages/create.page.tsx @@ -2,10 +2,10 @@ import { redirectPage } from '@nanostores/router' import { Meta } from '@solidjs/meta' import { clsx } from 'clsx' +import { AuthGuard } from '../components/AuthGuard' import { Button } from '../components/_shared/Button' import { Icon } from '../components/_shared/Icon' import { PageLayout } from '../components/_shared/PageLayout' -import { AuthGuard } from '../components/AuthGuard' import { useLocalize } from '../context/localize' import { apiClient } from '../graphql/client/core' import { router } from '../stores/router' diff --git a/src/pages/drafts.page.tsx b/src/pages/drafts.page.tsx index 1ea7a25d..1f8f7f7a 100644 --- a/src/pages/drafts.page.tsx +++ b/src/pages/drafts.page.tsx @@ -1,5 +1,5 @@ -import { PageLayout } from '../components/_shared/PageLayout' import { DraftsView } from '../components/Views/DraftsView' +import { PageLayout } from '../components/_shared/PageLayout' import { useLocalize } from '../context/localize' export const DraftsPage = () => { diff --git a/src/pages/edit.page.tsx b/src/pages/edit.page.tsx index d189d5ec..688d2fe4 100644 --- a/src/pages/edit.page.tsx +++ b/src/pages/edit.page.tsx @@ -1,8 +1,8 @@ -import { createMemo, createSignal, lazy, onMount, Show, Suspense } from 'solid-js' +import { Show, Suspense, createMemo, createSignal, lazy, onMount } from 'solid-js' +import { AuthGuard } from '../components/AuthGuard' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { AuthGuard } from '../components/AuthGuard' import { useLocalize } from '../context/localize' import { apiClient } from '../graphql/client/core' import { Shout } from '../graphql/schema/core.gen' diff --git a/src/pages/expo/expo.page.tsx b/src/pages/expo/expo.page.tsx index 2d32ead4..1a1a2235 100644 --- a/src/pages/expo/expo.page.tsx +++ b/src/pages/expo/expo.page.tsx @@ -2,9 +2,9 @@ import type { PageProps } from '../types' import { createEffect, createMemo, on } from 'solid-js' -import { PageLayout } from '../../components/_shared/PageLayout' import { Topics } from '../../components/Nav/Topics' import { Expo } from '../../components/Views/Expo' +import { PageLayout } from '../../components/_shared/PageLayout' import { useLocalize } from '../../context/localize' import { useRouter } from '../../stores/router' import { LayoutType } from '../types' diff --git a/src/pages/feed.page.tsx b/src/pages/feed.page.tsx index 5e654b26..869d22da 100644 --- a/src/pages/feed.page.tsx +++ b/src/pages/feed.page.tsx @@ -1,8 +1,8 @@ -import { createEffect, Match, on, onCleanup, Switch } from 'solid-js' +import { Match, Switch, createEffect, on, onCleanup } from 'solid-js' -import { PageLayout } from '../components/_shared/PageLayout' import { AuthGuard } from '../components/AuthGuard' import { Feed } from '../components/Views/Feed' +import { PageLayout } from '../components/_shared/PageLayout' import { useLocalize } from '../context/localize' import { ReactionsProvider } from '../context/reactions' import { LoadShoutsOptions } from '../graphql/schema/core.gen' diff --git a/src/pages/fourOuFour.page.tsx b/src/pages/fourOuFour.page.tsx index 6aa1a4b5..32e4ee32 100644 --- a/src/pages/fourOuFour.page.tsx +++ b/src/pages/fourOuFour.page.tsx @@ -1,5 +1,5 @@ -import { PageLayout } from '../components/_shared/PageLayout' import { FourOuFourView } from '../components/Views/FourOuFour' +import { PageLayout } from '../components/_shared/PageLayout' import { useLocalize } from '../context/localize' export const FourOuFourPage = () => { diff --git a/src/pages/inbox.page.tsx b/src/pages/inbox.page.tsx index 7bde26df..cff7c690 100644 --- a/src/pages/inbox.page.tsx +++ b/src/pages/inbox.page.tsx @@ -2,9 +2,9 @@ import type { PageProps } from './types' import { createSignal, onMount } from 'solid-js' +import { InboxView } from '../components/Views/Inbox/Inbox' import { PageLayout } from '../components/_shared/PageLayout' import { ShowOnlyOnClient } from '../components/_shared/ShowOnlyOnClient' -import { InboxView } from '../components/Views/Inbox/Inbox' import { useLocalize } from '../context/localize' import { loadAllAuthors } from '../stores/zine/authors' diff --git a/src/pages/index.page.server.ts b/src/pages/index.page.server.ts index c523d1f5..8ec75bf2 100644 --- a/src/pages/index.page.server.ts +++ b/src/pages/index.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { PRERENDERED_ARTICLES_COUNT } from '../components/Views/Home' import { apiClient } from '../graphql/client/core' diff --git a/src/pages/index.page.tsx b/src/pages/index.page.tsx index feceee68..93d3c412 100644 --- a/src/pages/index.page.tsx +++ b/src/pages/index.page.tsx @@ -1,10 +1,10 @@ import type { PageProps } from './types' -import { createSignal, onCleanup, onMount, Show } from 'solid-js' +import { Show, createSignal, onCleanup, onMount } from 'solid-js' +import { HomeView, PRERENDERED_ARTICLES_COUNT, RANDOM_TOPICS_COUNT } from '../components/Views/Home' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { HomeView, PRERENDERED_ARTICLES_COUNT, RANDOM_TOPICS_COUNT } from '../components/Views/Home' import { useLocalize } from '../context/localize' import { ReactionsProvider } from '../context/reactions' import { loadShouts, resetSortedArticles } from '../stores/zine/articles' diff --git a/src/pages/profile/profileSecurity.page.tsx b/src/pages/profile/profileSecurity.page.tsx index de37e74c..2e572047 100644 --- a/src/pages/profile/profileSecurity.page.tsx +++ b/src/pages/profile/profileSecurity.page.tsx @@ -1,9 +1,9 @@ import { clsx } from 'clsx' -import { Icon } from '../../components/_shared/Icon' -import { PageLayout } from '../../components/_shared/PageLayout' import { AuthGuard } from '../../components/AuthGuard' import { ProfileSettingsNavigation } from '../../components/Nav/ProfileSettingsNavigation' +import { Icon } from '../../components/_shared/Icon' +import { PageLayout } from '../../components/_shared/PageLayout' import { useLocalize } from '../../context/localize' import styles from './Settings.module.scss' diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx index 81398499..66542a46 100644 --- a/src/pages/profile/profileSettings.page.tsx +++ b/src/pages/profile/profileSettings.page.tsx @@ -1,6 +1,6 @@ -import { PageLayout } from '../../components/_shared/PageLayout' import { AuthGuard } from '../../components/AuthGuard' import { ProfileSettings } from '../../components/ProfileSettings' +import { PageLayout } from '../../components/_shared/PageLayout' import { useLocalize } from '../../context/localize' import { ProfileFormProvider } from '../../context/profile' diff --git a/src/pages/profile/profileSubscriptions.page.tsx b/src/pages/profile/profileSubscriptions.page.tsx index 71af19e1..c8c46b86 100644 --- a/src/pages/profile/profileSubscriptions.page.tsx +++ b/src/pages/profile/profileSubscriptions.page.tsx @@ -1,6 +1,6 @@ -import { PageLayout } from '../../components/_shared/PageLayout' import { AuthGuard } from '../../components/AuthGuard' import { ProfileSubscriptions } from '../../components/Views/ProfileSubscriptions' +import { PageLayout } from '../../components/_shared/PageLayout' import { useLocalize } from '../../context/localize' export const ProfileSubscriptionsPage = () => { diff --git a/src/pages/search.page.server.ts b/src/pages/search.page.server.ts index 95163568..22a337b1 100644 --- a/src/pages/search.page.server.ts +++ b/src/pages/search.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { apiClient } from '../graphql/client/core' import { SearchResult } from '../graphql/schema/core.gen' diff --git a/src/pages/search.page.tsx b/src/pages/search.page.tsx index fba302d0..524fdb62 100644 --- a/src/pages/search.page.tsx +++ b/src/pages/search.page.tsx @@ -1,10 +1,10 @@ import type { PageProps } from './types' -import { createEffect, createMemo, createSignal, onCleanup, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, onCleanup } from 'solid-js' +import { SearchView } from '../components/Views/Search' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { SearchView } from '../components/Views/Search' import { useLocalize } from '../context/localize' import { ReactionsProvider } from '../context/reactions' import { useRouter } from '../stores/router' diff --git a/src/pages/topic.page.server.ts b/src/pages/topic.page.server.ts index 7b73745d..db3a4896 100644 --- a/src/pages/topic.page.server.ts +++ b/src/pages/topic.page.server.ts @@ -1,5 +1,5 @@ -import type { PageProps } from './types' import type { PageContext } from '../renderer/types' +import type { PageProps } from './types' import { render } from 'vike/abort' diff --git a/src/pages/topic.page.tsx b/src/pages/topic.page.tsx index 3e1204b1..b5e6212a 100644 --- a/src/pages/topic.page.tsx +++ b/src/pages/topic.page.tsx @@ -1,10 +1,10 @@ import type { PageProps } from './types' -import { createEffect, createMemo, createSignal, on, onCleanup, onMount, Show } from 'solid-js' +import { Show, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js' +import { PRERENDERED_ARTICLES_COUNT, TopicView } from '../components/Views/Topic' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' -import { PRERENDERED_ARTICLES_COUNT, TopicView } from '../components/Views/Topic' import { ReactionsProvider } from '../context/reactions' import { useRouter } from '../stores/router' import { loadShouts, resetSortedArticles } from '../stores/zine/articles' diff --git a/src/renderer/_default.page.client.tsx b/src/renderer/_default.page.client.tsx index 0ee002ba..fff76e88 100644 --- a/src/renderer/_default.page.client.tsx +++ b/src/renderer/_default.page.client.tsx @@ -1,5 +1,5 @@ -import type { PageContext } from './types' import type { PageContextBuiltInClientWithClientRouting } from 'vike/types' +import type { PageContext } from './types' // import * as Sentry from '@sentry/browser' import i18next from 'i18next' diff --git a/src/renderer/_default.page.server.tsx b/src/renderer/_default.page.server.tsx index 3de8329b..003b1ff6 100644 --- a/src/renderer/_default.page.server.tsx +++ b/src/renderer/_default.page.server.tsx @@ -1,10 +1,10 @@ -import type { PageContext } from './types' import type { Language } from '../context/localize' +import type { PageContext } from './types' import i18next from 'i18next' import ICU from 'i18next-icu' import { generateHydrationScript, getAssets, renderToString } from 'solid-js/web' -import { escapeInject, dangerouslySkipEscape } from 'vike/server' +import { dangerouslySkipEscape, escapeInject } from 'vike/server' import en from '../../public/locales/en/translation.json' import ru from '../../public/locales/ru/translation.json' diff --git a/src/renderer/types.ts b/src/renderer/types.ts index 4948f2a7..4e674aa8 100644 --- a/src/renderer/types.ts +++ b/src/renderer/types.ts @@ -1,5 +1,5 @@ -import type { PageProps } from '../pages/types' import type { Component } from 'solid-js' +import type { PageProps } from '../pages/types' import { PageContextBuiltInClientWithClientRouting } from 'vike/dist/esm/types' diff --git a/src/stores/zine/articles.ts b/src/stores/zine/articles.ts index 9b41fc69..e517378b 100644 --- a/src/stores/zine/articles.ts +++ b/src/stores/zine/articles.ts @@ -1,8 +1,8 @@ import type { Author, - Shout, LoadShoutsOptions, QueryLoad_Shouts_SearchArgs, + Shout, } from '../../graphql/schema/core.gen' import { createLazyMemo } from '@solid-primitives/memo' diff --git a/src/stores/zine/layouts.ts b/src/stores/zine/layouts.ts index 218f0255..cb54250c 100644 --- a/src/stores/zine/layouts.ts +++ b/src/stores/zine/layouts.ts @@ -1,4 +1,4 @@ -import type { Shout, LoadShoutsOptions } from '../../graphql/schema/core.gen' +import type { LoadShoutsOptions, Shout } from '../../graphql/schema/core.gen' import { createSignal } from 'solid-js' diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts index 0d0bec8f..a0974a40 100644 --- a/src/utils/getImageUrl.ts +++ b/src/utils/getImageUrl.ts @@ -1,4 +1,4 @@ -import { thumborUrl, cdnUrl } from './config' +import { cdnUrl, thumborUrl } from './config' const getSizeUrlPart = (options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}) => { const widthString = options.width ? options.width.toString() : ''