From eea7095e6588c753e924c0e6164d44f653d4ef84 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Sun, 19 Nov 2023 18:07:28 +0600
Subject: [PATCH] refactor comment components

---
 .../LocalCommentFormTextarea/index.tsx        | 36 ---------------
 .../Authorized/index.tsx                      |  0
 .../CommentFormAttachButtons/index.tsx        |  0
 .../components}/CommentFormAttaches/index.tsx |  0
 .../CommentFormAttaches/styles.module.scss    |  0
 .../CommentFormFormatButtons/index.tsx        |  0
 .../styles.module.scss                        |  0
 .../components/CommentFormTextarea/index.tsx  | 44 +++++++++++++++++++
 .../{comment => common}/CommentForm/index.tsx | 14 +++---
 .../CommentForm/styles.module.scss            |  0
 src/components/common/CornerMenu/index.tsx    | 10 ++++-
 src/constants/comment.ts                      |  9 ----
 src/containers/boris/BorisComments/index.tsx  |  4 +-
 .../components}/CommentAvatar/index.tsx       |  0
 .../CommentAvatar/styles.module.scss          |  0
 .../comments}/CommentWrapper/index.tsx        |  2 +-
 .../CommentWrapper/styles.module.scss         |  0
 .../NodeCommentForm/index.tsx                 |  5 ++-
 .../{node => comments}/NodeCommentForm/ssr.ts |  0
 .../components}/CommentEditingForm/index.tsx  |  2 +-
 .../components}/CommentEmbedBlock/index.tsx   |  0
 .../CommentEmbedBlock/styles.module.scss      |  0
 .../components}/CommentImageGrid/index.tsx    |  0
 .../CommentImageGrid/styles.module.scss       |  0
 .../components}/CommentLike/index.tsx         |  0
 .../CommentLike/styles.module.scss            |  0
 .../components}/CommentMenu/index.tsx         |  0
 .../CommentMenu/styles.module.scss            |  0
 .../components}/CommentTextBlock/index.tsx    |  0
 .../CommentTextBlock/styles.module.scss       |  0
 .../CommentContent/constants/index.ts         | 10 +++++
 .../components}/CommentContent/index.tsx      | 11 +++--
 .../CommentContent/styles.module.scss         |  0
 .../components}/CommentDistance/index.tsx     |  0
 .../CommentDistance/styles.module.scss        |  0
 .../components}/Comment/index.tsx             |  8 ++--
 .../components}/Comment/styles.module.scss    |  0
 .../{node => comments}/NodeComments/index.tsx |  2 +-
 .../NodeComments/styles.module.scss           |  0
 src/containers/main/Header/index.tsx          |  2 +-
 src/containers/main/SubmitBarRouter/index.tsx |  2 +-
 src/containers/node/NodeBottomBlock/index.tsx |  4 +-
 42 files changed, 89 insertions(+), 76 deletions(-)
 delete mode 100644 src/components/comment/LocalCommentFormTextarea/index.tsx
 rename src/components/{containers => common}/Authorized/index.tsx (100%)
 rename src/components/{comment => common/CommentForm/components}/CommentFormAttachButtons/index.tsx (100%)
 rename src/components/{comment => common/CommentForm/components}/CommentFormAttaches/index.tsx (100%)
 rename src/components/{comment => common/CommentForm/components}/CommentFormAttaches/styles.module.scss (100%)
 rename src/components/{comment => common/CommentForm/components}/CommentFormFormatButtons/index.tsx (100%)
 rename src/components/{comment => common/CommentForm/components}/CommentFormFormatButtons/styles.module.scss (100%)
 create mode 100644 src/components/common/CommentForm/components/CommentFormTextarea/index.tsx
 rename src/components/{comment => common}/CommentForm/index.tsx (86%)
 rename src/components/{comment => common}/CommentForm/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/CommentWrapper/components}/CommentAvatar/index.tsx (100%)
 rename src/{components/comment => containers/comments/CommentWrapper/components}/CommentAvatar/styles.module.scss (100%)
 rename src/{components/containers => containers/comments}/CommentWrapper/index.tsx (93%)
 rename src/{components/containers => containers/comments}/CommentWrapper/styles.module.scss (100%)
 rename src/containers/{node => comments}/NodeCommentForm/index.tsx (91%)
 rename src/containers/{node => comments}/NodeCommentForm/ssr.ts (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentEditingForm/index.tsx (94%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentEmbedBlock/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentEmbedBlock/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentImageGrid/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentImageGrid/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentLike/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentLike/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentMenu/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentMenu/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentTextBlock/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components/CommentContent/components}/CommentTextBlock/styles.module.scss (100%)
 create mode 100644 src/containers/comments/NodeComments/components/Comment/components/CommentContent/constants/index.ts
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components}/CommentContent/index.tsx (93%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components}/CommentContent/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components}/CommentDistance/index.tsx (100%)
 rename src/{components/comment => containers/comments/NodeComments/components/Comment/components}/CommentDistance/styles.module.scss (100%)
 rename src/{components/comment => containers/comments/NodeComments/components}/Comment/index.tsx (90%)
 rename src/{components/comment => containers/comments/NodeComments/components}/Comment/styles.module.scss (100%)
 rename src/containers/{node => comments}/NodeComments/index.tsx (96%)
 rename src/containers/{node => comments}/NodeComments/styles.module.scss (100%)

