From feb65cfd4206cf820b766a26b14a3092b63b0311 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:27:32 +0300 Subject: [PATCH] Refactor components fold structure --- rsconcept/frontend/src/app/ErrorFallback.tsx | 2 +- .../{ => info}/ConstituentaBadge.tsx | 2 +- .../{ => info}/ConstituentaTooltip.tsx | 2 +- .../components/{ => info}/GrammemeBadge.tsx | 0 .../{ => info}/InfoConstituenta.tsx | 2 +- .../components/{ => info}/InfoCstClass.tsx | 0 .../components/{ => info}/InfoCstStatus.tsx | 0 .../src/components/{ => info}/InfoError.tsx | 6 ++--- .../components/{ => info}/InfoLibraryItem.tsx | 2 +- .../src/components/{ => info}/InfoTopic.tsx | 26 +++++++++---------- .../components/{ => info}/SelectedCounter.tsx | 0 .../components/{ => info}/WordFormBadge.tsx | 0 .../src/components/{Help => man}/HelpAPI.tsx | 0 .../components/{Help => man}/HelpButton.tsx | 2 +- .../{Help => man}/HelpConstituenta.tsx | 2 +- .../components/{Help => man}/HelpExteor.tsx | 0 .../components/{Help => man}/HelpLibrary.tsx | 0 .../src/components/{Help => man}/HelpMain.tsx | 0 .../components/{Help => man}/HelpPrivacy.tsx | 2 +- .../{Help => man}/HelpRSFormItems.tsx | 2 +- .../{Help => man}/HelpRSFormMeta.tsx | 0 .../components/{Help => man}/HelpRSLang.tsx | 0 .../{Help => man}/HelpRSTemplates.tsx | 0 .../{Help => man}/HelpTermGraph.tsx | 4 +-- .../{Help => man}/HelpTerminologyControl.tsx | 0 .../components/{Help => man}/HelpVersions.tsx | 0 .../{ => select}/ConstituentaMultiPicker.tsx | 8 +++--- .../{ => select}/ConstituentaPicker.tsx | 6 ++--- .../{ => select}/ConstituentaSelector.tsx | 2 +- .../components/{ => select}/SchemaPicker.tsx | 4 +-- .../{ => select}/SelectGrammeme.tsx | 0 .../{ => select}/VersionSelector.tsx | 2 +- .../{ => ui}/DataTable/DataTable.tsx | 2 +- .../{ => ui}/DataTable/DefaultNoData.tsx | 0 .../{ => ui}/DataTable/PaginationTools.tsx | 0 .../{ => ui}/DataTable/SelectAll.tsx | 0 .../{ => ui}/DataTable/SelectRow.tsx | 0 .../{ => ui}/DataTable/SortingIcon.tsx | 0 .../{ => ui}/DataTable/TableBody.tsx | 0 .../{ => ui}/DataTable/TableFooter.tsx | 0 .../{ => ui}/DataTable/TableHeader.tsx | 0 .../components/{ => ui}/DataTable/index.tsx | 0 .../src/components/{ => ui}/GraphUI.tsx | 0 .../frontend/src/components/ui/Loader.tsx | 2 +- .../{ => ui}/PDFViewer/PDFViewer.tsx | 2 +- .../{ => ui}/PDFViewer/PageControls.tsx | 0 .../components/{ => ui}/PDFViewer/index.tsx | 0 .../src/components/{ => wrap}/AnimateFade.tsx | 2 +- .../src/components/{ => wrap}/DataLoader.tsx | 6 ++--- .../{ => wrap}/ExpectedAnonymous.tsx | 2 +- .../src/components/{ => wrap}/RequireAuth.tsx | 2 +- .../frontend/src/context/AuthContext.tsx | 2 +- .../frontend/src/context/LibraryContext.tsx | 2 +- .../frontend/src/context/RSFormContext.tsx | 2 +- .../src/context/UserProfileContext.tsx | 2 +- .../DlgConstituentaTemplate/ArgumentsTab.tsx | 4 +-- .../DlgConstituentaTemplate.tsx | 2 +- .../DlgConstituentaTemplate/TemplateTab.tsx | 2 +- .../DlgEditReference/DlgEditReference.tsx | 2 +- .../dialogs/DlgEditReference/EntityTab.tsx | 4 +-- .../dialogs/DlgEditVersions/VersionsTable.tsx | 2 +- .../DlgEditWordForms/DlgEditWordForms.tsx | 4 +-- .../DlgEditWordForms/WordFormsTable.tsx | 4 +-- .../DlgInlineSynthesis/ConstituentsTab.tsx | 6 ++--- .../dialogs/DlgInlineSynthesis/SchemaTab.tsx | 2 +- rsconcept/frontend/src/dialogs/DlgShowAST.tsx | 2 +- .../frontend/src/dialogs/DlgSubstituteCst.tsx | 2 +- .../frontend/src/hooks/useCheckExpression.ts | 2 +- .../frontend/src/hooks/useConceptText.ts | 2 +- .../frontend/src/hooks/useRSFormDetails.ts | 2 +- .../frontend/src/hooks/useResolveText.ts | 2 +- .../frontend/src/pages/CreateRSFormPage.tsx | 6 ++--- .../src/pages/LibraryPage/LibraryPage.tsx | 2 +- .../src/pages/LibraryPage/ViewLibrary.tsx | 4 +-- rsconcept/frontend/src/pages/LoginPage.tsx | 6 ++--- .../src/pages/ManualsPage/ViewTopic.tsx | 4 +-- .../frontend/src/pages/PasswordChangePage.tsx | 4 +-- .../EditorRSExpression/EditorRSExpression.tsx | 2 +- .../EditorRSExpression/ParsingResult.tsx | 2 -- .../RSFormPage/EditorRSForm/EditorRSForm.tsx | 2 +- .../RSFormPage/EditorRSForm/FormRSForm.tsx | 4 +-- .../RSFormPage/EditorRSForm/RSFormToolbar.tsx | 2 +- .../RSFormPage/EditorRSList/EditorRSList.tsx | 4 +-- .../RSFormPage/EditorRSList/RSListToolbar.tsx | 2 +- .../pages/RSFormPage/EditorRSList/RSTable.tsx | 4 +-- .../EditorTermGraph/EditorTermGraph.tsx | 4 +-- .../EditorTermGraph/GraphToolbar.tsx | 2 +- .../RSFormPage/EditorTermGraph/TermGraph.tsx | 2 +- .../RSFormPage/EditorTermGraph/ViewHidden.tsx | 2 +- .../src/pages/RSFormPage/RSEditContext.tsx | 2 +- .../frontend/src/pages/RSFormPage/RSTabs.tsx | 2 +- .../ViewConstituents/ConstituentsTable.tsx | 4 +-- rsconcept/frontend/src/pages/RegisterPage.tsx | 6 ++--- .../src/pages/RestorePasswordPage.tsx | 4 +-- .../pages/UserProfilePage/EditorPassword.tsx | 2 +- .../pages/UserProfilePage/UserProfilePage.tsx | 2 +- .../src/pages/UserProfilePage/UserTabs.tsx | 4 +-- .../UserProfilePage/ViewSubscriptions.tsx | 2 +- rsconcept/frontend/src/utils/backendAPI.ts | 2 +- 99 files changed, 116 insertions(+), 118 deletions(-) rename rsconcept/frontend/src/components/{ => info}/ConstituentaBadge.tsx (93%) rename rsconcept/frontend/src/components/{ => info}/ConstituentaTooltip.tsx (88%) rename rsconcept/frontend/src/components/{ => info}/GrammemeBadge.tsx (100%) rename rsconcept/frontend/src/components/{ => info}/InfoConstituenta.tsx (96%) rename rsconcept/frontend/src/components/{ => info}/InfoCstClass.tsx (100%) rename rsconcept/frontend/src/components/{ => info}/InfoCstStatus.tsx (100%) rename rsconcept/frontend/src/components/{ => info}/InfoError.tsx (94%) rename rsconcept/frontend/src/components/{ => info}/InfoLibraryItem.tsx (95%) rename rsconcept/frontend/src/components/{ => info}/InfoTopic.tsx (61%) rename rsconcept/frontend/src/components/{ => info}/SelectedCounter.tsx (100%) rename rsconcept/frontend/src/components/{ => info}/WordFormBadge.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpAPI.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpButton.tsx (95%) rename rsconcept/frontend/src/components/{Help => man}/HelpConstituenta.tsx (95%) rename rsconcept/frontend/src/components/{Help => man}/HelpExteor.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpLibrary.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpMain.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpPrivacy.tsx (79%) rename rsconcept/frontend/src/components/{Help => man}/HelpRSFormItems.tsx (92%) rename rsconcept/frontend/src/components/{Help => man}/HelpRSFormMeta.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpRSLang.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpRSTemplates.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpTermGraph.tsx (91%) rename rsconcept/frontend/src/components/{Help => man}/HelpTerminologyControl.tsx (100%) rename rsconcept/frontend/src/components/{Help => man}/HelpVersions.tsx (100%) rename rsconcept/frontend/src/components/{ => select}/ConstituentaMultiPicker.tsx (96%) rename rsconcept/frontend/src/components/{ => select}/ConstituentaPicker.tsx (96%) rename rsconcept/frontend/src/components/{ => select}/ConstituentaSelector.tsx (96%) rename rsconcept/frontend/src/components/{ => select}/SchemaPicker.tsx (97%) rename rsconcept/frontend/src/components/{ => select}/SelectGrammeme.tsx (100%) rename rsconcept/frontend/src/components/{ => select}/VersionSelector.tsx (95%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/DataTable.tsx (99%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/DefaultNoData.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/PaginationTools.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/SelectAll.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/SelectRow.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/SortingIcon.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/TableBody.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/TableFooter.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/TableHeader.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/DataTable/index.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/GraphUI.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/PDFViewer/PDFViewer.tsx (97%) rename rsconcept/frontend/src/components/{ => ui}/PDFViewer/PageControls.tsx (100%) rename rsconcept/frontend/src/components/{ => ui}/PDFViewer/index.tsx (100%) rename rsconcept/frontend/src/components/{ => wrap}/AnimateFade.tsx (94%) rename rsconcept/frontend/src/components/{ => wrap}/DataLoader.tsx (88%) rename rsconcept/frontend/src/components/{ => wrap}/ExpectedAnonymous.tsx (96%) rename rsconcept/frontend/src/components/{ => wrap}/RequireAuth.tsx (94%) diff --git a/rsconcept/frontend/src/app/ErrorFallback.tsx b/rsconcept/frontend/src/app/ErrorFallback.tsx index 04188fb5..c55f2af0 100644 --- a/rsconcept/frontend/src/app/ErrorFallback.tsx +++ b/rsconcept/frontend/src/app/ErrorFallback.tsx @@ -1,6 +1,6 @@ import { type FallbackProps } from 'react-error-boundary'; -import InfoError from '../components/InfoError'; +import InfoError from '../components/info/InfoError'; import Button from '../components/ui/Button'; function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) { diff --git a/rsconcept/frontend/src/components/ConstituentaBadge.tsx b/rsconcept/frontend/src/components/info/ConstituentaBadge.tsx similarity index 93% rename from rsconcept/frontend/src/components/ConstituentaBadge.tsx rename to rsconcept/frontend/src/components/info/ConstituentaBadge.tsx index 46ac807d..24715472 100644 --- a/rsconcept/frontend/src/components/ConstituentaBadge.tsx +++ b/rsconcept/frontend/src/components/info/ConstituentaBadge.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import ConstituentaTooltip from '@/components/ConstituentaTooltip'; +import ConstituentaTooltip from '@/components/info/ConstituentaTooltip'; import { IConstituenta } from '@/models/rsform'; import { isMockCst } from '@/models/rsformAPI'; import { colorFgCstStatus, IColorTheme } from '@/styling/color'; diff --git a/rsconcept/frontend/src/components/ConstituentaTooltip.tsx b/rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx similarity index 88% rename from rsconcept/frontend/src/components/ConstituentaTooltip.tsx rename to rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx index cc12237d..4d64e3e2 100644 --- a/rsconcept/frontend/src/components/ConstituentaTooltip.tsx +++ b/rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx @@ -1,4 +1,4 @@ -import InfoConstituenta from '@/components/InfoConstituenta'; +import InfoConstituenta from '@/components/info/InfoConstituenta'; import Tooltip from '@/components/ui/Tooltip'; import { IConstituenta } from '@/models/rsform'; diff --git a/rsconcept/frontend/src/components/GrammemeBadge.tsx b/rsconcept/frontend/src/components/info/GrammemeBadge.tsx similarity index 100% rename from rsconcept/frontend/src/components/GrammemeBadge.tsx rename to rsconcept/frontend/src/components/info/GrammemeBadge.tsx diff --git a/rsconcept/frontend/src/components/InfoConstituenta.tsx b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx similarity index 96% rename from rsconcept/frontend/src/components/InfoConstituenta.tsx rename to rsconcept/frontend/src/components/info/InfoConstituenta.tsx index 9178f2ea..cbcd3183 100644 --- a/rsconcept/frontend/src/components/InfoConstituenta.tsx +++ b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx @@ -1,7 +1,7 @@ import { IConstituenta } from '@/models/rsform'; import { labelCstTypification } from '@/utils/labels'; -import { CProps } from './props'; +import { CProps } from '../props'; interface InfoConstituentaProps extends CProps.Div { data: IConstituenta; diff --git a/rsconcept/frontend/src/components/InfoCstClass.tsx b/rsconcept/frontend/src/components/info/InfoCstClass.tsx similarity index 100% rename from rsconcept/frontend/src/components/InfoCstClass.tsx rename to rsconcept/frontend/src/components/info/InfoCstClass.tsx diff --git a/rsconcept/frontend/src/components/InfoCstStatus.tsx b/rsconcept/frontend/src/components/info/InfoCstStatus.tsx similarity index 100% rename from rsconcept/frontend/src/components/InfoCstStatus.tsx rename to rsconcept/frontend/src/components/info/InfoCstStatus.tsx diff --git a/rsconcept/frontend/src/components/InfoError.tsx b/rsconcept/frontend/src/components/info/InfoError.tsx similarity index 94% rename from rsconcept/frontend/src/components/InfoError.tsx rename to rsconcept/frontend/src/components/info/InfoError.tsx index 2bd1b844..7b7b156e 100644 --- a/rsconcept/frontend/src/components/InfoError.tsx +++ b/rsconcept/frontend/src/components/info/InfoError.tsx @@ -4,9 +4,9 @@ import clsx from 'clsx'; import { urls } from '@/utils/constants'; import { isResponseHtml } from '@/utils/utils'; -import AnimateFade from './AnimateFade'; -import PrettyJson from './ui/PrettyJSON'; -import TextURL from './ui/TextURL'; +import PrettyJson from '../ui/PrettyJSON'; +import TextURL from '../ui/TextURL'; +import AnimateFade from '../wrap/AnimateFade'; export type ErrorData = string | Error | AxiosError | undefined; diff --git a/rsconcept/frontend/src/components/InfoLibraryItem.tsx b/rsconcept/frontend/src/components/info/InfoLibraryItem.tsx similarity index 95% rename from rsconcept/frontend/src/components/InfoLibraryItem.tsx rename to rsconcept/frontend/src/components/info/InfoLibraryItem.tsx index 1e8f45a6..088b15ee 100644 --- a/rsconcept/frontend/src/components/InfoLibraryItem.tsx +++ b/rsconcept/frontend/src/components/info/InfoLibraryItem.tsx @@ -3,7 +3,7 @@ import { useIntl } from 'react-intl'; import { useUsers } from '@/context/UsersContext'; import { ILibraryItemEx } from '@/models/library'; -import LabeledValue from './ui/LabeledValue'; +import LabeledValue from '../ui/LabeledValue'; interface InfoLibraryItemProps { item?: ILibraryItemEx; diff --git a/rsconcept/frontend/src/components/InfoTopic.tsx b/rsconcept/frontend/src/components/info/InfoTopic.tsx similarity index 61% rename from rsconcept/frontend/src/components/InfoTopic.tsx rename to rsconcept/frontend/src/components/info/InfoTopic.tsx index 1e47fa51..29b68051 100644 --- a/rsconcept/frontend/src/components/InfoTopic.tsx +++ b/rsconcept/frontend/src/components/info/InfoTopic.tsx @@ -1,18 +1,18 @@ import { HelpTopic } from '@/models/miscellaneous'; -import HelpAPI from './Help/HelpAPI'; -import HelpConstituenta from './Help/HelpConstituenta'; -import HelpExteor from './Help/HelpExteor'; -import HelpLibrary from './Help/HelpLibrary'; -import HelpMain from './Help/HelpMain'; -import HelpPrivacy from './Help/HelpPrivacy'; -import HelpRSFormItems from './Help/HelpRSFormItems'; -import HelpRSFormMeta from './Help/HelpRSFormMeta'; -import HelpRSLang from './Help/HelpRSLang'; -import HelpRSTemplates from './Help/HelpRSTemplates'; -import HelpTermGraph from './Help/HelpTermGraph'; -import HelpTerminologyControl from './Help/HelpTerminologyControl'; -import HelpVersions from './Help/HelpVersions'; +import HelpAPI from '../man/HelpAPI'; +import HelpConstituenta from '../man/HelpConstituenta'; +import HelpExteor from '../man/HelpExteor'; +import HelpLibrary from '../man/HelpLibrary'; +import HelpMain from '../man/HelpMain'; +import HelpPrivacy from '../man/HelpPrivacy'; +import HelpRSFormItems from '../man/HelpRSFormItems'; +import HelpRSFormMeta from '../man/HelpRSFormMeta'; +import HelpRSLang from '../man/HelpRSLang'; +import HelpRSTemplates from '../man/HelpRSTemplates'; +import HelpTermGraph from '../man/HelpTermGraph'; +import HelpTerminologyControl from '../man/HelpTerminologyControl'; +import HelpVersions from '../man/HelpVersions'; interface InfoTopicProps { topic: HelpTopic; diff --git a/rsconcept/frontend/src/components/SelectedCounter.tsx b/rsconcept/frontend/src/components/info/SelectedCounter.tsx similarity index 100% rename from rsconcept/frontend/src/components/SelectedCounter.tsx rename to rsconcept/frontend/src/components/info/SelectedCounter.tsx diff --git a/rsconcept/frontend/src/components/WordFormBadge.tsx b/rsconcept/frontend/src/components/info/WordFormBadge.tsx similarity index 100% rename from rsconcept/frontend/src/components/WordFormBadge.tsx rename to rsconcept/frontend/src/components/info/WordFormBadge.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpAPI.tsx b/rsconcept/frontend/src/components/man/HelpAPI.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpAPI.tsx rename to rsconcept/frontend/src/components/man/HelpAPI.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/man/HelpButton.tsx similarity index 95% rename from rsconcept/frontend/src/components/Help/HelpButton.tsx rename to rsconcept/frontend/src/components/man/HelpButton.tsx index 64073cd6..bb17f610 100644 --- a/rsconcept/frontend/src/components/Help/HelpButton.tsx +++ b/rsconcept/frontend/src/components/man/HelpButton.tsx @@ -4,7 +4,7 @@ import TextURL from '@/components/ui/TextURL'; import Tooltip, { PlacesType } from '@/components/ui/Tooltip'; import { HelpTopic } from '@/models/miscellaneous'; -import InfoTopic from '../InfoTopic'; +import InfoTopic from '../info/InfoTopic'; import { CProps } from '../props'; interface HelpButtonProps extends CProps.Styling { diff --git a/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx b/rsconcept/frontend/src/components/man/HelpConstituenta.tsx similarity index 95% rename from rsconcept/frontend/src/components/Help/HelpConstituenta.tsx rename to rsconcept/frontend/src/components/man/HelpConstituenta.tsx index 4ef5a3e5..b3e154af 100644 --- a/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx +++ b/rsconcept/frontend/src/components/man/HelpConstituenta.tsx @@ -1,4 +1,4 @@ -import InfoCstStatus from '@/components/InfoCstStatus'; +import InfoCstStatus from '@/components/info/InfoCstStatus'; import Divider from '@/components/ui/Divider'; function HelpConstituenta() { diff --git a/rsconcept/frontend/src/components/Help/HelpExteor.tsx b/rsconcept/frontend/src/components/man/HelpExteor.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpExteor.tsx rename to rsconcept/frontend/src/components/man/HelpExteor.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpLibrary.tsx b/rsconcept/frontend/src/components/man/HelpLibrary.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpLibrary.tsx rename to rsconcept/frontend/src/components/man/HelpLibrary.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpMain.tsx b/rsconcept/frontend/src/components/man/HelpMain.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpMain.tsx rename to rsconcept/frontend/src/components/man/HelpMain.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpPrivacy.tsx b/rsconcept/frontend/src/components/man/HelpPrivacy.tsx similarity index 79% rename from rsconcept/frontend/src/components/Help/HelpPrivacy.tsx rename to rsconcept/frontend/src/components/man/HelpPrivacy.tsx index 85b69783..ee699df8 100644 --- a/rsconcept/frontend/src/components/Help/HelpPrivacy.tsx +++ b/rsconcept/frontend/src/components/man/HelpPrivacy.tsx @@ -1,4 +1,4 @@ -import PDFViewer from '@/components/PDFViewer'; +import PDFViewer from '@/components/ui/PDFViewer'; import { resources } from '@/utils/constants'; function HelpPrivacy() { diff --git a/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx b/rsconcept/frontend/src/components/man/HelpRSFormItems.tsx similarity index 92% rename from rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx rename to rsconcept/frontend/src/components/man/HelpRSFormItems.tsx index 14a6ddde..2ba1aa4b 100644 --- a/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx +++ b/rsconcept/frontend/src/components/man/HelpRSFormItems.tsx @@ -1,4 +1,4 @@ -import InfoCstStatus from '@/components/InfoCstStatus'; +import InfoCstStatus from '@/components/info/InfoCstStatus'; import Divider from '@/components/ui/Divider'; function HelpRSFormItems() { diff --git a/rsconcept/frontend/src/components/Help/HelpRSFormMeta.tsx b/rsconcept/frontend/src/components/man/HelpRSFormMeta.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpRSFormMeta.tsx rename to rsconcept/frontend/src/components/man/HelpRSFormMeta.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpRSLang.tsx b/rsconcept/frontend/src/components/man/HelpRSLang.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpRSLang.tsx rename to rsconcept/frontend/src/components/man/HelpRSLang.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx b/rsconcept/frontend/src/components/man/HelpRSTemplates.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx rename to rsconcept/frontend/src/components/man/HelpRSTemplates.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx b/rsconcept/frontend/src/components/man/HelpTermGraph.tsx similarity index 91% rename from rsconcept/frontend/src/components/Help/HelpTermGraph.tsx rename to rsconcept/frontend/src/components/man/HelpTermGraph.tsx index 91ec2cef..bc279342 100644 --- a/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx +++ b/rsconcept/frontend/src/components/man/HelpTermGraph.tsx @@ -1,5 +1,5 @@ -import InfoCstClass from '@/components/InfoCstClass'; -import InfoCstStatus from '@/components/InfoCstStatus'; +import InfoCstClass from '@/components/info/InfoCstClass'; +import InfoCstStatus from '@/components/info/InfoCstStatus'; import Divider from '@/components/ui/Divider'; function HelpTermGraph() { diff --git a/rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx b/rsconcept/frontend/src/components/man/HelpTerminologyControl.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx rename to rsconcept/frontend/src/components/man/HelpTerminologyControl.tsx diff --git a/rsconcept/frontend/src/components/Help/HelpVersions.tsx b/rsconcept/frontend/src/components/man/HelpVersions.tsx similarity index 100% rename from rsconcept/frontend/src/components/Help/HelpVersions.tsx rename to rsconcept/frontend/src/components/man/HelpVersions.tsx diff --git a/rsconcept/frontend/src/components/ConstituentaMultiPicker.tsx b/rsconcept/frontend/src/components/select/ConstituentaMultiPicker.tsx similarity index 96% rename from rsconcept/frontend/src/components/ConstituentaMultiPicker.tsx rename to rsconcept/frontend/src/components/select/ConstituentaMultiPicker.tsx index f86275da..d4d747d0 100644 --- a/rsconcept/frontend/src/components/ConstituentaMultiPicker.tsx +++ b/rsconcept/frontend/src/components/select/ConstituentaMultiPicker.tsx @@ -3,14 +3,14 @@ import clsx from 'clsx'; import { useCallback, useLayoutEffect, useMemo, useState } from 'react'; -import DataTable, { createColumnHelper, RowSelectionState } from '@/components/DataTable'; +import DataTable, { createColumnHelper, RowSelectionState } from '@/components/ui/DataTable'; import { useConceptTheme } from '@/context/ThemeContext'; import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform'; import { describeConstituenta } from '@/utils/labels'; -import ConstituentaBadge from './ConstituentaBadge'; -import Button from './ui/Button'; -import FlexColumn from './ui/FlexColumn'; +import ConstituentaBadge from '../info/ConstituentaBadge'; +import Button from '../ui/Button'; +import FlexColumn from '../ui/FlexColumn'; interface ConstituentaMultiPickerProps { id?: string; diff --git a/rsconcept/frontend/src/components/ConstituentaPicker.tsx b/rsconcept/frontend/src/components/select/ConstituentaPicker.tsx similarity index 96% rename from rsconcept/frontend/src/components/ConstituentaPicker.tsx rename to rsconcept/frontend/src/components/select/ConstituentaPicker.tsx index 97c94bd2..24f867ca 100644 --- a/rsconcept/frontend/src/components/ConstituentaPicker.tsx +++ b/rsconcept/frontend/src/components/select/ConstituentaPicker.tsx @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react'; -import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; +import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable'; import SearchBar from '@/components/ui/SearchBar'; import { useConceptTheme } from '@/context/ThemeContext'; import { CstMatchMode } from '@/models/miscellaneous'; @@ -11,8 +11,8 @@ import { matchConstituenta } from '@/models/rsformAPI'; import { prefixes } from '@/utils/constants'; import { describeConstituenta } from '@/utils/labels'; -import ConstituentaBadge from './ConstituentaBadge'; -import FlexColumn from './ui/FlexColumn'; +import ConstituentaBadge from '../info/ConstituentaBadge'; +import FlexColumn from '../ui/FlexColumn'; interface ConstituentaPickerProps { id?: string; diff --git a/rsconcept/frontend/src/components/ConstituentaSelector.tsx b/rsconcept/frontend/src/components/select/ConstituentaSelector.tsx similarity index 96% rename from rsconcept/frontend/src/components/ConstituentaSelector.tsx rename to rsconcept/frontend/src/components/select/ConstituentaSelector.tsx index eb50cf28..d302f3e5 100644 --- a/rsconcept/frontend/src/components/ConstituentaSelector.tsx +++ b/rsconcept/frontend/src/components/select/ConstituentaSelector.tsx @@ -7,7 +7,7 @@ import { ConstituentaID, IConstituenta } from '@/models/rsform'; import { matchConstituenta } from '@/models/rsformAPI'; import { describeConstituenta, describeConstituentaTerm } from '@/utils/labels'; -import SelectSingle from './ui/SelectSingle'; +import SelectSingle from '../ui/SelectSingle'; interface ConstituentaSelectorProps { items?: IConstituenta[]; diff --git a/rsconcept/frontend/src/components/SchemaPicker.tsx b/rsconcept/frontend/src/components/select/SchemaPicker.tsx similarity index 97% rename from rsconcept/frontend/src/components/SchemaPicker.tsx rename to rsconcept/frontend/src/components/select/SchemaPicker.tsx index eaed76c4..cbbe38a8 100644 --- a/rsconcept/frontend/src/components/SchemaPicker.tsx +++ b/rsconcept/frontend/src/components/select/SchemaPicker.tsx @@ -1,14 +1,14 @@ import { useLayoutEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; -import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; +import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable'; import SearchBar from '@/components/ui/SearchBar'; import { useLibrary } from '@/context/LibraryContext'; import { useConceptTheme } from '@/context/ThemeContext'; import { ILibraryItem, LibraryItemID } from '@/models/library'; import { ILibraryFilter } from '@/models/miscellaneous'; -import FlexColumn from './ui/FlexColumn'; +import FlexColumn from '../ui/FlexColumn'; interface SchemaPickerProps { id?: string; diff --git a/rsconcept/frontend/src/components/SelectGrammeme.tsx b/rsconcept/frontend/src/components/select/SelectGrammeme.tsx similarity index 100% rename from rsconcept/frontend/src/components/SelectGrammeme.tsx rename to rsconcept/frontend/src/components/select/SelectGrammeme.tsx diff --git a/rsconcept/frontend/src/components/VersionSelector.tsx b/rsconcept/frontend/src/components/select/VersionSelector.tsx similarity index 95% rename from rsconcept/frontend/src/components/VersionSelector.tsx rename to rsconcept/frontend/src/components/select/VersionSelector.tsx index 7c20c32e..3835cdfa 100644 --- a/rsconcept/frontend/src/components/VersionSelector.tsx +++ b/rsconcept/frontend/src/components/select/VersionSelector.tsx @@ -5,7 +5,7 @@ import { useMemo } from 'react'; import { IVersionInfo } from '@/models/library'; import { labelVersion } from '@/utils/labels'; -import SelectSingle from './ui/SelectSingle'; +import SelectSingle from '../ui/SelectSingle'; interface VersionSelectorProps { items?: IVersionInfo[]; diff --git a/rsconcept/frontend/src/components/DataTable/DataTable.tsx b/rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx similarity index 99% rename from rsconcept/frontend/src/components/DataTable/DataTable.tsx rename to rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx index d285a891..bbd51cd6 100644 --- a/rsconcept/frontend/src/components/DataTable/DataTable.tsx +++ b/rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx @@ -16,7 +16,7 @@ import { } from '@tanstack/react-table'; import { useMemo, useState } from 'react'; -import { CProps } from '../props'; +import { CProps } from '../../props'; import DefaultNoData from './DefaultNoData'; import PaginationTools from './PaginationTools'; import TableBody from './TableBody'; diff --git a/rsconcept/frontend/src/components/DataTable/DefaultNoData.tsx b/rsconcept/frontend/src/components/ui/DataTable/DefaultNoData.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/DefaultNoData.tsx rename to rsconcept/frontend/src/components/ui/DataTable/DefaultNoData.tsx diff --git a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx b/rsconcept/frontend/src/components/ui/DataTable/PaginationTools.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/PaginationTools.tsx rename to rsconcept/frontend/src/components/ui/DataTable/PaginationTools.tsx diff --git a/rsconcept/frontend/src/components/DataTable/SelectAll.tsx b/rsconcept/frontend/src/components/ui/DataTable/SelectAll.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/SelectAll.tsx rename to rsconcept/frontend/src/components/ui/DataTable/SelectAll.tsx diff --git a/rsconcept/frontend/src/components/DataTable/SelectRow.tsx b/rsconcept/frontend/src/components/ui/DataTable/SelectRow.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/SelectRow.tsx rename to rsconcept/frontend/src/components/ui/DataTable/SelectRow.tsx diff --git a/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx b/rsconcept/frontend/src/components/ui/DataTable/SortingIcon.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/SortingIcon.tsx rename to rsconcept/frontend/src/components/ui/DataTable/SortingIcon.tsx diff --git a/rsconcept/frontend/src/components/DataTable/TableBody.tsx b/rsconcept/frontend/src/components/ui/DataTable/TableBody.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/TableBody.tsx rename to rsconcept/frontend/src/components/ui/DataTable/TableBody.tsx diff --git a/rsconcept/frontend/src/components/DataTable/TableFooter.tsx b/rsconcept/frontend/src/components/ui/DataTable/TableFooter.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/TableFooter.tsx rename to rsconcept/frontend/src/components/ui/DataTable/TableFooter.tsx diff --git a/rsconcept/frontend/src/components/DataTable/TableHeader.tsx b/rsconcept/frontend/src/components/ui/DataTable/TableHeader.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/TableHeader.tsx rename to rsconcept/frontend/src/components/ui/DataTable/TableHeader.tsx diff --git a/rsconcept/frontend/src/components/DataTable/index.tsx b/rsconcept/frontend/src/components/ui/DataTable/index.tsx similarity index 100% rename from rsconcept/frontend/src/components/DataTable/index.tsx rename to rsconcept/frontend/src/components/ui/DataTable/index.tsx diff --git a/rsconcept/frontend/src/components/GraphUI.tsx b/rsconcept/frontend/src/components/ui/GraphUI.tsx similarity index 100% rename from rsconcept/frontend/src/components/GraphUI.tsx rename to rsconcept/frontend/src/components/ui/GraphUI.tsx diff --git a/rsconcept/frontend/src/components/ui/Loader.tsx b/rsconcept/frontend/src/components/ui/Loader.tsx index 70f9041e..4839c5dd 100644 --- a/rsconcept/frontend/src/components/ui/Loader.tsx +++ b/rsconcept/frontend/src/components/ui/Loader.tsx @@ -4,7 +4,7 @@ import { ThreeDots } from 'react-loader-spinner'; import { useConceptTheme } from '@/context/ThemeContext'; -import AnimateFade from '../AnimateFade'; +import AnimateFade from '../wrap/AnimateFade'; interface LoaderProps { size?: number; diff --git a/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx b/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx similarity index 97% rename from rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx rename to rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx index 4579f24c..cdf54c9e 100644 --- a/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx +++ b/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx @@ -7,7 +7,7 @@ import { Document, Page } from 'react-pdf'; import useWindowSize from '@/hooks/useWindowSize'; import { graphLightT } from '@/styling/color'; -import Overlay from '../ui/Overlay'; +import Overlay from '../Overlay'; import PageControls from './PageControls'; const MAXIMUM_WIDTH = 1000; diff --git a/rsconcept/frontend/src/components/PDFViewer/PageControls.tsx b/rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx similarity index 100% rename from rsconcept/frontend/src/components/PDFViewer/PageControls.tsx rename to rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx diff --git a/rsconcept/frontend/src/components/PDFViewer/index.tsx b/rsconcept/frontend/src/components/ui/PDFViewer/index.tsx similarity index 100% rename from rsconcept/frontend/src/components/PDFViewer/index.tsx rename to rsconcept/frontend/src/components/ui/PDFViewer/index.tsx diff --git a/rsconcept/frontend/src/components/AnimateFade.tsx b/rsconcept/frontend/src/components/wrap/AnimateFade.tsx similarity index 94% rename from rsconcept/frontend/src/components/AnimateFade.tsx rename to rsconcept/frontend/src/components/wrap/AnimateFade.tsx index b2d59713..2861a456 100644 --- a/rsconcept/frontend/src/components/AnimateFade.tsx +++ b/rsconcept/frontend/src/components/wrap/AnimateFade.tsx @@ -2,7 +2,7 @@ import { motion } from 'framer-motion'; import { animateFade } from '@/styling/animations'; -import { CProps } from './props'; +import { CProps } from '../props'; interface AnimateFadeProps extends CProps.AnimatedDiv { noFadeIn?: boolean; diff --git a/rsconcept/frontend/src/components/DataLoader.tsx b/rsconcept/frontend/src/components/wrap/DataLoader.tsx similarity index 88% rename from rsconcept/frontend/src/components/DataLoader.tsx rename to rsconcept/frontend/src/components/wrap/DataLoader.tsx index 19472bc5..0b01adbc 100644 --- a/rsconcept/frontend/src/components/DataLoader.tsx +++ b/rsconcept/frontend/src/components/wrap/DataLoader.tsx @@ -1,9 +1,9 @@ import { AnimatePresence } from 'framer-motion'; import AnimateFade from './AnimateFade'; -import InfoError, { ErrorData } from './InfoError'; -import { CProps } from './props'; -import Loader from './ui/Loader'; +import InfoError, { ErrorData } from '../info/InfoError'; +import { CProps } from '../props'; +import Loader from '../ui/Loader'; interface DataLoaderProps extends CProps.AnimatedDiv { id: string; diff --git a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/components/wrap/ExpectedAnonymous.tsx similarity index 96% rename from rsconcept/frontend/src/components/ExpectedAnonymous.tsx rename to rsconcept/frontend/src/components/wrap/ExpectedAnonymous.tsx index 4d9f1e54..514a8417 100644 --- a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx +++ b/rsconcept/frontend/src/components/wrap/ExpectedAnonymous.tsx @@ -1,7 +1,7 @@ import { useAuth } from '@/context/AuthContext'; import { useConceptNavigation } from '@/context/NavigationContext'; -import TextURL from './ui/TextURL'; +import TextURL from '../ui/TextURL'; function ExpectedAnonymous() { const { user, logout } = useAuth(); diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/components/wrap/RequireAuth.tsx similarity index 94% rename from rsconcept/frontend/src/components/RequireAuth.tsx rename to rsconcept/frontend/src/components/wrap/RequireAuth.tsx index f7923549..7cf30688 100644 --- a/rsconcept/frontend/src/components/RequireAuth.tsx +++ b/rsconcept/frontend/src/components/wrap/RequireAuth.tsx @@ -2,7 +2,7 @@ import { useAuth } from '@/context/AuthContext'; -import TextURL from './ui/TextURL'; +import TextURL from '../ui/TextURL'; interface RequireAuthProps { children: React.ReactNode; diff --git a/rsconcept/frontend/src/context/AuthContext.tsx b/rsconcept/frontend/src/context/AuthContext.tsx index c36db596..82f5962e 100644 --- a/rsconcept/frontend/src/context/AuthContext.tsx +++ b/rsconcept/frontend/src/context/AuthContext.tsx @@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useLayoutEffect, useState } from 'react'; -import { type ErrorData } from '@/components/InfoError'; +import { type ErrorData } from '@/components/info/InfoError'; import useLocalStorage from '@/hooks/useLocalStorage'; import { IPasswordTokenData, IRequestPasswordData, IResetPasswordData, IUserLoginData } from '@/models/library'; import { ICurrentUser } from '@/models/library'; diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx index 47b53d4b..f7b44d1c 100644 --- a/rsconcept/frontend/src/context/LibraryContext.tsx +++ b/rsconcept/frontend/src/context/LibraryContext.tsx @@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'react'; -import { ErrorData } from '@/components/InfoError'; +import { ErrorData } from '@/components/info/InfoError'; import { ILibraryItem } from '@/models/library'; import { matchLibraryItem } from '@/models/libraryAPI'; import { ILibraryFilter } from '@/models/miscellaneous'; diff --git a/rsconcept/frontend/src/context/RSFormContext.tsx b/rsconcept/frontend/src/context/RSFormContext.tsx index e882a606..cafdcf0a 100644 --- a/rsconcept/frontend/src/context/RSFormContext.tsx +++ b/rsconcept/frontend/src/context/RSFormContext.tsx @@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useMemo, useState } from 'react'; -import { type ErrorData } from '@/components/InfoError'; +import { type ErrorData } from '@/components/info/InfoError'; import useRSFormDetails from '@/hooks/useRSFormDetails'; import { ILibraryItem, IVersionData } from '@/models/library'; import { ILibraryUpdateData } from '@/models/library'; diff --git a/rsconcept/frontend/src/context/UserProfileContext.tsx b/rsconcept/frontend/src/context/UserProfileContext.tsx index 3a61d591..ab68f0cd 100644 --- a/rsconcept/frontend/src/context/UserProfileContext.tsx +++ b/rsconcept/frontend/src/context/UserProfileContext.tsx @@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'react'; -import { ErrorData } from '@/components/InfoError'; +import { ErrorData } from '@/components/info/InfoError'; import { IUserProfile } from '@/models/library'; import { IUserUpdateData } from '@/models/library'; import { DataCallback, getProfile, patchProfile } from '@/utils/backendAPI'; diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx index ba1312c7..725f1ac5 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx @@ -5,8 +5,8 @@ import clsx from 'clsx'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { BiCheck, BiRefresh, BiX } from 'react-icons/bi'; -import ConstituentaPicker from '@/components/ConstituentaPicker'; -import DataTable, { IConditionalStyle } from '@/components/DataTable'; +import ConstituentaPicker from '@/components/select/ConstituentaPicker'; +import DataTable, { IConditionalStyle } from '@/components/ui/DataTable'; import RSInput from '@/components/RSInput'; import MiniButton from '@/components/ui/MiniButton'; import { useConceptTheme } from '@/context/ThemeContext'; diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx index a59c262d..4fb877e9 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { useLayoutEffect, useMemo, useState } from 'react'; import { TabList, TabPanel, Tabs } from 'react-tabs'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import Modal, { ModalProps } from '@/components/ui/Modal'; import Overlay from '@/components/ui/Overlay'; import TabLabel from '@/components/ui/TabLabel'; diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx index 9f24db07..05311868 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx @@ -2,8 +2,8 @@ import { Dispatch, useEffect, useMemo, useState } from 'react'; -import ConstituentaPicker from '@/components/ConstituentaPicker'; import RSInput from '@/components/RSInput'; +import ConstituentaPicker from '@/components/select/ConstituentaPicker'; import SelectSingle from '@/components/ui/SelectSingle'; import TextArea from '@/components/ui/TextArea'; import { useLibrary } from '@/context/LibraryContext'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx index 9197c15c..33e7a7e6 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { useState } from 'react'; import { TabList, TabPanel, Tabs } from 'react-tabs'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import Modal from '@/components/ui/Modal'; import Overlay from '@/components/ui/Overlay'; import TabLabel from '@/components/ui/TabLabel'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx index f36a15eb..6f561e58 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx @@ -2,8 +2,8 @@ import { useEffect, useLayoutEffect, useState } from 'react'; -import ConstituentaPicker from '@/components/ConstituentaPicker'; -import SelectGrammeme from '@/components/SelectGrammeme'; +import ConstituentaPicker from '@/components/select/ConstituentaPicker'; +import SelectGrammeme from '@/components/select/SelectGrammeme'; import FlexColumn from '@/components/ui/FlexColumn'; import Label from '@/components/ui/Label'; import TextInput from '@/components/ui/TextInput'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditVersions/VersionsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditVersions/VersionsTable.tsx index 8ef1947a..4abe6402 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditVersions/VersionsTable.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditVersions/VersionsTable.tsx @@ -5,7 +5,7 @@ import { useMemo } from 'react'; import { BiX } from 'react-icons/bi'; import { useIntl } from 'react-intl'; -import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; +import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable'; import MiniButton from '@/components/ui/MiniButton'; import { useConceptTheme } from '@/context/ThemeContext'; import { IVersionInfo } from '@/models/library'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index c7c8c67a..f7f1d858 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -4,8 +4,8 @@ import clsx from 'clsx'; import { useLayoutEffect, useState } from 'react'; import { BiCheck, BiChevronsDown, BiLeftArrow, BiRightArrow, BiX } from 'react-icons/bi'; -import HelpButton from '@/components/Help/HelpButton'; -import SelectGrammeme from '@/components/SelectGrammeme'; +import HelpButton from '@/components/man/HelpButton'; +import SelectGrammeme from '@/components/select/SelectGrammeme'; import Label from '@/components/ui/Label'; import MiniButton from '@/components/ui/MiniButton'; import Modal from '@/components/ui/Modal'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx index f988cbfb..1fd20619 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx +++ b/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 DataTable, { createColumnHelper } from '@/components/DataTable'; +import WordFormBadge from '@/components/info/WordFormBadge'; +import DataTable, { createColumnHelper } from '@/components/ui/DataTable'; import MiniButton from '@/components/ui/MiniButton'; -import WordFormBadge from '@/components/WordFormBadge'; import { IWordForm } from '@/models/language'; interface WordFormsTableProps { diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/ConstituentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/ConstituentsTab.tsx index 5c5d2c8b..8d013630 100644 --- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/ConstituentsTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/ConstituentsTab.tsx @@ -1,8 +1,8 @@ 'use client'; -import ConstituentaMultiPicker from '@/components/ConstituentaMultiPicker'; -import DataLoader from '@/components/DataLoader'; -import { ErrorData } from '@/components/InfoError'; +import { ErrorData } from '@/components/info/InfoError'; +import ConstituentaMultiPicker from '@/components/select/ConstituentaMultiPicker'; +import DataLoader from '@/components/wrap/DataLoader'; import { ConstituentaID, IRSForm } from '@/models/rsform'; import { prefixes } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SchemaTab.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SchemaTab.tsx index 33bb80e5..e5085eb9 100644 --- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SchemaTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SchemaTab.tsx @@ -2,7 +2,7 @@ import { useMemo } from 'react'; -import SchemaPicker from '@/components/SchemaPicker'; +import SchemaPicker from '@/components/select/SchemaPicker'; import TextInput from '@/components/ui/TextInput'; import { useLibrary } from '@/context/LibraryContext'; import { LibraryItemID } from '@/models/library'; diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx index 06739dd0..d4d51d1b 100644 --- a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx +++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from 'react'; -import GraphUI, { GraphEdge, GraphNode } from '@/components/GraphUI'; +import GraphUI, { GraphEdge, GraphNode } from '@/components/ui/GraphUI'; import Modal, { ModalProps } from '@/components/ui/Modal'; import { useConceptTheme } from '@/context/ThemeContext'; import { SyntaxTree } from '@/models/rslang'; diff --git a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx b/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx index be5082c0..b88c36c4 100644 --- a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { useMemo, useState } from 'react'; import { LuReplace } from 'react-icons/lu'; -import ConstituentaSelector from '@/components/ConstituentaSelector'; +import ConstituentaSelector from '@/components/select/ConstituentaSelector'; import Checkbox from '@/components/ui/Checkbox'; import FlexColumn from '@/components/ui/FlexColumn'; import Label from '@/components/ui/Label'; diff --git a/rsconcept/frontend/src/hooks/useCheckExpression.ts b/rsconcept/frontend/src/hooks/useCheckExpression.ts index 4d95e67e..d09a44b2 100644 --- a/rsconcept/frontend/src/hooks/useCheckExpression.ts +++ b/rsconcept/frontend/src/hooks/useCheckExpression.ts @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'; -import { type ErrorData } from '@/components/InfoError'; +import { type ErrorData } from '@/components/info/InfoError'; import { CstType, IConstituenta, type IRSForm } from '@/models/rsform'; import { getDefinitionPrefix } from '@/models/rsformAPI'; import { IArgumentInfo, IExpressionParse } from '@/models/rslang'; diff --git a/rsconcept/frontend/src/hooks/useConceptText.ts b/rsconcept/frontend/src/hooks/useConceptText.ts index ec8ad7b9..765338be 100644 --- a/rsconcept/frontend/src/hooks/useConceptText.ts +++ b/rsconcept/frontend/src/hooks/useConceptText.ts @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'; -import { ErrorData } from '@/components/InfoError'; +import { ErrorData } from '@/components/info/InfoError'; import { ILexemeData, ITextRequest, ITextResult, IWordFormPlain } from '@/models/language'; import { DataCallback, postGenerateLexeme, postInflectText, postParseText } from '@/utils/backendAPI'; diff --git a/rsconcept/frontend/src/hooks/useRSFormDetails.ts b/rsconcept/frontend/src/hooks/useRSFormDetails.ts index b124fa42..eef4b11f 100644 --- a/rsconcept/frontend/src/hooks/useRSFormDetails.ts +++ b/rsconcept/frontend/src/hooks/useRSFormDetails.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react'; -import { type ErrorData } from '@/components/InfoError'; +import { type ErrorData } from '@/components/info/InfoError'; import { IRSForm, IRSFormData } from '@/models/rsform'; import { loadRSFormData } from '@/models/rsformAPI'; import { getRSFormDetails } from '@/utils/backendAPI'; diff --git a/rsconcept/frontend/src/hooks/useResolveText.ts b/rsconcept/frontend/src/hooks/useResolveText.ts index e1733735..17afe7e8 100644 --- a/rsconcept/frontend/src/hooks/useResolveText.ts +++ b/rsconcept/frontend/src/hooks/useResolveText.ts @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'; -import { ErrorData } from '@/components/InfoError'; +import { ErrorData } from '@/components/info/InfoError'; import { IResolutionData } from '@/models/language'; import { IRSForm } from '@/models/rsform'; import { DataCallback, postResolveText } from '@/utils/backendAPI'; diff --git a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx index b4f7b3ff..1d17a58d 100644 --- a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx +++ b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx @@ -5,9 +5,7 @@ import { useEffect, useRef, useState } from 'react'; import { BiDownload } from 'react-icons/bi'; import { toast } from 'react-toastify'; -import AnimateFade from '@/components/AnimateFade'; -import InfoError from '@/components/InfoError'; -import RequireAuth from '@/components/RequireAuth'; +import InfoError from '@/components/info/InfoError'; import Button from '@/components/ui/Button'; import Checkbox from '@/components/ui/Checkbox'; import Label from '@/components/ui/Label'; @@ -16,6 +14,8 @@ 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 AnimateFade from '@/components/wrap/AnimateFade'; +import RequireAuth from '@/components/wrap/RequireAuth'; import { useLibrary } from '@/context/LibraryContext'; import { useConceptNavigation } from '@/context/NavigationContext'; import { LibraryItemType } from '@/models/library'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx index 7f1e3c3b..cff6da23 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx @@ -2,7 +2,7 @@ import { useCallback, useLayoutEffect, useState } from 'react'; -import DataLoader from '@/components/DataLoader'; +import DataLoader from '@/components/wrap/DataLoader'; import { useAuth } from '@/context/AuthContext'; import { useLibrary } from '@/context/LibraryContext'; import { useConceptNavigation } from '@/context/NavigationContext'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx index c4edca4a..929b3baf 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx @@ -4,8 +4,8 @@ import clsx from 'clsx'; import { useLayoutEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; -import DataTable, { createColumnHelper, VisibilityState } from '@/components/DataTable'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; +import DataTable, { createColumnHelper, VisibilityState } from '@/components/ui/DataTable'; import FlexColumn from '@/components/ui/FlexColumn'; import TextURL from '@/components/ui/TextURL'; import { useAuth } from '@/context/AuthContext'; diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx index da04b4d8..7f94145d 100644 --- a/rsconcept/frontend/src/pages/LoginPage.tsx +++ b/rsconcept/frontend/src/pages/LoginPage.tsx @@ -4,12 +4,12 @@ import axios from 'axios'; import clsx from 'clsx'; import { useEffect, useState } from 'react'; -import AnimateFade from '@/components/AnimateFade'; -import ExpectedAnonymous from '@/components/ExpectedAnonymous'; -import InfoError, { ErrorData } from '@/components/InfoError'; +import InfoError, { ErrorData } from '@/components/info/InfoError'; import SubmitButton from '@/components/ui/SubmitButton'; import TextInput from '@/components/ui/TextInput'; import TextURL from '@/components/ui/TextURL'; +import AnimateFade from '@/components/wrap/AnimateFade'; +import ExpectedAnonymous from '@/components/wrap/ExpectedAnonymous'; import { useAuth } from '@/context/AuthContext'; import { useConceptNavigation } from '@/context/NavigationContext'; import useQueryStrings from '@/hooks/useQueryStrings'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx index e4b21ee6..2d3e1a80 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx @@ -1,5 +1,5 @@ -import AnimateFade from '@/components/AnimateFade'; -import InfoTopic from '@/components/InfoTopic'; +import InfoTopic from '@/components/info/InfoTopic'; +import AnimateFade from '@/components/wrap/AnimateFade'; import { HelpTopic } from '@/models/miscellaneous'; interface ViewTopicProps { diff --git a/rsconcept/frontend/src/pages/PasswordChangePage.tsx b/rsconcept/frontend/src/pages/PasswordChangePage.tsx index 612a7fe2..52a387f1 100644 --- a/rsconcept/frontend/src/pages/PasswordChangePage.tsx +++ b/rsconcept/frontend/src/pages/PasswordChangePage.tsx @@ -4,10 +4,10 @@ import axios from 'axios'; import clsx from 'clsx'; import { useEffect, useMemo, useState } from 'react'; -import DataLoader from '@/components/DataLoader'; -import InfoError, { ErrorData } from '@/components/InfoError'; +import InfoError, { ErrorData } from '@/components/info/InfoError'; import SubmitButton from '@/components/ui/SubmitButton'; import TextInput from '@/components/ui/TextInput'; +import DataLoader from '@/components/wrap/DataLoader'; import { useAuth } from '@/context/AuthContext'; import { useConceptNavigation } from '@/context/NavigationContext'; import useQueryStrings from '@/hooks/useQueryStrings'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx index ea42cee8..de487d48 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx @@ -8,7 +8,7 @@ import { FaRegKeyboard } from 'react-icons/fa6'; import { RiNodeTree } from 'react-icons/ri'; import { toast } from 'react-toastify'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import RSInput from '@/components/RSInput'; import { RSTextWrapper } from '@/components/RSInput/textEditing'; import MiniButton from '@/components/ui/MiniButton'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx index 07812d93..51ad3b71 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx @@ -1,5 +1,3 @@ -'use client'; - import clsx from 'clsx'; import { motion } from 'framer-motion'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx index a12d4b2c..6b746335 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; -import InfoLibraryItem from '@/components/InfoLibraryItem'; +import InfoLibraryItem from '@/components/info/InfoLibraryItem'; import Divider from '@/components/ui/Divider'; import FlexColumn from '@/components/ui/FlexColumn'; import { useAuth } from '@/context/AuthContext'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx index 566d4065..d6f4cfb3 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx @@ -6,7 +6,8 @@ import { FiSave } from 'react-icons/fi'; import { LuGitBranchPlus, LuPencilLine } from 'react-icons/lu'; import { toast } from 'react-toastify'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; +import VersionSelector from '@/components/select/VersionSelector'; import Checkbox from '@/components/ui/Checkbox'; import Label from '@/components/ui/Label'; import MiniButton from '@/components/ui/MiniButton'; @@ -14,7 +15,6 @@ 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 VersionSelector from '@/components/VersionSelector'; import { useAuth } from '@/context/AuthContext'; import { useRSForm } from '@/context/RSFormContext'; import { LibraryItemType } from '@/models/library'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx index 61e486cd..e5cbe125 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx @@ -5,7 +5,7 @@ import { BiDownload, BiShareAlt, BiTrash } from 'react-icons/bi'; import { FiBell, FiBellOff, FiSave } from 'react-icons/fi'; import { LuCrown } from 'react-icons/lu'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import MiniButton from '@/components/ui/MiniButton'; import Overlay from '@/components/ui/Overlay'; import { HelpTopic } from '@/models/miscellaneous'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx index 7400f992..b7bac5e8 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx @@ -3,8 +3,8 @@ import clsx from 'clsx'; import { useLayoutEffect, useMemo, useState } from 'react'; -import { type RowSelectionState } from '@/components/DataTable'; -import SelectedCounter from '@/components/SelectedCounter'; +import { type RowSelectionState } from '@/components/ui/DataTable'; +import SelectedCounter from '@/components/info/SelectedCounter'; import { useConceptTheme } from '@/context/ThemeContext'; import { ConstituentaID, CstType } from '@/models/rsform'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx index ccaa29b3..a861b8ae 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { BiDownArrowCircle, BiDownvote, BiDuplicate, BiPlusCircle, BiTrash, BiUpvote } from 'react-icons/bi'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import Dropdown from '@/components/ui/Dropdown'; import DropdownButton from '@/components/ui/DropdownButton'; import MiniButton from '@/components/ui/MiniButton'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx index 24676638..df40294a 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx +++ b/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/info/ConstituentaBadge'; +import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/ui/DataTable'; import FlexColumn from '@/components/ui/FlexColumn'; import { useConceptTheme } from '@/context/ThemeContext'; import useWindowSize from '@/hooks/useWindowSize'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx index 7ebc3040..88d27d07 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx @@ -5,8 +5,8 @@ import { AnimatePresence } from 'framer-motion'; import { useCallback, useLayoutEffect, useMemo, useState } from 'react'; import { GraphEdge, GraphNode, LayoutTypes } from 'reagraph'; -import InfoConstituenta from '@/components/InfoConstituenta'; -import SelectedCounter from '@/components/SelectedCounter'; +import InfoConstituenta from '@/components/info/InfoConstituenta'; +import SelectedCounter from '@/components/info/SelectedCounter'; import Overlay from '@/components/ui/Overlay'; import { useConceptTheme } from '@/context/ThemeContext'; import DlgGraphParams from '@/dialogs/DlgGraphParams'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx index 9c0cdfbe..fbd8b6c9 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx @@ -2,7 +2,7 @@ import { BiCollapse, BiFilterAlt, BiFont, BiFontFamily, BiPlanet, BiPlusCircle, BiTrash } from 'react-icons/bi'; -import HelpButton from '@/components/Help/HelpButton'; +import HelpButton from '@/components/man/HelpButton'; import MiniButton from '@/components/ui/MiniButton'; import Overlay from '@/components/ui/Overlay'; import { HelpTopic } from '@/models/miscellaneous'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx index 4ae02ede..53012201 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx @@ -2,7 +2,7 @@ import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'; -import GraphUI, { GraphCanvasRef, GraphEdge, GraphNode, LayoutTypes, useSelection } from '@/components/GraphUI'; +import GraphUI, { GraphCanvasRef, GraphEdge, GraphNode, LayoutTypes, useSelection } from '@/components/ui/GraphUI'; import { useConceptTheme } from '@/context/ThemeContext'; import { ConstituentaID } from '@/models/rsform'; import { graphDarkT, graphLightT } from '@/styling/color'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx index a693642b..347e16a8 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'; -import ConstituentaTooltip from '@/components/ConstituentaTooltip'; +import ConstituentaTooltip from '@/components/info/ConstituentaTooltip'; import { useConceptTheme } from '@/context/ThemeContext'; import { GraphColoringScheme } from '@/models/miscellaneous'; import { ConstituentaID, IRSForm } from '@/models/rsform'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx index c317c8f5..5cd21025 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx @@ -6,7 +6,7 @@ import fileDownload from 'js-file-download'; import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useState } from 'react'; import { toast } from 'react-toastify'; -import InfoError, { ErrorData } from '@/components/InfoError'; +import InfoError, { ErrorData } from '@/components/info/InfoError'; import Divider from '@/components/ui/Divider'; import Loader from '@/components/ui/Loader'; import TextURL from '@/components/ui/TextURL'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx index 17ad3eb5..202d35bf 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx @@ -5,8 +5,8 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react'; import { TabList, TabPanel, Tabs } from 'react-tabs'; import { toast } from 'react-toastify'; -import AnimateFade from '@/components/AnimateFade'; import TabLabel from '@/components/ui/TabLabel'; +import AnimateFade from '@/components/wrap/AnimateFade'; import { useLibrary } from '@/context/LibraryContext'; import { useBlockNavigation, useConceptNavigation } from '@/context/NavigationContext'; import { useRSForm } from '@/context/RSFormContext'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx index b64bb003..94c81cf9 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx +++ b/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/info/ConstituentaBadge'; +import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/ui/DataTable'; import { useConceptTheme } from '@/context/ThemeContext'; import useWindowSize from '@/hooks/useWindowSize'; import { ConstituentaID, IConstituenta } from '@/models/rsform'; diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx index 023b362d..211d4a75 100644 --- a/rsconcept/frontend/src/pages/RegisterPage.tsx +++ b/rsconcept/frontend/src/pages/RegisterPage.tsx @@ -5,9 +5,7 @@ import { useEffect, useState } from 'react'; import { BiInfoCircle } from 'react-icons/bi'; import { toast } from 'react-toastify'; -import AnimateFade from '@/components/AnimateFade'; -import ExpectedAnonymous from '@/components/ExpectedAnonymous'; -import InfoError from '@/components/InfoError'; +import InfoError from '@/components/info/InfoError'; import Button from '@/components/ui/Button'; import Checkbox from '@/components/ui/Checkbox'; import FlexColumn from '@/components/ui/FlexColumn'; @@ -16,6 +14,8 @@ 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 AnimateFade from '@/components/wrap/AnimateFade'; +import ExpectedAnonymous from '@/components/wrap/ExpectedAnonymous'; import { useAuth } from '@/context/AuthContext'; import { useConceptNavigation } from '@/context/NavigationContext'; import { type IUserSignupData } from '@/models/library'; diff --git a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx index f0c55b16..8e477742 100644 --- a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx +++ b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx @@ -4,11 +4,11 @@ import axios from 'axios'; import clsx from 'clsx'; import { useEffect, useState } from 'react'; -import AnimateFade from '@/components/AnimateFade'; -import InfoError, { ErrorData } from '@/components/InfoError'; +import InfoError, { ErrorData } from '@/components/info/InfoError'; import SubmitButton from '@/components/ui/SubmitButton'; import TextInput from '@/components/ui/TextInput'; import TextURL from '@/components/ui/TextURL'; +import AnimateFade from '@/components/wrap/AnimateFade'; import { useAuth } from '@/context/AuthContext'; import { IRequestPasswordData } from '@/models/library'; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx index eeb6d976..03801235 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx @@ -5,7 +5,7 @@ import clsx from 'clsx'; import { useEffect, useMemo, useState } from 'react'; import { toast } from 'react-toastify'; -import InfoError, { ErrorData } from '@/components/InfoError'; +import InfoError, { ErrorData } from '@/components/info/InfoError'; import FlexColumn from '@/components/ui/FlexColumn'; import SubmitButton from '@/components/ui/SubmitButton'; import TextInput from '@/components/ui/TextInput'; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx index 3fd6f142..207e4e91 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx @@ -1,4 +1,4 @@ -import RequireAuth from '@/components/RequireAuth'; +import RequireAuth from '@/components/wrap/RequireAuth'; import { UserProfileState } from '@/context/UserProfileContext'; import UserTabs from './UserTabs'; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx index 72bb825e..4b67b823 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx @@ -4,10 +4,10 @@ import { AnimatePresence } from 'framer-motion'; import { useMemo, useState } from 'react'; import { FiBell, FiBellOff } from 'react-icons/fi'; -import AnimateFade from '@/components/AnimateFade'; -import DataLoader from '@/components/DataLoader'; import MiniButton from '@/components/ui/MiniButton'; import Overlay from '@/components/ui/Overlay'; +import AnimateFade from '@/components/wrap/AnimateFade'; +import DataLoader from '@/components/wrap/DataLoader'; import { useAuth } from '@/context/AuthContext'; import { useLibrary } from '@/context/LibraryContext'; import { useUserProfile } from '@/context/UserProfileContext'; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx index 95f77204..577d39fa 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx @@ -4,7 +4,7 @@ import { motion } from 'framer-motion'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; -import DataTable, { createColumnHelper } from '@/components/DataTable'; +import DataTable, { createColumnHelper } from '@/components/ui/DataTable'; import { useConceptNavigation } from '@/context/NavigationContext'; import { ILibraryItem } from '@/models/library'; import { animateSideView } from '@/styling/animations'; diff --git a/rsconcept/frontend/src/utils/backendAPI.ts b/rsconcept/frontend/src/utils/backendAPI.ts index d0cb3990..65fa7852 100644 --- a/rsconcept/frontend/src/utils/backendAPI.ts +++ b/rsconcept/frontend/src/utils/backendAPI.ts @@ -5,7 +5,7 @@ import axios, { AxiosError, AxiosRequestConfig } from 'axios'; import { toast } from 'react-toastify'; -import { type ErrorData } from '@/components/InfoError'; +import { type ErrorData } from '@/components/info/InfoError'; import { ILexemeData, IResolutionData, ITextRequest, ITextResult, IWordFormPlain } from '@/models/language'; import { ICurrentUser,