Refactoring: components folder structure

rsconcept/frontend/src/app/ErrorFallback.tsx

@@ -1,7 +1,7 @@
 import { type FallbackProps } from 'react-error-boundary';
 
-import Button from '../components/Common/Button';
 import InfoError from '../components/InfoError';
+import Button from '../components/ui/Button';
 
 function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
   return (

rsconcept/frontend/src/app/Footer.tsx

@@ -3,7 +3,7 @@ import clsx from 'clsx';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { urls } from '@/utils/constants';
 
-import TextURL from '../components/Common/TextURL';
+import TextURL from '../components/ui/TextURL';
 
 function Footer() {
   const { noNavigation, noFooter } = useConceptTheme();

rsconcept/frontend/src/app/Navigation/UserDropdown.tsx

@@ -1,5 +1,5 @@
-import Dropdown from '@/components/Common/Dropdown';
+import Dropdown from '@/components/ui/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
+import DropdownButton from '@/components/ui/DropdownButton';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useConceptTheme } from '@/context/ThemeContext';

rsconcept/frontend/src/components/ConstituentaPicker.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 
-import SearchBar from '@/components/Common/SearchBar';
 import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
+import SearchBar from '@/components/ui/SearchBar';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { CstMatchMode } from '@/models/miscellaneous';
 import { IConstituenta } from '@/models/rsform';

rsconcept/frontend/src/components/DataTable/SelectAll.tsx

@@ -1,6 +1,6 @@
 import { Table } from '@tanstack/react-table';
 
-import CheckboxTristate from '@/components/Common/CheckboxTristate';
+import CheckboxTristate from '@/components/ui/CheckboxTristate';
 
 interface SelectAllProps<TData> {
   table: Table<TData>;

rsconcept/frontend/src/components/DataTable/SelectRow.tsx

@@ -1,6 +1,6 @@
 import { Row } from '@tanstack/react-table';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
 
 interface SelectRowProps<TData> {
   row: Row<TData>;

rsconcept/frontend/src/components/ExpectedAnonymous.tsx

@@ -1,7 +1,7 @@
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 
-import TextURL from './Common/TextURL';
+import TextURL from './ui/TextURL';
 
 function ExpectedAnonymous() {
   const { user, logout } = useAuth();

rsconcept/frontend/src/components/Help/ConstituentaTooltip.tsx

@@ -1,5 +1,5 @@
-import Tooltip from '@/components/Common/Tooltip';
+import InfoConstituenta from '@/components/InfoConstituenta';
-import InfoConstituenta from '@/components/Shared/InfoConstituenta';
+import Tooltip from '@/components/ui/Tooltip';
 import { IConstituenta } from '@/models/rsform';
 
 interface ConstituentaTooltipProps {

rsconcept/frontend/src/components/Help/HelpAPI.tsx

@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpAPI() {

rsconcept/frontend/src/components/Help/HelpButton.tsx

@@ -1,7 +1,7 @@
 import { BiInfoCircle } from 'react-icons/bi';
 
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
-import Tooltip from '@/components/Common/Tooltip';
+import Tooltip from '@/components/ui/Tooltip';
 import { HelpTopic } from '@/models/miscellaneous';
 
 import { CProps } from '../props';

rsconcept/frontend/src/components/Help/HelpConstituenta.tsx

@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
+import InfoCstStatus from '@/components/InfoCstStatus';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpConstituenta() {
   // prettier-ignore

rsconcept/frontend/src/components/Help/HelpExteor.tsx

@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpExteor() {

rsconcept/frontend/src/components/Help/HelpMain.tsx

@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpMain() {

rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx

@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
+import InfoCstStatus from '@/components/InfoCstStatus';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpRSFormItems() {
   // prettier-ignore

rsconcept/frontend/src/components/Help/HelpRSLang.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import EmbedYoutube from '@/components/Common/EmbedYoutube';
+import EmbedYoutube from '@/components/ui/EmbedYoutube';
 import useWindowSize from '@/hooks/useWindowSize';
 import { urls, youtube } from '@/utils/constants';
 

rsconcept/frontend/src/components/Help/HelpTermGraph.tsx

@@ -1,6 +1,6 @@
-import Divider from '@/components/Common/Divider';
+import InfoCstClass from '@/components/InfoCstClass';
-import InfoCstClass from '@/components/Shared/InfoCstClass';
+import InfoCstStatus from '@/components/InfoCstStatus';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpTermGraph() {
   // prettier-ignore

rsconcept/frontend/src/components/InfoError.tsx

@@ -2,7 +2,7 @@ import axios, { type AxiosError } from 'axios';
 
 import { isResponseHtml } from '@/utils/utils';
 
-import PrettyJson from './Common/PrettyJSON';
+import PrettyJson from './ui/PrettyJSON';
 
 export type ErrorData = string | Error | AxiosError | undefined;
 

rsconcept/frontend/src/components/InfoLibraryItem.tsx

@@ -3,7 +3,7 @@ import { useIntl } from 'react-intl';
 import { useUsers } from '@/context/UsersContext';
 import { ILibraryItemEx } from '@/models/library';
 
-import LabeledValue from '../Common/LabeledValue';
+import LabeledValue from './ui/LabeledValue';
 
 interface InfoLibraryItemProps {
   item?: ILibraryItemEx;

rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx

@@ -7,7 +7,7 @@ import { Document, Page } from 'react-pdf';
 import useWindowSize from '@/hooks/useWindowSize';
 import { graphLightT } from '@/utils/color';
 
-import Overlay from '../Common/Overlay';
+import Overlay from '../ui/Overlay';
 import PageControls from './PageControls';
 
 const MAXIMUM_WIDTH = 1000;

rsconcept/frontend/src/components/RSInput/RSInput.tsx

@@ -8,7 +8,7 @@ import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { forwardRef, useCallback, useMemo, useRef } from 'react';
 
-import Label from '@/components/Common/Label';
+import Label from '@/components/ui/Label';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 

rsconcept/frontend/src/components/RefsInput/RefsInput.tsx

@@ -9,7 +9,7 @@ import { EditorView } from 'codemirror';
 import { AnimatePresence } from 'framer-motion';
 import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 
-import Label from '@/components/Common/Label';
+import Label from '@/components/ui/Label';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';

rsconcept/frontend/src/components/RequireAuth.tsx

@@ -2,7 +2,7 @@
 
 import { useAuth } from '@/context/AuthContext';
 
-import TextURL from './Common/TextURL';
+import TextURL from './ui/TextURL';
 
 interface RequireAuthProps {
   children: React.ReactNode;

rsconcept/frontend/src/components/SelectGrammeme.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import SelectMulti, { SelectMultiProps } from '@/components/Common/SelectMulti';
+import SelectMulti, { SelectMultiProps } from '@/components/ui/SelectMulti';
 import { Grammeme } from '@/models/language';
 import { getCompatibleGrams } from '@/models/languageAPI';
 import { compareGrammemeOptions, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';

rsconcept/frontend/src/components/SelectedCounter.tsx

@@ -1,4 +1,4 @@
-import Overlay from '@/components/Common/Overlay';
+import Overlay from '@/components/ui/Overlay';
 
 interface SelectedCounterProps {
   total: number;

rsconcept/frontend/src/context/ThemeContext.tsx

@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useState } from 'react';
 
-import Tooltip from '@/components/Common/Tooltip';
+import Tooltip from '@/components/ui/Tooltip';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { animationDuration } from '@/utils/animations';
 import { darkT, IColorTheme, lightT } from '@/utils/color';

rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx

@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Modal, { ModalProps } from '@/components/ui/Modal';
-import TextArea from '@/components/Common/TextArea';
+import TextArea from '@/components/ui/TextArea';
-import TextInput from '@/components/Common/TextInput';
+import TextInput from '@/components/ui/TextInput';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { ILibraryItem } from '@/models/library';

rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx

@@ -5,10 +5,10 @@ import clsx from 'clsx';
 import { Dispatch, useCallback, useEffect, useMemo, useState } from 'react';
 import { BiCheck, BiRefresh, BiX } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
 import DataTable, { IConditionalStyle } from '@/components/DataTable';
 import RSInput from '@/components/RSInput';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
+import MiniButton from '@/components/ui/MiniButton';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { IConstituenta, IRSForm } from '@/models/rsform';
 import { IArgumentValue } from '@/models/rslang';

rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx

@@ -2,10 +2,10 @@
 
 import { Dispatch } from 'react';
 
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import RSInput from '@/components/RSInput';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { CstType, ICstCreateData } from '@/models/rsform';
 import { labelCstType } from '@/utils/labels';
 import { SelectorCstType } from '@/utils/selectors';

rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx

@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
-import TabLabel from '@/components/Common/TabLabel';
 import HelpButton from '@/components/Help/HelpButton';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TabLabel from '@/components/ui/TabLabel';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';

rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx

@@ -2,10 +2,10 @@
 
 import { Dispatch, useEffect, useMemo, useState } from 'react';
 
-import SelectSingle from '@/components/Common/SelectSingle';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
-import TextArea from '@/components/Common/TextArea';
 import RSInput from '@/components/RSInput';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
 import { useLibrary } from '@/context/LibraryContext';
 import { CATEGORY_CST_TYPE, IConstituenta, IRSForm } from '@/models/rsform';
 import { applyFilterCategory } from '@/models/rsformAPI';

rsconcept/frontend/src/dialogs/DlgCreateCst.tsx

@@ -3,11 +3,11 @@
 import clsx from 'clsx';
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import RSInput from '@/components/RSInput';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
 import { generateAlias, validateNewAlias } from '@/models/rsformAPI';

rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx

@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useMemo, useState } from 'react';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import { IRSForm } from '@/models/rsform';
 import { classnames, prefixes } from '@/utils/constants';
 

rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx

@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 
-import TabLabel from '@/components/Common/TabLabel';
-import Modal from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import Modal from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TabLabel from '@/components/ui/TabLabel';
 import { ReferenceType } from '@/models/language';
 import { HelpTopic } from '@/models/miscellaneous';
 import { IConstituenta } from '@/models/rsform';

rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx

@@ -2,11 +2,11 @@
 
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import FlexColumn from '@/components/Common/FlexColumn';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
-import Label from '@/components/Common/Label';
+import SelectGrammeme from '@/components/SelectGrammeme';
-import TextInput from '@/components/Common/TextInput';
+import FlexColumn from '@/components/ui/FlexColumn';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
+import Label from '@/components/ui/Label';
-import SelectGrammeme from '@/components/Shared/SelectGrammeme';
+import TextInput from '@/components/ui/TextInput';
 import { ReferenceType } from '@/models/language';
 import { parseEntityReference, parseGrammemes } from '@/models/languageAPI';
 import { CstMatchMode } from '@/models/miscellaneous';

rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
 
-import TextInput from '@/components/Common/TextInput';
+import TextInput from '@/components/ui/TextInput';
 import { ReferenceType } from '@/models/language';
 import { parseSyntacticReference } from '@/models/languageAPI';
 

rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx

@@ -4,13 +4,13 @@ import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 import { BiCheck, BiChevronsDown, BiLeftArrow, BiRightArrow, BiX } from 'react-icons/bi';
 
-import Label from '@/components/Common/Label';
-import MiniButton from '@/components/Common/MiniButton';
-import Modal from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
-import TextArea from '@/components/Common/TextArea';
 import HelpButton from '@/components/Help/HelpButton';
-import SelectGrammeme from '@/components/Shared/SelectGrammeme';
+import SelectGrammeme from '@/components/SelectGrammeme';
+import Label from '@/components/ui/Label';
+import MiniButton from '@/components/ui/MiniButton';
+import Modal from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TextArea from '@/components/ui/TextArea';
 import useConceptText from '@/hooks/useConceptText';
 import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/language';
 import { parseGrammemes, wordFormEquals } from '@/models/languageAPI';

rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx

@@ -4,9 +4,9 @@ import clsx from 'clsx';
 import { useCallback, useMemo } from 'react';
 import { BiX } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
+import MiniButton from '@/components/ui/MiniButton';
 import DataTable, { createColumnHelper } from '@/components/DataTable';
-import WordFormBadge from '@/components/Shared/WordFormBadge';
+import WordFormBadge from '@/components/WordFormBadge';
 import { IWordForm } from '@/models/language';
 
 interface WordFormsTableProps {

rsconcept/frontend/src/dialogs/DlgGraphParams.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { GraphFilterParams } from '@/models/miscellaneous';
 import { CstType } from '@/models/rsform';

rsconcept/frontend/src/dialogs/DlgRenameCst.tsx

@@ -3,9 +3,9 @@
 import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Modal, { ModalProps } from '@/components/ui/Modal';
-import SelectSingle from '@/components/Common/SelectSingle';
+import SelectSingle from '@/components/ui/SelectSingle';
-import TextInput from '@/components/Common/TextInput';
+import TextInput from '@/components/ui/TextInput';
 import { useRSForm } from '@/context/RSFormContext';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { CstType, ICstRenameData } from '@/models/rsform';

rsconcept/frontend/src/dialogs/DlgShowAST.tsx

@@ -2,8 +2,8 @@
 
 import { useCallback, useMemo, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
 import GraphUI, { GraphEdge, GraphNode } from '@/components/GraphUI';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { SyntaxTree } from '@/models/rslang';
 import { graphDarkT, graphLightT } from '@/utils/color';

rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx

@@ -3,9 +3,9 @@
 import { useState } from 'react';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
-import FileInput from '@/components/Common/FileInput';
+import FileInput from '@/components/ui/FileInput';
-import Modal from '@/components/Common/Modal';
+import Modal from '@/components/ui/Modal';
 import { useRSForm } from '@/context/RSFormContext';
 import { IRSFormUploadData } from '@/models/rsform';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';

rsconcept/frontend/src/pages/CreateRSFormPage.tsx

@@ -5,16 +5,16 @@ import { useEffect, useRef, useState } from 'react';
 import { BiDownload } from 'react-icons/bi';
 import { toast } from 'react-toastify';
 
-import Button from '@/components/Common/Button';
-import Checkbox from '@/components/Common/Checkbox';
-import Label from '@/components/Common/Label';
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import InfoError from '@/components/InfoError';
 import RequireAuth from '@/components/RequireAuth';
+import Button from '@/components/ui/Button';
+import Checkbox from '@/components/ui/Checkbox';
+import Label from '@/components/ui/Label';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { LibraryItemType } from '@/models/library';

rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx

@@ -2,8 +2,8 @@
 
 import { useCallback, useLayoutEffect, useState } from 'react';
 
-import { Loader } from '@/components/Common/Loader';
 import InfoError from '@/components/InfoError';
+import { Loader } from '@/components/ui/Loader';
 import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';

rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx

@@ -3,9 +3,9 @@
 import { useCallback } from 'react';
 import { BiFilterAlt } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
+import Dropdown from '@/components/ui/Dropdown';
-import DropdownCheckbox from '@/components/Common/DropdownCheckbox';
+import DropdownCheckbox from '@/components/ui/DropdownCheckbox';
-import SelectorButton from '@/components/Common/SelectorButton';
+import SelectorButton from '@/components/ui/SelectorButton';
 import { useAuth } from '@/context/AuthContext';
 import useDropdown from '@/hooks/useDropdown';
 import { LibraryFilterStrategy } from '@/models/miscellaneous';

rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx

@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { useCallback } from 'react';
 
-import SearchBar from '@/components/Common/SearchBar';
+import SearchBar from '@/components/ui/SearchBar';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { ILibraryFilter } from '@/models/miscellaneous';
 import { LibraryFilterStrategy } from '@/models/miscellaneous';

rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx

@@ -4,9 +4,9 @@ import clsx from 'clsx';
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 
-import TextURL from '@/components/Common/TextURL';
 import DataTable, { createColumnHelper } from '@/components/DataTable';
 import HelpButton from '@/components/Help/HelpButton';
+import TextURL from '@/components/ui/TextURL';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useUsers } from '@/context/UsersContext';

rsconcept/frontend/src/pages/LoginPage.tsx

@@ -4,11 +4,11 @@ import axios from 'axios';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
-import TextURL from '@/components/Common/TextURL';
 import ExpectedAnonymous from '@/components/ExpectedAnonymous';
 import InfoError, { ErrorData } from '@/components/InfoError';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
+import TextURL from '@/components/ui/TextURL';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import useQueryStrings from '@/hooks/useQueryStrings';

rsconcept/frontend/src/pages/NotFoundPage.tsx

@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 
 export function NotFoundPage() {
   return (

rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx

@@ -4,9 +4,9 @@ import { useMemo } from 'react';
 import { BiDuplicate, BiPlusCircle, BiReset, BiTrash } from 'react-icons/bi';
 import { FiSave } from 'react-icons/fi';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface ConstituentaToolbarProps {

rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx

@@ -6,11 +6,11 @@ import { FiSave } from 'react-icons/fi';
 import { LiaEdit } from 'react-icons/lia';
 import { toast } from 'react-toastify';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
 import RefsInput from '@/components/RefsInput';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextArea from '@/components/ui/TextArea';
 import { useRSForm } from '@/context/RSFormContext';
 import { IConstituenta, ICstRenameData, ICstUpdateData } from '@/models/rsform';
 import { classnames } from '@/utils/constants';

rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx

@@ -8,10 +8,10 @@ import { FaRegKeyboard } from 'react-icons/fa6';
 import { RiNodeTree } from 'react-icons/ri';
 import { toast } from 'react-toastify';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import RSInput from '@/components/RSInput';
 import { RSTextWrapper } from '@/components/RSInput/textEditing';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { useRSForm } from '@/context/RSFormContext';
 import DlgShowAST from '@/dialogs/DlgShowAST';
 import useCheckExpression from '@/hooks/useCheckExpression';

rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx

@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { useMemo } from 'react';
 
-import { Loader } from '@/components/Common/Loader';
+import { Loader } from '@/components/ui/Loader';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { ExpressionStatus } from '@/models/rsform';
 import { type IConstituenta } from '@/models/rsform';

rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx

@@ -2,9 +2,9 @@
 
 import { Dispatch, SetStateAction } from 'react';
 
-import Divider from '@/components/Common/Divider';
+import InfoLibraryItem from '@/components/InfoLibraryItem';
-import FlexColumn from '@/components/Common/FlexColumn';
+import Divider from '@/components/ui/Divider';
-import InfoLibraryItem from '@/components/Shared/InfoLibraryItem';
+import FlexColumn from '@/components/ui/FlexColumn';
 import { useAuth } from '@/context/AuthContext';
 import { useRSForm } from '@/context/RSFormContext';
 import { globalIDs } from '@/utils/constants';

rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx

@@ -5,10 +5,10 @@ import { Dispatch, SetStateAction, useEffect, useLayoutEffect, useState } from '
 import { FiSave } from 'react-icons/fi';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
-import SubmitButton from '@/components/Common/SubmitButton';
+import SubmitButton from '@/components/ui/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
+import TextArea from '@/components/ui/TextArea';
-import TextInput from '@/components/Common/TextInput';
+import TextInput from '@/components/ui/TextInput';
 import { useAuth } from '@/context/AuthContext';
 import { useRSForm } from '@/context/RSFormContext';
 import { LibraryItemType } from '@/models/library';

rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx

@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
+import Divider from '@/components/ui/Divider';
-import LabeledValue from '@/components/Common/LabeledValue';
+import LabeledValue from '@/components/ui/LabeledValue';
 import { type IRSFormStats } from '@/models/rsform';
 
 interface RSFormStatsProps {

rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx

@@ -5,9 +5,9 @@ import { BiDownload, BiShareAlt, BiTrash } from 'react-icons/bi';
 import { FiBell, FiBellOff, FiSave } from 'react-icons/fi';
 import { LuCrown } from 'react-icons/lu';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface RSFormToolbarProps {

rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx

@@ -3,7 +3,7 @@
 import { useLayoutEffect, useState } from 'react';
 
 import { type RowSelectionState } from '@/components/DataTable';
-import SelectedCounter from '@/components/Shared/SelectedCounter';
+import SelectedCounter from '@/components/SelectedCounter';
 import { useRSForm } from '@/context/RSFormContext';
 import { CstType, ICstCreateData, ICstMovetoData } from '@/models/rsform';
 

rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx

@@ -3,11 +3,11 @@
 import { useMemo } from 'react';
 import { BiDownArrowCircle, BiDownvote, BiDuplicate, BiPlusCircle, BiTrash, BiUpvote } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownButton from '@/components/ui/DropdownButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import useDropdown from '@/hooks/useDropdown';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType } from '@/models/rsform';

rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx

@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
+import ConstituentaBadge from '@/components/ConstituentaBadge';
 import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/DataTable';
-import ConstituentaBadge from '@/components/Shared/ConstituentaBadge';
 import { useConceptTheme } from '@/context/ThemeContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { IConstituenta } from '@/models/rsform';

rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx

@@ -5,9 +5,9 @@ import { AnimatePresence } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { GraphEdge, GraphNode, LayoutTypes } from 'reagraph';
 
-import Overlay from '@/components/Common/Overlay';
+import InfoConstituenta from '@/components/InfoConstituenta';
-import InfoConstituenta from '@/components/Shared/InfoConstituenta';
+import SelectedCounter from '@/components/SelectedCounter';
-import SelectedCounter from '@/components/Shared/SelectedCounter';
+import Overlay from '@/components/ui/Overlay';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 import DlgGraphParams from '@/dialogs/DlgGraphParams';

rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSidebar.tsx

@@ -1,6 +1,6 @@
 import { LayoutTypes } from 'reagraph';
 
-import SelectSingle from '@/components/Common/SelectSingle';
+import SelectSingle from '@/components/ui/SelectSingle';
 import { GraphColoringScheme } from '@/models/miscellaneous';
 import { mapLabelColoring, mapLabelLayout } from '@/utils/labels';
 import { SelectorGraphColoring, SelectorGraphLayout } from '@/utils/selectors';

rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx

@@ -2,9 +2,9 @@
 
 import { BiCollapse, BiFilterAlt, BiFont, BiFontFamily, BiPlanet, BiPlusCircle, BiTrash } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface GraphToolbarProps {

rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx

@@ -8,10 +8,10 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 import { toast } from 'react-toastify';
 
-import { Loader } from '@/components/Common/Loader';
-import TabLabel from '@/components/Common/TabLabel';
-import TextURL from '@/components/Common/TextURL';
 import InfoError, { ErrorData } from '@/components/InfoError';
+import { Loader } from '@/components/ui/Loader';
+import TabLabel from '@/components/ui/TabLabel';
+import TextURL from '@/components/ui/TextURL';
 import { useAccessMode } from '@/context/AccessModeContext';
 import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';

rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx

@@ -15,9 +15,9 @@ import {
 import { FiEdit } from 'react-icons/fi';
 import { LuCrown, LuGlasses } from 'react-icons/lu';
 
-import Button from '@/components/Common/Button';
+import Button from '@/components/ui/Button';
-import Dropdown from '@/components/Common/Dropdown';
+import Dropdown from '@/components/ui/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
+import DropdownButton from '@/components/ui/DropdownButton';
 import { useAccessMode } from '@/context/AccessModeContext';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';

rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx

@@ -3,10 +3,10 @@
 import { useCallback, useLayoutEffect } from 'react';
 import { BiCog, BiFilterAlt } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
+import Dropdown from '@/components/ui/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
+import DropdownButton from '@/components/ui/DropdownButton';
-import SearchBar from '@/components/Common/SearchBar';
+import SearchBar from '@/components/ui/SearchBar';
-import SelectorButton from '@/components/Common/SelectorButton';
+import SelectorButton from '@/components/ui/SelectorButton';
 import useDropdown from '@/hooks/useDropdown';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';

rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx

@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
+import ConstituentaBadge from '@/components/ConstituentaBadge';
 import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/DataTable';
-import ConstituentaBadge from '@/components/Shared/ConstituentaBadge';
 import { useConceptTheme } from '@/context/ThemeContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { IConstituenta } from '@/models/rsform';

rsconcept/frontend/src/pages/RegisterPage.tsx

@@ -5,16 +5,16 @@ import { useEffect, useState } from 'react';
 import { BiInfoCircle } from 'react-icons/bi';
 import { toast } from 'react-toastify';
 
-import Button from '@/components/Common/Button';
-import Checkbox from '@/components/Common/Checkbox';
-import FlexColumn from '@/components/Common/FlexColumn';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
-import TextURL from '@/components/Common/TextURL';
-import Tooltip from '@/components/Common/Tooltip';
 import ExpectedAnonymous from '@/components/ExpectedAnonymous';
 import InfoError from '@/components/InfoError';
+import Button from '@/components/ui/Button';
+import Checkbox from '@/components/ui/Checkbox';
+import FlexColumn from '@/components/ui/FlexColumn';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
+import TextURL from '@/components/ui/TextURL';
+import Tooltip from '@/components/ui/Tooltip';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { type IUserSignupData } from '@/models/library';