diff --git a/src/components/comment/LocalCommentFormTextarea/index.tsx b/src/components/comment/LocalCommentFormTextarea/index.tsx
deleted file mode 100644
index d901d241..00000000
--- a/src/components/comment/LocalCommentFormTextarea/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { forwardRef, KeyboardEventHandler, TextareaHTMLAttributes, useCallback } from 'react';
-
-import { Textarea } from '~/components/input/Textarea';
-import { useRandomPhrase } from '~/constants/phrases';
-import { useCommentFormContext } from '~/hooks/comments/useCommentFormFormik';
-
-interface IProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
-  isLoading?: boolean;
-}
-
-const LocalCommentFormTextarea = forwardRef<HTMLTextAreaElement, IProps>(({ ...rest }, ref) => {
-  const { values, handleChange, handleSubmit, isSubmitting } = useCommentFormContext();
-
-  const onKeyDown = useCallback<KeyboardEventHandler<HTMLTextAreaElement>>(
-    ({ ctrlKey, key, metaKey }) => {
-      if ((ctrlKey || metaKey) && key === 'Enter') handleSubmit(undefined);
-    },
-    [handleSubmit]
-  );
-
-  const placeholder = useRandomPhrase('SIMPLE');
-
-  return (
-    <Textarea
-      {...rest}
-      ref={ref}
-      value={values.text}
-      handler={handleChange('text')}
-      onKeyDown={onKeyDown}
-      disabled={isSubmitting}
-      placeholder={placeholder}
-    />
-  );
-});
-
-export { LocalCommentFormTextarea };
diff --git a/src/components/containers/Authorized/index.tsx b/src/components/common/Authorized/index.tsx
similarity index 100%
rename from src/components/containers/Authorized/index.tsx
rename to src/components/common/Authorized/index.tsx
diff --git a/src/components/comment/CommentFormAttachButtons/index.tsx b/src/components/common/CommentForm/components/CommentFormAttachButtons/index.tsx
similarity index 100%
rename from src/components/comment/CommentFormAttachButtons/index.tsx
rename to src/components/common/CommentForm/components/CommentFormAttachButtons/index.tsx
diff --git a/src/components/comment/CommentFormAttaches/index.tsx b/src/components/common/CommentForm/components/CommentFormAttaches/index.tsx
similarity index 100%
rename from src/components/comment/CommentFormAttaches/index.tsx
rename to src/components/common/CommentForm/components/CommentFormAttaches/index.tsx
diff --git a/src/components/comment/CommentFormAttaches/styles.module.scss b/src/components/common/CommentForm/components/CommentFormAttaches/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentFormAttaches/styles.module.scss
rename to src/components/common/CommentForm/components/CommentFormAttaches/styles.module.scss
diff --git a/src/components/comment/CommentFormFormatButtons/index.tsx b/src/components/common/CommentForm/components/CommentFormFormatButtons/index.tsx
similarity index 100%
rename from src/components/comment/CommentFormFormatButtons/index.tsx
rename to src/components/common/CommentForm/components/CommentFormFormatButtons/index.tsx
diff --git a/src/components/comment/CommentFormFormatButtons/styles.module.scss b/src/components/common/CommentForm/components/CommentFormFormatButtons/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentFormFormatButtons/styles.module.scss
rename to src/components/common/CommentForm/components/CommentFormFormatButtons/styles.module.scss
diff --git a/src/components/common/CommentForm/components/CommentFormTextarea/index.tsx b/src/components/common/CommentForm/components/CommentFormTextarea/index.tsx
new file mode 100644
index 00000000..31230b8c
--- /dev/null
+++ b/src/components/common/CommentForm/components/CommentFormTextarea/index.tsx
@@ -0,0 +1,44 @@
+import React, {
+  forwardRef,
+  KeyboardEventHandler,
+  TextareaHTMLAttributes,
+  useCallback,
+} from 'react';
+
+import { Textarea } from '~/components/input/Textarea';
+import { useRandomPhrase } from '~/constants/phrases';
+import { useCommentFormContext } from '~/hooks/comments/useCommentFormFormik';
+
+interface IProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
+  isLoading?: boolean;
+}
+
+const CommentFormTextarea = forwardRef<HTMLTextAreaElement, IProps>(
+  ({ ...rest }, ref) => {
+    const { values, handleChange, handleSubmit, isSubmitting } =
+      useCommentFormContext();
+
+    const onKeyDown = useCallback<KeyboardEventHandler<HTMLTextAreaElement>>(
+      ({ ctrlKey, key, metaKey }) => {
+        if ((ctrlKey || metaKey) && key === 'Enter') handleSubmit(undefined);
+      },
+      [handleSubmit],
+    );
+
+    const placeholder = useRandomPhrase('SIMPLE');
+
+    return (
+      <Textarea
+        {...rest}
+        ref={ref}
+        value={values.text}
+        handler={handleChange('text')}
+        onKeyDown={onKeyDown}
+        disabled={isSubmitting}
+        placeholder={placeholder}
+      />
+    );
+  },
+);
+
+export { CommentFormTextarea };
diff --git a/src/components/comment/CommentForm/index.tsx b/src/components/common/CommentForm/index.tsx
similarity index 86%
rename from src/components/comment/CommentForm/index.tsx
rename to src/components/common/CommentForm/index.tsx
index 4f3b0d7b..ba7eb31e 100644
--- a/src/components/comment/CommentForm/index.tsx
+++ b/src/components/common/CommentForm/index.tsx
@@ -3,10 +3,6 @@ import { FC, useCallback, useState } from 'react';
 import { FormikProvider } from 'formik';
 import { observer } from 'mobx-react-lite';
 
