From 1ab4ce25565b9ea90e63241e4d7f678c88b07a15 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:41:58 +0300 Subject: [PATCH] R: Refactor auth and help feature boundary --- rsconcept/frontend/src/app/Navigation/UserButton.tsx | 2 +- rsconcept/frontend/src/app/Navigation/UserDropdown.tsx | 3 +-- .../frontend/src/components/{shared => Input}/SearchBar.tsx | 0 rsconcept/frontend/src/components/Input/index.tsx | 1 + rsconcept/frontend/src/components/Modal/ModalForm.tsx | 3 +-- rsconcept/frontend/src/components/Modal/ModalView.tsx | 2 +- .../src/features/auth/components/ExpectedAnonymous.tsx | 4 +--- .../frontend/src/features/auth/components/RequireAuth.tsx | 4 +--- rsconcept/frontend/src/features/auth/index.ts | 5 +++++ rsconcept/frontend/src/features/auth/pages/LoginPage.tsx | 2 +- .../shared => features/help/components}/BadgeHelp.tsx | 3 ++- rsconcept/frontend/src/features/help/index.ts | 2 ++ .../src/features/help/pages/ManualsPage/ViewTopic.tsx | 2 +- rsconcept/frontend/src/features/home/HomePage.tsx | 2 +- .../src/features/library/backend/useApplyLibraryFilter.tsx | 2 +- .../frontend/src/features/library/backend/useLibrary.tsx | 2 +- .../src/features/library/dialogs/DlgChangeLocation.tsx | 2 +- .../features/library/pages/CreateItemPage/CreateItemPage.tsx | 2 +- .../features/library/pages/CreateItemPage/FormCreateItem.tsx | 2 +- .../src/features/library/pages/LibraryPage/ToolbarSearch.tsx | 2 +- .../features/library/pages/LibraryPage/ViewSideLocation.tsx | 5 ++--- .../oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx | 2 +- .../frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx | 2 +- .../oss/dialogs/DlgEditOperation/DlgEditOperation.tsx | 2 +- .../src/features/oss/dialogs/DlgRelocateConstituents.tsx | 2 +- .../oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx | 3 +-- .../frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx | 2 +- .../src/features/oss/pages/OssPage/OssEditContext.tsx | 2 +- .../src/features/rsform/components/PickConstituenta.tsx | 2 +- .../src/features/rsform/components/PickMultiConstituenta.tsx | 2 +- .../frontend/src/features/rsform/components/PickSchema.tsx | 2 +- .../src/features/rsform/dialogs/DlgCloneLibraryItem.tsx | 2 +- .../features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx | 3 +-- .../rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx | 2 +- .../rsform/dialogs/DlgEditReference/DlgEditReference.tsx | 2 +- .../rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx | 2 +- .../frontend/src/features/rsform/dialogs/DlgRenameCst.tsx | 2 +- .../src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx | 2 +- .../rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx | 2 +- .../src/features/rsform/dialogs/DlgSubstituteCst.tsx | 2 +- .../RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx | 3 +-- .../RSFormPage/EditorRSExpression/EditorRSExpression.tsx | 3 +-- .../pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx | 3 +-- .../pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx | 3 +-- .../pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx | 3 +-- .../rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx | 2 +- .../rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx | 3 +-- .../pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx | 3 +-- .../pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx | 3 +-- .../src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx | 2 +- .../src/features/rsform/pages/RSFormPage/RSEditContext.tsx | 2 +- .../pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx | 2 +- .../src/features/users/pages/RegisterPage/FormSignup.tsx | 2 +- .../src/features/users/pages/RegisterPage/RegisterPage.tsx | 3 +-- .../features/users/pages/UserProfilePage/EditorPassword.tsx | 2 +- .../features/users/pages/UserProfilePage/UserProfilePage.tsx | 2 +- 56 files changed, 62 insertions(+), 71 deletions(-) rename rsconcept/frontend/src/components/{shared => Input}/SearchBar.tsx (100%) create mode 100644 rsconcept/frontend/src/features/auth/index.ts rename rsconcept/frontend/src/{components/shared => features/help/components}/BadgeHelp.tsx (96%) create mode 100644 rsconcept/frontend/src/features/help/index.ts diff --git a/rsconcept/frontend/src/app/Navigation/UserButton.tsx b/rsconcept/frontend/src/app/Navigation/UserButton.tsx index f56574da..251e9ab5 100644 --- a/rsconcept/frontend/src/app/Navigation/UserButton.tsx +++ b/rsconcept/frontend/src/app/Navigation/UserButton.tsx @@ -1,5 +1,5 @@ import { IconLogin, IconUser2 } from '@/components/Icons'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { usePreferencesStore } from '@/stores/preferences'; import NavigationButton from './NavigationButton'; diff --git a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx index 9d5391b0..55971996 100644 --- a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx +++ b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx @@ -14,8 +14,7 @@ import { IconUser } from '@/components/Icons'; import { CProps } from '@/components/props'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; -import { useLogout } from '@/features/auth/backend/useLogout'; +import { useAuthSuspense, useLogout } from '@/features/auth'; import { usePreferencesStore } from '@/stores/preferences'; import { urls } from '../urls'; diff --git a/rsconcept/frontend/src/components/shared/SearchBar.tsx b/rsconcept/frontend/src/components/Input/SearchBar.tsx similarity index 100% rename from rsconcept/frontend/src/components/shared/SearchBar.tsx rename to rsconcept/frontend/src/components/Input/SearchBar.tsx diff --git a/rsconcept/frontend/src/components/Input/index.tsx b/rsconcept/frontend/src/components/Input/index.tsx index 3fb336d9..2461f51f 100644 --- a/rsconcept/frontend/src/components/Input/index.tsx +++ b/rsconcept/frontend/src/components/Input/index.tsx @@ -3,6 +3,7 @@ export { CheckboxTristate } from './CheckboxTristate'; export { ErrorField } from './ErrorField'; export { FileInput } from './FileInput'; export { Label } from './Label'; +export { SearchBar } from './SearchBar'; export { SelectMulti, type SelectMultiProps } from './SelectMulti'; export { SelectSingle, type SelectSingleProps } from './SelectSingle'; export { SelectTree } from './SelectTree'; diff --git a/rsconcept/frontend/src/components/Modal/ModalForm.tsx b/rsconcept/frontend/src/components/Modal/ModalForm.tsx index 0c31edd4..cb126bea 100644 --- a/rsconcept/frontend/src/components/Modal/ModalForm.tsx +++ b/rsconcept/frontend/src/components/Modal/ModalForm.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import useEscapeKey from '@/hooks/useEscapeKey'; import { useDialogsStore } from '@/stores/dialogs'; import { PARAMETER } from '@/utils/constants'; @@ -11,7 +11,6 @@ import { prepareTooltip } from '@/utils/utils'; import { Button, MiniButton, SubmitButton } from '../Control'; import { IconClose } from '../Icons'; import { CProps } from '../props'; -import { BadgeHelp } from '../shared/BadgeHelp'; import { ModalBackdrop } from './ModalBackdrop'; export interface ModalProps extends CProps.Styling { diff --git a/rsconcept/frontend/src/components/Modal/ModalView.tsx b/rsconcept/frontend/src/components/Modal/ModalView.tsx index d9ebce3a..1a194676 100644 --- a/rsconcept/frontend/src/components/Modal/ModalView.tsx +++ b/rsconcept/frontend/src/components/Modal/ModalView.tsx @@ -2,6 +2,7 @@ import clsx from 'clsx'; +import { BadgeHelp } from '@/features/help'; import useEscapeKey from '@/hooks/useEscapeKey'; import { useDialogsStore } from '@/stores/dialogs'; import { PARAMETER } from '@/utils/constants'; @@ -9,7 +10,6 @@ import { prepareTooltip } from '@/utils/utils'; import { Button, MiniButton } from '../Control'; import { IconClose } from '../Icons'; -import { BadgeHelp } from '../shared/BadgeHelp'; import { ModalBackdrop } from './ModalBackdrop'; import { ModalProps } from './ModalForm'; diff --git a/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx index 12c01b2e..1baa81d9 100644 --- a/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx +++ b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx @@ -4,7 +4,7 @@ import { TextURL } from '@/components/Control'; import { useAuthSuspense } from '../backend/useAuth'; import { useLogout } from '../backend/useLogout'; -function ExpectedAnonymous() { +export function ExpectedAnonymous() { const { user } = useAuthSuspense(); const { logout } = useLogout(); const router = useConceptNavigation(); @@ -30,5 +30,3 @@ function ExpectedAnonymous() { ); } - -export default ExpectedAnonymous; diff --git a/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx b/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx index 08d4b09f..7a41d8e7 100644 --- a/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx +++ b/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx @@ -4,7 +4,7 @@ import { TextURL } from '@/components/Control'; import { useAuthSuspense } from '../backend/useAuth'; -function RequireAuth({ children }: React.PropsWithChildren) { +export function RequireAuth({ children }: React.PropsWithChildren) { const { isAnonymous } = useAuthSuspense(); if (isAnonymous) { @@ -19,5 +19,3 @@ function RequireAuth({ children }: React.PropsWithChildren) { } return <>{children}; } - -export default RequireAuth; diff --git a/rsconcept/frontend/src/features/auth/index.ts b/rsconcept/frontend/src/features/auth/index.ts new file mode 100644 index 00000000..4f96f319 --- /dev/null +++ b/rsconcept/frontend/src/features/auth/index.ts @@ -0,0 +1,5 @@ +export { useAuthSuspense } from './backend/useAuth'; +export { useChangePassword } from './backend/useChangePassword'; +export { useLogout } from './backend/useLogout'; +export { ExpectedAnonymous } from './components/ExpectedAnonymous'; +export { RequireAuth } from './components/RequireAuth'; diff --git a/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx index d2c9d68c..61ff588c 100644 --- a/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx +++ b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx @@ -15,7 +15,7 @@ import { resources } from '@/utils/constants'; import { IUserLoginDTO, schemaUserLogin } from '../backend/api'; import { useAuthSuspense } from '../backend/useAuth'; import { useLogin } from '../backend/useLogin'; -import ExpectedAnonymous from '../components/ExpectedAnonymous'; +import { ExpectedAnonymous } from '../components/ExpectedAnonymous'; function LoginPage() { const router = useConceptNavigation(); diff --git a/rsconcept/frontend/src/components/shared/BadgeHelp.tsx b/rsconcept/frontend/src/features/help/components/BadgeHelp.tsx similarity index 96% rename from rsconcept/frontend/src/components/shared/BadgeHelp.tsx rename to rsconcept/frontend/src/features/help/components/BadgeHelp.tsx index ffe0dfd9..e48acb12 100644 --- a/rsconcept/frontend/src/components/shared/BadgeHelp.tsx +++ b/rsconcept/frontend/src/features/help/components/BadgeHelp.tsx @@ -5,9 +5,10 @@ import { TextURL } from '@/components/Control'; import { IconHelp } from '@/components/Icons'; import { Loader } from '@/components/Loader'; import { CProps } from '@/components/props'; -import { HelpTopic } from '@/features/help/models/helpTopic'; import { usePreferencesStore } from '@/stores/preferences'; +import { HelpTopic } from '../models/helpTopic'; + const TopicPage = React.lazy(() => import('@/features/help/pages/ManualsPage/TopicPage')); interface BadgeHelpProps extends CProps.Styling { diff --git a/rsconcept/frontend/src/features/help/index.ts b/rsconcept/frontend/src/features/help/index.ts new file mode 100644 index 00000000..4ce36b03 --- /dev/null +++ b/rsconcept/frontend/src/features/help/index.ts @@ -0,0 +1,2 @@ +export { BadgeHelp } from './components/BadgeHelp'; +export { HelpTopic } from './models/helpTopic'; diff --git a/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx index ace88fbc..d2973057 100644 --- a/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx +++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx @@ -1,9 +1,9 @@ 'use client'; -import TopicPage from '@/features/help/pages/ManualsPage/TopicPage'; import { useMainHeight } from '@/stores/appLayout'; import { HelpTopic } from '../../models/helpTopic'; +import TopicPage from './TopicPage'; interface ViewTopicProps { topic: HelpTopic; diff --git a/rsconcept/frontend/src/features/home/HomePage.tsx b/rsconcept/frontend/src/features/home/HomePage.tsx index 38762235..c8c9dc74 100644 --- a/rsconcept/frontend/src/features/home/HomePage.tsx +++ b/rsconcept/frontend/src/features/home/HomePage.tsx @@ -2,7 +2,7 @@ import { useEffect } from 'react'; import { urls, useConceptNavigation } from '@/app'; import { Loader } from '@/components/Loader'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { PARAMETER } from '@/utils/constants'; function HomePage() { diff --git a/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx b/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx index f15dd275..9d736fab 100644 --- a/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx +++ b/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx @@ -1,4 +1,4 @@ -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { ILibraryFilter } from '../models/library'; import { matchLibraryItem, matchLibraryItemLocation } from '../models/libraryAPI'; diff --git a/rsconcept/frontend/src/features/library/backend/useLibrary.tsx b/rsconcept/frontend/src/features/library/backend/useLibrary.tsx index f14b57b3..29fce69b 100644 --- a/rsconcept/frontend/src/features/library/backend/useLibrary.tsx +++ b/rsconcept/frontend/src/features/library/backend/useLibrary.tsx @@ -1,7 +1,7 @@ import { useQuery, useSuspenseQuery } from '@tanstack/react-query'; import { queryClient } from '@/backend/queryClient'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { usePreferencesStore } from '@/stores/preferences'; import { libraryApi } from './api'; diff --git a/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx b/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx index 0365c3c8..40f132ce 100644 --- a/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx +++ b/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx @@ -7,7 +7,7 @@ import { z } from 'zod'; import { Label, TextArea } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { useDialogsStore } from '@/stores/dialogs'; import { limits } from '@/utils/constants'; import { errorMsg } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx index 3be81da4..8c921d2c 100644 --- a/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx +++ b/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx @@ -1,4 +1,4 @@ -import RequireAuth from '@/features/auth/components/RequireAuth'; +import { RequireAuth } from '@/features/auth'; import FormCreateItem from './FormCreateItem'; diff --git a/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx index 91f55aa1..f3ec86d5 100644 --- a/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx +++ b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx @@ -12,7 +12,7 @@ import { VisibilityIcon } from '@/components/DomainIcons'; import { IconDownload } from '@/components/Icons'; import { InfoError } from '@/components/InfoError'; import { Label, TextArea, TextInput } from '@/components/Input'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { EXTEOR_TRS_FILE } from '@/utils/constants'; import { ICreateLibraryItemDTO, schemaCreateLibraryItem } from '../../backend/api'; diff --git a/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx index b4db6226..91e99e1c 100644 --- a/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx +++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx @@ -14,8 +14,8 @@ import { IconOwner, IconUserSearch } from '@/components/Icons'; +import { SearchBar } from '@/components/Input'; import { CProps } from '@/components/props'; -import { SearchBar } from '@/components/shared/SearchBar'; import { SelectUser } from '@/features/users'; import { prefixes } from '@/utils/constants'; import { tripleToggleColor } from '@/utils/utils'; diff --git a/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx index 3613dabe..3d08731c 100644 --- a/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx +++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx @@ -5,9 +5,8 @@ import { MiniButton } from '@/components/Control'; import { SubfoldersIcon } from '@/components/DomainIcons'; import { IconFolderEdit, IconFolderTree } from '@/components/Icons'; import { CProps } from '@/components/props'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { useAuthSuspense } from '@/features/auth'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { FolderNode } from '@/features/library/models/FolderTree'; import useWindowSize from '@/hooks/useWindowSize'; import { useFitHeight } from '@/stores/appLayout'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx index 037c4bde..8b924db0 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx @@ -7,7 +7,7 @@ import { FormProvider, useForm, useWatch } from 'react-hook-form'; import { ModalForm } from '@/components/Modal'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { IOperationCreateDTO, IOperationPosition, schemaOperationCreate } from '../../backend/api'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx index f80c46c4..e5abab80 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx @@ -6,7 +6,7 @@ import { Controller, useForm } from 'react-hook-form'; import { Checkbox, TextInput } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { IOperation, IOperationSchema } from '@/features/oss/models/oss'; import { useDialogsStore } from '@/stores/dialogs'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx index 832a27f4..00660699 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx @@ -8,7 +8,7 @@ import { FormProvider, useForm, useWatch } from 'react-hook-form'; import { Loader } from '@/components/Loader'; import { ModalForm } from '@/components/Modal'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { IOperationPosition, IOperationUpdateDTO, schemaOperationUpdate } from '../../backend/api'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx index d40df1bb..9199c544 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx @@ -9,7 +9,7 @@ import { MiniButton } from '@/components/Control'; import { RelocateUpIcon } from '@/components/DomainIcons'; import { Loader } from '@/components/Loader'; import { ModalForm } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useLibrary } from '@/features/library/backend/useLibrary'; import SelectLibraryItem from '@/features/library/components/SelectLibraryItem'; import { ILibraryItem, LibraryItemID } from '@/features/library/models/library'; diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx index 5b48e9ed..f0d724b7 100644 --- a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx +++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx @@ -18,8 +18,7 @@ import { IconReset, IconSave } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useModificationStore } from '@/stores/modification'; import { PARAMETER } from '@/utils/constants'; import { prepareTooltip } from '@/utils/utils'; diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx index 868cb180..5babde47 100644 --- a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx +++ b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx @@ -18,7 +18,7 @@ import { IconReader, IconShare } from '@/components/Icons'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { useMutatingOss } from '@/features/oss/backend/useMutatingOss'; import { useRoleStore } from '@/features/users'; import { UserRole } from '@/features/users/models/user'; diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx index 30dfe347..aca2f9c0 100644 --- a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx +++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx @@ -3,7 +3,7 @@ import { createContext, useContext, useEffect, useState } from 'react'; import { urls, useConceptNavigation } from '@/app'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { useDeleteItem } from '@/features/library/backend/useDeleteItem'; import { ILibraryItemEditor, LibraryItemID } from '@/features/library/models/library'; import { useLibrarySearchStore } from '@/features/library/stores/librarySearch'; diff --git a/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx index 4949bb8d..c9ed448d 100644 --- a/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx +++ b/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx @@ -4,8 +4,8 @@ import clsx from 'clsx'; import { useState } from 'react'; import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; +import { SearchBar } from '@/components/Input'; import { CProps } from '@/components/props'; -import { SearchBar } from '@/components/shared/SearchBar'; import { NoData } from '@/components/View'; import { APP_COLORS } from '@/styling/colors'; diff --git a/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx index f0c01907..7165ae65 100644 --- a/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx +++ b/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx @@ -4,8 +4,8 @@ import clsx from 'clsx'; import { useState } from 'react'; import DataTable, { createColumnHelper, RowSelectionState } from '@/components/DataTable'; +import { SearchBar } from '@/components/Input'; import { CProps } from '@/components/props'; -import { SearchBar } from '@/components/shared/SearchBar'; import { NoData } from '@/components/View'; import { Graph } from '@/models/Graph'; diff --git a/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx b/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx index f64cdb09..365ec192 100644 --- a/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx +++ b/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx @@ -7,8 +7,8 @@ import { MiniButton } from '@/components/Control'; import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; import { Dropdown, useDropdown } from '@/components/Dropdown'; import { IconClose, IconFolderTree } from '@/components/Icons'; +import { SearchBar } from '@/components/Input'; import { CProps } from '@/components/props'; -import { SearchBar } from '@/components/shared/SearchBar'; import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/features/library/models/library'; import { matchLibraryItem } from '@/features/library/models/libraryAPI'; import { APP_COLORS } from '@/styling/colors'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx index 015b0946..3674f1d0 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx @@ -9,7 +9,7 @@ import { MiniButton } from '@/components/Control'; import { VisibilityIcon } from '@/components/DomainIcons'; import { Checkbox, Label, TextArea, TextInput } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { ICloneLibraryItemDTO, schemaCloneLibraryItem } from '@/features/library/backend/api'; import { useCloneItem } from '@/features/library/backend/useCloneItem'; import SelectAccessPolicy from '@/features/library/components/SelectAccessPolicy'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx index e93ad01b..9dcc70c9 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx @@ -4,8 +4,7 @@ import clsx from 'clsx'; import { useEffect, useState } from 'react'; import { TextArea, TextInput } from '@/components/Input'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { PARAMETER } from '@/utils/constants'; import { ICstCreateDTO } from '../../backend/api'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx index c11788d2..42b027ed 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx @@ -6,7 +6,7 @@ import { Suspense, useEffect, useState } from 'react'; import { Loader } from '@/components/Loader'; import { ModalForm } from '@/components/Modal'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import usePartialUpdate from '@/hooks/usePartialUpdate'; import { useDialogsStore } from '@/stores/dialogs'; import { promptText } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx index ac0c4f30..315b2943 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx @@ -5,7 +5,7 @@ import { useState } from 'react'; import { ModalForm } from '@/components/Modal'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { labelReferenceType } from '../../labels'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index 69b1cae5..56654ee0 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -7,7 +7,7 @@ import { MiniButton } from '@/components/Control'; import { IconAccept, IconMoveDown, IconMoveLeft, IconMoveRight, IconRemove } from '@/components/Icons'; import { Label, TextArea } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { promptText } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx index 0c6162a7..66f0322b 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx @@ -6,7 +6,7 @@ import { useForm, useWatch } from 'react-hook-form'; import { TextInput } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { ICstRenameDTO, schemaCstRename } from '../backend/api'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx index 52a4da83..ddc7b5c9 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx @@ -5,7 +5,7 @@ import { ReactFlowProvider } from 'reactflow'; import { Overlay } from '@/components/Container'; import { ModalView } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { SyntaxTree } from '../../models/rslang'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx index b7d4a9e9..ccf83ff5 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx @@ -4,7 +4,7 @@ import { toast } from 'react-toastify'; import { ReactFlowProvider } from 'reactflow'; import { ModalView } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { errorMsg } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx index 2ed4094d..a9186c97 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx @@ -6,7 +6,7 @@ import { Controller, useForm } from 'react-hook-form'; import { ErrorField } from '@/components/Input'; import { ModalForm } from '@/components/Modal'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { ICstSubstitutionsDTO, schemaCstSubstitutions } from '../backend/api'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx index 006a6dc0..35f042f0 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx @@ -17,8 +17,7 @@ import { IconReset, IconSave } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useFindPredecessor } from '@/features/oss/backend/useFindPredecessor'; import { useModificationStore } from '@/stores/modification'; import { usePreferencesStore } from '@/stores/preferences'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx index 84a4c7ce..b1f94f84 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx @@ -7,8 +7,7 @@ import { toast } from 'react-toastify'; import { DataCallback } from '@/backend/apiTransport'; import { Overlay } from '@/components/Container'; import { CProps } from '@/components/props'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { usePreferencesStore } from '@/stores/preferences'; import { transformAST } from '@/utils/codemirror'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx index 78d66c01..71d295b4 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx @@ -3,8 +3,7 @@ import { MiniButton } from '@/components/Control'; import { VisibilityIcon } from '@/components/DomainIcons'; import { IconImmutable, IconMutable } from '@/components/Icons'; import { Label } from '@/components/Input'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary'; import { useSetAccessPolicy } from '@/features/library/backend/useSetAccessPolicy'; import SelectAccessPolicy from '@/features/library/components/SelectAccessPolicy'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx index 01d12bc2..0e1651e5 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx @@ -3,8 +3,7 @@ import { Overlay } from '@/components/Container'; import { MiniButton } from '@/components/Control'; import { IconDestroy, IconSave, IconShare } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary'; import { AccessPolicy, ILibraryItemEditor, LibraryItemType } from '@/features/library/models/library'; import { useRoleStore } from '@/features/users'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx index 1d2b98e1..907d9ba8 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx @@ -3,8 +3,7 @@ import { Overlay } from '@/components/Container'; import { MiniButton } from '@/components/Control'; import { IconNewVersion, IconUpload, IconVersions } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useVersionRestore } from '@/features/library/backend/useVersionRestore'; import { useDialogsStore } from '@/stores/dialogs'; import { useModificationStore } from '@/stores/modification'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx index b7835135..4c1b49ee 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx @@ -8,7 +8,7 @@ import { Overlay } from '@/components/Container'; import { MiniButton } from '@/components/Control'; import { type RowSelectionState } from '@/components/DataTable'; import { IconCSV } from '@/components/Icons'; -import { SearchBar } from '@/components/shared/SearchBar'; +import { SearchBar } from '@/components/Input'; import { useFitHeight } from '@/stores/appLayout'; import { infoMsg } from '@/utils/labels'; import { convertToCSV } from '@/utils/utils'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx index 5e1ed9e9..aa1e4774 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx @@ -11,8 +11,7 @@ import { IconOpenList, IconReset } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { prefixes } from '@/utils/constants'; import { prepareTooltip } from '@/utils/utils'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx index a028c11a..c8da56a0 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx @@ -1,7 +1,6 @@ import { Overlay } from '@/components/Container'; import { SelectSingle } from '@/components/Input'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { mapLabelColoring } from '../../../labels'; import { IRSForm } from '../../../models/rsform'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx index 026730b3..f13d4067 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx @@ -13,8 +13,7 @@ import { IconTextOff, IconTypeGraph } from '@/components/Icons'; -import { BadgeHelp } from '@/components/shared/BadgeHelp'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { BadgeHelp, HelpTopic } from '@/features/help'; import { useDialogsStore } from '@/stores/dialogs'; import { PARAMETER } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx index d35dcf3f..920f1c10 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx @@ -31,7 +31,7 @@ import { IconTemplates, IconUpload } from '@/components/Icons'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { AccessPolicy, LocationHead } from '@/features/library/models/library'; import { OssTabID } from '@/features/oss/pages/OssPage/OssEditContext'; import { useRoleStore } from '@/features/users'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx index 7b0f472e..2d03f6aa 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx @@ -3,7 +3,7 @@ import { createContext, useContext, useEffect, useState } from 'react'; import { urls, useConceptNavigation } from '@/app'; -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; +import { useAuthSuspense } from '@/features/auth'; import { useDeleteItem } from '@/features/library/backend/useDeleteItem'; import { ILibraryItemEditor, LibraryItemID, VersionID } from '@/features/library/models/library'; import { useLibrarySearchStore } from '@/features/library/stores/librarySearch'; diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx index df1fcb03..4ba4afbd 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx @@ -4,7 +4,7 @@ import { useEffect } from 'react'; import { MiniButton } from '@/components/Control'; import { IconChild } from '@/components/Icons'; -import { SearchBar } from '@/components/shared/SearchBar'; +import { SearchBar } from '@/components/Input'; import { ConstituentaID, IConstituenta, IRSForm } from '../../../models/rsform'; import { matchConstituenta } from '../../../models/rsformAPI'; diff --git a/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx index 878505db..6d06fa3a 100644 --- a/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx +++ b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx @@ -13,7 +13,7 @@ import { IconHelp } from '@/components/Icons'; import { ErrorData } from '@/components/InfoError'; import { Checkbox, TextInput } from '@/components/Input'; import { PrettyJson } from '@/components/View'; -import { HelpTopic } from '@/features/help/models/helpTopic'; +import { HelpTopic } from '@/features/help'; import { globals, patterns } from '@/utils/constants'; import { IUserSignupDTO, schemaUserSignup } from '../../backend/api'; diff --git a/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx index aa1c6e90..c39b77b8 100644 --- a/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx +++ b/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx @@ -1,5 +1,4 @@ -import { useAuthSuspense } from '@/features/auth/backend/useAuth'; -import ExpectedAnonymous from '@/features/auth/components/ExpectedAnonymous'; +import { ExpectedAnonymous, useAuthSuspense } from '@/features/auth'; import FormSignup from './FormSignup'; diff --git a/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx index a04394dc..d073738d 100644 --- a/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx +++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx @@ -10,8 +10,8 @@ import { FlexColumn } from '@/components/Container'; import { SubmitButton } from '@/components/Control'; import { ErrorData } from '@/components/InfoError'; import { TextInput } from '@/components/Input'; +import { useChangePassword } from '@/features/auth'; import { IChangePasswordDTO, schemaChangePassword } from '@/features/auth/backend/api'; -import { useChangePassword } from '@/features/auth/backend/useChangePassword'; function EditorPassword() { const router = useConceptNavigation(); diff --git a/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx index 98109c8d..df5d8d2e 100644 --- a/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx +++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx @@ -1,4 +1,4 @@ -import RequireAuth from '@/features/auth/components/RequireAuth'; +import { RequireAuth } from '@/features/auth'; import EditorPassword from './EditorPassword'; import EditorProfile from './EditorProfile';