Reorganize components folder structure

Desbordante · May 9, 2024 · 75e9986 · 75e9986
1 parent bb1613a
commit 75e9986
Show file tree

Hide file tree

Showing 304 changed files with 326 additions and 298 deletions.
diff --git a/web-app/client/src/components/TabsLayout/index.tsx b/web-app/client/src/components/TabsLayout/index.tsx
diff --git a/...SuccessModal/AuthSuccessModal.module.scss → ...SuccessModal/AuthSuccessModal.module.scss b/...SuccessModal/AuthSuccessModal.module.scss → ...SuccessModal/AuthSuccessModal.module.scss
diff --git a/...nts/AuthSuccessModal/AuthSuccessModal.tsx → ...uth/AuthSuccessModal/AuthSuccessModal.tsx b/...nts/AuthSuccessModal/AuthSuccessModal.tsx → ...uth/AuthSuccessModal/AuthSuccessModal.tsx
@@ -1,6 +1,8 @@
-import React, { FC } from 'react';
-import Button from '@components/Button';
-import ModalContainer, { ModalProps } from '@components/ModalContainer';
+import { FC } from 'react';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
+import Button from '@components/common/uikit/Button';
 import { useAuthContext } from '@hooks/useAuthContext';
 import styles from './AuthSuccessModal.module.scss';
 

diff --git a/.../src/components/AuthSuccessModal/index.ts → ...components/auth/AuthSuccessModal/index.ts b/.../src/components/AuthSuccessModal/index.ts → ...components/auth/AuthSuccessModal/index.ts
diff --git a/...ponents/LogInModal/LogInModal.module.scss → ...ts/auth/LogInModal/LogInModal.module.scss b/...ponents/LogInModal/LogInModal.module.scss → ...ts/auth/LogInModal/LogInModal.module.scss
diff --git a/.../src/components/LogInModal/LogInModal.tsx → ...components/auth/LogInModal/LogInModal.tsx b/.../src/components/LogInModal/LogInModal.tsx → ...components/auth/LogInModal/LogInModal.tsx
@@ -1,6 +1,8 @@
 import { FC, useState } from 'react';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
 import useModal from '@hooks/useModal';
-import ModalContainer, { ModalProps } from '../ModalContainer';
 import Code from './steps/Code';
 import Email from './steps/Email';
 import LogIn from './steps/LogIn';

