From 5e9c111e0fb6795368e001b27d07393e2a2f0f85 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Mon, 20 Nov 2023 22:21:08 +0600 Subject: [PATCH] refactor editos --- .../BetterScrollDialog/index.tsx | 0 .../BetterScrollDialog/styles.module.scss | 0 .../BlurWrapper/index.tsx | 0 .../BlurWrapper/styles.module.scss | 0 .../{containers => common}/Card/index.tsx | 0 .../Card/styles.module.scss | 0 .../{containers => common}/CellGrid/index.tsx | 0 .../CellGrid/styles.module.scss | 0 .../{containers => common}/Columns/index.tsx | 0 .../Columns/styles.module.scss | 0 .../CoverBackdrop/index.tsx | 0 .../CoverBackdrop/styles.module.scss | 0 .../{dialogs => common}/DialogTitle/index.tsx | 0 .../DialogTitle/styles.module.scss | 0 .../{containers => common}/Filler/index.tsx | 0 .../Filler/styles.module.scss | 0 .../{containers => common}/Grid/index.tsx | 0 .../Grid/styles.module.scss | 0 .../{containers => common}/Group/index.tsx | 0 .../Group/styles.module.scss | 0 .../InfiniteScroll/index.tsx | 0 .../InfiniteScroll/styles.module.scss | 0 .../{containers => common}/Markdown/index.tsx | 0 .../ModalWrapper/index.tsx | 0 .../ModalWrapper/styles.module.scss | 0 .../{containers => common}/Padder/index.tsx | 0 .../Padder/styles.module.scss | 0 .../{containers => common}/Panel/index.tsx | 0 .../Panel/styles.module.scss | 0 .../{containers => common}/Sticky/index.tsx | 0 .../{dialogs => common}/Tabs/index.tsx | 0 .../Tabs/styles.module.scss | 0 .../{containers => common}/TagField/index.tsx | 0 .../TagField/styles.module.scss | 0 .../{containers => common}/Zone/index.tsx | 0 .../Zone/styles.module.scss | 0 src/components/flow/FlowCellMenu/index.tsx | 8 +- src/components/flow/FlowCellText/index.tsx | 2 +- src/components/flow/FlowLoginStamp/index.tsx | 2 +- .../flow/FlowSearchResults/index.tsx | 11 +- src/components/lab/LabBanner/index.tsx | 6 +- src/components/lab/LabBottomPanel/index.tsx | 26 +++- src/components/lab/LabDescription/index.tsx | 2 +- src/components/lab/LabFactoryBanner/index.tsx | 2 +- src/components/lab/LabHead/index.tsx | 2 +- src/components/lab/LabHero/index.tsx | 6 +- src/components/lab/LabHeroes/index.tsx | 6 +- src/components/lab/LabNoResults/index.tsx | 2 +- src/components/lab/LabNodeTitle/index.tsx | 2 +- src/components/lab/LabText/index.tsx | 2 +- src/components/main/UserButton/index.tsx | 2 +- src/components/node/NodeAuthorBlock/index.tsx | 2 +- src/components/node/NodeNoComments/index.tsx | 2 +- src/components/node/NodeRelated/index.tsx | 2 +- .../node/NodeRelated/placeholder.tsx | 2 +- src/components/notes/NoteCard/index.tsx | 6 +- .../notes/NoteCreationForm/index.tsx | 6 +- .../NotificationSettingsForm/index.tsx | 6 +- .../placeholders/Paragraph/index.tsx | 19 ++- .../profile/ProfileAccountsError/index.tsx | 2 +- .../profile/ProfileDescription/index.tsx | 2 +- .../profile/ProfileSettings/index.tsx | 6 +- .../ProfileSidebarNotifications/index.tsx | 2 +- .../profile/ProfileSidebarSettings/index.tsx | 2 +- .../settings/SettingsMenu/index.tsx | 8 +- .../sidebar/SidebarStackCard/index.tsx | 2 +- src/components/welcome/WelcomeSlide/index.tsx | 2 +- src/constants/node/index.ts | 65 --------- .../components/LoginDialogButtons/index.tsx | 5 +- src/containers/auth/LoginDialog/index.tsx | 8 +- .../auth/LoginSocialRegisterDialog/index.tsx | 8 +- .../components/RestoreInvalidCode/index.tsx | 7 +- .../components/RestoreSuccess/index.tsx | 2 +- .../auth/RestorePasswordDialog/index.tsx | 4 +- .../components/RestoreSent/index.tsx | 2 +- .../auth/RestoreRequestDialog/index.tsx | 4 +- .../auth/TelegramAttachDialog/index.tsx | 4 +- src/containers/boris/BorisComments/index.tsx | 2 +- .../components/BorisContacts/index.tsx | 2 +- .../BorisStats/components/StatsCard/index.tsx | 6 +- .../components/StatsCountdownCard/index.tsx | 2 +- .../components/StatsGraphCard/index.tsx | 4 +- src/containers/boris/BorisSidebar/index.tsx | 2 +- .../boris/BorisSuperpowers/index.tsx | 4 +- src/containers/comments/CommentForm/index.tsx | 2 +- .../components}/AudioEditor/index.tsx | 0 .../AudioEditor/styles.module.scss | 0 .../components}/AudioGrid/index.tsx | 0 .../EditorAudioUploadButton/index.tsx | 2 +- .../components}/EditorFiller/index.tsx | 2 +- .../EditorFiller/styles.module.scss | 0 .../EditorImageUploadButton/index.tsx | 3 +- .../components}/EditorPublicSwitch/index.tsx | 0 .../EditorPublicSwitch/styles.module.scss | 0 .../components}/EditorUploadButton/index.tsx | 0 .../EditorUploadButton/styles.module.scss | 0 .../EditorUploadCoverButton/index.tsx | 0 .../styles.module.scss | 0 .../EditorActionsPanel/constants/index.ts | 44 ++++++ .../components}/EditorActionsPanel/index.tsx | 6 +- .../EditorActionsPanel/styles.module.scss | 0 .../components}/EditorButtons/index.tsx | 9 +- .../components}/EditorConfirmClose/index.tsx | 6 +- .../EditorConfirmClose/styles.module.scss | 0 .../components}/ImageEditor/index.tsx | 3 +- .../ImageEditor/styles.module.scss | 0 .../components}/ImageGrid/index.tsx | 0 .../components}/ImageGrid/styles.module.scss | 0 .../components}/RoomEditor/index.tsx | 0 .../components}/RoomEditor/styles.module.scss | 0 .../components}/TextEditor/index.tsx | 0 .../components}/TextEditor/styles.module.scss | 0 .../components}/VideoEditor/index.tsx | 0 .../VideoEditor/styles.module.scss | 0 .../dialogs/EditorDialog/constants/index.ts | 31 +++++ src/containers/dialogs/EditorDialog/index.tsx | 128 ++++++++++-------- .../dialogs/EditorEditDialog/index.tsx | 52 ++++--- src/containers/dialogs/Modal/index.tsx | 2 +- src/containers/dialogs/TestDialog/index.tsx | 2 +- src/containers/flow/FlowStamp/index.tsx | 2 +- src/containers/lab/LabGrid/index.tsx | 2 +- src/containers/lab/LabLoading/index.tsx | 2 +- src/containers/lab/LabStats/index.tsx | 2 +- src/containers/main/Header/index.tsx | 2 +- src/containers/node/NodeBacklinks/index.tsx | 2 +- src/containers/node/NodeBottomBlock/index.tsx | 8 +- .../components/CommentContent/index.tsx | 2 +- .../NotificationSettings/index.tsx | 2 +- .../profile/ProfileAccounts/index.tsx | 2 +- src/containers/profile/ProfileInfo/index.tsx | 8 +- .../profile/ProfileQuickInfo/index.tsx | 8 +- .../profile/ProfileSidebarHead/index.tsx | 15 +- .../ProfileSidebarLogoutButton/index.tsx | 4 +- .../profile/ProfileSidebarMenu/index.tsx | 6 +- src/containers/profile/ProfileStats/index.tsx | 6 +- src/containers/profile/ProfileTabs/index.tsx | 2 +- .../profile/ProfileToggles/index.tsx | 2 +- .../settings/SettingsDeleted/index.tsx | 8 +- .../settings/SettingsNotes/index.tsx | 4 +- .../settings/ThemeSwitcher/index.tsx | 4 +- .../settings/UserSettingsView/index.tsx | 6 +- .../sidebars/ProfileSidebar/index.tsx | 2 +- src/containers/sidebars/TagSidebar/index.tsx | 2 +- src/containers/tags/Tags/index.tsx | 37 +++-- src/layouts/BorisLayout/index.tsx | 6 +- src/layouts/LabLayout/index.tsx | 4 +- src/layouts/NodeLayout/index.tsx | 2 +- src/layouts/SettingsLayout/index.tsx | 4 +- src/utils/providers/SidebarProvider.tsx | 2 +- 149 files changed, 416 insertions(+), 317 deletions(-) rename src/components/{dialogs => common}/BetterScrollDialog/index.tsx (100%) rename src/components/{dialogs => common}/BetterScrollDialog/styles.module.scss (100%) rename src/components/{containers => common}/BlurWrapper/index.tsx (100%) rename src/components/{containers => common}/BlurWrapper/styles.module.scss (100%) rename src/components/{containers => common}/Card/index.tsx (100%) rename src/components/{containers => common}/Card/styles.module.scss (100%) rename src/components/{containers => common}/CellGrid/index.tsx (100%) rename src/components/{containers => common}/CellGrid/styles.module.scss (100%) rename src/components/{containers => common}/Columns/index.tsx (100%) rename src/components/{containers => common}/Columns/styles.module.scss (100%) rename src/components/{containers => common}/CoverBackdrop/index.tsx (100%) rename src/components/{containers => common}/CoverBackdrop/styles.module.scss (100%) rename src/components/{dialogs => common}/DialogTitle/index.tsx (100%) rename src/components/{dialogs => common}/DialogTitle/styles.module.scss (100%) rename src/components/{containers => common}/Filler/index.tsx (100%) rename src/components/{containers => common}/Filler/styles.module.scss (100%) rename src/components/{containers => common}/Grid/index.tsx (100%) rename src/components/{containers => common}/Grid/styles.module.scss (100%) rename src/components/{containers => common}/Group/index.tsx (100%) rename src/components/{containers => common}/Group/styles.module.scss (100%) rename src/components/{containers => common}/InfiniteScroll/index.tsx (100%) rename src/components/{containers => common}/InfiniteScroll/styles.module.scss (100%) rename src/components/{containers => common}/Markdown/index.tsx (100%) rename src/components/{dialogs => common}/ModalWrapper/index.tsx (100%) rename src/components/{dialogs => common}/ModalWrapper/styles.module.scss (100%) rename src/components/{containers => common}/Padder/index.tsx (100%) rename src/components/{containers => common}/Padder/styles.module.scss (100%) rename src/components/{containers => common}/Panel/index.tsx (100%) rename src/components/{containers => common}/Panel/styles.module.scss (100%) rename src/components/{containers => common}/Sticky/index.tsx (100%) rename src/components/{dialogs => common}/Tabs/index.tsx (100%) rename src/components/{dialogs => common}/Tabs/styles.module.scss (100%) rename src/components/{containers => common}/TagField/index.tsx (100%) rename src/components/{containers => common}/TagField/styles.module.scss (100%) rename src/components/{containers => common}/Zone/index.tsx (100%) rename src/components/{containers => common}/Zone/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/AudioEditor/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/AudioEditor/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/AudioGrid/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorAudioUploadButton/index.tsx (72%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorFiller/index.tsx (83%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorFiller/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorImageUploadButton/index.tsx (84%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorPublicSwitch/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorPublicSwitch/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorUploadButton/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorUploadButton/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorUploadCoverButton/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components}/EditorUploadCoverButton/styles.module.scss (100%) create mode 100644 src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/constants/index.ts rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components}/EditorActionsPanel/index.tsx (76%) rename src/{components/editors => containers/dialogs/EditorDialog/components/EditorButtons/components}/EditorActionsPanel/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/EditorButtons/index.tsx (81%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/EditorConfirmClose/index.tsx (87%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/EditorConfirmClose/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/ImageEditor/index.tsx (92%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/ImageEditor/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/ImageGrid/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/ImageGrid/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/RoomEditor/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/RoomEditor/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/TextEditor/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/TextEditor/styles.module.scss (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/VideoEditor/index.tsx (100%) rename src/{components/editors => containers/dialogs/EditorDialog/components}/VideoEditor/styles.module.scss (100%) create mode 100644 src/containers/dialogs/EditorDialog/constants/index.ts diff --git a/src/components/dialogs/BetterScrollDialog/index.tsx b/src/components/common/BetterScrollDialog/index.tsx similarity index 100% rename from src/components/dialogs/BetterScrollDialog/index.tsx rename to src/components/common/BetterScrollDialog/index.tsx diff --git a/src/components/dialogs/BetterScrollDialog/styles.module.scss b/src/components/common/BetterScrollDialog/styles.module.scss similarity index 100% rename from src/components/dialogs/BetterScrollDialog/styles.module.scss rename to src/components/common/BetterScrollDialog/styles.module.scss diff --git a/src/components/containers/BlurWrapper/index.tsx b/src/components/common/BlurWrapper/index.tsx similarity index 100% rename from src/components/containers/BlurWrapper/index.tsx rename to src/components/common/BlurWrapper/index.tsx diff --git a/src/components/containers/BlurWrapper/styles.module.scss b/src/components/common/BlurWrapper/styles.module.scss similarity index 100% rename from src/components/containers/BlurWrapper/styles.module.scss rename to src/components/common/BlurWrapper/styles.module.scss diff --git a/src/components/containers/Card/index.tsx b/src/components/common/Card/index.tsx similarity index 100% rename from src/components/containers/Card/index.tsx rename to src/components/common/Card/index.tsx diff --git a/src/components/containers/Card/styles.module.scss b/src/components/common/Card/styles.module.scss similarity index 100% rename from src/components/containers/Card/styles.module.scss rename to src/components/common/Card/styles.module.scss diff --git a/src/components/containers/CellGrid/index.tsx b/src/components/common/CellGrid/index.tsx similarity index 100% rename from src/components/containers/CellGrid/index.tsx rename to src/components/common/CellGrid/index.tsx diff --git a/src/components/containers/CellGrid/styles.module.scss b/src/components/common/CellGrid/styles.module.scss similarity index 100% rename from src/components/containers/CellGrid/styles.module.scss rename to src/components/common/CellGrid/styles.module.scss diff --git a/src/components/containers/Columns/index.tsx b/src/components/common/Columns/index.tsx similarity index 100% rename from src/components/containers/Columns/index.tsx rename to src/components/common/Columns/index.tsx diff --git a/src/components/containers/Columns/styles.module.scss b/src/components/common/Columns/styles.module.scss similarity index 100% rename from src/components/containers/Columns/styles.module.scss rename to src/components/common/Columns/styles.module.scss diff --git a/src/components/containers/CoverBackdrop/index.tsx b/src/components/common/CoverBackdrop/index.tsx similarity index 100% rename from src/components/containers/CoverBackdrop/index.tsx rename to src/components/common/CoverBackdrop/index.tsx diff --git a/src/components/containers/CoverBackdrop/styles.module.scss b/src/components/common/CoverBackdrop/styles.module.scss similarity index 100% rename from src/components/containers/CoverBackdrop/styles.module.scss rename to src/components/common/CoverBackdrop/styles.module.scss diff --git a/src/components/dialogs/DialogTitle/index.tsx b/src/components/common/DialogTitle/index.tsx similarity index 100% rename from src/components/dialogs/DialogTitle/index.tsx rename to src/components/common/DialogTitle/index.tsx diff --git a/src/components/dialogs/DialogTitle/styles.module.scss b/src/components/common/DialogTitle/styles.module.scss similarity index 100% rename from src/components/dialogs/DialogTitle/styles.module.scss rename to src/components/common/DialogTitle/styles.module.scss diff --git a/src/components/containers/Filler/index.tsx b/src/components/common/Filler/index.tsx similarity index 100% rename from src/components/containers/Filler/index.tsx rename to src/components/common/Filler/index.tsx diff --git a/src/components/containers/Filler/styles.module.scss b/src/components/common/Filler/styles.module.scss similarity index 100% rename from src/components/containers/Filler/styles.module.scss rename to src/components/common/Filler/styles.module.scss diff --git a/src/components/containers/Grid/index.tsx b/src/components/common/Grid/index.tsx similarity index 100% rename from src/components/containers/Grid/index.tsx rename to src/components/common/Grid/index.tsx diff --git a/src/components/containers/Grid/styles.module.scss b/src/components/common/Grid/styles.module.scss similarity index 100% rename from src/components/containers/Grid/styles.module.scss rename to src/components/common/Grid/styles.module.scss diff --git a/src/components/containers/Group/index.tsx b/src/components/common/Group/index.tsx similarity index 100% rename from src/components/containers/Group/index.tsx rename to src/components/common/Group/index.tsx diff --git a/src/components/containers/Group/styles.module.scss b/src/components/common/Group/styles.module.scss similarity index 100% rename from src/components/containers/Group/styles.module.scss rename to src/components/common/Group/styles.module.scss diff --git a/src/components/containers/InfiniteScroll/index.tsx b/src/components/common/InfiniteScroll/index.tsx similarity index 100% rename from src/components/containers/InfiniteScroll/index.tsx rename to src/components/common/InfiniteScroll/index.tsx diff --git a/src/components/containers/InfiniteScroll/styles.module.scss b/src/components/common/InfiniteScroll/styles.module.scss similarity index 100% rename from src/components/containers/InfiniteScroll/styles.module.scss rename to src/components/common/InfiniteScroll/styles.module.scss diff --git a/src/components/containers/Markdown/index.tsx b/src/components/common/Markdown/index.tsx similarity index 100% rename from src/components/containers/Markdown/index.tsx rename to src/components/common/Markdown/index.tsx diff --git a/src/components/dialogs/ModalWrapper/index.tsx b/src/components/common/ModalWrapper/index.tsx similarity index 100% rename from src/components/dialogs/ModalWrapper/index.tsx rename to src/components/common/ModalWrapper/index.tsx diff --git a/src/components/dialogs/ModalWrapper/styles.module.scss b/src/components/common/ModalWrapper/styles.module.scss similarity index 100% rename from src/components/dialogs/ModalWrapper/styles.module.scss rename to src/components/common/ModalWrapper/styles.module.scss diff --git a/src/components/containers/Padder/index.tsx b/src/components/common/Padder/index.tsx similarity index 100% rename from src/components/containers/Padder/index.tsx rename to src/components/common/Padder/index.tsx diff --git a/src/components/containers/Padder/styles.module.scss b/src/components/common/Padder/styles.module.scss similarity index 100% rename from src/components/containers/Padder/styles.module.scss rename to src/components/common/Padder/styles.module.scss diff --git a/src/components/containers/Panel/index.tsx b/src/components/common/Panel/index.tsx similarity index 100% rename from src/components/containers/Panel/index.tsx rename to src/components/common/Panel/index.tsx diff --git a/src/components/containers/Panel/styles.module.scss b/src/components/common/Panel/styles.module.scss similarity index 100% rename from src/components/containers/Panel/styles.module.scss rename to src/components/common/Panel/styles.module.scss diff --git a/src/components/containers/Sticky/index.tsx b/src/components/common/Sticky/index.tsx similarity index 100% rename from src/components/containers/Sticky/index.tsx rename to src/components/common/Sticky/index.tsx diff --git a/src/components/dialogs/Tabs/index.tsx b/src/components/common/Tabs/index.tsx similarity index 100% rename from src/components/dialogs/Tabs/index.tsx rename to src/components/common/Tabs/index.tsx diff --git a/src/components/dialogs/Tabs/styles.module.scss b/src/components/common/Tabs/styles.module.scss similarity index 100% rename from src/components/dialogs/Tabs/styles.module.scss rename to src/components/common/Tabs/styles.module.scss diff --git a/src/components/containers/TagField/index.tsx b/src/components/common/TagField/index.tsx similarity index 100% rename from src/components/containers/TagField/index.tsx rename to src/components/common/TagField/index.tsx diff --git a/src/components/containers/TagField/styles.module.scss b/src/components/common/TagField/styles.module.scss similarity index 100% rename from src/components/containers/TagField/styles.module.scss rename to src/components/common/TagField/styles.module.scss diff --git a/src/components/containers/Zone/index.tsx b/src/components/common/Zone/index.tsx similarity index 100% rename from src/components/containers/Zone/index.tsx rename to src/components/common/Zone/index.tsx diff --git a/src/components/containers/Zone/styles.module.scss b/src/components/common/Zone/styles.module.scss similarity index 100% rename from src/components/containers/Zone/styles.module.scss rename to src/components/common/Zone/styles.module.scss diff --git a/src/components/flow/FlowCellMenu/index.tsx b/src/components/flow/FlowCellMenu/index.tsx index e3eb4d4b..314c8114 100644 --- a/src/components/flow/FlowCellMenu/index.tsx +++ b/src/components/flow/FlowCellMenu/index.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import classNames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Icon } from '~/components/input/Icon'; import { Toggle } from '~/components/input/Toggle'; import { FlowDisplayVariant } from '~/types'; @@ -60,7 +60,11 @@ const FlowCellMenu: FC = ({ {hasDescription && ( - + Текст diff --git a/src/components/flow/FlowCellText/index.tsx b/src/components/flow/FlowCellText/index.tsx index 527fb311..f23fbe90 100644 --- a/src/components/flow/FlowCellText/index.tsx +++ b/src/components/flow/FlowCellText/index.tsx @@ -2,7 +2,7 @@ import React, { FC, ReactElement } from 'react'; import classNames from 'classnames'; -import { Markdown } from '~/components/containers/Markdown'; +import { Markdown } from '~/components/common/Markdown'; import { formatText } from '~/utils/dom'; import { DivProps } from '~/utils/types'; diff --git a/src/components/flow/FlowLoginStamp/index.tsx b/src/components/flow/FlowLoginStamp/index.tsx index 1dcc82c1..8f9ab0ca 100644 --- a/src/components/flow/FlowLoginStamp/index.tsx +++ b/src/components/flow/FlowLoginStamp/index.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Button } from '~/components/input/Button'; import { Dialog } from '~/constants/modal'; import { useWindowSize } from '~/hooks/dom/useWindowSize'; diff --git a/src/components/flow/FlowSearchResults/index.tsx b/src/components/flow/FlowSearchResults/index.tsx index b978a950..1d51c260 100644 --- a/src/components/flow/FlowSearchResults/index.tsx +++ b/src/components/flow/FlowSearchResults/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { InfiniteScroll } from '~/components/containers/InfiniteScroll'; +import { InfiniteScroll } from '~/components/common/InfiniteScroll'; import { Icon } from '~/components/input/Icon'; import { INode } from '~/types'; @@ -15,7 +15,12 @@ interface IProps { onLoadMore: () => void; } -const FlowSearchResults: FC = ({ results, isLoading, onLoadMore, hasMore }) => { +const FlowSearchResults: FC = ({ + results, + isLoading, + onLoadMore, + hasMore, +}) => { if (!results.length) { return (
@@ -28,7 +33,7 @@ const FlowSearchResults: FC = ({ results, isLoading, onLoadMore, hasMore return (
- {results.map(node => ( + {results.map((node) => ( ))} diff --git a/src/components/lab/LabBanner/index.tsx b/src/components/lab/LabBanner/index.tsx index af595c2e..04e0dd58 100644 --- a/src/components/lab/LabBanner/index.tsx +++ b/src/components/lab/LabBanner/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { LabSquare } from '~/components/lab/LabSquare'; import styles from './styles.module.scss'; @@ -15,8 +15,8 @@ const LabBanner: FC = () => (

- Всё, что происходит здесь — всего лишь эксперимент, о котором не узнает никто за - пределами Убежища. + Всё, что происходит здесь — всего лишь эксперимент, о котором + не узнает никто за пределами Убежища.

diff --git a/src/components/lab/LabBottomPanel/index.tsx b/src/components/lab/LabBottomPanel/index.tsx index 23b80b93..50971be2 100644 --- a/src/components/lab/LabBottomPanel/index.tsx +++ b/src/components/lab/LabBottomPanel/index.tsx @@ -2,9 +2,9 @@ import React, { FC, useCallback } from 'react'; import classNames from 'classnames'; -import { Filler } from '~/components/containers/Filler'; -import { Grid } from '~/components/containers/Grid'; -import { Group } from '~/components/containers/Group'; +import { Filler } from '~/components/common/Filler'; +import { Grid } from '~/components/common/Grid'; +import { Group } from '~/components/common/Group'; import { Icon } from '~/components/input/Icon'; import { Placeholder } from '~/components/placeholders/Placeholder'; import { URLS } from '~/constants/urls'; @@ -21,14 +21,24 @@ type Props = { commentCount: number; }; -const LabBottomPanel: FC = ({ node, hasNewComments, commentCount, isLoading }) => { +const LabBottomPanel: FC = ({ + node, + hasNewComments, + commentCount, + isLoading, +}) => { const { push } = useNavigation(); - const onClick = useCallback(() => push(URLS.NODE_URL(node.id)), [push, node.id]); + const onClick = useCallback( + () => push(URLS.NODE_URL(node.id)), + [push, node.id], + ); return (
- {getPrettyDate(node.created_at)} + + {getPrettyDate(node.created_at)} +
@@ -37,7 +47,9 @@ const LabBottomPanel: FC = ({ node, hasNewComments, commentCount, isLoadi {commentCount > 0 && ( {commentCount} diff --git a/src/components/lab/LabDescription/index.tsx b/src/components/lab/LabDescription/index.tsx index 89a42628..5bc8da77 100644 --- a/src/components/lab/LabDescription/index.tsx +++ b/src/components/lab/LabDescription/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Markdown } from '~/components/containers/Markdown'; +import { Markdown } from '~/components/common/Markdown'; import { Paragraph } from '~/components/placeholders/Paragraph'; import { NodeComponentProps } from '~/constants/node'; import { useGotoNode } from '~/hooks/node/useGotoNode'; diff --git a/src/components/lab/LabFactoryBanner/index.tsx b/src/components/lab/LabFactoryBanner/index.tsx index 0faf919a..fa9c36ef 100644 --- a/src/components/lab/LabFactoryBanner/index.tsx +++ b/src/components/lab/LabFactoryBanner/index.tsx @@ -2,7 +2,7 @@ import React, { useRef } from 'react'; import classNames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import styles from './styles.module.scss'; diff --git a/src/components/lab/LabHead/index.tsx b/src/components/lab/LabHead/index.tsx index 7dbca81f..caab0535 100644 --- a/src/components/lab/LabHead/index.tsx +++ b/src/components/lab/LabHead/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { SearchInput } from '~/components/input/SearchInput'; import { HorizontalMenu } from '~/components/menu/HorizontalMenu'; import { LabNodesSort } from '~/types/lab'; diff --git a/src/components/lab/LabHero/index.tsx b/src/components/lab/LabHero/index.tsx index aac24ee2..417e7001 100644 --- a/src/components/lab/LabHero/index.tsx +++ b/src/components/lab/LabHero/index.tsx @@ -1,6 +1,6 @@ import React, { FC, useCallback } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Icon } from '~/components/input/Icon'; import { Placeholder } from '~/components/placeholders/Placeholder'; import { URLS } from '~/constants/urls'; @@ -44,7 +44,9 @@ const LabHero: FC = ({ node, isLoading }) => {
{node.title}
-
{getPrettyDate(node.created_at)}
+
+ {getPrettyDate(node.created_at)} +
); diff --git a/src/components/lab/LabHeroes/index.tsx b/src/components/lab/LabHeroes/index.tsx index 29600e1c..456e496d 100644 --- a/src/components/lab/LabHeroes/index.tsx +++ b/src/components/lab/LabHeroes/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { LabHero } from '~/components/lab/LabHero'; import styles from '~/containers/lab/LabStats/styles.module.scss'; import { INode } from '~/types'; @@ -16,7 +16,7 @@ const LabHeroes: FC = ({ nodes, isLoading }) => { if (isLoading) { return ( - {empty.map(i => ( + {empty.map((i) => ( ))} @@ -25,7 +25,7 @@ const LabHeroes: FC = ({ nodes, isLoading }) => { return ( - {nodes.slice(0, 10).map(node => ( + {nodes.slice(0, 10).map((node) => ( ))} diff --git a/src/components/lab/LabNoResults/index.tsx b/src/components/lab/LabNoResults/index.tsx index d2e1c568..86d40f48 100644 --- a/src/components/lab/LabNoResults/index.tsx +++ b/src/components/lab/LabNoResults/index.tsx @@ -1,6 +1,6 @@ import React, { VFC } from 'react'; -import { Card } from '~/components/containers/Card'; +import { Card } from '~/components/common/Card'; import { Button } from '~/components/input/Button'; import styles from './styles.module.scss'; diff --git a/src/components/lab/LabNodeTitle/index.tsx b/src/components/lab/LabNodeTitle/index.tsx index 4631f13e..5fc69847 100644 --- a/src/components/lab/LabNodeTitle/index.tsx +++ b/src/components/lab/LabNodeTitle/index.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import Tippy from '@tippyjs/react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Icon } from '~/components/input/Icon'; import { Placeholder } from '~/components/placeholders/Placeholder'; import { NodeComponentProps } from '~/constants/node'; diff --git a/src/components/lab/LabText/index.tsx b/src/components/lab/LabText/index.tsx index 107f85fb..9a42f968 100644 --- a/src/components/lab/LabText/index.tsx +++ b/src/components/lab/LabText/index.tsx @@ -1,6 +1,6 @@ import React, { FC, useMemo } from 'react'; -import { Markdown } from '~/components/containers/Markdown'; +import { Markdown } from '~/components/common/Markdown'; import { Paragraph } from '~/components/placeholders/Paragraph'; import { NodeComponentProps } from '~/constants/node'; import { useGotoNode } from '~/hooks/node/useGotoNode'; diff --git a/src/components/main/UserButton/index.tsx b/src/components/main/UserButton/index.tsx index 85c7bf2d..d40990c6 100644 --- a/src/components/main/UserButton/index.tsx +++ b/src/components/main/UserButton/index.tsx @@ -1,7 +1,7 @@ import { FC } from 'react'; import { Avatar } from '~/components/common/Avatar'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { imagePresets } from '~/constants/urls'; import { IFile } from '~/types'; import { getURL } from '~/utils/dom'; diff --git a/src/components/node/NodeAuthorBlock/index.tsx b/src/components/node/NodeAuthorBlock/index.tsx index b1f55586..b467bc20 100644 --- a/src/components/node/NodeAuthorBlock/index.tsx +++ b/src/components/node/NodeAuthorBlock/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { Avatar } from '~/components/common/Avatar'; -import { Card } from '~/components/containers/Card'; +import { Card } from '~/components/common/Card'; import { useUserDescription } from '~/hooks/auth/useUserDescription'; import { INodeUser } from '~/types'; diff --git a/src/components/node/NodeNoComments/index.tsx b/src/components/node/NodeNoComments/index.tsx index 11db8302..e983ce38 100644 --- a/src/components/node/NodeNoComments/index.tsx +++ b/src/components/node/NodeNoComments/index.tsx @@ -2,7 +2,7 @@ import React, { FC, useMemo } from 'react'; import classNames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { ERRORS } from '~/constants/errors'; import { t } from '~/utils/trans'; diff --git a/src/components/node/NodeRelated/index.tsx b/src/components/node/NodeRelated/index.tsx index b5b7ede1..c4dd6dfa 100644 --- a/src/components/node/NodeRelated/index.tsx +++ b/src/components/node/NodeRelated/index.tsx @@ -1,8 +1,8 @@ import React, { FC, ReactElement } from 'react'; +import { Group } from '~/components/common/Group'; import { Hoverable } from '~/components/common/Hoverable'; import { SubTitle } from '~/components/common/SubTitle'; -import { Group } from '~/components/containers/Group'; import { NodeThumbnail } from '~/components/node/NodeThumbnail'; import { INode } from '~/types'; diff --git a/src/components/node/NodeRelated/placeholder.tsx b/src/components/node/NodeRelated/placeholder.tsx index b63433a8..5cff3b2a 100644 --- a/src/components/node/NodeRelated/placeholder.tsx +++ b/src/components/node/NodeRelated/placeholder.tsx @@ -2,7 +2,7 @@ import React, { FC, memo } from 'react'; import classNames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import cell_style from '~/components/node/NodeThumbnail/styles.module.scss'; import { Placeholder } from '~/components/placeholders/Placeholder'; import { range } from '~/utils/ramda'; diff --git a/src/components/notes/NoteCard/index.tsx b/src/components/notes/NoteCard/index.tsx index b8b06c95..898362ee 100644 --- a/src/components/notes/NoteCard/index.tsx +++ b/src/components/notes/NoteCard/index.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useState, VFC } from 'react'; -import { Card } from '~/components/containers/Card'; -import { Markdown } from '~/components/containers/Markdown'; -import { Padder } from '~/components/containers/Padder'; +import { Card } from '~/components/common/Card'; +import { Markdown } from '~/components/common/Markdown'; +import { Padder } from '~/components/common/Padder'; import { NoteMenu } from '~/components/notes/NoteMenu'; import { formatText, getPrettyDate } from '~/utils/dom'; diff --git a/src/components/notes/NoteCreationForm/index.tsx b/src/components/notes/NoteCreationForm/index.tsx index e07935b6..06508ee1 100644 --- a/src/components/notes/NoteCreationForm/index.tsx +++ b/src/components/notes/NoteCreationForm/index.tsx @@ -3,9 +3,9 @@ import { FC, useCallback } from 'react'; import { FormikConfig, useFormik } from 'formik'; import { Asserts, object, string } from 'yup'; -import { Card } from '~/components/containers/Card'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; +import { Card } from '~/components/common/Card'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { Textarea } from '~/components/input/Textarea'; import { useRandomPhrase } from '~/constants/phrases'; diff --git a/src/components/notifications/NotificationSettingsForm/index.tsx b/src/components/notifications/NotificationSettingsForm/index.tsx index 3880db9a..25597c78 100644 --- a/src/components/notifications/NotificationSettingsForm/index.tsx +++ b/src/components/notifications/NotificationSettingsForm/index.tsx @@ -1,8 +1,8 @@ import React, { FC, useCallback } from 'react'; -import { Card } from '~/components/containers/Card'; -import { Group } from '~/components/containers/Group'; -import { Zone } from '~/components/containers/Zone'; +import { Card } from '~/components/common/Card'; +import { Group } from '~/components/common/Group'; +import { Zone } from '~/components/common/Zone'; import { Button } from '~/components/input/Button'; import { InputRow } from '~/components/input/InputRow'; import { Toggle } from '~/components/input/Toggle'; diff --git a/src/components/placeholders/Paragraph/index.tsx b/src/components/placeholders/Paragraph/index.tsx index e3e47301..aa6bf6ca 100644 --- a/src/components/placeholders/Paragraph/index.tsx +++ b/src/components/placeholders/Paragraph/index.tsx @@ -1,7 +1,10 @@ import React, { FC, useMemo } from 'react'; -import { Group } from '~/components/containers/Group'; -import { Placeholder, PlaceholderProps } from '~/components/placeholders/Placeholder'; +import { Group } from '~/components/common/Group'; +import { + Placeholder, + PlaceholderProps, +} from '~/components/placeholders/Placeholder'; import styles from './styles.module.scss'; @@ -14,17 +17,21 @@ const Paragraph: FC = ({ lines = 3, wordsLimit = 12, ...props }) => { const iters = useMemo( () => [...new Array(lines)].map(() => - [...new Array(Math.ceil(Math.random() * wordsLimit))].map((_, i) => i) + [...new Array(Math.ceil(Math.random() * wordsLimit))].map((_, i) => i), ), - [lines, wordsLimit] + [lines, wordsLimit], ); return ( {iters.map((words, i) => (
- {words.map(word => ( - + {words.map((word) => ( + ))}
))} diff --git a/src/components/profile/ProfileAccountsError/index.tsx b/src/components/profile/ProfileAccountsError/index.tsx index 3b4dced7..0c803264 100644 --- a/src/components/profile/ProfileAccountsError/index.tsx +++ b/src/components/profile/ProfileAccountsError/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { ERROR_LITERAL } from '~/constants/errors'; diff --git a/src/components/profile/ProfileDescription/index.tsx b/src/components/profile/ProfileDescription/index.tsx index 331a06cd..b7725d08 100644 --- a/src/components/profile/ProfileDescription/index.tsx +++ b/src/components/profile/ProfileDescription/index.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import classNames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { ProfileLoader } from '~/containers/profile/ProfileLoader'; import { useUser } from '~/hooks/auth/useUser'; import markdown from '~/styles/common/markdown.module.scss'; diff --git a/src/components/profile/ProfileSettings/index.tsx b/src/components/profile/ProfileSettings/index.tsx index d3eae72a..283cf5d3 100644 --- a/src/components/profile/ProfileSettings/index.tsx +++ b/src/components/profile/ProfileSettings/index.tsx @@ -1,8 +1,8 @@ import { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { UserSettingsView } from '~/containers/settings/UserSettingsView'; import { diff --git a/src/components/profile/ProfileSidebarNotifications/index.tsx b/src/components/profile/ProfileSidebarNotifications/index.tsx index b2958bce..cd83c2e8 100644 --- a/src/components/profile/ProfileSidebarNotifications/index.tsx +++ b/src/components/profile/ProfileSidebarNotifications/index.tsx @@ -1,6 +1,6 @@ import { useState, VFC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { HorizontalMenu } from '~/components/menu/HorizontalMenu'; import { useStackContext } from '~/components/sidebar/SidebarStack'; diff --git a/src/components/profile/ProfileSidebarSettings/index.tsx b/src/components/profile/ProfileSidebarSettings/index.tsx index 90e23c1c..57b16608 100644 --- a/src/components/profile/ProfileSidebarSettings/index.tsx +++ b/src/components/profile/ProfileSidebarSettings/index.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Button } from '~/components/input/Button'; import { useStackContext } from '~/components/sidebar/SidebarStack'; import { SidebarStackCard } from '~/components/sidebar/SidebarStackCard'; diff --git a/src/components/settings/SettingsMenu/index.tsx b/src/components/settings/SettingsMenu/index.tsx index 1ceca3d2..675e5faf 100644 --- a/src/components/settings/SettingsMenu/index.tsx +++ b/src/components/settings/SettingsMenu/index.tsx @@ -2,8 +2,8 @@ import { VFC } from 'react'; import Link from 'next/link'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { VerticalMenu } from '~/components/menu/VerticalMenu'; import { URLS } from '~/constants/urls'; @@ -28,7 +28,9 @@ const SettingsMenu: VFC = () => ( - Удалённые посты + + Удалённые посты + diff --git a/src/components/sidebar/SidebarStackCard/index.tsx b/src/components/sidebar/SidebarStackCard/index.tsx index 8e93257f..47dfd228 100644 --- a/src/components/sidebar/SidebarStackCard/index.tsx +++ b/src/components/sidebar/SidebarStackCard/index.tsx @@ -1,6 +1,6 @@ import React, { FC, ReactNode, useMemo } from 'react'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Button } from '~/components/input/Button'; import styles from './styles.module.scss'; diff --git a/src/components/welcome/WelcomeSlide/index.tsx b/src/components/welcome/WelcomeSlide/index.tsx index c33bf4ce..337ee5c4 100644 --- a/src/components/welcome/WelcomeSlide/index.tsx +++ b/src/components/welcome/WelcomeSlide/index.tsx @@ -2,7 +2,7 @@ import { FC } from 'react'; import classNames from 'classnames'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Container } from '~/containers/main/Container'; import { useAuth } from '~/hooks/auth/useAuth'; import markdown from '~/styles/common/markdown.module.scss'; diff --git a/src/constants/node/index.ts b/src/constants/node/index.ts index 49c6a42b..5eaf9d1e 100644 --- a/src/constants/node/index.ts +++ b/src/constants/node/index.ts @@ -1,15 +1,5 @@ import { FC } from 'react'; -import { AudioEditor } from '~/components/editors/AudioEditor'; -import { EditorAudioUploadButton } from '~/components/editors/EditorAudioUploadButton'; -import { EditorFiller } from '~/components/editors/EditorFiller'; -import { EditorImageUploadButton } from '~/components/editors/EditorImageUploadButton'; -import { EditorPublicSwitch } from '~/components/editors/EditorPublicSwitch'; -import { EditorUploadCoverButton } from '~/components/editors/EditorUploadCoverButton'; -import { ImageEditor } from '~/components/editors/ImageEditor'; -import { RoomEditor } from '~/components/editors/RoomEditor'; -import { TextEditor } from '~/components/editors/TextEditor'; -import { VideoEditor } from '~/components/editors/VideoEditor'; import { LabAudio } from '~/components/lab/LabAudioBlock'; import { LabDescription } from '~/components/lab/LabDescription'; import { LabImage } from '~/components/lab/LabImage'; @@ -23,7 +13,6 @@ import { NodeImageSwiperBlock } from '~/components/node/NodeImageSwiperBlock'; import { NodeTextBlock } from '~/components/node/NodeTextBlock'; import { NodeVideoBlock } from '~/components/node/NodeVideoBlock'; import { IComment, INode, ValueOf } from '~/types'; -import { IEditorComponentProps, NodeEditorProps } from '~/types/node'; export const EMPTY_NODE: INode = { id: 0, @@ -98,60 +87,6 @@ export const EMPTY_COMMENT: IComment = { user: undefined, }; -export const NODE_EDITORS: Record< - typeof NODE_TYPES[keyof typeof NODE_TYPES], - FC -> = { - [NODE_TYPES.IMAGE]: ImageEditor, - [NODE_TYPES.TEXT]: TextEditor, - [NODE_TYPES.VIDEO]: VideoEditor, - [NODE_TYPES.AUDIO]: AudioEditor, - [NODE_TYPES.ROOM]: RoomEditor, -}; - -export const NODE_PANEL_COMPONENTS: Record< - string, - FC[] -> = { - [NODE_TYPES.TEXT]: [ - EditorFiller, - EditorUploadCoverButton, - EditorPublicSwitch, - ], - [NODE_TYPES.VIDEO]: [ - EditorFiller, - EditorUploadCoverButton, - EditorPublicSwitch, - ], - [NODE_TYPES.IMAGE]: [ - EditorImageUploadButton, - EditorFiller, - EditorUploadCoverButton, - EditorPublicSwitch, - ], - [NODE_TYPES.AUDIO]: [ - EditorAudioUploadButton, - EditorImageUploadButton, - EditorFiller, - EditorUploadCoverButton, - EditorPublicSwitch, - ], - [NODE_TYPES.ROOM]: [ - EditorAudioUploadButton, - EditorImageUploadButton, - EditorFiller, - ], -}; - -export const NODE_EDITOR_DATA: Record< - typeof NODE_TYPES[keyof typeof NODE_TYPES], - Partial -> = { - [NODE_TYPES.TEXT]: { - blocks: [{ text: '', type: 'text' }], - }, -}; - export const NODE_SETTINGS = { MAX_FILES: 16, MAX_IMAGE_ASPECT: 1.2, diff --git a/src/containers/auth/LoginDialog/components/LoginDialogButtons/index.tsx b/src/containers/auth/LoginDialog/components/LoginDialogButtons/index.tsx index e89558ae..3b376b1a 100644 --- a/src/containers/auth/LoginDialog/components/LoginDialogButtons/index.tsx +++ b/src/containers/auth/LoginDialog/components/LoginDialogButtons/index.tsx @@ -1,13 +1,12 @@ import React, { FC } from 'react'; -import { Grid } from '~/components/containers/Grid'; -import { Group } from '~/components/containers/Group'; +import { Grid } from '~/components/common/Grid'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { OAuthProvider } from '~/types/auth'; import styles from './styles.module.scss'; - interface IProps { openOauthWindow: (provider: OAuthProvider) => void; } diff --git a/src/containers/auth/LoginDialog/index.tsx b/src/containers/auth/LoginDialog/index.tsx index 3756c77c..16deb37a 100644 --- a/src/containers/auth/LoginDialog/index.tsx +++ b/src/containers/auth/LoginDialog/index.tsx @@ -1,9 +1,9 @@ import { FC, useCallback, useRef } from 'react'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; -import { BetterScrollDialog } from '~/components/dialogs/BetterScrollDialog'; -import { DialogTitle } from '~/components/dialogs/DialogTitle'; +import { BetterScrollDialog } from '~/components/common/BetterScrollDialog'; +import { DialogTitle } from '~/components/common/DialogTitle'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { InputText } from '~/components/input/InputText'; import { Dialog } from '~/constants/modal'; diff --git a/src/containers/auth/LoginSocialRegisterDialog/index.tsx b/src/containers/auth/LoginSocialRegisterDialog/index.tsx index 84f94c6c..2dc469c8 100644 --- a/src/containers/auth/LoginSocialRegisterDialog/index.tsx +++ b/src/containers/auth/LoginSocialRegisterDialog/index.tsx @@ -1,10 +1,10 @@ import React, { FC, useCallback, useState } from 'react'; import { apiLoginWithSocial } from '~/api/auth'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; -import { BetterScrollDialog } from '~/components/dialogs/BetterScrollDialog'; -import { DialogTitle } from '~/components/dialogs/DialogTitle'; +import { BetterScrollDialog } from '~/components/common/BetterScrollDialog'; +import { DialogTitle } from '~/components/common/DialogTitle'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { InputText } from '~/components/input/InputText'; import { Toggle } from '~/components/input/Toggle'; import { getRandomPhrase } from '~/constants/phrases'; diff --git a/src/containers/auth/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx b/src/containers/auth/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx index 434c0fa6..c989f8df 100644 --- a/src/containers/auth/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx +++ b/src/containers/auth/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx @@ -1,6 +1,6 @@ import React, { VFC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { Icon } from '~/components/input/Icon'; import { ERROR_LITERAL, ERRORS } from '~/constants/errors'; @@ -12,7 +12,10 @@ interface RestoreInvalidCodeProps { onClose: () => void; } -const RestoreInvalidCode: VFC = ({ error, onClose }) => ( +const RestoreInvalidCode: VFC = ({ + error, + onClose, +}) => ( diff --git a/src/containers/auth/RestorePasswordDialog/components/RestoreSuccess/index.tsx b/src/containers/auth/RestorePasswordDialog/components/RestoreSuccess/index.tsx index e5248052..21aff2b5 100644 --- a/src/containers/auth/RestorePasswordDialog/components/RestoreSuccess/index.tsx +++ b/src/containers/auth/RestorePasswordDialog/components/RestoreSuccess/index.tsx @@ -1,6 +1,6 @@ import React, { VFC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { Icon } from '~/components/input/Icon'; diff --git a/src/containers/auth/RestorePasswordDialog/index.tsx b/src/containers/auth/RestorePasswordDialog/index.tsx index 07e89961..4b7f6a03 100644 --- a/src/containers/auth/RestorePasswordDialog/index.tsx +++ b/src/containers/auth/RestorePasswordDialog/index.tsx @@ -1,7 +1,7 @@ import React, { FC, useCallback, useMemo, useState } from 'react'; import { apiRestoreCode } from '~/api/auth'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { InputText } from '~/components/input/InputText'; import { useCloseOnEscape } from '~/hooks'; @@ -9,7 +9,7 @@ import { useRestoreCode } from '~/hooks/auth/useRestoreCode'; import { useRestorePasswordForm } from '~/hooks/auth/useRestorePasswordForm'; import { DialogComponentProps } from '~/types/modal'; -import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog'; +import { BetterScrollDialog } from '../../../components/common/BetterScrollDialog'; import { RestoreInvalidCode } from './components/RestoreInvalidCode'; import { RestoreSuccess } from './components/RestoreSuccess'; diff --git a/src/containers/auth/RestoreRequestDialog/components/RestoreSent/index.tsx b/src/containers/auth/RestoreRequestDialog/components/RestoreSent/index.tsx index 6e1d04e4..cc48dc45 100644 --- a/src/containers/auth/RestoreRequestDialog/components/RestoreSent/index.tsx +++ b/src/containers/auth/RestoreRequestDialog/components/RestoreSent/index.tsx @@ -1,6 +1,6 @@ import React, { VFC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { Icon } from '~/components/input/Icon'; diff --git a/src/containers/auth/RestoreRequestDialog/index.tsx b/src/containers/auth/RestoreRequestDialog/index.tsx index 76ab4db4..f18425df 100644 --- a/src/containers/auth/RestoreRequestDialog/index.tsx +++ b/src/containers/auth/RestoreRequestDialog/index.tsx @@ -1,14 +1,14 @@ import React, { useCallback, useMemo, useState, VFC } from 'react'; import { apiRequestRestoreCode } from '~/api/auth'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { InputText } from '~/components/input/InputText'; import { useCloseOnEscape } from '~/hooks'; import { useRestoreRequestForm } from '~/hooks/auth/useRestoreRequestForm'; import { DialogComponentProps } from '~/types/modal'; -import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog'; +import { BetterScrollDialog } from '../../../components/common/BetterScrollDialog'; import { RestoreSent } from './components/RestoreSent'; import styles from './styles.module.scss'; diff --git a/src/containers/auth/TelegramAttachDialog/index.tsx b/src/containers/auth/TelegramAttachDialog/index.tsx index 0df8fd82..2e784ef1 100644 --- a/src/containers/auth/TelegramAttachDialog/index.tsx +++ b/src/containers/auth/TelegramAttachDialog/index.tsx @@ -2,12 +2,12 @@ import React, { FC, useCallback, useMemo } from 'react'; import { TelegramUser } from '@v9v/ts-react-telegram-login'; -import { Padder } from '~/components/containers/Padder'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { useTelegramAccount } from '~/hooks/auth/useTelegramAccount'; import { DialogComponentProps } from '~/types/modal'; -import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog'; +import { BetterScrollDialog } from '../../../components/common/BetterScrollDialog'; import { TelegramLoginForm } from '../LoginDialog/components/TelegramLoginForm/index'; interface TelegramAttachDialogProps extends DialogComponentProps {} diff --git a/src/containers/boris/BorisComments/index.tsx b/src/containers/boris/BorisComments/index.tsx index ce1e9d38..943f021a 100644 --- a/src/containers/boris/BorisComments/index.tsx +++ b/src/containers/boris/BorisComments/index.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Footer } from '~/components/main/Footer'; import { NodeNoComments } from '~/components/node/NodeNoComments'; import { NodeCommentFormSSR } from '~/containers/node/NodeCommentForm/ssr'; diff --git a/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx b/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx index cf6dff3b..d38d6280 100644 --- a/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Padder } from '~/components/containers/Padder'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { BorisContactItem } from './components/BorisContactItem'; diff --git a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx index 7b7fed26..26c27d30 100644 --- a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx @@ -2,10 +2,10 @@ import React, { FC, ReactNode } from 'react'; import classNames from 'classnames'; +import { Card, CardProps } from '~/components/common/Card'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { SubTitle } from '~/components/common/SubTitle'; -import { Card, CardProps } from '~/components/containers/Card'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; import styles from './styles.module.scss'; diff --git a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx index fde1abd8..9f2b736e 100644 --- a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx @@ -3,7 +3,7 @@ import React, { VFC } from 'react'; import classNames from 'classnames'; import { addYears, differenceInMonths, differenceInYears } from 'date-fns'; -import { CardProps } from '~/components/containers/Card'; +import { CardProps } from '~/components/common/Card'; import { StatsCard } from '../StatsCard'; diff --git a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx index af7c449c..dda29b34 100644 --- a/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx @@ -1,7 +1,7 @@ import React, { VFC } from 'react'; -import { CardProps } from '~/components/containers/Card'; -import { Filler } from '~/components/containers/Filler'; +import { CardProps } from '~/components/common/Card'; +import { Filler } from '~/components/common/Filler'; import { BasicCurveChart } from '../BasicCurveChart'; import { StatsCard } from '../StatsCard'; diff --git a/src/containers/boris/BorisSidebar/index.tsx b/src/containers/boris/BorisSidebar/index.tsx index 2bd68d27..a107ebc8 100644 --- a/src/containers/boris/BorisSidebar/index.tsx +++ b/src/containers/boris/BorisSidebar/index.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { SuperPowersToggle } from '~/containers/auth/SuperPowersToggle'; import { useTelegramAccount } from '~/hooks/auth/useTelegramAccount'; import { BorisUsageStats } from '~/types/boris'; diff --git a/src/containers/boris/BorisSuperpowers/index.tsx b/src/containers/boris/BorisSuperpowers/index.tsx index 9d4718e6..9c908a4f 100644 --- a/src/containers/boris/BorisSuperpowers/index.tsx +++ b/src/containers/boris/BorisSuperpowers/index.tsx @@ -1,8 +1,8 @@ import { FC } from 'react'; import { Anchor } from '~/components/common/Anchor'; -import { Card } from '~/components/containers/Card'; -import { Group } from '~/components/containers/Group'; +import { Card } from '~/components/common/Card'; +import { Group } from '~/components/common/Group'; import markdown from '~/styles/common/markdown.module.scss'; export interface BorisSuperpowersProps {} diff --git a/src/containers/comments/CommentForm/index.tsx b/src/containers/comments/CommentForm/index.tsx index ba7eb31e..7e223cce 100644 --- a/src/containers/comments/CommentForm/index.tsx +++ b/src/containers/comments/CommentForm/index.tsx @@ -3,7 +3,7 @@ import { FC, useCallback, useState } from 'react'; import { FormikProvider } from 'formik'; import { observer } from 'mobx-react-lite'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Button } from '~/components/input/Button'; import { ERROR_LITERAL } from '~/constants/errors'; import { EMPTY_COMMENT } from '~/constants/node'; diff --git a/src/components/editors/AudioEditor/index.tsx b/src/containers/dialogs/EditorDialog/components/AudioEditor/index.tsx similarity index 100% rename from src/components/editors/AudioEditor/index.tsx rename to src/containers/dialogs/EditorDialog/components/AudioEditor/index.tsx diff --git a/src/components/editors/AudioEditor/styles.module.scss b/src/containers/dialogs/EditorDialog/components/AudioEditor/styles.module.scss similarity index 100% rename from src/components/editors/AudioEditor/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/AudioEditor/styles.module.scss diff --git a/src/components/editors/AudioGrid/index.tsx b/src/containers/dialogs/EditorDialog/components/AudioGrid/index.tsx similarity index 100% rename from src/components/editors/AudioGrid/index.tsx rename to src/containers/dialogs/EditorDialog/components/AudioGrid/index.tsx diff --git a/src/components/editors/EditorAudioUploadButton/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorAudioUploadButton/index.tsx similarity index 72% rename from src/components/editors/EditorAudioUploadButton/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorAudioUploadButton/index.tsx index 3cc626b0..114d8a81 100644 --- a/src/components/editors/EditorAudioUploadButton/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorAudioUploadButton/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { EditorUploadButton } from '~/components/editors/EditorUploadButton'; import { UploadType } from '~/constants/uploads'; +import { EditorUploadButton } from '~/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadButton'; import { IEditorComponentProps } from '~/types/node'; type IProps = IEditorComponentProps & {}; diff --git a/src/components/editors/EditorFiller/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorFiller/index.tsx similarity index 83% rename from src/components/editors/EditorFiller/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorFiller/index.tsx index b5e48bec..a6856ba6 100644 --- a/src/components/editors/EditorFiller/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorFiller/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { IEditorComponentProps } from '~/types/node'; import styles from './styles.module.scss'; diff --git a/src/components/editors/EditorFiller/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorFiller/styles.module.scss similarity index 100% rename from src/components/editors/EditorFiller/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorFiller/styles.module.scss diff --git a/src/components/editors/EditorImageUploadButton/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorImageUploadButton/index.tsx similarity index 84% rename from src/components/editors/EditorImageUploadButton/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorImageUploadButton/index.tsx index cbc82efb..91209938 100644 --- a/src/components/editors/EditorImageUploadButton/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorImageUploadButton/index.tsx @@ -1,9 +1,10 @@ import React, { FC } from 'react'; -import { EditorUploadButton } from '~/components/editors/EditorUploadButton'; import { UploadType } from '~/constants/uploads'; import { IEditorComponentProps } from '~/types/node'; +import { EditorUploadButton } from '../EditorUploadButton'; + type IProps = IEditorComponentProps & {}; const EditorImageUploadButton: FC = () => ( diff --git a/src/components/editors/EditorPublicSwitch/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorPublicSwitch/index.tsx similarity index 100% rename from src/components/editors/EditorPublicSwitch/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorPublicSwitch/index.tsx diff --git a/src/components/editors/EditorPublicSwitch/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorPublicSwitch/styles.module.scss similarity index 100% rename from src/components/editors/EditorPublicSwitch/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorPublicSwitch/styles.module.scss diff --git a/src/components/editors/EditorUploadButton/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadButton/index.tsx similarity index 100% rename from src/components/editors/EditorUploadButton/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadButton/index.tsx diff --git a/src/components/editors/EditorUploadButton/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadButton/styles.module.scss similarity index 100% rename from src/components/editors/EditorUploadButton/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadButton/styles.module.scss diff --git a/src/components/editors/EditorUploadCoverButton/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadCoverButton/index.tsx similarity index 100% rename from src/components/editors/EditorUploadCoverButton/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadCoverButton/index.tsx diff --git a/src/components/editors/EditorUploadCoverButton/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadCoverButton/styles.module.scss similarity index 100% rename from src/components/editors/EditorUploadCoverButton/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/components/EditorUploadCoverButton/styles.module.scss diff --git a/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/constants/index.ts b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/constants/index.ts new file mode 100644 index 00000000..45ddb4b7 --- /dev/null +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/constants/index.ts @@ -0,0 +1,44 @@ +import { FC } from 'react'; + +import { NODE_TYPES } from '~/constants/node'; +import { IEditorComponentProps } from '~/types/node'; + +import { EditorAudioUploadButton } from '../components/EditorAudioUploadButton'; +import { EditorFiller } from '../components/EditorFiller'; +import { EditorImageUploadButton } from '../components/EditorImageUploadButton'; +import { EditorPublicSwitch } from '../components/EditorPublicSwitch'; +import { EditorUploadCoverButton } from '../components/EditorUploadCoverButton'; + +export const NODE_PANEL_COMPONENTS: Record< + string, + FC[] +> = { + [NODE_TYPES.TEXT]: [ + EditorFiller, + EditorUploadCoverButton, + EditorPublicSwitch, + ], + [NODE_TYPES.VIDEO]: [ + EditorFiller, + EditorUploadCoverButton, + EditorPublicSwitch, + ], + [NODE_TYPES.IMAGE]: [ + EditorImageUploadButton, + EditorFiller, + EditorUploadCoverButton, + EditorPublicSwitch, + ], + [NODE_TYPES.AUDIO]: [ + EditorAudioUploadButton, + EditorImageUploadButton, + EditorFiller, + EditorUploadCoverButton, + EditorPublicSwitch, + ], + [NODE_TYPES.ROOM]: [ + EditorAudioUploadButton, + EditorImageUploadButton, + EditorFiller, + ], +}; diff --git a/src/components/editors/EditorActionsPanel/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/index.tsx similarity index 76% rename from src/components/editors/EditorActionsPanel/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/index.tsx index c047653c..69eb3d3f 100644 --- a/src/components/editors/EditorActionsPanel/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/index.tsx @@ -1,9 +1,9 @@ import React, { createElement, FC } from 'react'; -import { NODE_PANEL_COMPONENTS } from '~/constants/node'; import { useNodeFormContext } from '~/hooks/node/useNodeFormFormik'; import { has } from '~/utils/ramda'; +import { NODE_PANEL_COMPONENTS } from './constants'; import styles from './styles.module.scss'; const EditorActionsPanel: FC = () => { @@ -16,7 +16,9 @@ const EditorActionsPanel: FC = () => { return (
{NODE_PANEL_COMPONENTS[values.type] && - NODE_PANEL_COMPONENTS[values.type].map((el, key) => createElement(el, { key }))} + NODE_PANEL_COMPONENTS[values.type].map((el, key) => + createElement(el, { key }), + )}
); }; diff --git a/src/components/editors/EditorActionsPanel/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/styles.module.scss similarity index 100% rename from src/components/editors/EditorActionsPanel/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorButtons/components/EditorActionsPanel/styles.module.scss diff --git a/src/components/editors/EditorButtons/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorButtons/index.tsx similarity index 81% rename from src/components/editors/EditorButtons/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorButtons/index.tsx index 2ffb1e72..155c36c7 100644 --- a/src/components/editors/EditorButtons/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorButtons/index.tsx @@ -1,14 +1,15 @@ import React, { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; -import { EditorActionsPanel } from '~/components/editors/EditorActionsPanel'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { InputText } from '~/components/input/InputText'; import { useWindowSize } from '~/hooks/dom/useWindowSize'; import { useNodeFormContext } from '~/hooks/node/useNodeFormFormik'; +import { EditorActionsPanel } from './components/EditorActionsPanel'; + const EditorButtons: FC = () => { const { values, handleChange, isSubmitting } = useNodeFormContext(); const { isTablet } = useWindowSize(); diff --git a/src/components/editors/EditorConfirmClose/index.tsx b/src/containers/dialogs/EditorDialog/components/EditorConfirmClose/index.tsx similarity index 87% rename from src/components/editors/EditorConfirmClose/index.tsx rename to src/containers/dialogs/EditorDialog/components/EditorConfirmClose/index.tsx index 25ba8636..7f9dace5 100644 --- a/src/components/editors/EditorConfirmClose/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/EditorConfirmClose/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import styles from './styles.module.scss'; @@ -15,8 +15,8 @@ const EditorConfirmClose: FC = ({ onApprove, onDecline }) => (
Точно закрыть?
- Все изменения будут потеряны, воспоминания затёрты, очевидцы умрут, над миром воссияет - ядерный рассвет. + Все изменения будут потеряны, воспоминания затёрты, очевидцы умрут, над + миром воссияет ядерный рассвет.
diff --git a/src/components/editors/EditorConfirmClose/styles.module.scss b/src/containers/dialogs/EditorDialog/components/EditorConfirmClose/styles.module.scss similarity index 100% rename from src/components/editors/EditorConfirmClose/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/EditorConfirmClose/styles.module.scss diff --git a/src/components/editors/ImageEditor/index.tsx b/src/containers/dialogs/EditorDialog/components/ImageEditor/index.tsx similarity index 92% rename from src/components/editors/ImageEditor/index.tsx rename to src/containers/dialogs/EditorDialog/components/ImageEditor/index.tsx index 6c67b713..ce304682 100644 --- a/src/components/editors/ImageEditor/index.tsx +++ b/src/containers/dialogs/EditorDialog/components/ImageEditor/index.tsx @@ -1,11 +1,12 @@ import React, { FC } from 'react'; -import { ImageGrid } from '~/components/editors/ImageGrid'; import { UploadDropzone } from '~/components/upload/UploadDropzone'; import { NodeEditorProps } from '~/types/node'; import { useUploaderContext } from '~/utils/context/UploaderContextProvider'; import { values } from '~/utils/ramda'; +import { ImageGrid } from '../ImageGrid'; + import styles from './styles.module.scss'; type IProps = NodeEditorProps; diff --git a/src/components/editors/ImageEditor/styles.module.scss b/src/containers/dialogs/EditorDialog/components/ImageEditor/styles.module.scss similarity index 100% rename from src/components/editors/ImageEditor/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/ImageEditor/styles.module.scss diff --git a/src/components/editors/ImageGrid/index.tsx b/src/containers/dialogs/EditorDialog/components/ImageGrid/index.tsx similarity index 100% rename from src/components/editors/ImageGrid/index.tsx rename to src/containers/dialogs/EditorDialog/components/ImageGrid/index.tsx diff --git a/src/components/editors/ImageGrid/styles.module.scss b/src/containers/dialogs/EditorDialog/components/ImageGrid/styles.module.scss similarity index 100% rename from src/components/editors/ImageGrid/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/ImageGrid/styles.module.scss diff --git a/src/components/editors/RoomEditor/index.tsx b/src/containers/dialogs/EditorDialog/components/RoomEditor/index.tsx similarity index 100% rename from src/components/editors/RoomEditor/index.tsx rename to src/containers/dialogs/EditorDialog/components/RoomEditor/index.tsx diff --git a/src/components/editors/RoomEditor/styles.module.scss b/src/containers/dialogs/EditorDialog/components/RoomEditor/styles.module.scss similarity index 100% rename from src/components/editors/RoomEditor/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/RoomEditor/styles.module.scss diff --git a/src/components/editors/TextEditor/index.tsx b/src/containers/dialogs/EditorDialog/components/TextEditor/index.tsx similarity index 100% rename from src/components/editors/TextEditor/index.tsx rename to src/containers/dialogs/EditorDialog/components/TextEditor/index.tsx diff --git a/src/components/editors/TextEditor/styles.module.scss b/src/containers/dialogs/EditorDialog/components/TextEditor/styles.module.scss similarity index 100% rename from src/components/editors/TextEditor/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/TextEditor/styles.module.scss diff --git a/src/components/editors/VideoEditor/index.tsx b/src/containers/dialogs/EditorDialog/components/VideoEditor/index.tsx similarity index 100% rename from src/components/editors/VideoEditor/index.tsx rename to src/containers/dialogs/EditorDialog/components/VideoEditor/index.tsx diff --git a/src/components/editors/VideoEditor/styles.module.scss b/src/containers/dialogs/EditorDialog/components/VideoEditor/styles.module.scss similarity index 100% rename from src/components/editors/VideoEditor/styles.module.scss rename to src/containers/dialogs/EditorDialog/components/VideoEditor/styles.module.scss diff --git a/src/containers/dialogs/EditorDialog/constants/index.ts b/src/containers/dialogs/EditorDialog/constants/index.ts new file mode 100644 index 00000000..dd9d0bc0 --- /dev/null +++ b/src/containers/dialogs/EditorDialog/constants/index.ts @@ -0,0 +1,31 @@ +import { FC } from 'react'; + +import { NODE_TYPES } from '~/constants/node'; +import { INode } from '~/types'; +import { NodeEditorProps } from '~/types/node'; + +import { AudioEditor } from '../components/AudioEditor'; +import { ImageEditor } from '../components/ImageEditor'; +import { RoomEditor } from '../components/RoomEditor'; +import { TextEditor } from '../components/TextEditor'; +import { VideoEditor } from '../components/VideoEditor'; + +export const NODE_EDITORS: Record< + typeof NODE_TYPES[keyof typeof NODE_TYPES], + FC +> = { + [NODE_TYPES.IMAGE]: ImageEditor, + [NODE_TYPES.TEXT]: TextEditor, + [NODE_TYPES.VIDEO]: VideoEditor, + [NODE_TYPES.AUDIO]: AudioEditor, + [NODE_TYPES.ROOM]: RoomEditor, +}; + +export const NODE_EDITOR_DATA: Record< + typeof NODE_TYPES[keyof typeof NODE_TYPES], + Partial +> = { + [NODE_TYPES.TEXT]: { + blocks: [{ text: '', type: 'text' }], + }, +}; diff --git a/src/containers/dialogs/EditorDialog/index.tsx b/src/containers/dialogs/EditorDialog/index.tsx index a35a56b6..d5144e4c 100644 --- a/src/containers/dialogs/EditorDialog/index.tsx +++ b/src/containers/dialogs/EditorDialog/index.tsx @@ -1,13 +1,16 @@ -import React, { createElement, FC, useCallback, useMemo, useState } from 'react'; +import React, { + createElement, + FC, + useCallback, + useMemo, + useState, +} from 'react'; import { FormikProvider } from 'formik'; import { observer } from 'mobx-react-lite'; -import { CoverBackdrop } from '~/components/containers/CoverBackdrop'; -import { BetterScrollDialog } from '~/components/dialogs/BetterScrollDialog'; -import { EditorButtons } from '~/components/editors/EditorButtons'; -import { EditorConfirmClose } from '~/components/editors/EditorConfirmClose'; -import { NODE_EDITORS } from '~/constants/node'; +import { BetterScrollDialog } from '~/components/common/BetterScrollDialog'; +import { CoverBackdrop } from '~/components/common/CoverBackdrop'; import { UploadSubject, UploadTarget } from '~/constants/uploads'; import { useCloseOnEscape } from '~/hooks'; import { useUploader } from '~/hooks/data/useUploader'; @@ -17,6 +20,9 @@ import { DialogComponentProps } from '~/types/modal'; import { UploaderContextProvider } from '~/utils/context/UploaderContextProvider'; import { prop } from '~/utils/ramda'; +import { EditorButtons } from './components/EditorButtons'; +import { EditorConfirmClose } from './components/EditorConfirmClose'; +import { NODE_EDITORS } from './constants/'; import styles from './styles.module.scss'; interface Props extends DialogComponentProps { @@ -24,61 +30,73 @@ interface Props extends DialogComponentProps { onSubmit: (node: INode) => Promise; } -const EditorDialog: FC = observer(({ node, onRequestClose, onSubmit }) => { - const [isConfirmModalShown, setConfirmModalShown] = useState(false); +const EditorDialog: FC = observer( + ({ node, onRequestClose, onSubmit }) => { + const [isConfirmModalShown, setConfirmModalShown] = useState(false); - const uploader = useUploader(UploadSubject.Editor, UploadTarget.Nodes, node.files); - const formik = useNodeFormFormik(node, uploader, onRequestClose, onSubmit); - const { values, handleSubmit, dirty } = formik; + const uploader = useUploader( + UploadSubject.Editor, + UploadTarget.Nodes, + node.files, + ); + const formik = useNodeFormFormik(node, uploader, onRequestClose, onSubmit); + const { values, handleSubmit, dirty } = formik; - const component = useMemo(() => node.type && prop(node.type, NODE_EDITORS), [node.type]); + const component = useMemo( + () => node.type && prop(node.type, NODE_EDITORS), + [node.type], + ); - const closeConfirmModal = useCallback(() => { - setConfirmModalShown(false); - }, [setConfirmModalShown]); + const closeConfirmModal = useCallback(() => { + setConfirmModalShown(false); + }, [setConfirmModalShown]); - const onClose = useCallback(() => { - if (!dirty) { - onRequestClose(); - return; + const onClose = useCallback(() => { + if (!dirty) { + onRequestClose(); + return; + } + + if (isConfirmModalShown) { + closeConfirmModal(); + return; + } + + setConfirmModalShown(true); + }, [dirty, isConfirmModalShown, onRequestClose, closeConfirmModal]); + + useCloseOnEscape(onClose); + + if (!component) { + return null; } - if (isConfirmModalShown) { - closeConfirmModal(); - return; - } + return ( + + +
+ } + backdrop={} + width={860} + onClose={onClose} + > + <> + {isConfirmModalShown && ( + + )} - setConfirmModalShown(true); - }, [dirty, isConfirmModalShown, onRequestClose, closeConfirmModal]); - - useCloseOnEscape(onClose); - - if (!component) { - return null; - } - - return ( - - - - } - backdrop={} - width={860} - onClose={onClose} - > - <> - {isConfirmModalShown && ( - - )} - -
{createElement(component)}
- - - - - - ); -}); +
{createElement(component)}
+ +
+ + + + ); + }, +); export { EditorDialog }; diff --git a/src/containers/dialogs/EditorEditDialog/index.tsx b/src/containers/dialogs/EditorEditDialog/index.tsx index 01b7f589..2e5096ce 100644 --- a/src/containers/dialogs/EditorEditDialog/index.tsx +++ b/src/containers/dialogs/EditorEditDialog/index.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import { observer } from 'mobx-react-lite'; -import { ModalWrapper } from '~/components/dialogs/ModalWrapper'; +import { ModalWrapper } from '~/components/common/ModalWrapper'; import { LoaderCircle } from '~/components/input/LoaderCircle'; import { EditorDialog } from '~/containers/dialogs/EditorDialog'; import { useLoadNode } from '~/hooks/node/useLoadNode'; @@ -16,29 +16,37 @@ export interface EditorEditDialogProps extends DialogComponentProps { nodeId: number; } -const EditorEditDialog: FC = observer(({ nodeId, onRequestClose }) => { - const { node, isLoading } = useLoadNode(nodeId); - const updateNode = useUpdateNode(nodeId); +const EditorEditDialog: FC = observer( + ({ nodeId, onRequestClose }) => { + const { node, isLoading } = useLoadNode(nodeId); + const updateNode = useUpdateNode(nodeId); - const onSubmit = useCallback( - async (node: INode) => { - await updateNode(node); - onRequestClose(); - }, - [updateNode, onRequestClose] - ); - - if (isLoading || !node) { - return ( - -
- -
- + const onSubmit = useCallback( + async (node: INode) => { + await updateNode(node); + onRequestClose(); + }, + [updateNode, onRequestClose], ); - } - return ; -}); + if (isLoading || !node) { + return ( + +
+ +
+ + ); + } + + return ( + + ); + }, +); export { EditorEditDialog }; diff --git a/src/containers/dialogs/Modal/index.tsx b/src/containers/dialogs/Modal/index.tsx index a93a7829..1a43da99 100644 --- a/src/containers/dialogs/Modal/index.tsx +++ b/src/containers/dialogs/Modal/index.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import { observer } from 'mobx-react-lite'; -import { ModalWrapper } from '~/components/dialogs/ModalWrapper'; +import { ModalWrapper } from '~/components/common/ModalWrapper'; import { DIALOG_CONTENT } from '~/constants/modal'; import { useModalStore } from '~/store/modal/useModalStore'; import { has } from '~/utils/ramda'; diff --git a/src/containers/dialogs/TestDialog/index.tsx b/src/containers/dialogs/TestDialog/index.tsx index db47df69..21e76720 100644 --- a/src/containers/dialogs/TestDialog/index.tsx +++ b/src/containers/dialogs/TestDialog/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog'; +import { BetterScrollDialog } from '~/components/common/BetterScrollDialog'; import styles from './styles.module.scss'; diff --git a/src/containers/flow/FlowStamp/index.tsx b/src/containers/flow/FlowStamp/index.tsx index b3aaab47..b84672ab 100644 --- a/src/containers/flow/FlowStamp/index.tsx +++ b/src/containers/flow/FlowStamp/index.tsx @@ -2,8 +2,8 @@ import React, { FC, FormEvent, useCallback, useMemo } from 'react'; import classNames from 'classnames'; +import { Group } from '~/components/common/Group'; import { Superpower } from '~/components/common/Superpower'; -import { Group } from '~/components/containers/Group'; import { FlowRecent } from '~/components/flow/FlowRecent'; import { FlowSearchResults } from '~/components/flow/FlowSearchResults'; import { Icon } from '~/components/input/Icon'; diff --git a/src/containers/lab/LabGrid/index.tsx b/src/containers/lab/LabGrid/index.tsx index 09146b4d..a71f7371 100644 --- a/src/containers/lab/LabGrid/index.tsx +++ b/src/containers/lab/LabGrid/index.tsx @@ -1,7 +1,7 @@ import { FC, memo } from 'react'; +import { Columns } from '~/components/common/Columns'; import { Hoverable } from '~/components/common/Hoverable'; -import { Columns } from '~/components/containers/Columns'; import { LabNoResults } from '~/components/lab/LabNoResults'; import { LabNode } from '~/components/lab/LabNode'; import { useLabContext } from '~/utils/context/LabContextProvider'; diff --git a/src/containers/lab/LabLoading/index.tsx b/src/containers/lab/LabLoading/index.tsx index 2e0b74bd..084663df 100644 --- a/src/containers/lab/LabLoading/index.tsx +++ b/src/containers/lab/LabLoading/index.tsx @@ -1,6 +1,6 @@ import React, { FC, memo } from 'react'; -import { Columns } from '~/components/containers/Columns'; +import { Columns } from '~/components/common/Columns'; import { LabNode } from '~/components/lab/LabNode'; import { EMPTY_NODE, NODE_TYPES } from '~/constants/node'; import { values } from '~/utils/ramda'; diff --git a/src/containers/lab/LabStats/index.tsx b/src/containers/lab/LabStats/index.tsx index fbea05c6..b409dd8f 100644 --- a/src/containers/lab/LabStats/index.tsx +++ b/src/containers/lab/LabStats/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; +import { Group } from '~/components/common/Group'; import { SubTitle } from '~/components/common/SubTitle'; -import { Group } from '~/components/containers/Group'; import { FlowRecentItem } from '~/components/flow/FlowRecentItem'; import { LabFactoryBanner } from '~/components/lab/LabFactoryBanner'; import { LabHeroes } from '~/components/lab/LabHeroes'; diff --git a/src/containers/main/Header/index.tsx b/src/containers/main/Header/index.tsx index 6599ac59..4cf97a32 100644 --- a/src/containers/main/Header/index.tsx +++ b/src/containers/main/Header/index.tsx @@ -6,7 +6,7 @@ import { observer } from 'mobx-react-lite'; import { Anchor } from '~/components/common/Anchor'; import { Authorized } from '~/components/common/Authorized'; -import { Filler } from '~/components/containers/Filler'; +import { Filler } from '~/components/common/Filler'; import { Button } from '~/components/input/Button'; import { Logo } from '~/components/main/Logo'; import { Dialog } from '~/constants/modal'; diff --git a/src/containers/node/NodeBacklinks/index.tsx b/src/containers/node/NodeBacklinks/index.tsx index 98ef80c7..56dee139 100644 --- a/src/containers/node/NodeBacklinks/index.tsx +++ b/src/containers/node/NodeBacklinks/index.tsx @@ -1,7 +1,7 @@ import { FC, useMemo } from 'react'; +import { Card } from '~/components/common/Card'; import { SubTitle } from '~/components/common/SubTitle'; -import { Card } from '~/components/containers/Card'; import { Backlink } from '~/components/node/Backlink'; import { NodeBackLink } from '~/types'; import { has } from '~/utils/ramda'; diff --git a/src/containers/node/NodeBottomBlock/index.tsx b/src/containers/node/NodeBottomBlock/index.tsx index 2d804abb..d0a60654 100644 --- a/src/containers/node/NodeBottomBlock/index.tsx +++ b/src/containers/node/NodeBottomBlock/index.tsx @@ -1,9 +1,9 @@ import { FC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; -import { Sticky } from '~/components/containers/Sticky'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; +import { Sticky } from '~/components/common/Sticky'; import { NodeAuthorBlock } from '~/components/node/NodeAuthorBlock'; import { NodeDeletedBadge } from '~/components/node/NodeDeletedBadge'; import { NodeNoComments } from '~/components/node/NodeNoComments'; diff --git a/src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx index 8f08b9d2..1aa8d06a 100644 --- a/src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx +++ b/src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx @@ -10,7 +10,7 @@ import { import classnames from 'classnames'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { AudioPlayer } from '~/components/media/AudioPlayer'; import { UploadType } from '~/constants/uploads'; import { IComment, IFile } from '~/types'; diff --git a/src/containers/notifications/NotificationSettings/index.tsx b/src/containers/notifications/NotificationSettings/index.tsx index 24ac8ce5..dfc9d026 100644 --- a/src/containers/notifications/NotificationSettings/index.tsx +++ b/src/containers/notifications/NotificationSettings/index.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Padder } from '~/components/containers/Padder'; +import { Padder } from '~/components/common/Padder'; import { NotificationSettingsForm } from '~/components/notifications/NotificationSettingsForm'; import { useOAuth } from '~/hooks/auth/useOAuth'; import { useNotificationSettings } from '~/hooks/notifications/useNotificationSettings'; diff --git a/src/containers/profile/ProfileAccounts/index.tsx b/src/containers/profile/ProfileAccounts/index.tsx index d176843d..4790022f 100644 --- a/src/containers/profile/ProfileAccounts/index.tsx +++ b/src/containers/profile/ProfileAccounts/index.tsx @@ -1,6 +1,6 @@ import React, { FC, Fragment } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { Icon } from '~/components/input/Icon'; import { Placeholder } from '~/components/placeholders/Placeholder'; diff --git a/src/containers/profile/ProfileInfo/index.tsx b/src/containers/profile/ProfileInfo/index.tsx index 088d5fc1..948bdfff 100644 --- a/src/containers/profile/ProfileInfo/index.tsx +++ b/src/containers/profile/ProfileInfo/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { Placeholder } from '~/components/placeholders/Placeholder'; import { ProfileAvatar } from '~/components/profile/ProfileAvatar'; import { usePatchUser } from '~/hooks/auth/usePatchUser'; @@ -31,7 +31,11 @@ const ProfileInfo: FC = ({ isOwn }) => {
- +
diff --git a/src/containers/profile/ProfileQuickInfo/index.tsx b/src/containers/profile/ProfileQuickInfo/index.tsx index 7d232428..ddf5ad62 100644 --- a/src/containers/profile/ProfileQuickInfo/index.tsx +++ b/src/containers/profile/ProfileQuickInfo/index.tsx @@ -2,8 +2,8 @@ import React, { FC } from 'react'; import classNames from 'classnames'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { useUserActiveStatus } from '~/hooks/auth/useUserActiveStatus'; import { IUser } from '~/types/auth'; @@ -23,7 +23,9 @@ const ProfileQuickInfo: FC = ({ user }) => {
{user.fullname || user.username}
~{user.username}
-
+
{isActive ? 'юнит в сознании' : 'юнит деактивирован'}
diff --git a/src/containers/profile/ProfileSidebarHead/index.tsx b/src/containers/profile/ProfileSidebarHead/index.tsx index 7107c40e..b17b3adf 100644 --- a/src/containers/profile/ProfileSidebarHead/index.tsx +++ b/src/containers/profile/ProfileSidebarHead/index.tsx @@ -1,7 +1,7 @@ import React, { VFC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { ProfileAvatar } from '~/components/profile/ProfileAvatar'; import { usePatchUser } from '~/hooks/auth/usePatchUser'; import { useUser } from '~/hooks/auth/useUser'; @@ -16,11 +16,18 @@ const ProfileSidebarHead: VFC = () => { return ( - +
{user.fullname || user.username}
-
{!!user.fullname && `~${user.username}`}
+
+ {!!user.fullname && `~${user.username}`} +
); diff --git a/src/containers/profile/ProfileSidebarLogoutButton/index.tsx b/src/containers/profile/ProfileSidebarLogoutButton/index.tsx index c2726820..bc03f284 100644 --- a/src/containers/profile/ProfileSidebarLogoutButton/index.tsx +++ b/src/containers/profile/ProfileSidebarLogoutButton/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { Button } from '~/components/input/Button'; import { MenuButton } from '~/components/menu/MenuButton'; diff --git a/src/containers/profile/ProfileSidebarMenu/index.tsx b/src/containers/profile/ProfileSidebarMenu/index.tsx index f60f60d4..e309ecc9 100644 --- a/src/containers/profile/ProfileSidebarMenu/index.tsx +++ b/src/containers/profile/ProfileSidebarMenu/index.tsx @@ -2,9 +2,9 @@ import React, { useCallback, VFC } from 'react'; import classNames from 'classnames'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Zone } from '~/components/containers/Zone'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; +import { Zone } from '~/components/common/Zone'; import { VerticalMenu } from '~/components/menu/VerticalMenu'; import { useStackContext } from '~/components/sidebar/SidebarStack'; import { ProfileSidebarHead } from '~/containers/profile/ProfileSidebarHead'; diff --git a/src/containers/profile/ProfileStats/index.tsx b/src/containers/profile/ProfileStats/index.tsx index 13906ef1..6da74058 100644 --- a/src/containers/profile/ProfileStats/index.tsx +++ b/src/containers/profile/ProfileStats/index.tsx @@ -1,9 +1,9 @@ import React, { VFC } from 'react'; +import { Card } from '~/components/common/Card'; +import { Grid } from '~/components/common/Grid'; +import { Group } from '~/components/common/Group'; import { Square } from '~/components/common/Square'; -import { Card } from '~/components/containers/Card'; -import { Grid } from '~/components/containers/Grid'; -import { Group } from '~/components/containers/Group'; interface ProfileStatsProps {} diff --git a/src/containers/profile/ProfileTabs/index.tsx b/src/containers/profile/ProfileTabs/index.tsx index e76a8ff7..3f47b1c1 100644 --- a/src/containers/profile/ProfileTabs/index.tsx +++ b/src/containers/profile/ProfileTabs/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Tabs } from '~/components/dialogs/Tabs'; +import { Tabs } from '~/components/common/Tabs'; import styles from './styles.module.scss'; diff --git a/src/containers/profile/ProfileToggles/index.tsx b/src/containers/profile/ProfileToggles/index.tsx index 6827ac18..ed60c36f 100644 --- a/src/containers/profile/ProfileToggles/index.tsx +++ b/src/containers/profile/ProfileToggles/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; +import { Group } from '~/components/common/Group'; import { SuperPowersToggle } from '~/containers/auth/SuperPowersToggle'; interface ProfileTogglesProps {} diff --git a/src/containers/settings/SettingsDeleted/index.tsx b/src/containers/settings/SettingsDeleted/index.tsx index 6c1e495e..0be086ac 100644 --- a/src/containers/settings/SettingsDeleted/index.tsx +++ b/src/containers/settings/SettingsDeleted/index.tsx @@ -1,8 +1,8 @@ import React, { VFC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Padder } from '~/components/containers/Padder'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; +import { Padder } from '~/components/common/Padder'; import { FlowRecentItem } from '~/components/flow/FlowRecentItem'; import { Icon } from '~/components/input/Icon'; import { InputText } from '~/components/input/InputText'; @@ -32,7 +32,7 @@ const SettingsDeleted: VFC = () => {
- {nodes.map(node => ( + {nodes.map((node) => (
diff --git a/src/containers/settings/SettingsNotes/index.tsx b/src/containers/settings/SettingsNotes/index.tsx index cb4cf6c7..9fd145aa 100644 --- a/src/containers/settings/SettingsNotes/index.tsx +++ b/src/containers/settings/SettingsNotes/index.tsx @@ -1,7 +1,7 @@ import { FC, useCallback, useState, VFC } from 'react'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { Button } from '~/components/input/Button'; import { NoteCard } from '~/components/notes/NoteCard'; import { NoteCreationForm } from '~/components/notes/NoteCreationForm'; diff --git a/src/containers/settings/ThemeSwitcher/index.tsx b/src/containers/settings/ThemeSwitcher/index.tsx index 3cc9f5eb..89d83f2d 100644 --- a/src/containers/settings/ThemeSwitcher/index.tsx +++ b/src/containers/settings/ThemeSwitcher/index.tsx @@ -2,8 +2,8 @@ import React, { FC } from 'react'; import classNames from 'classnames'; -import { Card } from '~/components/containers/Card'; -import { Group } from '~/components/containers/Group'; +import { Card } from '~/components/common/Card'; +import { Group } from '~/components/common/Group'; import { Theme, themeColors } from '~/constants/themes'; import { useTheme } from '~/utils/providers/ThemeProvider'; diff --git a/src/containers/settings/UserSettingsView/index.tsx b/src/containers/settings/UserSettingsView/index.tsx index f1aa3aea..1e7a8a26 100644 --- a/src/containers/settings/UserSettingsView/index.tsx +++ b/src/containers/settings/UserSettingsView/index.tsx @@ -1,9 +1,9 @@ import { FC } from 'react'; +import { Filler } from '~/components/common/Filler'; +import { Group } from '~/components/common/Group'; import { Superpower } from '~/components/common/Superpower'; -import { Filler } from '~/components/containers/Filler'; -import { Group } from '~/components/containers/Group'; -import { Zone } from '~/components/containers/Zone'; +import { Zone } from '~/components/common/Zone'; import { InputText } from '~/components/input/InputText'; import { Textarea } from '~/components/input/Textarea'; import { ProfileAccounts } from '~/containers/profile/ProfileAccounts'; diff --git a/src/containers/sidebars/ProfileSidebar/index.tsx b/src/containers/sidebars/ProfileSidebar/index.tsx index f8bf25a1..bd723609 100644 --- a/src/containers/sidebars/ProfileSidebar/index.tsx +++ b/src/containers/sidebars/ProfileSidebar/index.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useMemo, VFC } from 'react'; -import { CoverBackdrop } from '~/components/containers/CoverBackdrop'; +import { CoverBackdrop } from '~/components/common/CoverBackdrop'; import { ProfileSidebarNotes } from '~/components/profile/ProfileSidebarNotes'; import { ProfileSidebarNotifications } from '~/components/profile/ProfileSidebarNotifications'; import { ProfileSidebarSettings } from '~/components/profile/ProfileSidebarSettings'; diff --git a/src/containers/sidebars/TagSidebar/index.tsx b/src/containers/sidebars/TagSidebar/index.tsx index 416b4ec8..1a0543db 100644 --- a/src/containers/sidebars/TagSidebar/index.tsx +++ b/src/containers/sidebars/TagSidebar/index.tsx @@ -1,6 +1,6 @@ import { useMemo, VFC } from 'react'; -import { InfiniteScroll } from '~/components/containers/InfiniteScroll'; +import { InfiniteScroll } from '~/components/common/InfiniteScroll'; import { Icon } from '~/components/input/Icon'; import { SidebarStack } from '~/components/sidebar/SidebarStack'; import { SidebarStackCard } from '~/components/sidebar/SidebarStackCard'; diff --git a/src/containers/tags/Tags/index.tsx b/src/containers/tags/Tags/index.tsx index 4695320a..eb17591c 100644 --- a/src/containers/tags/Tags/index.tsx +++ b/src/containers/tags/Tags/index.tsx @@ -1,6 +1,12 @@ -import React, { FC, HTMLAttributes, useCallback, useMemo, useState } from 'react'; +import React, { + FC, + HTMLAttributes, + useCallback, + useMemo, + useState, +} from 'react'; -import { TagField } from '~/components/containers/TagField'; +import { TagField } from '~/components/common/TagField'; import { Tag } from '~/components/tags/Tag'; import { TagInput } from '~/containers/tags/TagInput'; import { ITag } from '~/types'; @@ -35,8 +41,10 @@ export const Tags: FC = ({ return; } - const exist = tags.map(tag => tag.title); - const uniqueTags = uniq([...exist, ...data, ...last]).filter(el => el) as string[]; + const exist = tags.map((tag) => tag.title); + const uniqueTags = uniq([...exist, ...data, ...last]).filter( + (el) => el, + ) as string[]; if (uniqueTags.length === exist.length) { return; @@ -45,18 +53,18 @@ export const Tags: FC = ({ onTagsChange(uniqueTags); setData([]); }, - [data, onTagsChange, tags] + [data, onTagsChange, tags], ); const onAppendTag = useCallback( (created: string[]) => { setData( uniq([...data, ...created]).filter( - title => !tags.some(it => it.title?.trim() === title?.trim()) - ) + (title) => !tags.some((it) => it.title?.trim() === title?.trim()), + ), ); }, - [data, setData, tags] + [data, setData, tags], ); const onClearTag = useCallback((): string | undefined => { @@ -67,13 +75,16 @@ export const Tags: FC = ({ }, [data, setData]); const exclude = useMemo( - () => [...(data || []), ...(tags || []).filter(el => el.title).map(({ title }) => title!)], - [data, tags] + () => [ + ...(data || []), + ...(tags || []).filter((el) => el.title).map(({ title }) => title!), + ], + [data, tags], ); return ( - {catTags.map(tag => ( + {catTags.map((tag) => ( = ({ /> ))} - {ordinaryTags.map(tag => ( + {ordinaryTags.map((tag) => ( = ({ /> ))} - {data.map(title => ( + {data.map((title) => ( ))} diff --git a/src/layouts/BorisLayout/index.tsx b/src/layouts/BorisLayout/index.tsx index 87384ce0..22c176e3 100644 --- a/src/layouts/BorisLayout/index.tsx +++ b/src/layouts/BorisLayout/index.tsx @@ -2,10 +2,10 @@ import { FC } from 'react'; import { observer } from 'mobx-react-lite'; +import { Card } from '~/components/common/Card'; +import { Group } from '~/components/common/Group'; +import { Sticky } from '~/components/common/Sticky'; import { Superpower } from '~/components/common/Superpower'; -import { Card } from '~/components/containers/Card'; -import { Group } from '~/components/containers/Group'; -import { Sticky } from '~/components/containers/Sticky'; import { BorisComments } from '~/containers/boris/BorisComments'; import { BorisSidebar } from '~/containers/boris/BorisSidebar'; import { BorisSuperPowersSSR } from '~/containers/boris/BorisSuperpowers/ssr'; diff --git a/src/layouts/LabLayout/index.tsx b/src/layouts/LabLayout/index.tsx index 1a0d18a4..a7935435 100644 --- a/src/layouts/LabLayout/index.tsx +++ b/src/layouts/LabLayout/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { Group } from '~/components/containers/Group'; -import { Sticky } from '~/components/containers/Sticky'; +import { Group } from '~/components/common/Group'; +import { Sticky } from '~/components/common/Sticky'; import { LabHead } from '~/components/lab/LabHead'; import { LabGrid } from '~/containers/lab/LabGrid'; import { LabLoading } from '~/containers/lab/LabLoading'; diff --git a/src/layouts/NodeLayout/index.tsx b/src/layouts/NodeLayout/index.tsx index 961cfd66..170a652c 100644 --- a/src/layouts/NodeLayout/index.tsx +++ b/src/layouts/NodeLayout/index.tsx @@ -2,9 +2,9 @@ import React, { useCallback } from 'react'; import { observer } from 'mobx-react-lite'; +import { Card } from '~/components/common/Card'; import { ScrollHelperBottom } from '~/components/common/ScrollHelperBottom'; import { Superpower } from '~/components/common/Superpower'; -import { Card } from '~/components/containers/Card'; import { Footer } from '~/components/main/Footer'; import { NodeTitle } from '~/components/node/NodeTitle'; import { Dialog } from '~/constants/modal'; diff --git a/src/layouts/SettingsLayout/index.tsx b/src/layouts/SettingsLayout/index.tsx index 04a089a9..1d3ab2b0 100644 --- a/src/layouts/SettingsLayout/index.tsx +++ b/src/layouts/SettingsLayout/index.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { Card } from '~/components/containers/Card'; -import { Sticky } from '~/components/containers/Sticky'; +import { Card } from '~/components/common/Card'; +import { Sticky } from '~/components/common/Sticky'; import { SettingsMenu } from '~/components/settings/SettingsMenu'; import { Container } from '~/containers/main/Container'; diff --git a/src/utils/providers/SidebarProvider.tsx b/src/utils/providers/SidebarProvider.tsx index 856da2ae..be446a44 100644 --- a/src/utils/providers/SidebarProvider.tsx +++ b/src/utils/providers/SidebarProvider.tsx @@ -10,7 +10,7 @@ import { import { useRouter } from 'next/router'; -import { ModalWrapper } from '~/components/dialogs/ModalWrapper'; +import { ModalWrapper } from '~/components/common/ModalWrapper'; import { SidebarName } from '~/constants/sidebar'; import { sidebarComponents } from '~/constants/sidebar/components'; import { SidebarComponent, SidebarProps } from '~/types/sidebar';