diff --git a/src/containers/boris/BorisComments/index.tsx b/src/containers/boris/BorisComments/index.tsx index 5e0ec348..ce1e9d38 100644 --- a/src/containers/boris/BorisComments/index.tsx +++ b/src/containers/boris/BorisComments/index.tsx @@ -3,8 +3,8 @@ import { FC } from 'react'; import { Group } from '~/components/containers/Group'; import { Footer } from '~/components/main/Footer'; import { NodeNoComments } from '~/components/node/NodeNoComments'; -import { NodeCommentFormSSR } from '~/containers/comments/NodeCommentForm/ssr'; -import { NodeComments } from '~/containers/comments/NodeComments'; +import { NodeCommentFormSSR } from '~/containers/node/NodeCommentForm/ssr'; +import { NodeComments } from '~/containers/node/NodeComments'; import { useCommentContext } from '~/utils/context/CommentContextProvider'; interface Props {} diff --git a/src/components/common/CommentForm/components/CommentFormAttachButtons/index.tsx b/src/containers/comments/CommentForm/components/CommentFormAttachButtons/index.tsx similarity index 100% rename from src/components/common/CommentForm/components/CommentFormAttachButtons/index.tsx rename to src/containers/comments/CommentForm/components/CommentFormAttachButtons/index.tsx diff --git a/src/components/common/CommentForm/components/CommentFormAttaches/index.tsx b/src/containers/comments/CommentForm/components/CommentFormAttaches/index.tsx similarity index 100% rename from src/components/common/CommentForm/components/CommentFormAttaches/index.tsx rename to src/containers/comments/CommentForm/components/CommentFormAttaches/index.tsx diff --git a/src/components/common/CommentForm/components/CommentFormAttaches/styles.module.scss b/src/containers/comments/CommentForm/components/CommentFormAttaches/styles.module.scss similarity index 100% rename from src/components/common/CommentForm/components/CommentFormAttaches/styles.module.scss rename to src/containers/comments/CommentForm/components/CommentFormAttaches/styles.module.scss diff --git a/src/components/common/CommentForm/components/CommentFormFormatButtons/index.tsx b/src/containers/comments/CommentForm/components/CommentFormFormatButtons/index.tsx similarity index 100% rename from src/components/common/CommentForm/components/CommentFormFormatButtons/index.tsx rename to src/containers/comments/CommentForm/components/CommentFormFormatButtons/index.tsx diff --git a/src/components/common/CommentForm/components/CommentFormFormatButtons/styles.module.scss b/src/containers/comments/CommentForm/components/CommentFormFormatButtons/styles.module.scss similarity index 100% rename from src/components/common/CommentForm/components/CommentFormFormatButtons/styles.module.scss rename to src/containers/comments/CommentForm/components/CommentFormFormatButtons/styles.module.scss diff --git a/src/components/common/CommentForm/components/CommentFormTextarea/index.tsx b/src/containers/comments/CommentForm/components/CommentFormTextarea/index.tsx similarity index 100% rename from src/components/common/CommentForm/components/CommentFormTextarea/index.tsx rename to src/containers/comments/CommentForm/components/CommentFormTextarea/index.tsx diff --git a/src/components/common/CommentForm/index.tsx b/src/containers/comments/CommentForm/index.tsx similarity index 100% rename from src/components/common/CommentForm/index.tsx rename to src/containers/comments/CommentForm/index.tsx diff --git a/src/components/common/CommentForm/styles.module.scss b/src/containers/comments/CommentForm/styles.module.scss similarity index 100% rename from src/components/common/CommentForm/styles.module.scss rename to src/containers/comments/CommentForm/styles.module.scss diff --git a/src/containers/node/NodeBottomBlock/index.tsx b/src/containers/node/NodeBottomBlock/index.tsx index 8a45a365..2d804abb 100644 --- a/src/containers/node/NodeBottomBlock/index.tsx +++ b/src/containers/node/NodeBottomBlock/index.tsx @@ -9,14 +9,15 @@ import { NodeDeletedBadge } from '~/components/node/NodeDeletedBadge'; import { NodeNoComments } from '~/components/node/NodeNoComments'; import { NodeRelatedBlock } from '~/components/node/NodeRelatedBlock'; import { NodeTagsBlock } from '~/components/node/NodeTagsBlock'; -import { NodeCommentFormSSR } from '~/containers/comments/NodeCommentForm/ssr'; -import { NodeComments } from '~/containers/comments/NodeComments'; import { NodeBacklinks } from '~/containers/node/NodeBacklinks'; +import { NodeComments } from '~/containers/node/NodeComments'; import { useNodeBlocks } from '~/hooks/node/useNodeBlocks'; import { useCommentContext } from '~/utils/context/CommentContextProvider'; import { useNodeContext } from '~/utils/context/NodeContextProvider'; import { useNodeRelatedContext } from '~/utils/context/NodeRelatedContextProvider'; +import { NodeCommentFormSSR } from '../NodeCommentForm/ssr'; + import styles from './styles.module.scss'; interface IProps { diff --git a/src/containers/comments/NodeCommentForm/index.tsx b/src/containers/node/NodeCommentForm/index.tsx similarity index 91% rename from src/containers/comments/NodeCommentForm/index.tsx rename to src/containers/node/NodeCommentForm/index.tsx index b8e3ae0b..a0d57004 100644 --- a/src/containers/comments/NodeCommentForm/index.tsx +++ b/src/containers/node/NodeCommentForm/index.tsx @@ -2,18 +2,17 @@ import { FC, useCallback } from 'react'; import { observer } from 'mobx-react-lite'; -import { CommentForm } from '~/components/common/CommentForm'; import { UploadDropzone } from '~/components/upload/UploadDropzone'; import { Dialog } from '~/constants/modal'; import { UploadSubject, UploadTarget } from '~/constants/uploads'; +import { CommentForm } from '~/containers/comments/CommentForm'; +import { CommentWrapper } from '~/containers/comments/CommentWrapper'; import { useAuth } from '~/hooks/auth/useAuth'; import { useUploader } from '~/hooks/data/useUploader'; import { useShowModal } from '~/hooks/modal/useShowModal'; import { IComment } from '~/types'; import { UploaderContextProvider } from '~/utils/context/UploaderContextProvider'; -import { CommentWrapper } from '../CommentWrapper'; - export interface Props { saveComment: (comment: IComment) => Promise; } diff --git a/src/containers/comments/NodeCommentForm/ssr.ts b/src/containers/node/NodeCommentForm/ssr.ts similarity index 100% rename from src/containers/comments/NodeCommentForm/ssr.ts rename to src/containers/node/NodeCommentForm/ssr.ts diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx similarity index 94% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx index c533a985..22671108 100644 --- a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx +++ b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx @@ -2,9 +2,9 @@ import { FC } from 'react'; import { observer } from 'mobx-react-lite'; -import { CommentForm } from '~/components/common/CommentForm'; import { UploadDropzone } from '~/components/upload/UploadDropzone'; import { UploadSubject, UploadTarget } from '~/constants/uploads'; +import { CommentForm } from '~/containers/comments/CommentForm'; import { useUploader } from '~/hooks/data/useUploader'; import { IComment, INode } from '~/types'; import { UploaderContextProvider } from '~/utils/context/UploaderContextProvider'; diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/constants/index.ts b/src/containers/node/NodeComments/components/Comment/components/CommentContent/constants/index.ts similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/constants/index.ts rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/constants/index.ts diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentContent/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentContent/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentContent/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentContent/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentDistance/index.tsx b/src/containers/node/NodeComments/components/Comment/components/CommentDistance/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentDistance/index.tsx rename to src/containers/node/NodeComments/components/Comment/components/CommentDistance/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/components/CommentDistance/styles.module.scss b/src/containers/node/NodeComments/components/Comment/components/CommentDistance/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/components/CommentDistance/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/components/CommentDistance/styles.module.scss diff --git a/src/containers/comments/NodeComments/components/Comment/index.tsx b/src/containers/node/NodeComments/components/Comment/index.tsx similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/index.tsx rename to src/containers/node/NodeComments/components/Comment/index.tsx diff --git a/src/containers/comments/NodeComments/components/Comment/styles.module.scss b/src/containers/node/NodeComments/components/Comment/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/components/Comment/styles.module.scss rename to src/containers/node/NodeComments/components/Comment/styles.module.scss diff --git a/src/containers/comments/NodeComments/index.tsx b/src/containers/node/NodeComments/index.tsx similarity index 96% rename from src/containers/comments/NodeComments/index.tsx rename to src/containers/node/NodeComments/index.tsx index d82cf880..e598ad97 100644 --- a/src/containers/comments/NodeComments/index.tsx +++ b/src/containers/node/NodeComments/index.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react-lite'; import { LoadMoreButton } from '~/components/input/LoadMoreButton'; import { ANNOUNCE_USER_ID, BORIS_NODE_ID } from '~/constants/boris/constants'; -import { Comment } from '~/containers/comments/NodeComments/components/Comment'; +import { Comment } from '~/containers/node/NodeComments/components/Comment'; import { useGrouppedComments } from '~/hooks/node/useGrouppedComments'; import { ICommentGroup } from '~/types'; import { useCommentContext } from '~/utils/context/CommentContextProvider'; diff --git a/src/containers/comments/NodeComments/styles.module.scss b/src/containers/node/NodeComments/styles.module.scss similarity index 100% rename from src/containers/comments/NodeComments/styles.module.scss rename to src/containers/node/NodeComments/styles.module.scss