diff --git a/...client/src/components/LogInModal/index.ts → ...t/src/components/auth/LogInModal/index.ts b/...client/src/components/LogInModal/index.ts → ...t/src/components/auth/LogInModal/index.ts
diff --git a/.../src/components/LogInModal/steps/Code.tsx → ...components/auth/LogInModal/steps/Code.tsx b/.../src/components/LogInModal/steps/Code.tsx → ...components/auth/LogInModal/steps/Code.tsx
@@ -1,8 +1,8 @@
 import { useMutation } from '@apollo/client';
 import { FC } from 'react';
 import { useForm } from 'react-hook-form';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
 import {
   approveRecoveryCode,
   approveRecoveryCodeVariables,

diff --git a/...src/components/LogInModal/steps/Email.tsx → ...omponents/auth/LogInModal/steps/Email.tsx b/...src/components/LogInModal/steps/Email.tsx → ...omponents/auth/LogInModal/steps/Email.tsx
@@ -3,13 +3,13 @@ import { Dispatch, FC, SetStateAction, useEffect } from 'react';
 
 import { useForm } from 'react-hook-form';
 import isEmail from 'validator/lib/isEmail';
-import Button from '@components/Button';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
 import {
   issueCodeForPasswordRecovery,
   issueCodeForPasswordRecoveryVariables,
 } from '@graphql/operations/mutations/__generated__/issueCodeForPasswordRecovery';
 import { ISSUE_CODE_FOR_PASSWORD_RECOVERY } from '@graphql/operations/mutations/issueCodeForPasswordRecovery';
-import { Text } from '../../Inputs';
 import styles from '../LogInModal.module.scss';
 
 type Inputs = {

diff --git a/...src/components/LogInModal/steps/LogIn.tsx → ...omponents/auth/LogInModal/steps/LogIn.tsx b/...src/components/LogInModal/steps/LogIn.tsx → ...omponents/auth/LogInModal/steps/LogIn.tsx
@@ -2,8 +2,8 @@ import { useMutation } from '@apollo/client';
 import { FC } from 'react';
 import { useForm } from 'react-hook-form';
 import isEmail from 'validator/lib/isEmail';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
 import {
   logIn,
   logInVariables,

diff --git a/.../components/LogInModal/steps/Password.tsx → ...onents/auth/LogInModal/steps/Password.tsx b/.../components/LogInModal/steps/Password.tsx → ...onents/auth/LogInModal/steps/Password.tsx
@@ -2,8 +2,8 @@ import { useMutation } from '@apollo/client';
 import { FC } from 'react';
 import { useForm } from 'react-hook-form';
 import isStrongPassword from 'validator/lib/isStrongPassword';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
 import {
   changePassword,
   changePasswordVariables,

diff --git a/...rc/components/SignUpModal/SignUpModal.tsx → ...mponents/auth/SignUpModal/SignUpModal.tsx b/...rc/components/SignUpModal/SignUpModal.tsx → ...mponents/auth/SignUpModal/SignUpModal.tsx
@@ -1,7 +1,9 @@
 import React, { FC, useCallback, useState } from 'react';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
 import { useAuthContext } from '@hooks/useAuthContext';
 import useModal from '@hooks/useModal';
-import ModalContainer, { ModalProps } from '../ModalContainer';
 import CoreInfo from './steps/CoreInfo';
 import EmailVerification from './steps/EmailVerification';
 

diff --git a/...lient/src/components/SignUpModal/index.ts → .../src/components/auth/SignUpModal/index.ts b/...lient/src/components/SignUpModal/index.ts → .../src/components/auth/SignUpModal/index.ts
diff --git a/...components/SignUpModal/steps/CoreInfo.tsx → ...nents/auth/SignUpModal/steps/CoreInfo.tsx b/...components/SignUpModal/steps/CoreInfo.tsx → ...nents/auth/SignUpModal/steps/CoreInfo.tsx
@@ -4,9 +4,9 @@ import { FC } from 'react';
 import { useForm } from 'react-hook-form';
 import isEmail from 'validator/lib/isEmail';
 import isStrongPassword from 'validator/lib/isStrongPassword';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
-import { ControlledSelect } from '@components/Inputs/Select';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
+import { ControlledSelect } from '@components/common/uikit/Inputs/Select';
 import {
   createUser,
   createUserVariables,

diff --git a/...s/SignUpModal/steps/EmailVerification.tsx → ...h/SignUpModal/steps/EmailVerification.tsx b/...s/SignUpModal/steps/EmailVerification.tsx → ...h/SignUpModal/steps/EmailVerification.tsx
@@ -1,9 +1,9 @@
 import { useMutation } from '@apollo/client';
 import { FC, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import Button from '@components/Button';
-import { Alert } from '@components/FileStats/Alert';
-import { Text } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { Alert } from '@components/common/uikit/FileStats/Alert';
+import { Text } from '@components/common/uikit/Inputs';
 import {
   approveUserEmail,
   approveUserEmailVariables,

diff --git a/.../components/Collapse/Collapse.module.scss → ...choose-file/Collapse/Collapse.module.scss b/.../components/Collapse/Collapse.module.scss → ...choose-file/Collapse/Collapse.module.scss
diff --git a/...ient/src/components/Collapse/Collapse.tsx → ...ponents/choose-file/Collapse/Collapse.tsx b/...ient/src/components/Collapse/Collapse.tsx → ...ponents/choose-file/Collapse/Collapse.tsx
diff --git a/.../client/src/components/Collapse/index.tsx → ...components/choose-file/Collapse/index.tsx b/.../client/src/components/Collapse/index.tsx → ...components/choose-file/Collapse/index.tsx
diff --git a/...nents/DatasetCard/DatasetCard.module.scss → ...-file/DatasetCard/DatasetCard.module.scss b/...nents/DatasetCard/DatasetCard.module.scss → ...-file/DatasetCard/DatasetCard.module.scss
diff --git a/...rc/components/DatasetCard/DatasetCard.tsx → ...s/choose-file/DatasetCard/DatasetCard.tsx b/...rc/components/DatasetCard/DatasetCard.tsx → ...s/choose-file/DatasetCard/DatasetCard.tsx
diff --git a/...ient/src/components/DatasetCard/index.tsx → ...ponents/choose-file/DatasetCard/index.tsx b/...ient/src/components/DatasetCard/index.tsx → ...ponents/choose-file/DatasetCard/index.tsx
diff --git a/...tasetUploader/DatasetUploader.module.scss → ...tasetUploader/DatasetUploader.module.scss b/...tasetUploader/DatasetUploader.module.scss → ...tasetUploader/DatasetUploader.module.scss
diff --git a/...nents/DatasetUploader/DatasetUploader.tsx → ...-file/DatasetUploader/DatasetUploader.tsx b/...nents/DatasetUploader/DatasetUploader.tsx → ...-file/DatasetUploader/DatasetUploader.tsx
@@ -6,8 +6,7 @@ import checkIcon from '@assets/icons/check.svg';
 import crossIcon from '@assets/icons/cross.svg';
 import dragIcon from '@assets/icons/drag.svg';
 import uploadIcon from '@assets/icons/upload.svg';
-import cardStyles from '@components/DatasetCard/DatasetCard.module.scss';
-import ProgressBar, { Progress } from '@components/ProgressBar/ProgressBar';
+import cardStyles from '@components/choose-file/DatasetCard/DatasetCard.module.scss';
 import {
   uploadDataset,
   uploadDatasetVariables,
@@ -17,6 +16,7 @@ import { getAlgorithmsConfig } from '@graphql/operations/queries/__generated__/g
 import { GET_ALGORITHMS_CONFIG } from '@graphql/operations/queries/getAlgorithmsConfig';
 import useModal from '@hooks/useModal';
 import { AllowedDataset } from 'types/algorithms';
+import ProgressBar, { Progress } from './components/ProgressBar/ProgressBar';
 import styles from './DatasetUploader.module.scss';
 
 type Props = {

diff --git a/...nents/ProgressBar/ProgressBar.module.scss → ...nents/ProgressBar/ProgressBar.module.scss b/...nents/ProgressBar/ProgressBar.module.scss → ...nents/ProgressBar/ProgressBar.module.scss
diff --git a/...rc/components/ProgressBar/ProgressBar.tsx → ...er/components/ProgressBar/ProgressBar.tsx b/...rc/components/ProgressBar/ProgressBar.tsx → ...er/components/ProgressBar/ProgressBar.tsx
diff --git a/.../src/components/DatasetUploader/index.tsx → ...nts/choose-file/DatasetUploader/index.tsx b/.../src/components/DatasetUploader/index.tsx → ...nts/choose-file/DatasetUploader/index.tsx
diff --git a/...tiesModal/FilePropertiesModal.module.scss → ...tiesModal/FilePropertiesModal.module.scss b/...tiesModal/FilePropertiesModal.module.scss → ...tiesModal/FilePropertiesModal.module.scss
diff --git a/...lePropertiesModal/FilePropertiesModal.tsx → ...lePropertiesModal/FilePropertiesModal.tsx b/...lePropertiesModal/FilePropertiesModal.tsx → ...lePropertiesModal/FilePropertiesModal.tsx
@@ -1,13 +1,12 @@
 import { FC } from 'react';
-import {
-  FilePropsForm,
-  FilePropsList,
-} from '@components/FilePropertiesModal/tabs/PropertiesTab';
-import { StatsTab } from '@components/FilePropertiesModal/tabs/StatsTab';
-import ModalContainer, { ModalProps } from '@components/ModalContainer';
-import { Tab, TabView } from '@components/TabView/TabView';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
 import { AllowedDataset } from 'types/algorithms';
 import { FileProps } from 'types/globalTypes';
+import { Tab, TabView } from './components/TabView/TabView';
+import { FilePropsForm, FilePropsList } from './tabs/PropertiesTab';
+import { StatsTab } from './tabs/StatsTab';
 import styles from './FilePropertiesModal.module.scss';
 
 type Props = ModalProps &

diff --git a/...rc/components/TabView/TabView.module.scss → ...al/components/TabView/TabView.module.scss b/...rc/components/TabView/TabView.module.scss → ...al/components/TabView/TabView.module.scss
diff --git a/...client/src/components/TabView/TabView.tsx → ...rtiesModal/components/TabView/TabView.tsx b/...client/src/components/TabView/TabView.tsx → ...rtiesModal/components/TabView/TabView.tsx
diff --git a/.../DatasetItem/FilePropertiesModal/index.ts → .../choose-file/FilePropertiesModal/index.ts b/.../DatasetItem/FilePropertiesModal/index.ts → .../choose-file/FilePropertiesModal/index.ts
diff --git a/...ilePropertiesModal/tabs/PropertiesTab.tsx → ...ilePropertiesModal/tabs/PropertiesTab.tsx b/...ilePropertiesModal/tabs/PropertiesTab.tsx → ...ilePropertiesModal/tabs/PropertiesTab.tsx
@@ -2,9 +2,9 @@ import { useQuery } from '@apollo/client';
 import _ from 'lodash';
 import { FC, useEffect, useMemo } from 'react';
 import { SubmitHandler, useForm } from 'react-hook-form';
-import Button from '@components/Button';
-import { Checkbox, Text } from '@components/Inputs';
-import { ControlledSelect } from '@components/Inputs/Select';
+import Button from '@components/common/uikit/Button';
+import { Checkbox, Text } from '@components/common/uikit/Inputs';
+import { ControlledSelect } from '@components/common/uikit/Inputs/Select';
 import delimiterNames from '@constants/delimiterNames';
 import { getAlgorithmsConfig } from '@graphql/operations/queries/__generated__/getAlgorithmsConfig';
 import { GET_ALGORITHMS_CONFIG } from '@graphql/operations/queries/getAlgorithmsConfig';

diff --git a/...sModal/tabs/StatsTab/StatsTab.module.scss → ...sModal/tabs/StatsTab/StatsTab.module.scss b/...sModal/tabs/StatsTab/StatsTab.module.scss → ...sModal/tabs/StatsTab/StatsTab.module.scss
diff --git a/...tiesModal/tabs/StatsTab/StatsTab.test.tsx → ...tiesModal/tabs/StatsTab/StatsTab.test.tsx b/...tiesModal/tabs/StatsTab/StatsTab.test.tsx → ...tiesModal/tabs/StatsTab/StatsTab.test.tsx
@@ -3,7 +3,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { useRouter } from 'next/router';
-import { StatsTab } from '@components/FilePropertiesModal/tabs/StatsTab';
+import { StatsTab } from '@components/choose-file/FilePropertiesModal/tabs/StatsTab';
 import { startProcessingStats } from '@graphql/operations/mutations/__generated__/startProcessingStats';
 import { START_PROCESSING_STATS } from '@graphql/operations/mutations/startProcessingStats';
 import {

diff --git a/...pertiesModal/tabs/StatsTab/hooks/index.ts → ...pertiesModal/tabs/StatsTab/hooks/index.ts b/...pertiesModal/tabs/StatsTab/hooks/index.ts → ...pertiesModal/tabs/StatsTab/hooks/index.ts
diff --git a/...Modal/tabs/StatsTab/hooks/useFileStats.ts → ...Modal/tabs/StatsTab/hooks/useFileStats.ts b/...Modal/tabs/StatsTab/hooks/useFileStats.ts → ...Modal/tabs/StatsTab/hooks/useFileStats.ts
@@ -1,6 +1,6 @@
 import { useQuery } from '@apollo/client';
 import { Dispatch, SetStateAction } from 'react';
-import { StatsStage } from '@components/FilePropertiesModal/tabs/StatsTab';
+import { StatsStage } from '@components/choose-file/FilePropertiesModal/tabs/StatsTab';
 import {
   getFileStats,
   getFileStatsVariables,

diff --git a/.../tabs/StatsTab/hooks/usePollingControl.ts → .../tabs/StatsTab/hooks/usePollingControl.ts b/.../tabs/StatsTab/hooks/usePollingControl.ts → .../tabs/StatsTab/hooks/usePollingControl.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { StatsStage } from '@components/FilePropertiesModal/tabs/StatsTab';
+import { StatsStage } from '@components/choose-file/FilePropertiesModal/tabs/StatsTab';
 
 export const usePollingControl = (
   stage: StatsStage | null,

diff --git a/...tabs/StatsTab/hooks/useStartProcessing.ts → ...tabs/StatsTab/hooks/useStartProcessing.ts b/...tabs/StatsTab/hooks/useStartProcessing.ts → ...tabs/StatsTab/hooks/useStartProcessing.ts
diff --git a/...lePropertiesModal/tabs/StatsTab/index.tsx → ...lePropertiesModal/tabs/StatsTab/index.tsx b/...lePropertiesModal/tabs/StatsTab/index.tsx → ...lePropertiesModal/tabs/StatsTab/index.tsx
diff --git a/...Modal/tabs/StatsTab/stages/ErrorStage.tsx → ...Modal/tabs/StatsTab/stages/ErrorStage.tsx b/...Modal/tabs/StatsTab/stages/ErrorStage.tsx → ...Modal/tabs/StatsTab/stages/ErrorStage.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { Alert } from '@components/FileStats/Alert';
+import { Alert } from '@components/common/uikit/FileStats/Alert';
 import styles from '../StatsTab.module.scss';
 
 type ErrorStageProps = {

diff --git a/...dal/tabs/StatsTab/stages/LoadingStage.tsx → ...dal/tabs/StatsTab/stages/LoadingStage.tsx b/...dal/tabs/StatsTab/stages/LoadingStage.tsx → ...dal/tabs/StatsTab/stages/LoadingStage.tsx
diff --git a/...ertiesModal/tabs/StatsTab/stages/Menu.tsx → ...ertiesModal/tabs/StatsTab/stages/Menu.tsx b/...ertiesModal/tabs/StatsTab/stages/Menu.tsx → ...ertiesModal/tabs/StatsTab/stages/Menu.tsx
@@ -1,6 +1,6 @@
 import { ComponentType } from 'react';
 import { MenuProps } from 'react-select';
-import { InputPropsBase } from '@components/Inputs';
+import { InputPropsBase } from '@components/common/uikit/Inputs';
 import styles from '../StatsTab.module.scss';
 
 export const Menu: ComponentType<MenuProps & InputPropsBase> = ({

diff --git a/...abs/StatsTab/stages/NotSupportedStage.tsx → ...abs/StatsTab/stages/NotSupportedStage.tsx b/...abs/StatsTab/stages/NotSupportedStage.tsx → ...abs/StatsTab/stages/NotSupportedStage.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { Alert } from '@components/FileStats/Alert';
+import { Alert } from '@components/common/uikit/FileStats/Alert';
 import styles from '../StatsTab.module.scss';
 
 export const NotSupportedStage: FC = () => (

diff --git a/...tiesModal/tabs/StatsTab/stages/Option.tsx → ...tiesModal/tabs/StatsTab/stages/Option.tsx b/...tiesModal/tabs/StatsTab/stages/Option.tsx → ...tiesModal/tabs/StatsTab/stages/Option.tsx
@@ -1,8 +1,8 @@
 import { ComponentType } from 'react';
 import { OptionProps } from 'react-select';
-import { Badge } from '@components/FileStats/Badge';
-import { InputPropsBase } from '@components/Inputs';
-import { Option as CustomOption } from '@components/Inputs/Select/customComponents';
+import { Badge } from '@components/common/uikit/FileStats/Badge';
+import { InputPropsBase } from '@components/common/uikit/Inputs';
+import { Option as CustomOption } from '@components/common/uikit/Inputs/Select/customComponents';
 import { ColumnOption } from 'types/fileStats';
 import styles from '../StatsTab.module.scss';
 

diff --git a/...esModal/tabs/StatsTab/stages/Overview.tsx → ...esModal/tabs/StatsTab/stages/Overview.tsx b/...esModal/tabs/StatsTab/stages/Overview.tsx → ...esModal/tabs/StatsTab/stages/Overview.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { Table } from '@components/FileStats/Table';
+import { Table } from '@components/common/uikit/FileStats/Table';
 import { getFileStats_datasetInfo } from '@graphql/operations/queries/__generated__/getFileStats';
 import { getOverview } from '@utils/fileStats';
 

diff --git a/.../tabs/StatsTab/stages/ProcessingStage.tsx → .../tabs/StatsTab/stages/ProcessingStage.tsx b/.../tabs/StatsTab/stages/ProcessingStage.tsx → .../tabs/StatsTab/stages/ProcessingStage.tsx
@@ -1,6 +1,6 @@
 import { FC, useId } from 'react';
-import Button from '@components/Button';
-import { Progress } from '@components/FileStats/Progress';
+import Button from '@components/common/uikit/Button';
+import { Progress } from '@components/common/uikit/FileStats/Progress';
 import { getFileStats_datasetInfo_statsInfo_state_TaskState as TaskState } from '@graphql/operations/queries/__generated__/getFileStats';
 import styles from '../StatsTab.module.scss';
 import { Stage } from './Stage';

diff --git a/...sModal/tabs/StatsTab/stages/ShowStage.tsx → ...sModal/tabs/StatsTab/stages/ShowStage.tsx b/...sModal/tabs/StatsTab/stages/ShowStage.tsx → ...sModal/tabs/StatsTab/stages/ShowStage.tsx
@@ -1,8 +1,8 @@
 import { useRouter } from 'next/router';
 import { FC, useState } from 'react';
-import Button from '@components/Button';
-import { ColumnCard } from '@components/FileStats/ColumnCard';
-import { Select } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { ColumnCard } from '@components/common/uikit/FileStats/ColumnCard';
+import { Select } from '@components/common/uikit/Inputs';
 import { getFileStats_datasetInfo } from '@graphql/operations/queries/__generated__/getFileStats';
 import { ColumnOption } from 'types/fileStats';
 import styles from '../StatsTab.module.scss';

diff --git a/...rtiesModal/tabs/StatsTab/stages/Stage.tsx → ...rtiesModal/tabs/StatsTab/stages/Stage.tsx b/...rtiesModal/tabs/StatsTab/stages/Stage.tsx → ...rtiesModal/tabs/StatsTab/stages/Stage.tsx
diff --git a/...Modal/tabs/StatsTab/stages/StartStage.tsx → ...Modal/tabs/StatsTab/stages/StartStage.tsx b/...Modal/tabs/StatsTab/stages/StartStage.tsx → ...Modal/tabs/StatsTab/stages/StartStage.tsx
@@ -1,7 +1,7 @@
 import { FC, useState } from 'react';
-import Button from '@components/Button';
-import { Alert } from '@components/FileStats/Alert';
-import NumberSlider from '@components/Inputs/NumberSlider/NumberSlider';
+import Button from '@components/common/uikit/Button';
+import { Alert } from '@components/common/uikit/FileStats/Alert';
+import NumberSlider from '@components/common/uikit/Inputs/NumberSlider/NumberSlider';
 import styles from '../StatsTab.module.scss';
 import { Stage } from './Stage';
 

diff --git a/...ertiesModal/tabs/StatsTab/stages/index.ts → ...ertiesModal/tabs/StatsTab/stages/index.ts b/...ertiesModal/tabs/StatsTab/stages/index.ts → ...ertiesModal/tabs/StatsTab/stages/index.ts
diff --git a/...s/PrimitiveCard/PrimitiveCard.module.scss → ...e/PrimitiveCard/PrimitiveCard.module.scss b/...s/PrimitiveCard/PrimitiveCard.module.scss → ...e/PrimitiveCard/PrimitiveCard.module.scss
diff --git a/...omponents/PrimitiveCard/PrimitiveCard.tsx → ...primitive/PrimitiveCard/PrimitiveCard.tsx b/...omponents/PrimitiveCard/PrimitiveCard.tsx → ...primitive/PrimitiveCard/PrimitiveCard.tsx
@@ -1,7 +1,7 @@
 import cn from 'classnames';
 import { FC, FormEvent } from 'react';
-import { Radio } from '@components/Inputs';
-import PrimitiveDescription from '@components/PrimitiveDescription';
+import PrimitiveDescription from '@components/choose-primitive/PrimitiveDescription';
+import { Radio } from '@components/common/uikit/Inputs';
 import { PrimitiveInfoType } from '@constants/primitiveInfoType';
 import styles from './PrimitiveCard.module.scss';
 

diff --git a/...ent/src/components/PrimitiveCard/index.ts → ...s/choose-primitive/PrimitiveCard/index.ts b/...ent/src/components/PrimitiveCard/index.ts → ...s/choose-primitive/PrimitiveCard/index.ts
diff --git a/...cription/PrimitiveDescription.module.scss → ...cription/PrimitiveDescription.module.scss b/...cription/PrimitiveDescription.module.scss → ...cription/PrimitiveDescription.module.scss
diff --git a/...itiveDescription/PrimitiveDescription.tsx → ...itiveDescription/PrimitiveDescription.tsx b/...itiveDescription/PrimitiveDescription.tsx → ...itiveDescription/PrimitiveDescription.tsx
diff --git a/.../components/PrimitiveDescription/index.ts → ...e-primitive/PrimitiveDescription/index.ts b/.../components/PrimitiveDescription/index.ts → ...e-primitive/PrimitiveDescription/index.ts
diff --git a/.../src/components/ClientOnly/ClientOnly.tsx → ...s/common/layout/ClientOnly/ClientOnly.tsx b/.../src/components/ClientOnly/ClientOnly.tsx → ...s/common/layout/ClientOnly/ClientOnly.tsx
diff --git a/...client/src/components/ClientOnly/index.ts → ...ponents/common/layout/ClientOnly/index.ts b/...client/src/components/ClientOnly/index.ts → ...ponents/common/layout/ClientOnly/index.ts
diff --git a/.../src/components/Layout/Layout.module.scss → ...s/common/layout/Layout/Layout.module.scss b/.../src/components/Layout/Layout.module.scss → ...s/common/layout/Layout/Layout.module.scss
diff --git a/...p/client/src/components/Layout/Layout.tsx → ...omponents/common/layout/Layout/Layout.tsx b/...p/client/src/components/Layout/Layout.tsx → ...omponents/common/layout/Layout/Layout.tsx
@@ -1,13 +1,13 @@
-const MobileBanner = dynamic(() => import('@components/MobileBanner'), {
+const MobileBanner = dynamic(() => import('./components/MobileBanner'), {
   ssr: false,
 });
 
 import { useAtom } from 'jotai';
 import dynamic from 'next/dynamic';
 import Head from 'next/head';
 import visibleModalsAtom from '@atoms/visibleModalsAtom';
-import Header from '@components/Header';
 import { FCWithChildren } from 'types/react';
+import Header from './components/Header';
 import styles from './Layout.module.scss';
 
 const Layout: FCWithChildren = ({ children }) => {

diff --git a/.../src/components/Header/Header.module.scss → ...yout/components/Header/Header.module.scss b/.../src/components/Header/Header.module.scss → ...yout/components/Header/Header.module.scss
diff --git a/...p/client/src/components/Header/Header.tsx → ...ayout/Layout/components/Header/Header.tsx b/...p/client/src/components/Header/Header.tsx → ...ayout/Layout/components/Header/Header.tsx
@@ -2,10 +2,10 @@ import classNames from 'classnames';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import ListIcon from '@assets/icons/list.svg?component';
-import Button from '@components/Button';
-import NavBar from '@components/NavBar';
+import Button from '@components/common/uikit/Button';
 import { useAuthContext } from '@hooks/useAuthContext';
 import useModal from '@hooks/useModal';
+import NavBar from './components/NavBar';
 import styles from './Header.module.scss';
 
 const Header = () => {

diff --git a/.../src/components/NavBar/NavBar.module.scss → ...ader/components/NavBar/NavBar.module.scss b/.../src/components/NavBar/NavBar.module.scss → ...ader/components/NavBar/NavBar.module.scss
diff --git a/...p/client/src/components/NavBar/NavBar.tsx → ...nents/Header/components/NavBar/NavBar.tsx b/...p/client/src/components/NavBar/NavBar.tsx → ...nents/Header/components/NavBar/NavBar.tsx
diff --git a/...app/client/src/components/NavBar/index.ts → ...ponents/Header/components/NavBar/index.ts b/...app/client/src/components/NavBar/index.ts → ...ponents/Header/components/NavBar/index.ts
diff --git a/...app/client/src/components/Header/index.ts → .../layout/Layout/components/Header/index.ts b/...app/client/src/components/Header/index.ts → .../layout/Layout/components/Header/index.ts
diff --git a/...nts/MobileBanner/MobileBanner.module.scss → ...nts/MobileBanner/MobileBanner.module.scss b/...nts/MobileBanner/MobileBanner.module.scss → ...nts/MobileBanner/MobileBanner.module.scss
diff --git a/.../components/MobileBanner/MobileBanner.tsx → .../components/MobileBanner/MobileBanner.tsx b/.../components/MobileBanner/MobileBanner.tsx → .../components/MobileBanner/MobileBanner.tsx
diff --git a/...ient/src/components/MobileBanner/index.ts → ...t/Layout/components/MobileBanner/index.ts b/...ient/src/components/MobileBanner/index.ts → ...t/Layout/components/MobileBanner/index.ts
diff --git a/...app/client/src/components/Layout/index.ts → .../components/common/layout/Layout/index.ts b/...app/client/src/components/Layout/index.ts → .../components/common/layout/Layout/index.ts
diff --git a/...tiesModal/ListPropertiesModal.module.scss → ...tiesModal/ListPropertiesModal.module.scss b/...tiesModal/ListPropertiesModal.module.scss → ...tiesModal/ListPropertiesModal.module.scss
diff --git a/...stPropertiesModal/ListPropertiesModal.tsx → ...stPropertiesModal/ListPropertiesModal.tsx b/...stPropertiesModal/ListPropertiesModal.tsx → ...stPropertiesModal/ListPropertiesModal.tsx
@@ -1,5 +1,7 @@
-import Button from '@components/Button';
-import ModalContainer, { ModalProps } from '@components/ModalContainer';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
+import Button from '@components/common/uikit/Button';
 import { FCWithChildren } from 'types/react';
 import styles from './ListPropertiesModal.module.scss';
 

diff --git a/...c/components/ListPropertiesModal/index.ts → ...ommon/layout/ListPropertiesModal/index.ts b/...c/components/ListPropertiesModal/index.ts → ...ommon/layout/ListPropertiesModal/index.ts
diff --git a/...ModalContainer/ModalContainer.module.scss → ...ModalContainer/ModalContainer.module.scss b/...ModalContainer/ModalContainer.module.scss → ...ModalContainer/ModalContainer.module.scss
diff --git a/...ponents/ModalContainer/ModalContainer.tsx → .../layout/ModalContainer/ModalContainer.tsx b/...ponents/ModalContainer/ModalContainer.tsx → .../layout/ModalContainer/ModalContainer.tsx
@@ -2,7 +2,7 @@ import cn from 'classnames';
 import { useEffect } from 'react';
 import { animated, useSpring } from 'react-spring';
 import CloseIcon from '@assets/icons/close.svg?component';
-import OutsideClickObserver from '@components/OutsideClickObserver';
+import OutsideClickObserver from '@components/common/layout/OutsideClickObserver';
 import { FCWithChildren } from 'types/react';
 import styles from './ModalContainer.module.scss';
 

diff --git a/...nt/src/components/ModalContainer/index.ts → ...nts/common/layout/ModalContainer/index.ts b/...nt/src/components/ModalContainer/index.ts → ...nts/common/layout/ModalContainer/index.ts
diff --git a/...ideClickObserver/OutsideClickObserver.tsx → ...ideClickObserver/OutsideClickObserver.tsx b/...ideClickObserver/OutsideClickObserver.tsx → ...ideClickObserver/OutsideClickObserver.tsx
diff --git a/.../components/OutsideClickObserver/index.ts → ...mmon/layout/OutsideClickObserver/index.ts b/.../components/OutsideClickObserver/index.ts → ...mmon/layout/OutsideClickObserver/index.ts
diff --git a/...s/ReportsLayout/ReportsLayout.module.scss → ...t/ReportsLayout/ReportsLayout.module.scss b/...s/ReportsLayout/ReportsLayout.module.scss → ...t/ReportsLayout/ReportsLayout.module.scss
diff --git a/...omponents/ReportsLayout/ReportsLayout.tsx → ...on/layout/ReportsLayout/ReportsLayout.tsx b/...omponents/ReportsLayout/ReportsLayout.tsx → ...on/layout/ReportsLayout/ReportsLayout.tsx
diff --git a/...nt/src/components/ReportsLayout/index.tsx → ...nts/common/layout/ReportsLayout/index.tsx b/...nt/src/components/ReportsLayout/index.tsx → ...nts/common/layout/ReportsLayout/index.tsx
diff --git a/...NodeTable/ScrollableNodeTable.module.scss → ...NodeTable/ScrollableNodeTable.module.scss b/...NodeTable/ScrollableNodeTable.module.scss → ...NodeTable/ScrollableNodeTable.module.scss
diff --git a/...rollableNodeTable/ScrollableNodeTable.tsx → ...rollableNodeTable/ScrollableNodeTable.tsx b/...rollableNodeTable/ScrollableNodeTable.tsx → ...rollableNodeTable/ScrollableNodeTable.tsx
diff --git a/...ponents/ScrollableNodeTable/TableTypes.ts → .../layout/ScrollableNodeTable/TableTypes.ts b/...ponents/ScrollableNodeTable/TableTypes.ts → .../layout/ScrollableNodeTable/TableTypes.ts
diff --git a/...able/implementations/MFDTable.module.scss → ...able/implementations/MFDTable.module.scss b/...able/implementations/MFDTable.module.scss → ...able/implementations/MFDTable.module.scss
diff --git a/...bleNodeTable/implementations/MFDTable.tsx → ...bleNodeTable/implementations/MFDTable.tsx b/...bleNodeTable/implementations/MFDTable.tsx → ...bleNodeTable/implementations/MFDTable.tsx
@@ -4,12 +4,11 @@ import Check from '@assets/icons/check.svg?component';
 import Cross from '@assets/icons/cross.svg?component';
 
 import { MFDHighlight } from '@atoms/MFDTaskAtom';
-
 import Table, {
   Row,
   ScrollDirection,
   TableProps,
-} from '@components/ScrollableNodeTable';
+} from '@components/common/layout/ScrollableNodeTable';
 
 import styles from './MFDTable.module.scss';
 

diff --git a/...c/components/ScrollableNodeTable/index.ts → ...ommon/layout/ScrollableNodeTable/index.ts b/...c/components/ScrollableNodeTable/index.ts → ...ommon/layout/ScrollableNodeTable/index.ts
diff --git a/...omponents/TabLayout/TabLayout.module.scss → ...on/layout/TabLayout/TabLayout.module.scss b/...omponents/TabLayout/TabLayout.module.scss → ...on/layout/TabLayout/TabLayout.module.scss
diff --git a/...nt/src/components/TabLayout/TabLayout.tsx → ...nts/common/layout/TabLayout/TabLayout.tsx b/...nt/src/components/TabLayout/TabLayout.tsx → ...nts/common/layout/TabLayout/TabLayout.tsx
@@ -5,9 +5,9 @@ import { DefaultValues, FormProvider, useForm } from 'react-hook-form';
 import { Subscription } from 'react-hook-form/dist/utils/createSubject';
 import FilterIcon from '@assets/icons/filter.svg?component';
 import OrderingIcon from '@assets/icons/ordering.svg?component';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
-import PaginationComponent from '@components/Pagination';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
+import PaginationComponent from '@components/common/uikit/Pagination';
 import useFormPersist, { StorageToValues } from '@hooks/useFormPersist';
 import { OrderDirection, Pagination } from 'types/globalTypes';
 import styles from './TabLayout.module.scss';

diff --git a/.../client/src/components/TabLayout/index.ts → ...mponents/common/layout/TabLayout/index.ts b/.../client/src/components/TabLayout/index.ts → ...mponents/common/layout/TabLayout/index.ts
diff --git a/...ponents/TabsLayout/TabsLayout.module.scss → .../layout/TabsLayout/TabsLayout.module.scss b/...ponents/TabsLayout/TabsLayout.module.scss → .../layout/TabsLayout/TabsLayout.module.scss
diff --git a/.../src/components/TabsLayout/TabsLayout.tsx → ...s/common/layout/TabsLayout/TabsLayout.tsx b/.../src/components/TabsLayout/TabsLayout.tsx → ...s/common/layout/TabsLayout/TabsLayout.tsx
diff --git a/...client/src/components/TabsLayout/index.ts → ...ponents/common/layout/TabsLayout/index.ts b/...client/src/components/TabsLayout/index.ts → ...ponents/common/layout/TabsLayout/index.ts
diff --git a/...nts/WizardLayout/WizardLayout.module.scss → ...out/WizardLayout/WizardLayout.module.scss b/...nts/WizardLayout/WizardLayout.module.scss → ...out/WizardLayout/WizardLayout.module.scss
diff --git a/.../components/WizardLayout/WizardLayout.tsx → ...mmon/layout/WizardLayout/WizardLayout.tsx b/.../components/WizardLayout/WizardLayout.tsx → ...mmon/layout/WizardLayout/WizardLayout.tsx
diff --git a/...ent/src/components/WizardLayout/index.tsx → ...ents/common/layout/WizardLayout/index.tsx b/...ent/src/components/WizardLayout/index.tsx → ...ents/common/layout/WizardLayout/index.tsx
diff --git a/.../src/components/Button/Button.module.scss → ...ts/common/uikit/Button/Button.module.scss b/.../src/components/Button/Button.module.scss → ...ts/common/uikit/Button/Button.module.scss
diff --git a/...ent/src/components/Button/Button.test.tsx → ...nents/common/uikit/Button/Button.test.tsx b/...ent/src/components/Button/Button.test.tsx → ...nents/common/uikit/Button/Button.test.tsx
diff --git a/...p/client/src/components/Button/Button.tsx → ...components/common/uikit/Button/Button.tsx b/...p/client/src/components/Button/Button.tsx → ...components/common/uikit/Button/Button.tsx
diff --git a/...app/client/src/components/Button/index.ts → ...c/components/common/uikit/Button/index.ts b/...app/client/src/components/Button/index.ts → ...c/components/common/uikit/Button/index.ts
diff --git a/...omponents/Chart/ChartControls.module.scss → ...mon/uikit/Chart/ChartControls.module.scss b/...omponents/Chart/ChartControls.module.scss → ...mon/uikit/Chart/ChartControls.module.scss
diff --git a/...nt/src/components/Chart/ChartControls.tsx → ...ents/common/uikit/Chart/ChartControls.tsx b/...nt/src/components/Chart/ChartControls.tsx → ...ents/common/uikit/Chart/ChartControls.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react';
 import CollapseChartIcon from '@assets/icons/collapse-chart.svg?component';
-import Button from '@components/Button';
-import { Text } from '@components/Inputs';
+import Button from '@components/common/uikit/Button';
+import { Text } from '@components/common/uikit/Inputs';
 import styles from './ChartControls.module.scss';
 
 type Props = {

diff --git a/...components/Chart/LayeredChart.module.scss → ...mmon/uikit/Chart/LayeredChart.module.scss b/...components/Chart/LayeredChart.module.scss → ...mmon/uikit/Chart/LayeredChart.module.scss
diff --git a/...ent/src/components/Chart/LayeredChart.tsx → ...nents/common/uikit/Chart/LayeredChart.tsx b/...ent/src/components/Chart/LayeredChart.tsx → ...nents/common/uikit/Chart/LayeredChart.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { animated } from 'react-spring';
-import { DepAttribute } from '@components/TaskContext';
+import { DepAttribute } from '@components/meta/TaskContext';
 import { Column } from '@graphql/operations/fragments/__generated__/Column';
 import { ChartControls } from './ChartControls';
 import styles from './LayeredChart.module.scss';

diff --git a/web-app/client/src/components/Chart/index.ts → ...rc/components/common/uikit/Chart/index.ts b/web-app/client/src/components/Chart/index.ts → ...rc/components/common/uikit/Chart/index.ts
diff --git a/...nents/DatasetItem/DatasetItem.module.scss → ...uikit/DatasetItem/DatasetItem.module.scss b/...nents/DatasetItem/DatasetItem.module.scss → ...uikit/DatasetItem/DatasetItem.module.scss
diff --git a/...rc/components/DatasetItem/DatasetItem.tsx → .../common/uikit/DatasetItem/DatasetItem.tsx b/...rc/components/DatasetItem/DatasetItem.tsx → .../common/uikit/DatasetItem/DatasetItem.tsx
@@ -2,9 +2,9 @@ import moment from 'moment';
 import prettyBytes from 'pretty-bytes';
 import { FC, useState } from 'react';
 import FileIcon from '@assets/icons/file.svg?component';
-import Button from '@components/Button';
+import Button from '@components/common/uikit/Button';
 import { getDatasetsInfo_datasets_data } from '@graphql/operations/queries/__generated__/getDatasetsInfo';
-import FilePropertiesModal from './FilePropertiesModal';
+import FilePropertiesModal from './components/FilePropertiesModal';
 import styles from './DatasetItem.module.scss';
 
 interface Props {

diff --git a/...tiesModal/FilePropertiesModal.module.scss → ...tiesModal/FilePropertiesModal.module.scss b/...tiesModal/FilePropertiesModal.module.scss → ...tiesModal/FilePropertiesModal.module.scss
diff --git a/...lePropertiesModal/FilePropertiesModal.tsx → ...lePropertiesModal/FilePropertiesModal.tsx b/...lePropertiesModal/FilePropertiesModal.tsx → ...lePropertiesModal/FilePropertiesModal.tsx
@@ -1,6 +1,8 @@
 import { FC } from 'react';
-import { FilePropsList } from '@components/FilePropertiesModal/tabs/PropertiesTab';
-import ModalContainer, { ModalProps } from '@components/ModalContainer';
+import { FilePropsList } from '@components/choose-file/FilePropertiesModal/tabs/PropertiesTab';
+import ModalContainer, {
+  ModalProps,
+} from '@components/common/layout/ModalContainer';
 import { AllowedDataset } from 'types/algorithms';
 import styles from './FilePropertiesModal.module.scss';
 

diff --git a/...c/components/FilePropertiesModal/index.ts → ...m/components/FilePropertiesModal/index.ts b/...c/components/FilePropertiesModal/index.ts → ...m/components/FilePropertiesModal/index.ts
diff --git a/...lient/src/components/DatasetItem/index.ts → ...ponents/common/uikit/DatasetItem/index.ts b/...lient/src/components/DatasetItem/index.ts → ...ponents/common/uikit/DatasetItem/index.ts
diff --git a/...nts/ExternalLink/ExternalLink.module.scss → ...kit/ExternalLink/ExternalLink.module.scss b/...nts/ExternalLink/ExternalLink.module.scss → ...kit/ExternalLink/ExternalLink.module.scss
diff --git a/.../components/ExternalLink/ExternalLink.tsx → ...ommon/uikit/ExternalLink/ExternalLink.tsx b/.../components/ExternalLink/ExternalLink.tsx → ...ommon/uikit/ExternalLink/ExternalLink.tsx
diff --git a/...ient/src/components/ExternalLink/index.ts → ...onents/common/uikit/ExternalLink/index.ts b/...ient/src/components/ExternalLink/index.ts → ...onents/common/uikit/ExternalLink/index.ts
diff --git a/...ponents/FileStats/Alert/Alert.module.scss → ...n/uikit/FileStats/Alert/Alert.module.scss b/...ponents/FileStats/Alert/Alert.module.scss → ...n/uikit/FileStats/Alert/Alert.module.scss
diff --git a/.../src/components/FileStats/Alert/Alert.tsx → ...ts/common/uikit/FileStats/Alert/Alert.tsx b/.../src/components/FileStats/Alert/Alert.tsx → ...ts/common/uikit/FileStats/Alert/Alert.tsx
diff --git a/...t/src/components/FileStats/Alert/index.ts → ...nts/common/uikit/FileStats/Alert/index.ts b/...t/src/components/FileStats/Alert/index.ts → ...nts/common/uikit/FileStats/Alert/index.ts
diff --git a/...ponents/FileStats/Badge/Badge.module.scss → ...n/uikit/FileStats/Badge/Badge.module.scss b/...ponents/FileStats/Badge/Badge.module.scss → ...n/uikit/FileStats/Badge/Badge.module.scss
diff --git a/.../src/components/FileStats/Badge/Badge.tsx → ...ts/common/uikit/FileStats/Badge/Badge.tsx b/.../src/components/FileStats/Badge/Badge.tsx → ...ts/common/uikit/FileStats/Badge/Badge.tsx
diff --git a/...t/src/components/FileStats/Badge/index.ts → ...nts/common/uikit/FileStats/Badge/index.ts b/...t/src/components/FileStats/Badge/index.ts → ...nts/common/uikit/FileStats/Badge/index.ts
diff --git a/...leStats/ColumnCard/ColumnCard.module.scss → ...leStats/ColumnCard/ColumnCard.module.scss b/...leStats/ColumnCard/ColumnCard.module.scss → ...leStats/ColumnCard/ColumnCard.module.scss
diff --git a/.../FileStats/ColumnCard/ColumnCard.test.tsx → .../FileStats/ColumnCard/ColumnCard.test.tsx b/.../FileStats/ColumnCard/ColumnCard.test.tsx → .../FileStats/ColumnCard/ColumnCard.test.tsx
@@ -1,6 +1,6 @@
+import { ColumnCard } from '@components/FileStats/ColumnCard/ColumnCard';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { ColumnCard } from '@components/FileStats/ColumnCard/ColumnCard';
 import { completedFileStatsMock } from '@graphql/operations/queries/__mocks__/getFileStats';
 
 const user = userEvent.setup();