-import { CommentFormAttachButtons } from '~/components/comment/CommentFormAttachButtons';
-import { CommentFormAttaches } from '~/components/comment/CommentFormAttaches';
-import { CommentFormFormatButtons } from '~/components/comment/CommentFormFormatButtons';
-import { LocalCommentFormTextarea } from '~/components/comment/LocalCommentFormTextarea';
 import { Filler } from '~/components/containers/Filler';
 import { Button } from '~/components/input/Button';
 import { ERROR_LITERAL } from '~/constants/errors';
@@ -14,10 +10,12 @@ import { EMPTY_COMMENT } from '~/constants/node';
 import { useCommentFormFormik } from '~/hooks/comments/useCommentFormFormik';
 import { useInputPasteUpload } from '~/hooks/dom/useInputPasteUpload';
 import { IComment } from '~/types';
-import {
-  useUploaderContext,
-} from '~/utils/context/UploaderContextProvider';
+import { useUploaderContext } from '~/utils/context/UploaderContextProvider';
 
+import { CommentFormAttachButtons } from './components/CommentFormAttachButtons';
+import { CommentFormAttaches } from './components/CommentFormAttaches';
+import { CommentFormFormatButtons } from './components/CommentFormFormatButtons';
+import { CommentFormTextarea } from './components/CommentFormTextarea';
 import styles from './styles.module.scss';
 
 interface IProps {
@@ -63,7 +61,7 @@ const CommentForm: FC<IProps> = observer(
       <form onSubmit={formik.handleSubmit} className={styles.wrap}>
         <FormikProvider value={formik}>
           <div className={styles.input}>
-            <LocalCommentFormTextarea onPaste={onPaste} ref={setTextArea} />
+            <CommentFormTextarea onPaste={onPaste} ref={setTextArea} />
 
             {!!error && (
               <div className={styles.error} onClick={clearError}>
diff --git a/src/components/comment/CommentForm/styles.module.scss b/src/components/common/CommentForm/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentForm/styles.module.scss
rename to src/components/common/CommentForm/styles.module.scss
diff --git a/src/components/common/CornerMenu/index.tsx b/src/components/common/CornerMenu/index.tsx
index 9b4ac9da..1594dade 100644
--- a/src/components/common/CornerMenu/index.tsx
+++ b/src/components/common/CornerMenu/index.tsx
@@ -1,8 +1,9 @@
 import React, { useCallback, useState, VFC } from 'react';
 
-import styles from '~/components/comment/CommentMenu/styles.module.scss';
 import { MenuDots } from '~/components/common/MenuDots';
 
+import styles from './styles.module.scss';
+
 interface MenuAction {
   title: string;
   action: () => void;
@@ -18,7 +19,12 @@ const CornerMenu: VFC<CornerMenuProps> = ({ actions }) => {
   const onBlur = useCallback(() => setIsMenuOpened(false), [setIsMenuOpened]);
 
   return (
-    <div className={styles.wrap} onFocus={onFocus} onBlur={onBlur} tabIndex={-1}>
+    <div
+      className={styles.wrap}
+      onFocus={onFocus}
+      onBlur={onBlur}
+      tabIndex={-1}
+    >
       <MenuDots onClick={onFocus} />
 
       {is_menu_opened && (
diff --git a/src/constants/comment.ts b/src/constants/comment.ts
index f03fcbf0..cd3e5f2f 100644
--- a/src/constants/comment.ts
+++ b/src/constants/comment.ts
@@ -1,6 +1,3 @@
-import { CommentEmbedBlock } from '~/components/comment/CommentEmbedBlock';
-import { CommentTextBlock } from '~/components/comment/CommentTextBlock';
-
 export const COMMENT_BLOCK_TYPES = {
   TEXT: 'TEXT',
   MARK: 'MARK',
@@ -31,10 +28,4 @@ export type ICommentBlockProps = {
   block: ICommentBlock;
 };
 
-export const COMMENT_BLOCK_RENDERERS = {
-  [COMMENT_BLOCK_TYPES.TEXT]: CommentTextBlock,
-  [COMMENT_BLOCK_TYPES.MARK]: CommentTextBlock,
-  [COMMENT_BLOCK_TYPES.EMBED]: CommentEmbedBlock,
-};
-
 export const NEW_COMMENT_CLASSNAME = 'newComment';
diff --git a/src/containers/boris/BorisComments/index.tsx b/src/containers/boris/BorisComments/index.tsx
index ce1e9d38..5e0ec348 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/node/NodeCommentForm/ssr';
-import { NodeComments } from '~/containers/node/NodeComments';
+import { NodeCommentFormSSR } from '~/containers/comments/NodeCommentForm/ssr';
+import { NodeComments } from '~/containers/comments/NodeComments';
 import { useCommentContext } from '~/utils/context/CommentContextProvider';
 
 interface Props {}
diff --git a/src/components/comment/CommentAvatar/index.tsx b/src/containers/comments/CommentWrapper/components/CommentAvatar/index.tsx
similarity index 100%
rename from src/components/comment/CommentAvatar/index.tsx
rename to src/containers/comments/CommentWrapper/components/CommentAvatar/index.tsx
diff --git a/src/components/comment/CommentAvatar/styles.module.scss b/src/containers/comments/CommentWrapper/components/CommentAvatar/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentAvatar/styles.module.scss
rename to src/containers/comments/CommentWrapper/components/CommentAvatar/styles.module.scss
diff --git a/src/components/containers/CommentWrapper/index.tsx b/src/containers/comments/CommentWrapper/index.tsx
similarity index 93%
rename from src/components/containers/CommentWrapper/index.tsx
rename to src/containers/comments/CommentWrapper/index.tsx
index 0cfa4dbd..a0ba8544 100644
--- a/src/components/containers/CommentWrapper/index.tsx
+++ b/src/containers/comments/CommentWrapper/index.tsx
@@ -2,11 +2,11 @@ import React, { FC } from 'react';
 
 import classNames from 'classnames';
 
-import { CommentAvatar } from '~/components/comment/CommentAvatar';
 import { IUser } from '~/types/auth';
 import { path } from '~/utils/ramda';
 import { DivProps } from '~/utils/types';
 
+import { CommentAvatar } from './components/CommentAvatar';
 import styles from './styles.module.scss';
 
 type IProps = DivProps & {
diff --git a/src/components/containers/CommentWrapper/styles.module.scss b/src/containers/comments/CommentWrapper/styles.module.scss
similarity index 100%
rename from src/components/containers/CommentWrapper/styles.module.scss
rename to src/containers/comments/CommentWrapper/styles.module.scss
diff --git a/src/containers/node/NodeCommentForm/index.tsx b/src/containers/comments/NodeCommentForm/index.tsx
similarity index 91%
rename from src/containers/node/NodeCommentForm/index.tsx
rename to src/containers/comments/NodeCommentForm/index.tsx
index 21325787..b8e3ae0b 100644
--- a/src/containers/node/NodeCommentForm/index.tsx
+++ b/src/containers/comments/NodeCommentForm/index.tsx
@@ -2,8 +2,7 @@ import { FC, useCallback } from 'react';
 
 import { observer } from 'mobx-react-lite';
 
-import { CommentForm } from '~/components/comment/CommentForm';
-import { CommentWrapper } from '~/components/containers/CommentWrapper';
+import { CommentForm } from '~/components/common/CommentForm';
 import { UploadDropzone } from '~/components/upload/UploadDropzone';
 import { Dialog } from '~/constants/modal';
 import { UploadSubject, UploadTarget } from '~/constants/uploads';
@@ -13,6 +12,8 @@ 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<IComment | undefined>;
 }
diff --git a/src/containers/node/NodeCommentForm/ssr.ts b/src/containers/comments/NodeCommentForm/ssr.ts
similarity index 100%
rename from src/containers/node/NodeCommentForm/ssr.ts
rename to src/containers/comments/NodeCommentForm/ssr.ts
diff --git a/src/components/comment/CommentEditingForm/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx
similarity index 94%
rename from src/components/comment/CommentEditingForm/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx
index c3201898..c533a985 100644
--- a/src/components/comment/CommentEditingForm/index.tsx
+++ b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEditingForm/index.tsx
@@ -2,7 +2,7 @@ import { FC } from 'react';
 
 import { observer } from 'mobx-react-lite';
 
-import { CommentForm } from '~/components/comment/CommentForm';
+import { CommentForm } from '~/components/common/CommentForm';
 import { UploadDropzone } from '~/components/upload/UploadDropzone';
 import { UploadSubject, UploadTarget } from '~/constants/uploads';
 import { useUploader } from '~/hooks/data/useUploader';
diff --git a/src/components/comment/CommentEmbedBlock/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx
similarity index 100%
rename from src/components/comment/CommentEmbedBlock/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/index.tsx
diff --git a/src/components/comment/CommentEmbedBlock/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentEmbedBlock/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentEmbedBlock/styles.module.scss
diff --git a/src/components/comment/CommentImageGrid/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx
similarity index 100%
rename from src/components/comment/CommentImageGrid/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/index.tsx
diff --git a/src/components/comment/CommentImageGrid/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentImageGrid/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentImageGrid/styles.module.scss
diff --git a/src/components/comment/CommentLike/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx
similarity index 100%
rename from src/components/comment/CommentLike/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/index.tsx
diff --git a/src/components/comment/CommentLike/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentLike/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentLike/styles.module.scss
diff --git a/src/components/comment/CommentMenu/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx
similarity index 100%
rename from src/components/comment/CommentMenu/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/index.tsx
diff --git a/src/components/comment/CommentMenu/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentMenu/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentMenu/styles.module.scss
diff --git a/src/components/comment/CommentTextBlock/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx
similarity index 100%
rename from src/components/comment/CommentTextBlock/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/index.tsx
diff --git a/src/components/comment/CommentTextBlock/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/components/CommentTextBlock/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentTextBlock/styles.module.scss
rename to src/containers/comments/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/comments/NodeComments/components/Comment/components/CommentContent/constants/index.ts
new file mode 100644
index 00000000..bd6b1ed4
--- /dev/null
+++ b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/constants/index.ts
@@ -0,0 +1,10 @@
+import { COMMENT_BLOCK_TYPES } from '~/constants/comment';
+
+import { CommentEmbedBlock } from '../components/CommentEmbedBlock';
+import { CommentTextBlock } from '../components/CommentTextBlock';
+
+export const COMMENT_BLOCK_RENDERERS = {
+  [COMMENT_BLOCK_TYPES.TEXT]: CommentTextBlock,
+  [COMMENT_BLOCK_TYPES.MARK]: CommentTextBlock,
+  [COMMENT_BLOCK_TYPES.EMBED]: CommentEmbedBlock,
+};
diff --git a/src/components/comment/CommentContent/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/index.tsx
similarity index 93%
rename from src/components/comment/CommentContent/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/index.tsx
index a3b77369..8f08b9d2 100644
--- a/src/components/comment/CommentContent/index.tsx
+++ b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/index.tsx
@@ -12,17 +12,16 @@ import classnames from 'classnames';
 
 import { Group } from '~/components/containers/Group';
 import { AudioPlayer } from '~/components/media/AudioPlayer';
-import { COMMENT_BLOCK_RENDERERS } from '~/constants/comment';
 import { UploadType } from '~/constants/uploads';
 import { IComment, IFile } from '~/types';
 import { formatCommentText, getPrettyDate } from '~/utils/dom';
 import { append, assocPath, path, reduce } from '~/utils/ramda';
 
-import { CommentEditingForm } from '../CommentEditingForm';
-import { CommentImageGrid } from '../CommentImageGrid';
-import { CommentLike } from '../CommentLike';
-import { CommentMenu } from '../CommentMenu';
-
+import { CommentEditingForm } from './components/CommentEditingForm';
+import { CommentImageGrid } from './components/CommentImageGrid';
+import { CommentLike } from './components/CommentLike';
+import { CommentMenu } from './components/CommentMenu';
+import { COMMENT_BLOCK_RENDERERS } from './constants';
 import styles from './styles.module.scss';
 
 interface IProps {
diff --git a/src/components/comment/CommentContent/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentContent/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentContent/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentContent/styles.module.scss
diff --git a/src/components/comment/CommentDistance/index.tsx b/src/containers/comments/NodeComments/components/Comment/components/CommentDistance/index.tsx
similarity index 100%
rename from src/components/comment/CommentDistance/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/components/CommentDistance/index.tsx
diff --git a/src/components/comment/CommentDistance/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/components/CommentDistance/styles.module.scss
similarity index 100%
rename from src/components/comment/CommentDistance/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/components/CommentDistance/styles.module.scss
diff --git a/src/components/comment/Comment/index.tsx b/src/containers/comments/NodeComments/components/Comment/index.tsx
similarity index 90%
rename from src/components/comment/Comment/index.tsx
rename to src/containers/comments/NodeComments/components/Comment/index.tsx
index 4be90124..ec645f93 100644
--- a/src/components/comment/Comment/index.tsx
+++ b/src/containers/comments/NodeComments/components/Comment/index.tsx
@@ -3,14 +3,14 @@ import React, { FC, HTMLAttributes, memo } from 'react';
 import classNames from 'classnames';
 import { parseISO } from 'date-fns';
 
-import { CommentContent } from '~/components/comment/CommentContent';
-import { CommentDistance } from '~/components/comment/CommentDistance';
-import { CommentWrapper } from '~/components/containers/CommentWrapper';
 import { NEW_COMMENT_CLASSNAME } from '~/constants/comment';
+import { CommentWrapper } from '~/containers/comments/CommentWrapper';
 import { IComment, ICommentGroup, IFile } from '~/types';
 
-import { CommendDeleted } from '../../node/CommendDeleted';
+import { CommendDeleted } from '../../../../../components/node/CommendDeleted';
 
+import { CommentContent } from './components/CommentContent';
+import { CommentDistance } from './components/CommentDistance';
 import styles from './styles.module.scss';
 
 type Props = HTMLAttributes<HTMLDivElement> & {
diff --git a/src/components/comment/Comment/styles.module.scss b/src/containers/comments/NodeComments/components/Comment/styles.module.scss
similarity index 100%
rename from src/components/comment/Comment/styles.module.scss
rename to src/containers/comments/NodeComments/components/Comment/styles.module.scss
diff --git a/src/containers/node/NodeComments/index.tsx b/src/containers/comments/NodeComments/index.tsx
similarity index 96%
rename from src/containers/node/NodeComments/index.tsx
rename to src/containers/comments/NodeComments/index.tsx
index 63656bf1..d82cf880 100644
--- a/src/containers/node/NodeComments/index.tsx
+++ b/src/containers/comments/NodeComments/index.tsx
@@ -2,9 +2,9 @@ import React, { FC, useMemo } from 'react';
 
 import { observer } from 'mobx-react-lite';
 
-import { Comment } from '~/components/comment/Comment';
 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 { useGrouppedComments } from '~/hooks/node/useGrouppedComments';
 import { ICommentGroup } from '~/types';
 import { useCommentContext } from '~/utils/context/CommentContextProvider';
diff --git a/src/containers/node/NodeComments/styles.module.scss b/src/containers/comments/NodeComments/styles.module.scss
similarity index 100%
rename from src/containers/node/NodeComments/styles.module.scss
rename to src/containers/comments/NodeComments/styles.module.scss
diff --git a/src/containers/main/Header/index.tsx b/src/containers/main/Header/index.tsx
index 19c06218..6599ac59 100644
--- a/src/containers/main/Header/index.tsx
+++ b/src/containers/main/Header/index.tsx
@@ -5,7 +5,7 @@ import isBefore from 'date-fns/isBefore';
 import { observer } from 'mobx-react-lite';
 
 import { Anchor } from '~/components/common/Anchor';
-import { Authorized } from '~/components/containers/Authorized';
+import { Authorized } from '~/components/common/Authorized';
 import { Filler } from '~/components/containers/Filler';
 import { Button } from '~/components/input/Button';
 import { Logo } from '~/components/main/Logo';
diff --git a/src/containers/main/SubmitBarRouter/index.tsx b/src/containers/main/SubmitBarRouter/index.tsx
index 21ef2afa..87f673cc 100644
--- a/src/containers/main/SubmitBarRouter/index.tsx
+++ b/src/containers/main/SubmitBarRouter/index.tsx
@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 
-import { Authorized } from '~/components/containers/Authorized';
+import { Authorized } from '~/components/common/Authorized';
 
 import { SubmitBarSSR } from './components/SubmitBar/ssr';
 
diff --git a/src/containers/node/NodeBottomBlock/index.tsx b/src/containers/node/NodeBottomBlock/index.tsx
index 6ce7883a..8a45a365 100644
--- a/src/containers/node/NodeBottomBlock/index.tsx
+++ b/src/containers/node/NodeBottomBlock/index.tsx
@@ -9,9 +9,9 @@ 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 { NodeCommentFormSSR } from '~/containers/node/NodeCommentForm/ssr';
-import { NodeComments } from '~/containers/node/NodeComments';
 import { useNodeBlocks } from '~/hooks/node/useNodeBlocks';
 import { useCommentContext } from '~/utils/context/CommentContextProvider';
 import { useNodeContext } from '~/utils/context/NodeContextProvider';