diff --git a/docs/docs/contributor/frontend/basics/overview.mdx b/docs/docs/contributor/frontend/basics/basics.mdx similarity index 93% rename from docs/docs/contributor/frontend/basics/overview.mdx rename to docs/docs/contributor/frontend/basics/basics.mdx index 73457206c9..9e837f0659 100644 --- a/docs/docs/contributor/frontend/basics/overview.mdx +++ b/docs/docs/contributor/frontend/basics/basics.mdx @@ -1,11 +1,15 @@ --- -title: Overview -description: Overview +title: Basics +# description: Overview sidebar_position: 0 sidebar_custom_props: icon: TbEyeglass --- +import DocCardList from '@theme/DocCardList'; + + + ## Tech Stack We took care of having a clean and simple stack, with minimal boilerplate code. diff --git a/docs/docs/contributor/frontend/basics/contributing.mdx b/docs/docs/contributor/frontend/basics/contributing.mdx index 25096fd064..14a4e29c47 100644 --- a/docs/docs/contributor/frontend/basics/contributing.mdx +++ b/docs/docs/contributor/frontend/basics/contributing.mdx @@ -4,6 +4,9 @@ sidebar_position: 1 sidebar_custom_props: icon: TbTopologyStar --- +import DocCardList from '@theme/DocCardList'; + + ## Pre-requesites diff --git a/docs/docs/contributor/frontend/basics/design-system.mdx b/docs/docs/contributor/frontend/basics/design-system.mdx index 3cde9d40de..dd6bd1a1d2 100644 --- a/docs/docs/contributor/frontend/basics/design-system.mdx +++ b/docs/docs/contributor/frontend/basics/design-system.mdx @@ -1,9 +1,14 @@ --- +title: Design System sidebar_position: 7 sidebar_custom_props: icon: TbPaint --- +import DocCardList from '@theme/DocCardList'; + + + # Design System We rely on our internal and custom design system, that is built on top of styled-components. diff --git a/docs/docs/contributor/frontend/basics/folder-architecture.mdx b/docs/docs/contributor/frontend/basics/folder-architecture.mdx index c5c080cbfe..07043a3c82 100644 --- a/docs/docs/contributor/frontend/basics/folder-architecture.mdx +++ b/docs/docs/contributor/frontend/basics/folder-architecture.mdx @@ -1,9 +1,14 @@ --- +title: Folder Architecture sidebar_position: 5 sidebar_custom_props: icon: TbFolder --- +import DocCardList from '@theme/DocCardList'; + + + # Folder Architecture In this guide, you will explore the details of the project directory structure and how it contributes to the organization and maintainability of Twenty. diff --git a/docs/docs/contributor/frontend/basics/work-with-figma.mdx b/docs/docs/contributor/frontend/basics/work-with-figma.mdx index 1111e85d04..a42c9bc397 100644 --- a/docs/docs/contributor/frontend/basics/work-with-figma.mdx +++ b/docs/docs/contributor/frontend/basics/work-with-figma.mdx @@ -5,6 +5,10 @@ sidebar_custom_props: icon: TbBrandFigma --- +import DocCardList from '@theme/DocCardList'; + + + Figma is a collaborative interface design tool that aids in bridging the communication barrier between designers and developers. In this guide, we'll go over how to collaborate with Twenty’s Figma. diff --git a/docs/docs/contributor/frontend/frontend.mdx b/docs/docs/contributor/frontend/frontend.mdx index 5b684c1811..7087b9804e 100644 --- a/docs/docs/contributor/frontend/frontend.mdx +++ b/docs/docs/contributor/frontend/frontend.mdx @@ -7,6 +7,7 @@ sidebar_custom_props: icon: TbTerminal2 isSidebarRoot: true --- + Welcome to the Frontend Development section of the documentation. Here you will find information about the frontend development process, the tools we use, and the best practices we follow. diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css index 2c637ae13c..7b1761d6b7 100644 --- a/docs/src/css/custom.css +++ b/docs/src/css/custom.css @@ -234,4 +234,8 @@ a.table-of-contents__link:hover{ .tabs-container { padding: 20px; +} + +.card{ + text-decoration: none; } \ No newline at end of file diff --git a/front/src/App.tsx b/front/src/App.tsx index 9819a65ec3..aa0d9d9516 100644 --- a/front/src/App.tsx +++ b/front/src/App.tsx @@ -2,7 +2,7 @@ import { Navigate, Route, Routes, useLocation } from 'react-router-dom'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { DefaultLayout } from '@/ui/layout/components/DefaultLayout'; +import { DefaultLayout } from '@/ui/layout/page/DefaultLayout'; import { PageTitle } from '@/ui/utilities/page-title/PageTitle'; import { CommandMenuEffect } from '~/effect-components/CommandMenuEffect'; import { GotoHotkeysEffect } from '~/effect-components/GotoHotkeysEffect'; diff --git a/front/src/AppNavbar.tsx b/front/src/AppNavbar.tsx index 2f953c4b43..8bf15a7034 100644 --- a/front/src/AppNavbar.tsx +++ b/front/src/AppNavbar.tsx @@ -12,11 +12,11 @@ import { IconSettings, IconTargetArrow, IconUser, -} from '@/ui/icon/index'; +} from '@/ui/display/icon/index'; import { useIsSubMenuNavbarDisplayed } from '@/ui/layout/hooks/useIsSubMenuNavbarDisplayed'; -import MainNavbar from '@/ui/navbar/components/MainNavbar'; -import NavItem from '@/ui/navbar/components/NavItem'; -import NavTitle from '@/ui/navbar/components/NavTitle'; +import MainNavbar from '@/ui/navigation/navbar/components/MainNavbar'; +import NavItem from '@/ui/navigation/navbar/components/NavItem'; +import NavTitle from '@/ui/navigation/navbar/components/NavTitle'; import { measureTotalFrameLoad } from './utils/measureTotalFrameLoad'; diff --git a/front/src/effect-components/PageChangeEffect.tsx b/front/src/effect-components/PageChangeEffect.tsx index dcbbd2b7ee..fb50693c35 100644 --- a/front/src/effect-components/PageChangeEffect.tsx +++ b/front/src/effect-components/PageChangeEffect.tsx @@ -12,9 +12,9 @@ import { AppBasePath } from '@/types/AppBasePath'; import { AppPath } from '@/types/AppPath'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; import { SettingsPath } from '@/types/SettingsPath'; -import { TableHotkeyScope } from '@/ui/data-table/types/TableHotkeyScope'; -import { IconCheckbox, IconNotes } from '@/ui/icon'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { TableHotkeyScope } from '@/ui/data/data-table/types/TableHotkeyScope'; +import { IconCheckbox, IconNotes } from '@/ui/display/icon'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; import { ActivityType, diff --git a/front/src/index.tsx b/front/src/index.tsx index 003c0ca88a..9b9fa92477 100644 --- a/front/src/index.tsx +++ b/front/src/index.tsx @@ -7,8 +7,8 @@ import { RecoilRoot } from 'recoil'; import { ApolloProvider } from '@/apollo/components/ApolloProvider'; import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider'; import { RecoilDebugObserverEffect } from '@/debug/components/RecoilDebugObserver'; -import { DialogProvider } from '@/ui/dialog/components/DialogProvider'; -import { SnackBarProvider } from '@/ui/snack-bar/components/SnackBarProvider'; +import { DialogProvider } from '@/ui/feedback/dialog/components/DialogProvider'; +import { SnackBarProvider } from '@/ui/feedback/snack-bar/components/SnackBarProvider'; import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider'; import { ThemeType } from '@/ui/theme/constants/theme'; import { UserProvider } from '@/users/components/UserProvider'; diff --git a/front/src/modules/activities/components/ActivityBodyEditor.tsx b/front/src/modules/activities/components/ActivityBodyEditor.tsx index cf90d557fa..26018b4df8 100644 --- a/front/src/modules/activities/components/ActivityBodyEditor.tsx +++ b/front/src/modules/activities/components/ActivityBodyEditor.tsx @@ -5,7 +5,7 @@ import { useBlockNote } from '@blocknote/react'; import styled from '@emotion/styled'; import debounce from 'lodash.debounce'; -import { BlockEditor } from '@/ui/editor/components/BlockEditor'; +import { BlockEditor } from '@/ui/input/editor/components/BlockEditor'; import { Activity, useUpdateActivityMutation } from '~/generated/graphql'; import { ACTIVITY_UPDATE_FRAGMENT } from '../graphql/fragments/activityUpdateFragment'; diff --git a/front/src/modules/activities/components/ActivityCreateButton.tsx b/front/src/modules/activities/components/ActivityCreateButton.tsx index ed519b8d07..8dd8dfcc1f 100644 --- a/front/src/modules/activities/components/ActivityCreateButton.tsx +++ b/front/src/modules/activities/components/ActivityCreateButton.tsx @@ -1,6 +1,10 @@ -import { Button } from '@/ui/button/components/Button'; -import { ButtonGroup } from '@/ui/button/components/ButtonGroup'; -import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon/index'; +import { + IconCheckbox, + IconNotes, + IconTimelineEvent, +} from '@/ui/display/icon/index'; +import { Button } from '@/ui/input/button/components/Button'; +import { ButtonGroup } from '@/ui/input/button/components/ButtonGroup'; type ActivityCreateButtonProps = { onNoteClick?: () => void; diff --git a/front/src/modules/activities/components/ActivityEditor.tsx b/front/src/modules/activities/components/ActivityEditor.tsx index ecb7f0e576..a07f757fbf 100644 --- a/front/src/modules/activities/components/ActivityEditor.tsx +++ b/front/src/modules/activities/components/ActivityEditor.tsx @@ -7,7 +7,7 @@ import { ActivityBodyEditor } from '@/activities/components/ActivityBodyEditor'; import { ActivityComments } from '@/activities/components/ActivityComments'; import { ActivityTypeDropdown } from '@/activities/components/ActivityTypeDropdown'; import { GET_ACTIVITIES } from '@/activities/graphql/queries/getActivities'; -import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; +import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { diff --git a/front/src/modules/activities/components/ActivityTypeDropdown.tsx b/front/src/modules/activities/components/ActivityTypeDropdown.tsx index f27f2f3733..0064270598 100644 --- a/front/src/modules/activities/components/ActivityTypeDropdown.tsx +++ b/front/src/modules/activities/components/ActivityTypeDropdown.tsx @@ -5,8 +5,8 @@ import { ChipAccent, ChipSize, ChipVariant, -} from '@/ui/chip/components/Chip'; -import { IconCheckbox, IconNotes } from '@/ui/icon'; +} from '@/ui/display/chip/components/Chip'; +import { IconCheckbox, IconNotes } from '@/ui/display/icon'; import { Activity, ActivityType } from '~/generated/graphql'; type ActivityTypeDropdownProps = { diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx index c5f7d58361..2a43045b7e 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx @@ -1,9 +1,9 @@ -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; -import { FieldRelationMetadata } from '@/ui/field/types/FieldMetadata'; -import { IconUserCircle } from '@/ui/icon'; -import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; -import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; +import { FieldRelationMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope'; +import { IconUserCircle } from '@/ui/display/icon'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { Company, User, useUpdateActivityMutation } from '~/generated/graphql'; diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx index 6d6c39fb4f..19912aabee 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { ActivityAssigneePicker } from '@/activities/components/ActivityAssigneePicker'; -import { useInlineCell } from '@/ui/inline-cell/hooks/useInlineCell'; +import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell'; import { Activity, User } from '~/generated/graphql'; const StyledContainer = styled.div` diff --git a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx index 9b5cd65001..472fb72d02 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx @@ -1,9 +1,9 @@ -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; -import { FieldDateMetadata } from '@/ui/field/types/FieldMetadata'; -import { IconCalendar } from '@/ui/icon/index'; -import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; -import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; +import { FieldDateMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope'; +import { IconCalendar } from '@/ui/display/icon/index'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useUpdateActivityMutation } from '~/generated/graphql'; diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx index 6db6c74a01..818f8b102e 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx @@ -1,7 +1,7 @@ import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips'; -import { IconArrowUpRight, IconPencil } from '@/ui/icon'; -import { InlineCellContainer } from '@/ui/inline-cell/components/InlineCellContainer'; -import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { InlineCellContainer } from '@/ui/data/inline-cell/components/InlineCellContainer'; +import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { IconArrowUpRight, IconPencil } from '@/ui/display/icon'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Activity, ActivityTarget, Company, Person } from '~/generated/graphql'; diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx index 80c36546f1..e17cd9bfe4 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx @@ -5,7 +5,7 @@ import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHa import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName'; import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery'; import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery'; -import { useInlineCell } from '@/ui/inline-cell/hooks/useInlineCell'; +import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell'; import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect'; import { Activity, ActivityTarget } from '~/generated/graphql'; import { assertNotNull } from '~/utils/assert'; diff --git a/front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts b/front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts index ee410ad270..75c30eb9b1 100644 --- a/front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts +++ b/front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts @@ -1,8 +1,8 @@ import { useRecoilState } from 'recoil'; -import { useRightDrawer } from '@/ui/right-drawer/hooks/useRightDrawer'; -import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope'; -import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages'; +import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; +import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; +import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; import { viewableActivityIdState } from '../states/viewableActivityIdState'; diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts index 50723a95fd..dd831f0c44 100644 --- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts +++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts @@ -5,9 +5,9 @@ import { v4 } from 'uuid'; import { currentUserState } from '@/auth/states/currentUserState'; import { GET_COMPANIES } from '@/companies/graphql/queries/getCompanies'; import { GET_PEOPLE } from '@/people/graphql/queries/getPeople'; -import { useRightDrawer } from '@/ui/right-drawer/hooks/useRightDrawer'; -import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope'; -import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages'; +import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; +import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; +import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; import { ActivityType, useCreateActivityMutation } from '~/generated/graphql'; diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts index b94aa6477e..e7e7cb393b 100644 --- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts +++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts @@ -1,6 +1,6 @@ import { useRecoilValue } from 'recoil'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; import { ActivityType } from '~/generated/graphql'; import { diff --git a/front/src/modules/activities/notes/components/Notes.tsx b/front/src/modules/activities/notes/components/Notes.tsx index d22c6e9c9e..3d91cb6703 100644 --- a/front/src/modules/activities/notes/components/Notes.tsx +++ b/front/src/modules/activities/notes/components/Notes.tsx @@ -4,8 +4,8 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateAct import { NoteList } from '@/activities/notes/components/NoteList'; import { useNotes } from '@/activities/notes/hooks/useNotes'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; -import { Button } from '@/ui/button/components/Button'; -import { IconNotes } from '@/ui/icon'; +import { IconNotes } from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; import { ActivityType } from '~/generated/graphql'; const StyledTaskGroupEmptyContainer = styled.div` diff --git a/front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx b/front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx index e3d62e2221..6c7ad192fe 100644 --- a/front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx +++ b/front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx @@ -5,9 +5,9 @@ import { GET_ACTIVITIES } from '@/activities/graphql/queries/getActivities'; import { GET_ACTIVITIES_BY_TARGETS } from '@/activities/graphql/queries/getActivitiesByTarget'; import { GET_COMPANIES } from '@/companies/graphql/queries/getCompanies'; import { GET_PEOPLE } from '@/people/graphql/queries/getPeople'; -import { LightIconButton } from '@/ui/button/components/LightIconButton'; -import { IconTrash } from '@/ui/icon'; -import { isRightDrawerOpenState } from '@/ui/right-drawer/states/isRightDrawerOpenState'; +import { IconTrash } from '@/ui/display/icon'; +import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; +import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState'; import { useDeleteActivityMutation } from '~/generated/graphql'; type ActivityActionBarProps = { diff --git a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx index 2abeeb7ab5..1902fe4f9f 100644 --- a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx +++ b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx @@ -3,7 +3,7 @@ import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; import { ActivityEditor } from '@/activities/components/ActivityEditor'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; import { useGetActivityQuery } from '~/generated/graphql'; import '@blocknote/core/style.css'; diff --git a/front/src/modules/activities/table/components/CommentChip.tsx b/front/src/modules/activities/table/components/CommentChip.tsx index d3c6fd776b..2c64c650d8 100644 --- a/front/src/modules/activities/table/components/CommentChip.tsx +++ b/front/src/modules/activities/table/components/CommentChip.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComment } from '@/ui/icon'; +import { IconComment } from '@/ui/display/icon'; export type CommentChipProps = { count: number; diff --git a/front/src/modules/activities/tasks/components/AddTaskButton.tsx b/front/src/modules/activities/tasks/components/AddTaskButton.tsx index e5e07989b2..0e8f931dce 100644 --- a/front/src/modules/activities/tasks/components/AddTaskButton.tsx +++ b/front/src/modules/activities/tasks/components/AddTaskButton.tsx @@ -1,7 +1,7 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; -import { Button } from '@/ui/button/components/Button'; -import { IconPlus } from '@/ui/icon'; +import { IconPlus } from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; import { ActivityType } from '~/generated/graphql'; export const AddTaskButton = ({ diff --git a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx index 1a03497915..fdfe3e5cfa 100644 --- a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx +++ b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx @@ -1,8 +1,8 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer'; import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; -import { PageAddButton } from '@/ui/layout/components/PageAddButton'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { PageAddButton } from '@/ui/layout/page/PageAddButton'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; import { ActivityType } from '~/generated/graphql'; export const PageAddTaskButton = () => { diff --git a/front/src/modules/activities/tasks/components/TaskGroups.tsx b/front/src/modules/activities/tasks/components/TaskGroups.tsx index f19cf18f9e..b42aad8851 100644 --- a/front/src/modules/activities/tasks/components/TaskGroups.tsx +++ b/front/src/modules/activities/tasks/components/TaskGroups.tsx @@ -4,9 +4,9 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateAct import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; import { useTasks } from '@/activities/tasks/hooks/useTasks'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; -import { Button } from '@/ui/button/components/Button'; -import { IconCheckbox } from '@/ui/icon'; -import { activeTabIdScopedState } from '@/ui/tab/states/activeTabIdScopedState'; +import { IconCheckbox } from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; +import { activeTabIdScopedState } from '@/ui/layout/tab/states/activeTabIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { ActivityType } from '~/generated/graphql'; diff --git a/front/src/modules/activities/tasks/components/TaskRow.tsx b/front/src/modules/activities/tasks/components/TaskRow.tsx index b9991606d5..585980f344 100644 --- a/front/src/modules/activities/tasks/components/TaskRow.tsx +++ b/front/src/modules/activities/tasks/components/TaskRow.tsx @@ -3,9 +3,9 @@ import styled from '@emotion/styled'; import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips'; import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer'; -import { IconCalendar, IconComment } from '@/ui/icon'; +import { IconCalendar, IconComment } from '@/ui/display/icon'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; import { beautifyExactDate, hasDatePassed } from '~/utils/date-utils'; import { TaskForList } from '../../types/TaskForList'; diff --git a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts index a8ab8d83e4..2f140d3f17 100644 --- a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts +++ b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts @@ -2,7 +2,7 @@ import { DateTime } from 'luxon'; import { useRecoilState } from 'recoil'; import { currentUserState } from '@/auth/states/currentUserState'; -import { turnFilterIntoWhereClause } from '@/ui/view-bar/utils/turnFilterIntoWhereClause'; +import { turnFilterIntoWhereClause } from '@/ui/data/view-bar/utils/turnFilterIntoWhereClause'; import { ActivityType, useGetActivitiesQuery, diff --git a/front/src/modules/activities/tasks/hooks/useTasks.ts b/front/src/modules/activities/tasks/hooks/useTasks.ts index 04101fb448..fbba10c1c1 100644 --- a/front/src/modules/activities/tasks/hooks/useTasks.ts +++ b/front/src/modules/activities/tasks/hooks/useTasks.ts @@ -2,9 +2,9 @@ import { DateTime } from 'luxon'; import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { turnFilterIntoWhereClause } from '@/ui/data/view-bar/utils/turnFilterIntoWhereClause'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { turnFilterIntoWhereClause } from '@/ui/view-bar/utils/turnFilterIntoWhereClause'; import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql'; import { parseDate } from '~/utils/date-utils'; diff --git a/front/src/modules/activities/timeline/components/TimelineActivity.tsx b/front/src/modules/activities/timeline/components/TimelineActivity.tsx index bea4ca5d21..a436f2954e 100644 --- a/front/src/modules/activities/timeline/components/TimelineActivity.tsx +++ b/front/src/modules/activities/timeline/components/TimelineActivity.tsx @@ -3,8 +3,8 @@ import styled from '@emotion/styled'; import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer'; import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask'; -import { IconNotes } from '@/ui/icon'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; +import { IconNotes } from '@/ui/display/icon'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { Activity, User } from '~/generated/graphql'; import { diff --git a/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx b/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx index ceb96fd230..5c4e698a5d 100644 --- a/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx +++ b/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; import { ActivityType } from '~/generated/graphql'; const StyledTitleContainer = styled.div` diff --git a/front/src/modules/activities/timeline/components/TimelineItemsContainer.tsx b/front/src/modules/activities/timeline/components/TimelineItemsContainer.tsx index 246b33f194..ea3d5e54da 100644 --- a/front/src/modules/activities/timeline/components/TimelineItemsContainer.tsx +++ b/front/src/modules/activities/timeline/components/TimelineItemsContainer.tsx @@ -3,7 +3,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { ActivityForDrawer } from '@/activities/types/ActivityForDrawer'; -import { IconCircleDot } from '@/ui/icon'; +import { IconCircleDot } from '@/ui/display/icon'; import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; import { TimelineActivity } from './TimelineActivity'; diff --git a/front/src/modules/auth/components/Modal.tsx b/front/src/modules/auth/components/Modal.tsx index 4c1d61884b..db7d03d86a 100644 --- a/front/src/modules/auth/components/Modal.tsx +++ b/front/src/modules/auth/components/Modal.tsx @@ -1,7 +1,7 @@ import React from 'react'; import styled from '@emotion/styled'; -import { Modal as UIModal } from '@/ui/modal/components/Modal'; +import { Modal as UIModal } from '@/ui/layout/modal/components/Modal'; const StyledContent = styled(UIModal.Content)` align-items: center; diff --git a/front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx b/front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx index 827aba0dc8..335d663c0f 100644 --- a/front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx +++ b/front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx @@ -4,8 +4,8 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import { MainButton } from '@/ui/button/components/MainButton'; -import { IconBrandGoogle } from '@/ui/icon'; +import { IconBrandGoogle } from '@/ui/display/icon'; +import { MainButton } from '@/ui/input/button/components/MainButton'; import { TextInput } from '@/ui/input/components/TextInput'; import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn'; diff --git a/front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx b/front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx index 9c8dd8bae4..0d34f7eeaa 100644 --- a/front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx +++ b/front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx @@ -9,7 +9,7 @@ import { authProvidersState } from '@/client-config/states/authProvidersState'; import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState'; import { AppPath } from '@/types/AppPath'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useGetWorkspaceFromInviteHashQuery } from '~/generated/graphql'; import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation'; diff --git a/front/src/modules/command-menu/components/CommandMenu.tsx b/front/src/modules/command-menu/components/CommandMenu.tsx index aa27fa5c53..7996d1a48a 100644 --- a/front/src/modules/command-menu/components/CommandMenu.tsx +++ b/front/src/modules/command-menu/components/CommandMenu.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { useRecoilValue } from 'recoil'; import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer'; -import { IconNotes } from '@/ui/icon'; +import { IconNotes } from '@/ui/display/icon'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope'; import { Avatar } from '@/users/components/Avatar'; diff --git a/front/src/modules/command-menu/components/CommandMenuItem.tsx b/front/src/modules/command-menu/components/CommandMenuItem.tsx index ad5c9baa2d..53b1cf7fb2 100644 --- a/front/src/modules/command-menu/components/CommandMenuItem.tsx +++ b/front/src/modules/command-menu/components/CommandMenuItem.tsx @@ -1,8 +1,8 @@ import { useNavigate } from 'react-router-dom'; -import { IconArrowUpRight } from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { MenuItemCommand } from '@/ui/menu-item/components/MenuItemCommand'; +import { IconArrowUpRight } from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { MenuItemCommand } from '@/ui/navigation/menu-item/components/MenuItemCommand'; import { useCommandMenu } from '../hooks/useCommandMenu'; diff --git a/front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx index 521bcab3e9..779b08fd07 100644 --- a/front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx +++ b/front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx @@ -5,7 +5,7 @@ import { userEvent, within } from '@storybook/testing-library'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { CommandType } from '@/command-menu/types/Command'; -import { IconCheckbox, IconNotes } from '@/ui/icon'; +import { IconCheckbox, IconNotes } from '@/ui/display/icon'; import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator'; import { graphqlMocks } from '~/testing/graphqlMocks'; import { sleep } from '~/testing/sleep'; diff --git a/front/src/modules/command-menu/types/Command.ts b/front/src/modules/command-menu/types/Command.ts index 2d4448d36a..59ca09d0d1 100644 --- a/front/src/modules/command-menu/types/Command.ts +++ b/front/src/modules/command-menu/types/Command.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export enum CommandType { Navigate = 'Navigate', diff --git a/front/src/modules/companies/__stories__/CompanyBoardCard.stories.tsx b/front/src/modules/companies/__stories__/CompanyBoardCard.stories.tsx index 12ce3b94f9..b7f9a626a0 100644 --- a/front/src/modules/companies/__stories__/CompanyBoardCard.stories.tsx +++ b/front/src/modules/companies/__stories__/CompanyBoardCard.stories.tsx @@ -4,9 +4,9 @@ import { Meta, StoryObj } from '@storybook/react'; import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard'; import { pipelineAvailableFieldDefinitions } from '@/pipeline/constants/pipelineAvailableFieldDefinitions'; -import { BoardCardIdContext } from '@/ui/board/contexts/BoardCardIdContext'; -import { boardCardFieldsScopedState } from '@/ui/board/states/boardCardFieldsScopedState'; -import { BoardColumnRecoilScopeContext } from '@/ui/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext'; +import { BoardCardIdContext } from '@/ui/layout/board/contexts/BoardCardIdContext'; +import { boardCardFieldsScopedState } from '@/ui/layout/board/states/boardCardFieldsScopedState'; +import { BoardColumnRecoilScopeContext } from '@/ui/layout/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; diff --git a/front/src/modules/companies/board/components/CompanyBoard.tsx b/front/src/modules/companies/board/components/CompanyBoard.tsx index bfd515ddf8..717f308a2b 100644 --- a/front/src/modules/companies/board/components/CompanyBoard.tsx +++ b/front/src/modules/companies/board/components/CompanyBoard.tsx @@ -1,12 +1,12 @@ import { BoardContext } from '@/companies/states/contexts/BoardContext'; import { pipelineAvailableFieldDefinitions } from '@/pipeline/constants/pipelineAvailableFieldDefinitions'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { EntityBoard, EntityBoardProps, -} from '@/ui/board/components/EntityBoard'; -import { EntityBoardActionBar } from '@/ui/board/components/EntityBoardActionBar'; -import { EntityBoardContextMenu } from '@/ui/board/components/EntityBoardContextMenu'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; +} from '@/ui/layout/board/components/EntityBoard'; +import { EntityBoardActionBar } from '@/ui/layout/board/components/EntityBoardActionBar'; +import { EntityBoardContextMenu } from '@/ui/layout/board/components/EntityBoardContextMenu'; import { useBoardViews } from '@/views/hooks/useBoardViews'; import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions'; diff --git a/front/src/modules/companies/components/AddPersonToCompany.tsx b/front/src/modules/companies/components/AddPersonToCompany.tsx index 4158917fe8..086468cfd1 100644 --- a/front/src/modules/companies/components/AddPersonToCompany.tsx +++ b/front/src/modules/companies/components/AddPersonToCompany.tsx @@ -9,10 +9,10 @@ import { PersonForSelect, } from '@/people/components/PeoplePicker'; import { GET_PEOPLE } from '@/people/graphql/queries/getPeople'; -import { LightIconButton } from '@/ui/button/components/LightIconButton'; -import { DoubleTextInput } from '@/ui/field/meta-types/input/components/internal/DoubleTextInput'; -import { FieldDoubleText } from '@/ui/field/types/FieldDoubleText'; -import { IconPlus } from '@/ui/icon'; +import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput'; +import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText'; +import { IconPlus } from '@/ui/display/icon'; +import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; diff --git a/front/src/modules/companies/components/CompanyBoardCard.tsx b/front/src/modules/companies/components/CompanyBoardCard.tsx index 413174e7a0..1cad5cb722 100644 --- a/front/src/modules/companies/components/CompanyBoardCard.tsx +++ b/front/src/modules/companies/components/CompanyBoardCard.tsx @@ -2,15 +2,15 @@ import { ReactNode, useContext } from 'react'; import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; -import { BoardCardIdContext } from '@/ui/board/contexts/BoardCardIdContext'; -import { useBoardContext } from '@/ui/board/hooks/useBoardContext'; -import { useCurrentCardSelected } from '@/ui/board/hooks/useCurrentCardSelected'; -import { visibleBoardCardFieldsScopedSelector } from '@/ui/board/states/selectors/visibleBoardCardFieldsScopedSelector'; -import { EntityChipVariant } from '@/ui/chip/components/EntityChip'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; -import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope'; +import { EntityChipVariant } from '@/ui/display/chip/components/EntityChip'; import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox'; +import { BoardCardIdContext } from '@/ui/layout/board/contexts/BoardCardIdContext'; +import { useBoardContext } from '@/ui/layout/board/hooks/useBoardContext'; +import { useCurrentCardSelected } from '@/ui/layout/board/hooks/useCurrentCardSelected'; +import { visibleBoardCardFieldsScopedSelector } from '@/ui/layout/board/states/selectors/visibleBoardCardFieldsScopedSelector'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useUpdateOnePipelineProgressMutation } from '~/generated/graphql'; import { getLogoUrlFromDomainName } from '~/utils'; diff --git a/front/src/modules/companies/components/CompanyChip.tsx b/front/src/modules/companies/components/CompanyChip.tsx index 39016efc67..7beeb9b6f4 100644 --- a/front/src/modules/companies/components/CompanyChip.tsx +++ b/front/src/modules/companies/components/CompanyChip.tsx @@ -1,4 +1,7 @@ -import { EntityChip, EntityChipVariant } from '@/ui/chip/components/EntityChip'; +import { + EntityChip, + EntityChipVariant, +} from '@/ui/display/chip/components/EntityChip'; type CompanyChipProps = { id: string; diff --git a/front/src/modules/companies/components/CompanyProgressPicker.tsx b/front/src/modules/companies/components/CompanyProgressPicker.tsx index 300e72211b..d997cc5c2f 100644 --- a/front/src/modules/companies/components/CompanyProgressPicker.tsx +++ b/front/src/modules/companies/components/CompanyProgressPicker.tsx @@ -2,16 +2,16 @@ import { useEffect, useMemo, useRef, useState } from 'react'; import { useRecoilState } from 'recoil'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState'; -import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { IconChevronDown } from '@/ui/icon'; +import { IconChevronDown } from '@/ui/display/icon'; import { SingleEntitySelectBase } from '@/ui/input/relation-picker/components/SingleEntitySelectBase'; import { useEntitySelectSearch } from '@/ui/input/relation-picker/hooks/useEntitySelectSearch'; import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useFilteredSearchCompanyQuery } from '../hooks/useFilteredSearchCompanyQuery'; diff --git a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx index 39f5e34c62..87cdb8046d 100644 --- a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx +++ b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx @@ -1,9 +1,9 @@ +import { FilterDropdownEntitySearchSelect } from '@/ui/data/view-bar/components/FilterDropdownEntitySearchSelect'; +import { useViewBarContext } from '@/ui/data/view-bar/hooks/useViewBarContext'; +import { filterDropdownSearchInputScopedState } from '@/ui/data/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; -import { useViewBarContext } from '@/ui/view-bar/hooks/useViewBarContext'; -import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useFilteredSearchCompanyQuery } from '../hooks/useFilteredSearchCompanyQuery'; diff --git a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx index 241dfaedca..cdb7eed833 100644 --- a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx +++ b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx @@ -2,22 +2,22 @@ import { useEffect, useMemo } from 'react'; import { useSearchParams } from 'react-router-dom'; import { useRecoilCallback, useRecoilState } from 'recoil'; -import { useBoardActionBarEntries } from '@/ui/board/hooks/useBoardActionBarEntries'; -import { useBoardContextMenuEntries } from '@/ui/board/hooks/useBoardContextMenuEntries'; -import { isBoardLoadedState } from '@/ui/board/states/isBoardLoadedState'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; +import { availableSortsScopedState } from '@/ui/data/view-bar/states/availableSortsScopedState'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { entityCountInCurrentViewState } from '@/ui/data/view-bar/states/entityCountInCurrentViewState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { sortsOrderByScopedSelector } from '@/ui/data/view-bar/states/selectors/sortsOrderByScopedSelector'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { turnFilterIntoWhereClause } from '@/ui/data/view-bar/utils/turnFilterIntoWhereClause'; +import { useBoardActionBarEntries } from '@/ui/layout/board/hooks/useBoardActionBarEntries'; +import { useBoardContextMenuEntries } from '@/ui/layout/board/hooks/useBoardContextMenuEntries'; +import { isBoardLoadedState } from '@/ui/layout/board/states/isBoardLoadedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; -import { availableSortsScopedState } from '@/ui/view-bar/states/availableSortsScopedState'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { entityCountInCurrentViewState } from '@/ui/view-bar/states/entityCountInCurrentViewState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { sortsOrderByScopedSelector } from '@/ui/view-bar/states/selectors/sortsOrderByScopedSelector'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; -import { turnFilterIntoWhereClause } from '@/ui/view-bar/utils/turnFilterIntoWhereClause'; import { Pipeline, PipelineProgressableType, diff --git a/front/src/modules/companies/components/NewCompanyProgressButton.tsx b/front/src/modules/companies/components/NewCompanyProgressButton.tsx index c47fd1352c..3a76334fb6 100644 --- a/front/src/modules/companies/components/NewCompanyProgressButton.tsx +++ b/front/src/modules/companies/components/NewCompanyProgressButton.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext, useState } from 'react'; -import { NewButton } from '@/ui/board/components/NewButton'; -import { BoardColumnContext } from '@/ui/board/contexts/BoardColumnContext'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect'; import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { NewButton } from '@/ui/layout/board/components/NewButton'; +import { BoardColumnContext } from '@/ui/layout/board/contexts/BoardColumnContext'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; diff --git a/front/src/modules/companies/constants/companiesAvailableColumnDefinitions.tsx b/front/src/modules/companies/constants/companiesAvailableColumnDefinitions.tsx index eee7c45eb2..ef41276684 100644 --- a/front/src/modules/companies/constants/companiesAvailableColumnDefinitions.tsx +++ b/front/src/modules/companies/constants/companiesAvailableColumnDefinitions.tsx @@ -1,4 +1,4 @@ -import { ColumnDefinition } from '@/ui/data-table/types/ColumnDefinition'; +import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition'; import { FieldBooleanMetadata, FieldChipMetadata, @@ -9,7 +9,7 @@ import { FieldRelationMetadata, FieldTextMetadata, FieldURLMetadata, -} from '@/ui/field/types/FieldMetadata'; +} from '@/ui/data/field/types/FieldMetadata'; import { IconArrowUpRight, IconBrandLinkedin, @@ -23,7 +23,7 @@ import { IconTarget, IconUserCircle, IconUsers, -} from '@/ui/icon/index'; +} from '@/ui/display/icon/index'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { User } from '~/generated/graphql'; diff --git a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx index b0e0e19d63..60d0940132 100644 --- a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx +++ b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import styled from '@emotion/styled'; -import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Company, useUpdateOneCompanyMutation } from '~/generated/graphql'; diff --git a/front/src/modules/companies/hooks/useCompanyQuery.ts b/front/src/modules/companies/hooks/useCompanyQuery.ts index bcd7e6a34b..5565fca76a 100644 --- a/front/src/modules/companies/hooks/useCompanyQuery.ts +++ b/front/src/modules/companies/hooks/useCompanyQuery.ts @@ -1,6 +1,6 @@ import { useSetRecoilState } from 'recoil'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; import { useGetCompanyQuery } from '~/generated/graphql'; export const useCompanyQuery = (id: string) => { diff --git a/front/src/modules/companies/hooks/useCompanyTableActionBarEntries.tsx b/front/src/modules/companies/hooks/useCompanyTableActionBarEntries.tsx index e68c58ca1e..910c02dd09 100644 --- a/front/src/modules/companies/hooks/useCompanyTableActionBarEntries.tsx +++ b/front/src/modules/companies/hooks/useCompanyTableActionBarEntries.tsx @@ -2,8 +2,8 @@ import { useSetRecoilState } from 'recoil'; import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds'; import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; -import { actionBarEntriesState } from '@/ui/action-bar/states/actionBarEntriesState'; -import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; +import { IconCheckbox, IconNotes, IconTrash } from '@/ui/display/icon'; +import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState'; import { ActivityType } from '~/generated/graphql'; import { useDeleteSelectedComapnies } from './useDeleteCompanies'; diff --git a/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx b/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx index 3d831cef62..da15a8e96f 100644 --- a/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx +++ b/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx @@ -3,16 +3,16 @@ import { useRecoilValue, useSetRecoilState } from 'recoil'; import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds'; import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; import { useFavorites } from '@/favorites/hooks/useFavorites'; -import { contextMenuEntriesState } from '@/ui/context-menu/states/contextMenuEntriesState'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; import { IconCheckbox, IconHeart, IconHeartOff, IconNotes, IconTrash, -} from '@/ui/icon'; +} from '@/ui/display/icon'; +import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState'; import { ActivityType, useGetFavoritesQuery } from '~/generated/graphql'; import { useDeleteSelectedComapnies } from './useDeleteCompanies'; diff --git a/front/src/modules/companies/hooks/useCreateCompanyProgress.ts b/front/src/modules/companies/hooks/useCreateCompanyProgress.ts index b062409222..ff1078b1e0 100644 --- a/front/src/modules/companies/hooks/useCreateCompanyProgress.ts +++ b/front/src/modules/companies/hooks/useCreateCompanyProgress.ts @@ -5,7 +5,7 @@ import { v4 } from 'uuid'; import { GET_PIPELINE_PROGRESS } from '@/pipeline/graphql/queries/getPipelineProgress'; import { GET_PIPELINES } from '@/pipeline/graphql/queries/getPipelines'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState'; -import { boardCardIdsByColumnIdFamilyState } from '@/ui/board/states/boardCardIdsByColumnIdFamilyState'; +import { boardCardIdsByColumnIdFamilyState } from '@/ui/layout/board/states/boardCardIdsByColumnIdFamilyState'; import { useCreateOneCompanyPipelineProgressMutation } from '~/generated/graphql'; export const useCreateCompanyProgress = () => { diff --git a/front/src/modules/companies/hooks/useDeleteCompanies.ts b/front/src/modules/companies/hooks/useDeleteCompanies.ts index 04a6759033..afd95a51dc 100644 --- a/front/src/modules/companies/hooks/useDeleteCompanies.ts +++ b/front/src/modules/companies/hooks/useDeleteCompanies.ts @@ -3,9 +3,9 @@ import { useRecoilState, useRecoilValue } from 'recoil'; import { useOptimisticEvict } from '@/apollo/optimistic-effect/hooks/useOptimisticEvict'; import { GET_PIPELINES } from '@/pipeline/graphql/queries/getPipelines'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; -import { tableRowIdsState } from '@/ui/data-table/states/tableRowIdsState'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; +import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState'; import { useDeleteManyCompaniesMutation } from '~/generated/graphql'; export const useDeleteSelectedComapnies = () => { diff --git a/front/src/modules/companies/hooks/useSpreadsheetCompanyImport.ts b/front/src/modules/companies/hooks/useSpreadsheetCompanyImport.ts index 221f66285e..95e5f71b8d 100644 --- a/front/src/modules/companies/hooks/useSpreadsheetCompanyImport.ts +++ b/front/src/modules/companies/hooks/useSpreadsheetCompanyImport.ts @@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid'; import { useSpreadsheetImport } from '@/spreadsheet-import/hooks/useSpreadsheetImport'; import { SpreadsheetOptions } from '@/spreadsheet-import/types'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { useInsertManyCompanyMutation } from '~/generated/graphql'; import { fieldsForCompany } from '../utils/fieldsForCompany'; diff --git a/front/src/modules/companies/hooks/useUpdateBoardCardIds.ts b/front/src/modules/companies/hooks/useUpdateBoardCardIds.ts index 4756b533ea..c5095ba828 100644 --- a/front/src/modules/companies/hooks/useUpdateBoardCardIds.ts +++ b/front/src/modules/companies/hooks/useUpdateBoardCardIds.ts @@ -1,7 +1,7 @@ import { useRecoilCallback } from 'recoil'; -import { boardCardIdsByColumnIdFamilyState } from '@/ui/board/states/boardCardIdsByColumnIdFamilyState'; -import { boardColumnsState } from '@/ui/board/states/boardColumnsState'; +import { boardCardIdsByColumnIdFamilyState } from '@/ui/layout/board/states/boardCardIdsByColumnIdFamilyState'; +import { boardColumnsState } from '@/ui/layout/board/states/boardColumnsState'; import { GetPipelineProgressQuery } from '~/generated/graphql'; export const useUpdateCompanyBoardCardIds = () => diff --git a/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts b/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts index 5562813a23..2ceed24e86 100644 --- a/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts +++ b/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts @@ -1,11 +1,11 @@ import { useRecoilCallback } from 'recoil'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState'; -import { boardCardIdsByColumnIdFamilyState } from '@/ui/board/states/boardCardIdsByColumnIdFamilyState'; -import { boardColumnsState } from '@/ui/board/states/boardColumnsState'; -import { savedBoardColumnsState } from '@/ui/board/states/savedBoardColumnsState'; -import { BoardColumnDefinition } from '@/ui/board/types/BoardColumnDefinition'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; +import { boardCardIdsByColumnIdFamilyState } from '@/ui/layout/board/states/boardCardIdsByColumnIdFamilyState'; +import { boardColumnsState } from '@/ui/layout/board/states/boardColumnsState'; +import { savedBoardColumnsState } from '@/ui/layout/board/states/savedBoardColumnsState'; +import { BoardColumnDefinition } from '@/ui/layout/board/types/BoardColumnDefinition'; import { isThemeColor } from '@/ui/theme/utils/castStringAsThemeColor'; import { Pipeline } from '~/generated/graphql'; import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; diff --git a/front/src/modules/companies/table/components/CompanyTable.tsx b/front/src/modules/companies/table/components/CompanyTable.tsx index 61e6e0d8ed..569c4998b7 100644 --- a/front/src/modules/companies/table/components/CompanyTable.tsx +++ b/front/src/modules/companies/table/components/CompanyTable.tsx @@ -3,15 +3,15 @@ import { getCompaniesOptimisticEffectDefinition } from '@/companies/graphql/opti import { useCompanyTableActionBarEntries } from '@/companies/hooks/useCompanyTableActionBarEntries'; import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries'; import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport'; -import { DataTable } from '@/ui/data-table/components/DataTable'; -import { DataTableEffect } from '@/ui/data-table/components/DataTableEffect'; -import { TableContext } from '@/ui/data-table/contexts/TableContext'; -import { useUpsertDataTableItem } from '@/ui/data-table/hooks/useUpsertDataTableItem'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { DataTable } from '@/ui/data/data-table/components/DataTable'; +import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect'; +import { TableContext } from '@/ui/data/data-table/contexts/TableContext'; +import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; +import { filtersWhereScopedSelector } from '@/ui/data/view-bar/states/selectors/filtersWhereScopedSelector'; +import { sortsOrderByScopedSelector } from '@/ui/data/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; -import { filtersWhereScopedSelector } from '@/ui/view-bar/states/selectors/filtersWhereScopedSelector'; -import { sortsOrderByScopedSelector } from '@/ui/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useTableViews } from '@/views/hooks/useTableViews'; import { UpdateOneCompanyMutationVariables, diff --git a/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx b/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx index 29bc77592b..a2105506ab 100644 --- a/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx +++ b/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx @@ -1,8 +1,8 @@ import { useEffect } from 'react'; -import { useSetDataTableData } from '@/ui/data-table/hooks/useSetDataTableData'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { tableColumnsScopedState } from '@/ui/data-table/states/tableColumnsScopedState'; +import { useSetDataTableData } from '@/ui/data/data-table/hooks/useSetDataTableData'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { companiesAvailableColumnDefinitions } from '../../constants/companiesAvailableColumnDefinitions'; diff --git a/front/src/modules/companies/table/components/CompanyTableMockMode.tsx b/front/src/modules/companies/table/components/CompanyTableMockMode.tsx index ab8c93c496..8267a1ee1d 100644 --- a/front/src/modules/companies/table/components/CompanyTableMockMode.tsx +++ b/front/src/modules/companies/table/components/CompanyTableMockMode.tsx @@ -1,6 +1,6 @@ -import { DataTable } from '@/ui/data-table/components/DataTable'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; +import { DataTable } from '@/ui/data/data-table/components/DataTable'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { useUpdateOneCompanyMutation } from '~/generated/graphql'; import { CompanyTableMockDataEffect } from './CompanyTableMockDataEffect'; diff --git a/front/src/modules/companies/utils/fieldsForCompany.tsx b/front/src/modules/companies/utils/fieldsForCompany.tsx index 2287a09186..28388a6ae9 100644 --- a/front/src/modules/companies/utils/fieldsForCompany.tsx +++ b/front/src/modules/companies/utils/fieldsForCompany.tsx @@ -7,7 +7,7 @@ import { IconMoneybag, IconTarget, IconUsers, -} from '@/ui/icon'; +} from '@/ui/display/icon'; export const fieldsForCompany = [ { diff --git a/front/src/modules/favorites/components/Favorites.tsx b/front/src/modules/favorites/components/Favorites.tsx index ab7b960548..1cae8177ee 100644 --- a/front/src/modules/favorites/components/Favorites.tsx +++ b/front/src/modules/favorites/components/Favorites.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; -import NavItem from '@/ui/navbar/components/NavItem'; -import NavTitle from '@/ui/navbar/components/NavTitle'; +import NavItem from '@/ui/navigation/navbar/components/NavItem'; +import NavTitle from '@/ui/navigation/navbar/components/NavTitle'; import { Avatar } from '@/users/components/Avatar'; import { useGetFavoritesQuery } from '~/generated/graphql'; import { getLogoUrlFromDomainName } from '~/utils'; diff --git a/front/src/modules/metadata/components/ObjectDataTableEffect.tsx b/front/src/modules/metadata/components/ObjectDataTableEffect.tsx index 3badecf633..78d630fcf2 100644 --- a/front/src/modules/metadata/components/ObjectDataTableEffect.tsx +++ b/front/src/modules/metadata/components/ObjectDataTableEffect.tsx @@ -2,13 +2,13 @@ import { useEffect } from 'react'; import { useSearchParams } from 'react-router-dom'; import { useRecoilCallback } from 'recoil'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; import { useFindManyCustomObjects } from '../hooks/useFindManyCustomObjects'; diff --git a/front/src/modules/metadata/components/ObjectTable.tsx b/front/src/modules/metadata/components/ObjectTable.tsx index 04bd98a342..fdaf3ae2a5 100644 --- a/front/src/modules/metadata/components/ObjectTable.tsx +++ b/front/src/modules/metadata/components/ObjectTable.tsx @@ -1,9 +1,9 @@ import { suppliersAvailableColumnDefinitions } from '@/companies/constants/companiesAvailableColumnDefinitions'; import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport'; -import { DataTable } from '@/ui/data-table/components/DataTable'; -import { TableContext } from '@/ui/data-table/contexts/TableContext'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; +import { DataTable } from '@/ui/data/data-table/components/DataTable'; +import { TableContext } from '@/ui/data/data-table/contexts/TableContext'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { useTableViews } from '@/views/hooks/useTableViews'; import { ObjectDataTableEffect } from './ObjectDataTableEffect'; diff --git a/front/src/modules/metadata/components/useSetDataTableData.ts b/front/src/modules/metadata/components/useSetDataTableData.ts index 17025876bb..f09d4a1583 100644 --- a/front/src/modules/metadata/components/useSetDataTableData.ts +++ b/front/src/modules/metadata/components/useSetDataTableData.ts @@ -1,15 +1,15 @@ import { useRecoilCallback } from 'recoil'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { isFetchingDataTableDataState } from '@/ui/data-table/states/isFetchingDataTableDataState'; -import { numberOfTableRowsState } from '@/ui/data-table/states/numberOfTableRowsState'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { tableRowIdsState } from '@/ui/data-table/states/tableRowIdsState'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState'; +import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; +import { availableSortsScopedState } from '@/ui/data/view-bar/states/availableSortsScopedState'; +import { entityCountInCurrentViewState } from '@/ui/data/view-bar/states/entityCountInCurrentViewState'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; -import { availableSortsScopedState } from '@/ui/view-bar/states/availableSortsScopedState'; -import { entityCountInCurrentViewState } from '@/ui/view-bar/states/entityCountInCurrentViewState'; export const useSetObjectDataTableData = () => { const resetTableRowSelection = useResetTableRowSelection(); diff --git a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx index c647042b25..4c9aebf437 100644 --- a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx +++ b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx @@ -1,10 +1,10 @@ import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery'; +import { FilterDropdownEntitySearchSelect } from '@/ui/data/view-bar/components/FilterDropdownEntitySearchSelect'; +import { useViewBarContext } from '@/ui/data/view-bar/hooks/useViewBarContext'; +import { filterDropdownSearchInputScopedState } from '@/ui/data/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; -import { useViewBarContext } from '@/ui/view-bar/hooks/useViewBarContext'; -import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; export const FilterDropdownPeopleSearchSelect = () => { const { ViewBarRecoilScopeContext } = useViewBarContext(); diff --git a/front/src/modules/people/components/PeopleCard.tsx b/front/src/modules/people/components/PeopleCard.tsx index 1156ca79d1..e1780043e0 100644 --- a/front/src/modules/people/components/PeopleCard.tsx +++ b/front/src/modules/people/components/PeopleCard.tsx @@ -4,11 +4,11 @@ import { getOperationName } from '@apollo/client/utilities'; import styled from '@emotion/styled'; import { autoUpdate, flip, offset, useFloating } from '@floating-ui/react'; -import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { IconDotsVertical, IconLinkOff, IconTrash } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { IconDotsVertical, IconLinkOff, IconTrash } from '@/ui/display/icon'; +import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { Avatar } from '@/users/components/Avatar'; import { diff --git a/front/src/modules/people/components/PersonChip.tsx b/front/src/modules/people/components/PersonChip.tsx index 00ebfbfecc..5879ee96f9 100644 --- a/front/src/modules/people/components/PersonChip.tsx +++ b/front/src/modules/people/components/PersonChip.tsx @@ -1,4 +1,7 @@ -import { EntityChip, EntityChipVariant } from '@/ui/chip/components/EntityChip'; +import { + EntityChip, + EntityChipVariant, +} from '@/ui/display/chip/components/EntityChip'; export type PersonChipProps = { id: string; diff --git a/front/src/modules/people/constants/peopleAvailableColumnDefinitions.tsx b/front/src/modules/people/constants/peopleAvailableColumnDefinitions.tsx index 6a841d539d..badd2fb8b4 100644 --- a/front/src/modules/people/constants/peopleAvailableColumnDefinitions.tsx +++ b/front/src/modules/people/constants/peopleAvailableColumnDefinitions.tsx @@ -1,4 +1,4 @@ -import { ColumnDefinition } from '@/ui/data-table/types/ColumnDefinition'; +import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition'; import { FieldDateMetadata, FieldDoubleTextChipMetadata, @@ -8,7 +8,7 @@ import { FieldRelationMetadata, FieldTextMetadata, FieldURLMetadata, -} from '@/ui/field/types/FieldMetadata'; +} from '@/ui/data/field/types/FieldMetadata'; import { IconArrowUpRight, IconBrandLinkedin, @@ -21,7 +21,7 @@ import { IconPencil, IconPhone, IconUser, -} from '@/ui/icon/index'; +} from '@/ui/display/icon/index'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { Company } from '~/generated/graphql'; import { getLogoUrlFromDomainName } from '~/utils'; diff --git a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx index 4ddcda882c..1d7bb629f0 100644 --- a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx +++ b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { EntityTitleDoubleTextInput } from '@/ui/input/components/EntityTitleDoubleTextInput'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Person, useUpdateOnePersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/people/hooks/useCreateActivityForPeople.ts b/front/src/modules/people/hooks/useCreateActivityForPeople.ts index 018d7b90f0..5964d7a68f 100644 --- a/front/src/modules/people/hooks/useCreateActivityForPeople.ts +++ b/front/src/modules/people/hooks/useCreateActivityForPeople.ts @@ -5,8 +5,8 @@ import { ActivityTargetableEntity, ActivityTargetableEntityType, } from '@/activities/types/ActivityTargetableEntity'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; import { ActivityType, Person } from '~/generated/graphql'; export const useCreateActivityForPeople = () => { diff --git a/front/src/modules/people/hooks/usePeopleTableContextMenuEntries.tsx b/front/src/modules/people/hooks/usePeopleTableContextMenuEntries.tsx index ad5ee78055..a61811f226 100644 --- a/front/src/modules/people/hooks/usePeopleTableContextMenuEntries.tsx +++ b/front/src/modules/people/hooks/usePeopleTableContextMenuEntries.tsx @@ -2,17 +2,17 @@ import { getOperationName } from '@apollo/client/utilities'; import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; import { useFavorites } from '@/favorites/hooks/useFavorites'; -import { contextMenuEntriesState } from '@/ui/context-menu/states/contextMenuEntriesState'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; -import { tableRowIdsState } from '@/ui/data-table/states/tableRowIdsState'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; +import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState'; import { IconCheckbox, IconHeart, IconHeartOff, IconNotes, IconTrash, -} from '@/ui/icon'; +} from '@/ui/display/icon'; +import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState'; import { ActivityType, useDeleteManyPersonMutation, diff --git a/front/src/modules/people/hooks/usePersonQuery.ts b/front/src/modules/people/hooks/usePersonQuery.ts index 887d647c41..ab20e18a0f 100644 --- a/front/src/modules/people/hooks/usePersonQuery.ts +++ b/front/src/modules/people/hooks/usePersonQuery.ts @@ -1,6 +1,6 @@ import { useSetRecoilState } from 'recoil'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; import { useGetPersonQuery } from '~/generated/graphql'; export const usePersonQuery = (id: string) => { diff --git a/front/src/modules/people/hooks/usePersonTableActionBarEntries.tsx b/front/src/modules/people/hooks/usePersonTableActionBarEntries.tsx index 77df3e8608..2705a25c43 100644 --- a/front/src/modules/people/hooks/usePersonTableActionBarEntries.tsx +++ b/front/src/modules/people/hooks/usePersonTableActionBarEntries.tsx @@ -1,11 +1,11 @@ import { getOperationName } from '@apollo/client/utilities'; import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; -import { actionBarEntriesState } from '@/ui/action-bar/states/actionBarEntriesState'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/data-table/states/selectors/selectedRowIdsSelector'; -import { tableRowIdsState } from '@/ui/data-table/states/tableRowIdsState'; -import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector'; +import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState'; +import { IconCheckbox, IconNotes, IconTrash } from '@/ui/display/icon'; +import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; import { GET_PEOPLE } from '../graphql/queries/getPeople'; diff --git a/front/src/modules/people/hooks/useSetPeopleDataTable.ts b/front/src/modules/people/hooks/useSetPeopleDataTable.ts index e79e28b960..048534a51e 100644 --- a/front/src/modules/people/hooks/useSetPeopleDataTable.ts +++ b/front/src/modules/people/hooks/useSetPeopleDataTable.ts @@ -1,14 +1,14 @@ import { useLocation } from 'react-router-dom'; import { useRecoilCallback } from 'recoil'; -import { useResetTableRowSelection } from '@/ui/data-table/hooks/useResetTableRowSelection'; -import { isFetchingDataTableDataState } from '@/ui/data-table/states/isFetchingDataTableDataState'; -import { numberOfTableRowsState } from '@/ui/data-table/states/numberOfTableRowsState'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { tableRowIdsState } from '@/ui/data-table/states/tableRowIdsState'; +import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection'; +import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState'; +import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; import { currentPageLocationState } from '@/ui/utilities/loading-state/states/currentPageLocationState'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; import { GetPeopleQuery } from '~/generated/graphql'; import { peopleFilters } from '~/pages/people/people-filters'; diff --git a/front/src/modules/people/hooks/useSpreadsheetPersonImport.ts b/front/src/modules/people/hooks/useSpreadsheetPersonImport.ts index 4ba3c74a7b..f9c16d228c 100644 --- a/front/src/modules/people/hooks/useSpreadsheetPersonImport.ts +++ b/front/src/modules/people/hooks/useSpreadsheetPersonImport.ts @@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid'; import { useSpreadsheetImport } from '@/spreadsheet-import/hooks/useSpreadsheetImport'; import { SpreadsheetOptions } from '@/spreadsheet-import/types'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { useInsertManyPersonMutation } from '~/generated/graphql'; import { fieldsForPerson } from '../utils/fieldsForPerson'; diff --git a/front/src/modules/people/table/components/PeopleTable.tsx b/front/src/modules/people/table/components/PeopleTable.tsx index d72e3c02ce..fe16ef4928 100644 --- a/front/src/modules/people/table/components/PeopleTable.tsx +++ b/front/src/modules/people/table/components/PeopleTable.tsx @@ -3,15 +3,15 @@ import { getPeopleOptimisticEffectDefinition } from '@/people/graphql/optimistic import { usePersonTableContextMenuEntries } from '@/people/hooks/usePeopleTableContextMenuEntries'; import { usePersonTableActionBarEntries } from '@/people/hooks/usePersonTableActionBarEntries'; import { useSpreadsheetPersonImport } from '@/people/hooks/useSpreadsheetPersonImport'; -import { DataTable } from '@/ui/data-table/components/DataTable'; -import { DataTableEffect } from '@/ui/data-table/components/DataTableEffect'; -import { TableContext } from '@/ui/data-table/contexts/TableContext'; -import { useUpsertDataTableItem } from '@/ui/data-table/hooks/useUpsertDataTableItem'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { DataTable } from '@/ui/data/data-table/components/DataTable'; +import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect'; +import { TableContext } from '@/ui/data/data-table/contexts/TableContext'; +import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; +import { filtersWhereScopedSelector } from '@/ui/data/view-bar/states/selectors/filtersWhereScopedSelector'; +import { sortsOrderByScopedSelector } from '@/ui/data/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; -import { filtersWhereScopedSelector } from '@/ui/view-bar/states/selectors/filtersWhereScopedSelector'; -import { sortsOrderByScopedSelector } from '@/ui/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useTableViews } from '@/views/hooks/useTableViews'; import { UpdateOnePersonMutationVariables, diff --git a/front/src/modules/people/utils/fieldsForPerson.tsx b/front/src/modules/people/utils/fieldsForPerson.tsx index 53f0aec884..a2fe05a037 100644 --- a/front/src/modules/people/utils/fieldsForPerson.tsx +++ b/front/src/modules/people/utils/fieldsForPerson.tsx @@ -8,7 +8,7 @@ import { IconMail, IconMap, IconUser, -} from '@/ui/icon'; +} from '@/ui/display/icon'; export const fieldsForPerson = [ { diff --git a/front/src/modules/pipeline/components/PipelineAddButton.tsx b/front/src/modules/pipeline/components/PipelineAddButton.tsx index 300b455a43..f335112c66 100644 --- a/front/src/modules/pipeline/components/PipelineAddButton.tsx +++ b/front/src/modules/pipeline/components/PipelineAddButton.tsx @@ -1,13 +1,13 @@ import { CompanyProgressPicker } from '@/companies/components/CompanyProgressPicker'; import { useCreateCompanyProgress } from '@/companies/hooks/useCreateCompanyProgress'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { IconPlus } from '@/ui/icon/index'; +import { ViewBarDropdownButton } from '@/ui/data/view-bar/components/ViewBarDropdownButton'; +import { IconPlus } from '@/ui/display/icon/index'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { IconButton } from '@/ui/input/button/components/IconButton'; import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; -import { ViewBarDropdownButton } from '@/ui/view-bar/components/ViewBarDropdownButton'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { logError } from '~/utils/logError'; export const PipelineAddButton = () => { diff --git a/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx b/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx index 32486c6000..bfea0f2de0 100644 --- a/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx +++ b/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx @@ -1,19 +1,19 @@ -import { BoardFieldDefinition } from '@/ui/board/types/BoardFieldDefinition'; import { FieldDateMetadata, FieldMetadata, FieldNumberMetadata, FieldProbabilityMetadata, FieldRelationMetadata, -} from '@/ui/field/types/FieldMetadata'; +} from '@/ui/data/field/types/FieldMetadata'; import { IconCalendarEvent, IconCurrencyDollar, IconPencil, IconProgressCheck, IconUser, -} from '@/ui/icon'; +} from '@/ui/display/icon'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; +import { BoardFieldDefinition } from '@/ui/layout/board/types/BoardFieldDefinition'; import { Person } from '~/generated/graphql'; export const pipelineAvailableFieldDefinitions: BoardFieldDefinition[] = diff --git a/front/src/modules/pipeline/hooks/usePipelineStages.ts b/front/src/modules/pipeline/hooks/usePipelineStages.ts index d7a09fd9a5..fcb1ce9907 100644 --- a/front/src/modules/pipeline/hooks/usePipelineStages.ts +++ b/front/src/modules/pipeline/hooks/usePipelineStages.ts @@ -1,7 +1,7 @@ import { getOperationName } from '@apollo/client/utilities'; import { useRecoilValue } from 'recoil'; -import { BoardColumnDefinition } from '@/ui/board/types/BoardColumnDefinition'; +import { BoardColumnDefinition } from '@/ui/layout/board/types/BoardColumnDefinition'; import { useCreatePipelineStageMutation, useDeletePipelineStageMutation, diff --git a/front/src/modules/settings/components/IconWithLabel.tsx b/front/src/modules/settings/components/IconWithLabel.tsx index 1470b32dc9..92791e1d10 100644 --- a/front/src/modules/settings/components/IconWithLabel.tsx +++ b/front/src/modules/settings/components/IconWithLabel.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; type IconWithLabelProps = { Icon: IconComponent; diff --git a/front/src/modules/settings/components/SettingsIconSection.tsx b/front/src/modules/settings/components/SettingsIconSection.tsx index 6224032da7..b3995e0a02 100644 --- a/front/src/modules/settings/components/SettingsIconSection.tsx +++ b/front/src/modules/settings/components/SettingsIconSection.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; import { IconPicker } from '@/ui/input/components/IconPicker'; -import { H2Title } from '@/ui/typography/components/H2Title'; import ArrowRight from '../assets/ArrowRight.svg'; diff --git a/front/src/modules/settings/components/SettingsNavbar.tsx b/front/src/modules/settings/components/SettingsNavbar.tsx index 17f9fbfd08..c231312092 100644 --- a/front/src/modules/settings/components/SettingsNavbar.tsx +++ b/front/src/modules/settings/components/SettingsNavbar.tsx @@ -10,10 +10,10 @@ import { IconSettings, IconUserCircle, IconUsers, -} from '@/ui/icon/index'; -import NavItem from '@/ui/navbar/components/NavItem'; -import NavTitle from '@/ui/navbar/components/NavTitle'; -import SubMenuNavbar from '@/ui/navbar/components/SubMenuNavbar'; +} from '@/ui/display/icon/index'; +import NavItem from '@/ui/navigation/navbar/components/NavItem'; +import NavTitle from '@/ui/navigation/navbar/components/NavTitle'; +import SubMenuNavbar from '@/ui/navigation/navbar/components/SubMenuNavbar'; export const SettingsNavbar = () => { const navigate = useNavigate(); diff --git a/front/src/modules/settings/objects/components/ObjectFieldDataType.tsx b/front/src/modules/settings/objects/components/ObjectFieldDataType.tsx index ffdc9009eb..d07f7c5e0d 100644 --- a/front/src/modules/settings/objects/components/ObjectFieldDataType.tsx +++ b/front/src/modules/settings/objects/components/ObjectFieldDataType.tsx @@ -8,8 +8,8 @@ import { IconPlug, IconSocial, IconUserCircle, -} from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +} from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { ObjectFieldItem } from '../types/ObjectFieldItem'; diff --git a/front/src/modules/settings/objects/components/ObjectFieldItemTableRow.tsx b/front/src/modules/settings/objects/components/ObjectFieldItemTableRow.tsx index 6652e82943..b7c23a5268 100644 --- a/front/src/modules/settings/objects/components/ObjectFieldItemTableRow.tsx +++ b/front/src/modules/settings/objects/components/ObjectFieldItemTableRow.tsx @@ -1,9 +1,9 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconDotsVertical } from '@/ui/icon'; -import { TableCell } from '@/ui/table/components/TableCell'; -import { TableRow } from '@/ui/table/components/TableRow'; +import { IconDotsVertical } from '@/ui/display/icon'; +import { TableCell } from '@/ui/layout/table/components/TableCell'; +import { TableRow } from '@/ui/layout/table/components/TableRow'; import { ObjectFieldItem } from '../types/ObjectFieldItem'; diff --git a/front/src/modules/settings/objects/constants/mockObjects.ts b/front/src/modules/settings/objects/constants/mockObjects.ts index 011fcdf5f4..a242c3328b 100644 --- a/front/src/modules/settings/objects/constants/mockObjects.ts +++ b/front/src/modules/settings/objects/constants/mockObjects.ts @@ -14,7 +14,7 @@ import { IconUser, IconUserCircle, IconUsers, -} from '@/ui/icon'; +} from '@/ui/display/icon'; export const activeObjectItems = [ { diff --git a/front/src/modules/settings/objects/types/ObjectFieldItem.ts b/front/src/modules/settings/objects/types/ObjectFieldItem.ts index 8feb6bc01a..77edcb1b6c 100644 --- a/front/src/modules/settings/objects/types/ObjectFieldItem.ts +++ b/front/src/modules/settings/objects/types/ObjectFieldItem.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type ObjectFieldItem = { name: string; diff --git a/front/src/modules/settings/profile/components/DeleteAccount.tsx b/front/src/modules/settings/profile/components/DeleteAccount.tsx index 85563f40e9..d3e52ad09e 100644 --- a/front/src/modules/settings/profile/components/DeleteAccount.tsx +++ b/front/src/modules/settings/profile/components/DeleteAccount.tsx @@ -5,9 +5,9 @@ import { useRecoilValue } from 'recoil'; import { useAuth } from '@/auth/hooks/useAuth'; import { currentUserState } from '@/auth/states/currentUserState'; import { AppPath } from '@/types/AppPath'; -import { Button } from '@/ui/button/components/Button'; -import { ConfirmationModal } from '@/ui/modal/components/ConfirmationModal'; -import { H2Title } from '@/ui/typography/components/H2Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { Button } from '@/ui/input/button/components/Button'; +import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; import { useDeleteUserAccountMutation } from '~/generated/graphql'; export const DeleteAccount = () => { diff --git a/front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/front/src/modules/settings/profile/components/DeleteWorkspace.tsx index f8289bdb2c..4264bd9282 100644 --- a/front/src/modules/settings/profile/components/DeleteWorkspace.tsx +++ b/front/src/modules/settings/profile/components/DeleteWorkspace.tsx @@ -5,11 +5,11 @@ import { useRecoilValue } from 'recoil'; import { useAuth } from '@/auth/hooks/useAuth'; import { currentUserState } from '@/auth/states/currentUserState'; import { AppPath } from '@/types/AppPath'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; import { ConfirmationModal, StyledConfirmationButton, -} from '@/ui/modal/components/ConfirmationModal'; -import { H2Title } from '@/ui/typography/components/H2Title'; +} from '@/ui/layout/modal/components/ConfirmationModal'; import { useDeleteCurrentWorkspaceMutation } from '~/generated/graphql'; export const DeleteWorkspace = () => { diff --git a/front/src/modules/settings/profile/components/ToggleField.tsx b/front/src/modules/settings/profile/components/ToggleField.tsx index 3cd20fdb38..84401e2372 100644 --- a/front/src/modules/settings/profile/components/ToggleField.tsx +++ b/front/src/modules/settings/profile/components/ToggleField.tsx @@ -1,8 +1,8 @@ import { useRecoilValue } from 'recoil'; import { currentUserState } from '@/auth/states/currentUserState'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { Toggle } from '@/ui/input/components/Toggle'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; import { useUpdateAllowImpersonationMutation } from '~/generated/graphql'; export const ToggleField = () => { diff --git a/front/src/modules/spreadsheet-import/components/ContinueButton.tsx b/front/src/modules/spreadsheet-import/components/ContinueButton.tsx index 8d81951ce9..a3b06aba42 100644 --- a/front/src/modules/spreadsheet-import/components/ContinueButton.tsx +++ b/front/src/modules/spreadsheet-import/components/ContinueButton.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled'; -import { MainButton } from '@/ui/button/components/MainButton'; -import { Modal } from '@/ui/modal/components/Modal'; -import { CircularProgressBar } from '@/ui/progress-bar/components/CircularProgressBar'; +import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar'; +import { MainButton } from '@/ui/input/button/components/MainButton'; +import { Modal } from '@/ui/layout/modal/components/Modal'; const StyledFooter = styled(Modal.Footer)` height: 60px; diff --git a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx index 18bf6f629d..1fa871c206 100644 --- a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx +++ b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx @@ -13,13 +13,13 @@ import debounce from 'lodash.debounce'; import { ReadonlyDeep } from 'type-fest'; import { SelectOption } from '@/spreadsheet-import/types'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemSelect } from '@/ui/menu-item/components/MenuItemSelect'; -import { AppTooltip } from '@/ui/tooltip/AppTooltip'; +import { AppTooltip } from '@/ui/display/tooltip/AppTooltip'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemSelect } from '@/ui/navigation/menu-item/components/MenuItemSelect'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { useUpdateEffect } from '~/hooks/useUpdateEffect'; diff --git a/front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx b/front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx index a95bcb05f8..d8593bb17b 100644 --- a/front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx +++ b/front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled'; import { useSpreadsheetImportInitialStep } from '@/spreadsheet-import/hooks/useSpreadsheetImportInitialStep'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { useDialog } from '@/ui/dialog/hooks/useDialog'; -import { IconX } from '@/ui/icon/index'; -import { useStepBar } from '@/ui/step-bar/hooks/useStepBar'; +import { IconX } from '@/ui/display/icon/index'; +import { useDialog } from '@/ui/feedback/dialog//hooks/useDialog'; +import { IconButton } from '@/ui/input/button/components/IconButton'; +import { useStepBar } from '@/ui/navigation/step-bar/hooks/useStepBar'; const StyledCloseButtonContainer = styled.div` align-items: center; diff --git a/front/src/modules/spreadsheet-import/components/ModalWrapper.tsx b/front/src/modules/spreadsheet-import/components/ModalWrapper.tsx index fb7a1ad1bc..a6814e9c44 100644 --- a/front/src/modules/spreadsheet-import/components/ModalWrapper.tsx +++ b/front/src/modules/spreadsheet-import/components/ModalWrapper.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { ModalCloseButton } from './ModalCloseButton'; diff --git a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx index 63136e603a..46c5bd8fbc 100644 --- a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx @@ -11,9 +11,9 @@ import { normalizeTableData } from '@/spreadsheet-import/utils/normalizeTableDat import { setColumn } from '@/spreadsheet-import/utils/setColumn'; import { setIgnoreColumn } from '@/spreadsheet-import/utils/setIgnoreColumn'; import { setSubColumn } from '@/spreadsheet-import/utils/setSubColumn'; -import { useDialog } from '@/ui/dialog/hooks/useDialog'; -import { Modal } from '@/ui/modal/components/Modal'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { useDialog } from '@/ui/feedback/dialog//hooks/useDialog'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { ColumnGrid } from './components/ColumnGrid'; import { TemplateColumn } from './components/TemplateColumn'; diff --git a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx index 7c22740876..858b498c6b 100644 --- a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx @@ -11,7 +11,7 @@ import styled from '@emotion/styled'; import { MatchColumnSelect } from '@/spreadsheet-import/components/MatchColumnSelect'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; import { Fields } from '@/spreadsheet-import/types'; -import { IconChevronDown, IconForbid } from '@/ui/icon'; +import { IconChevronDown, IconForbid } from '@/ui/display/icon'; import { Column, Columns } from '../MatchColumnsStep'; import { ColumnType } from '../MatchColumnsStep'; diff --git a/front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx b/front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx index 126cfb30b4..90b595e30b 100644 --- a/front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx @@ -4,7 +4,7 @@ import styled from '@emotion/styled'; import { ContinueButton } from '@/spreadsheet-import/components/ContinueButton'; import { Heading } from '@/spreadsheet-import/components/Heading'; import { RawData } from '@/spreadsheet-import/types'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { SelectHeaderTable } from './components/SelectHeaderTable'; diff --git a/front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx b/front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx index b07a40ca23..6739fa2ebe 100644 --- a/front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx @@ -5,7 +5,7 @@ import { ContinueButton } from '@/spreadsheet-import/components/ContinueButton'; import { Heading } from '@/spreadsheet-import/components/Heading'; import { Radio } from '@/ui/input/components/Radio'; import { RadioGroup } from '@/ui/input/components/RadioGroup'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; const StyledContent = styled(Modal.Content)` align-items: center; diff --git a/front/src/modules/spreadsheet-import/steps/components/Steps.tsx b/front/src/modules/spreadsheet-import/steps/components/Steps.tsx index 3700afbcb8..5fc6dcacd8 100644 --- a/front/src/modules/spreadsheet-import/steps/components/Steps.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/Steps.tsx @@ -2,9 +2,9 @@ import styled from '@emotion/styled'; import { useSpreadsheetImportInitialStep } from '@/spreadsheet-import/hooks/useSpreadsheetImportInitialStep'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; -import { Modal } from '@/ui/modal/components/Modal'; -import { StepBar } from '@/ui/step-bar/components/StepBar'; -import { useStepBar } from '@/ui/step-bar/hooks/useStepBar'; +import { Modal } from '@/ui/layout/modal/components/Modal'; +import { StepBar } from '@/ui/navigation/step-bar/components/StepBar'; +import { useStepBar } from '@/ui/navigation/step-bar/hooks/useStepBar'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { UploadFlow } from './UploadFlow'; diff --git a/front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx b/front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx index ca75a08df9..a627c14da6 100644 --- a/front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx @@ -7,9 +7,9 @@ import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpre import { RawData } from '@/spreadsheet-import/types'; import { exceedsMaxRecords } from '@/spreadsheet-import/utils/exceedsMaxRecords'; import { mapWorkbook } from '@/spreadsheet-import/utils/mapWorkbook'; -import { Modal } from '@/ui/modal/components/Modal'; -import { CircularProgressBar } from '@/ui/progress-bar/components/CircularProgressBar'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { MatchColumnsStep } from './MatchColumnsStep/MatchColumnsStep'; import { SelectHeaderStep } from './SelectHeaderStep/SelectHeaderStep'; diff --git a/front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx b/front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx index 619bde6355..f0cdc1bb43 100644 --- a/front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'; import styled from '@emotion/styled'; import { WorkBook } from 'xlsx-ugnis'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { DropZone } from './components/DropZone'; diff --git a/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx b/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx index a2768d1140..aa08114716 100644 --- a/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx @@ -5,8 +5,8 @@ import * as XLSX from 'xlsx-ugnis'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; import { readFileAsync } from '@/spreadsheet-import/utils/readFilesAsync'; -import { MainButton } from '@/ui/button/components/MainButton'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { MainButton } from '@/ui/input/button/components/MainButton'; const StyledContainer = styled.div` align-items: center; diff --git a/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/columns.tsx b/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/columns.tsx index 7b6046e14c..b65cc254e3 100644 --- a/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/columns.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/UploadStep/components/columns.tsx @@ -3,7 +3,7 @@ import { createPortal } from 'react-dom'; import styled from '@emotion/styled'; import { Fields } from '@/spreadsheet-import/types'; -import { AppTooltip } from '@/ui/tooltip/AppTooltip'; +import { AppTooltip } from '@/ui/display/tooltip/AppTooltip'; const StyledHeaderContainer = styled.div` align-items: center; diff --git a/front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx b/front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx index 6758f11995..75085649f9 100644 --- a/front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx @@ -8,11 +8,11 @@ import { Table } from '@/spreadsheet-import/components/Table'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; import { Data } from '@/spreadsheet-import/types'; import { addErrorsAndRunHooks } from '@/spreadsheet-import/utils/dataMutations'; -import { Button } from '@/ui/button/components/Button'; -import { useDialog } from '@/ui/dialog/hooks/useDialog'; -import { IconTrash } from '@/ui/icon'; +import { IconTrash } from '@/ui/display/icon'; +import { useDialog } from '@/ui/feedback/dialog//hooks/useDialog'; +import { Button } from '@/ui/input/button/components/Button'; import { Toggle } from '@/ui/input/components/Toggle'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { generateColumns } from './components/columns'; import { Meta } from './types'; diff --git a/front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx b/front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx index d6f3730951..0af8b7f4f2 100644 --- a/front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx +++ b/front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx @@ -4,10 +4,10 @@ import styled from '@emotion/styled'; import { MatchColumnSelect } from '@/spreadsheet-import/components/MatchColumnSelect'; import { Data, Fields } from '@/spreadsheet-import/types'; +import { AppTooltip } from '@/ui/display/tooltip/AppTooltip'; import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox'; import { TextInput } from '@/ui/input/components/TextInput'; import { Toggle } from '@/ui/input/components/Toggle'; -import { AppTooltip } from '@/ui/tooltip/AppTooltip'; import { Meta } from '../types'; diff --git a/front/src/modules/spreadsheet-import/types/index.ts b/front/src/modules/spreadsheet-import/types/index.ts index ffacca7c2e..cadcf4c926 100644 --- a/front/src/modules/spreadsheet-import/types/index.ts +++ b/front/src/modules/spreadsheet-import/types/index.ts @@ -3,7 +3,7 @@ import { ReadonlyDeep } from 'type-fest'; import { Columns } from '@/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep'; import { StepState } from '@/spreadsheet-import/steps/components/UploadFlow'; import { Meta } from '@/spreadsheet-import/steps/components/ValidationStep/types'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type SpreadsheetOptions = { // Is modal visible. diff --git a/front/src/modules/ui/board/types/BoardFieldDefinition.ts b/front/src/modules/ui/board/types/BoardFieldDefinition.ts deleted file mode 100644 index c9715065c2..0000000000 --- a/front/src/modules/ui/board/types/BoardFieldDefinition.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; - -export type BoardFieldDefinition = - FieldDefinition & { - index: number; - isVisible?: boolean; - }; diff --git a/front/src/modules/ui/data-table/types/ColumnDefinition.ts b/front/src/modules/ui/data-table/types/ColumnDefinition.ts deleted file mode 100644 index 49f7a9f67e..0000000000 --- a/front/src/modules/ui/data-table/types/ColumnDefinition.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; - -export type ColumnDefinition = FieldDefinition & { - size: number; - index: number; - isVisible?: boolean; -}; diff --git a/front/src/modules/ui/data-table/action-bar/components/DataTableActionBar.tsx b/front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx similarity index 80% rename from front/src/modules/ui/data-table/action-bar/components/DataTableActionBar.tsx rename to front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx index 2698fe682b..3dd4332ff8 100644 --- a/front/src/modules/ui/data-table/action-bar/components/DataTableActionBar.tsx +++ b/front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRecoilValue } from 'recoil'; -import { ActionBar } from '@/ui/action-bar/components/ActionBar'; +import { ActionBar } from '@/ui/navigation/action-bar/components/ActionBar'; import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector'; diff --git a/front/src/modules/ui/data-table/components/CheckboxCell.tsx b/front/src/modules/ui/data/data-table/components/CheckboxCell.tsx similarity index 90% rename from front/src/modules/ui/data-table/components/CheckboxCell.tsx rename to front/src/modules/ui/data/data-table/components/CheckboxCell.tsx index c28296cdbd..340d53ff91 100644 --- a/front/src/modules/ui/data-table/components/CheckboxCell.tsx +++ b/front/src/modules/ui/data/data-table/components/CheckboxCell.tsx @@ -2,8 +2,8 @@ import { useCallback } from 'react'; import styled from '@emotion/styled'; import { useSetRecoilState } from 'recoil'; -import { actionBarOpenState } from '@/ui/action-bar/states/actionBarIsOpenState'; import { Checkbox } from '@/ui/input/components/Checkbox'; +import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState'; import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected'; diff --git a/front/src/modules/ui/data-table/components/ColumnHead.tsx b/front/src/modules/ui/data/data-table/components/ColumnHead.tsx similarity index 94% rename from front/src/modules/ui/data-table/components/ColumnHead.tsx rename to front/src/modules/ui/data/data-table/components/ColumnHead.tsx index cb67534461..ccc8075de5 100644 --- a/front/src/modules/ui/data-table/components/ColumnHead.tsx +++ b/front/src/modules/ui/data/data-table/components/ColumnHead.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/components/ColumnHeadWithDropdown.tsx b/front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx similarity index 82% rename from front/src/modules/ui/data-table/components/ColumnHeadWithDropdown.tsx rename to front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx index 8f9a52c6e5..a1d4250d4b 100644 --- a/front/src/modules/ui/data-table/components/ColumnHeadWithDropdown.tsx +++ b/front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx @@ -1,6 +1,6 @@ -import { DropdownMenu } from '@/ui/dropdown/components/DropdownMenu'; -import { DropdownScope } from '@/ui/dropdown/scopes/DropdownScope'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/components/DataTable.tsx b/front/src/modules/ui/data/data-table/components/DataTable.tsx similarity index 100% rename from front/src/modules/ui/data-table/components/DataTable.tsx rename to front/src/modules/ui/data/data-table/components/DataTable.tsx diff --git a/front/src/modules/ui/data-table/components/DataTableBody.tsx b/front/src/modules/ui/data/data-table/components/DataTableBody.tsx similarity index 100% rename from front/src/modules/ui/data-table/components/DataTableBody.tsx rename to front/src/modules/ui/data/data-table/components/DataTableBody.tsx diff --git a/front/src/modules/ui/data-table/components/DataTableCell.tsx b/front/src/modules/ui/data/data-table/components/DataTableCell.tsx similarity index 87% rename from front/src/modules/ui/data-table/components/DataTableCell.tsx rename to front/src/modules/ui/data/data-table/components/DataTableCell.tsx index b7086f70e8..0b3340fb41 100644 --- a/front/src/modules/ui/data-table/components/DataTableCell.tsx +++ b/front/src/modules/ui/data/data-table/components/DataTableCell.tsx @@ -1,11 +1,11 @@ import { useContext } from 'react'; import { useSetRecoilState } from 'recoil'; -import { contextMenuIsOpenState } from '@/ui/context-menu/states/contextMenuIsOpenState'; -import { contextMenuPositionState } from '@/ui/context-menu/states/contextMenuPositionState'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { isFieldRelation } from '@/ui/field/types/guards/isFieldRelation'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { isFieldRelation } from '@/ui/data/field/types/guards/isFieldRelation'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; +import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState'; +import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ColumnContext } from '../contexts/ColumnContext'; diff --git a/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx b/front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx similarity index 81% rename from front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx rename to front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx index cb4e244950..6cadbf25d6 100644 --- a/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx +++ b/front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx @@ -1,9 +1,9 @@ -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; -import { IconArrowLeft, IconArrowRight, IconEyeOff } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { IconArrowLeft, IconArrowRight, IconEyeOff } from '@/ui/display/icon'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { ColumnHeadDropdownId } from '../constants/ColumnHeadDropdownId'; import { useTableColumns } from '../hooks/useTableColumns'; diff --git a/front/src/modules/ui/data-table/components/DataTableEffect.tsx b/front/src/modules/ui/data/data-table/components/DataTableEffect.tsx similarity index 84% rename from front/src/modules/ui/data-table/components/DataTableEffect.tsx rename to front/src/modules/ui/data/data-table/components/DataTableEffect.tsx index 8f82d98c0f..74a235d8dc 100644 --- a/front/src/modules/ui/data-table/components/DataTableEffect.tsx +++ b/front/src/modules/ui/data/data-table/components/DataTableEffect.tsx @@ -4,14 +4,14 @@ import { useRecoilCallback } from 'recoil'; import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect'; import { OptimisticEffectDefinition } from '@/apollo/optimistic-effect/types/OptimisticEffectDefinition'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { FilterDefinition } from '@/ui/data/view-bar/types/FilterDefinition'; +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; -import { FilterDefinition } from '@/ui/view-bar/types/FilterDefinition'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; import { SortOrder } from '~/generated/graphql'; import { useSetDataTableData } from '../hooks/useSetDataTableData'; diff --git a/front/src/modules/ui/data-table/components/DataTableHeader.tsx b/front/src/modules/ui/data/data-table/components/DataTableHeader.tsx similarity index 98% rename from front/src/modules/ui/data-table/components/DataTableHeader.tsx rename to front/src/modules/ui/data/data-table/components/DataTableHeader.tsx index 50c93e1efc..6eb944b128 100644 --- a/front/src/modules/ui/data-table/components/DataTableHeader.tsx +++ b/front/src/modules/ui/data/data-table/components/DataTableHeader.tsx @@ -2,8 +2,8 @@ import { useCallback, useState } from 'react'; import styled from '@emotion/styled'; import { useRecoilCallback, useRecoilState } from 'recoil'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { IconPlus } from '@/ui/icon'; +import { IconPlus } from '@/ui/display/icon'; +import { IconButton } from '@/ui/input/button/components/IconButton'; import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; diff --git a/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx b/front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButton.tsx similarity index 84% rename from front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx rename to front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButton.tsx index 49ff83d06e..18e5bbe8be 100644 --- a/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx +++ b/front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButton.tsx @@ -1,11 +1,11 @@ import { ComponentProps, useCallback, useRef } from 'react'; import styled from '@emotion/styled'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; -import { IconPlus } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { IconPlus } from '@/ui/display/icon'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; diff --git a/front/src/modules/ui/data-table/components/DataTableRow.tsx b/front/src/modules/ui/data/data-table/components/DataTableRow.tsx similarity index 100% rename from front/src/modules/ui/data-table/components/DataTableRow.tsx rename to front/src/modules/ui/data/data-table/components/DataTableRow.tsx diff --git a/front/src/modules/ui/data-table/components/SelectAllCheckbox.tsx b/front/src/modules/ui/data/data-table/components/SelectAllCheckbox.tsx similarity index 100% rename from front/src/modules/ui/data-table/components/SelectAllCheckbox.tsx rename to front/src/modules/ui/data/data-table/components/SelectAllCheckbox.tsx diff --git a/front/src/modules/ui/data-table/constants/ColumnHeadDropdownId.ts b/front/src/modules/ui/data/data-table/constants/ColumnHeadDropdownId.ts similarity index 100% rename from front/src/modules/ui/data-table/constants/ColumnHeadDropdownId.ts rename to front/src/modules/ui/data/data-table/constants/ColumnHeadDropdownId.ts diff --git a/front/src/modules/ui/data-table/constants/TableOptionsDropdownId.ts b/front/src/modules/ui/data/data-table/constants/TableOptionsDropdownId.ts similarity index 100% rename from front/src/modules/ui/data-table/constants/TableOptionsDropdownId.ts rename to front/src/modules/ui/data/data-table/constants/TableOptionsDropdownId.ts diff --git a/front/src/modules/ui/data-table/constants/countries.json b/front/src/modules/ui/data/data-table/constants/countries.json similarity index 100% rename from front/src/modules/ui/data-table/constants/countries.json rename to front/src/modules/ui/data/data-table/constants/countries.json diff --git a/front/src/modules/ui/data-table/context-menu/components/DataTableContextMenu.tsx b/front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx similarity index 79% rename from front/src/modules/ui/data-table/context-menu/components/DataTableContextMenu.tsx rename to front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx index d46afc5e0b..60c3924cd9 100644 --- a/front/src/modules/ui/data-table/context-menu/components/DataTableContextMenu.tsx +++ b/front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRecoilValue } from 'recoil'; -import { ContextMenu } from '@/ui/context-menu/components/ContextMenu'; +import { ContextMenu } from '@/ui/navigation/context-menu/components/ContextMenu'; import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector'; diff --git a/front/src/modules/ui/data-table/contexts/CellHotkeyScopeContext.ts b/front/src/modules/ui/data/data-table/contexts/CellHotkeyScopeContext.ts similarity index 100% rename from front/src/modules/ui/data-table/contexts/CellHotkeyScopeContext.ts rename to front/src/modules/ui/data/data-table/contexts/CellHotkeyScopeContext.ts diff --git a/front/src/modules/ui/data-table/contexts/ColumnContext.ts b/front/src/modules/ui/data/data-table/contexts/ColumnContext.ts similarity index 73% rename from front/src/modules/ui/data-table/contexts/ColumnContext.ts rename to front/src/modules/ui/data/data-table/contexts/ColumnContext.ts index ac1a9297e8..499ca58e1e 100644 --- a/front/src/modules/ui/data-table/contexts/ColumnContext.ts +++ b/front/src/modules/ui/data/data-table/contexts/ColumnContext.ts @@ -1,6 +1,6 @@ import { createContext } from 'react'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/contexts/ColumnIndexContext.ts b/front/src/modules/ui/data/data-table/contexts/ColumnIndexContext.ts similarity index 100% rename from front/src/modules/ui/data-table/contexts/ColumnIndexContext.ts rename to front/src/modules/ui/data/data-table/contexts/ColumnIndexContext.ts diff --git a/front/src/modules/ui/data-table/contexts/EntityUpdateMutationHookContext.ts b/front/src/modules/ui/data/data-table/contexts/EntityUpdateMutationHookContext.ts similarity index 100% rename from front/src/modules/ui/data-table/contexts/EntityUpdateMutationHookContext.ts rename to front/src/modules/ui/data/data-table/contexts/EntityUpdateMutationHookContext.ts diff --git a/front/src/modules/ui/data-table/contexts/RowIdContext.ts b/front/src/modules/ui/data/data-table/contexts/RowIdContext.ts similarity index 100% rename from front/src/modules/ui/data-table/contexts/RowIdContext.ts rename to front/src/modules/ui/data/data-table/contexts/RowIdContext.ts diff --git a/front/src/modules/ui/data-table/contexts/RowIndexContext.ts b/front/src/modules/ui/data/data-table/contexts/RowIndexContext.ts similarity index 100% rename from front/src/modules/ui/data-table/contexts/RowIndexContext.ts rename to front/src/modules/ui/data/data-table/contexts/RowIndexContext.ts diff --git a/front/src/modules/ui/data-table/contexts/TableContext.ts b/front/src/modules/ui/data/data-table/contexts/TableContext.ts similarity index 78% rename from front/src/modules/ui/data-table/contexts/TableContext.ts rename to front/src/modules/ui/data/data-table/contexts/TableContext.ts index a5e079bdac..fc116d1272 100644 --- a/front/src/modules/ui/data-table/contexts/TableContext.ts +++ b/front/src/modules/ui/data/data-table/contexts/TableContext.ts @@ -1,6 +1,6 @@ import { createContext } from 'react'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/hooks/useCellInputEventHandlers.ts b/front/src/modules/ui/data/data-table/hooks/useCellInputEventHandlers.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useCellInputEventHandlers.ts rename to front/src/modules/ui/data/data-table/hooks/useCellInputEventHandlers.ts diff --git a/front/src/modules/ui/data-table/hooks/useCloseCurrentTableCellInEditMode.ts b/front/src/modules/ui/data/data-table/hooks/useCloseCurrentTableCellInEditMode.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useCloseCurrentTableCellInEditMode.ts rename to front/src/modules/ui/data/data-table/hooks/useCloseCurrentTableCellInEditMode.ts diff --git a/front/src/modules/ui/data-table/hooks/useCurrentEntityId.ts b/front/src/modules/ui/data/data-table/hooks/useCurrentEntityId.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useCurrentEntityId.ts rename to front/src/modules/ui/data/data-table/hooks/useCurrentEntityId.ts diff --git a/front/src/modules/ui/data-table/hooks/useCurrentRowSelected.ts b/front/src/modules/ui/data/data-table/hooks/useCurrentRowSelected.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useCurrentRowSelected.ts rename to front/src/modules/ui/data/data-table/hooks/useCurrentRowSelected.ts diff --git a/front/src/modules/ui/data-table/hooks/useDisableSoftFocus.ts b/front/src/modules/ui/data/data-table/hooks/useDisableSoftFocus.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useDisableSoftFocus.ts rename to front/src/modules/ui/data/data-table/hooks/useDisableSoftFocus.ts diff --git a/front/src/modules/ui/data-table/hooks/useGetIsSomeCellInEditMode.ts b/front/src/modules/ui/data/data-table/hooks/useGetIsSomeCellInEditMode.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useGetIsSomeCellInEditMode.ts rename to front/src/modules/ui/data/data-table/hooks/useGetIsSomeCellInEditMode.ts diff --git a/front/src/modules/ui/data-table/hooks/useLeaveTableFocus.ts b/front/src/modules/ui/data/data-table/hooks/useLeaveTableFocus.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useLeaveTableFocus.ts rename to front/src/modules/ui/data/data-table/hooks/useLeaveTableFocus.ts diff --git a/front/src/modules/ui/data-table/hooks/useMapKeyboardToSoftFocus.ts b/front/src/modules/ui/data/data-table/hooks/useMapKeyboardToSoftFocus.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useMapKeyboardToSoftFocus.ts rename to front/src/modules/ui/data/data-table/hooks/useMapKeyboardToSoftFocus.ts diff --git a/front/src/modules/ui/data-table/hooks/useMoveEditModeToCellPosition.ts b/front/src/modules/ui/data/data-table/hooks/useMoveEditModeToCellPosition.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useMoveEditModeToCellPosition.ts rename to front/src/modules/ui/data/data-table/hooks/useMoveEditModeToCellPosition.ts diff --git a/front/src/modules/ui/data-table/hooks/useMoveSoftFocus.ts b/front/src/modules/ui/data/data-table/hooks/useMoveSoftFocus.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useMoveSoftFocus.ts rename to front/src/modules/ui/data/data-table/hooks/useMoveSoftFocus.ts diff --git a/front/src/modules/ui/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts b/front/src/modules/ui/data/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts rename to front/src/modules/ui/data/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts diff --git a/front/src/modules/ui/data-table/hooks/useResetTableRowSelection.ts b/front/src/modules/ui/data/data-table/hooks/useResetTableRowSelection.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useResetTableRowSelection.ts rename to front/src/modules/ui/data/data-table/hooks/useResetTableRowSelection.ts diff --git a/front/src/modules/ui/data-table/hooks/useSelectAllRows.ts b/front/src/modules/ui/data/data-table/hooks/useSelectAllRows.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useSelectAllRows.ts rename to front/src/modules/ui/data/data-table/hooks/useSelectAllRows.ts diff --git a/front/src/modules/ui/data-table/hooks/useSetDataTableData.ts b/front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts similarity index 79% rename from front/src/modules/ui/data-table/hooks/useSetDataTableData.ts rename to front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts index e8650f46fb..aea4af97dc 100644 --- a/front/src/modules/ui/data-table/hooks/useSetDataTableData.ts +++ b/front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts @@ -1,12 +1,12 @@ import { useRecoilCallback } from 'recoil'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; +import { availableSortsScopedState } from '@/ui/data/view-bar/states/availableSortsScopedState'; +import { entityCountInCurrentViewState } from '@/ui/data/view-bar/states/entityCountInCurrentViewState'; +import { FilterDefinition } from '@/ui/data/view-bar/types/FilterDefinition'; +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; -import { availableSortsScopedState } from '@/ui/view-bar/states/availableSortsScopedState'; -import { entityCountInCurrentViewState } from '@/ui/view-bar/states/entityCountInCurrentViewState'; -import { FilterDefinition } from '@/ui/view-bar/types/FilterDefinition'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; import { isFetchingDataTableDataState } from '../states/isFetchingDataTableDataState'; import { numberOfTableRowsState } from '../states/numberOfTableRowsState'; diff --git a/front/src/modules/ui/data-table/hooks/useSetRowSelectedState.ts b/front/src/modules/ui/data/data-table/hooks/useSetRowSelectedState.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useSetRowSelectedState.ts rename to front/src/modules/ui/data/data-table/hooks/useSetRowSelectedState.ts diff --git a/front/src/modules/ui/data-table/hooks/useSetSoftFocusPosition.ts b/front/src/modules/ui/data/data-table/hooks/useSetSoftFocusPosition.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useSetSoftFocusPosition.ts rename to front/src/modules/ui/data/data-table/hooks/useSetSoftFocusPosition.ts diff --git a/front/src/modules/ui/data-table/hooks/useTableColumns.ts b/front/src/modules/ui/data/data-table/hooks/useTableColumns.ts similarity index 93% rename from front/src/modules/ui/data-table/hooks/useTableColumns.ts rename to front/src/modules/ui/data/data-table/hooks/useTableColumns.ts index eb2c22089c..2aa248217c 100644 --- a/front/src/modules/ui/data-table/hooks/useTableColumns.ts +++ b/front/src/modules/ui/data/data-table/hooks/useTableColumns.ts @@ -1,11 +1,11 @@ import { useCallback, useContext } from 'react'; import { useSetRecoilState } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { ViewFieldForVisibility } from '@/ui/data/view-bar/types/ViewFieldForVisibility'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { ViewFieldForVisibility } from '@/ui/view-bar/types/ViewFieldForVisibility'; import { useMoveViewColumns } from '@/views/hooks/useMoveViewColumns'; import { TableContext } from '../contexts/TableContext'; diff --git a/front/src/modules/ui/data-table/hooks/useUpsertDataTableItem.ts b/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts similarity index 84% rename from front/src/modules/ui/data-table/hooks/useUpsertDataTableItem.ts rename to front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts index de8e72e35d..4eb84488c7 100644 --- a/front/src/modules/ui/data-table/hooks/useUpsertDataTableItem.ts +++ b/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts @@ -1,6 +1,6 @@ import { useRecoilCallback } from 'recoil'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; export const useUpsertDataTableItem = () => useRecoilCallback( diff --git a/front/src/modules/ui/data-table/hooks/useUpsertDataTableItems.ts b/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts similarity index 91% rename from front/src/modules/ui/data-table/hooks/useUpsertDataTableItems.ts rename to front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts index 6ca19d8415..2d259d56ed 100644 --- a/front/src/modules/ui/data-table/hooks/useUpsertDataTableItems.ts +++ b/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts @@ -1,6 +1,6 @@ import { useRecoilCallback } from 'recoil'; -import { entityFieldsFamilyState } from '@/ui/field/states/entityFieldsFamilyState'; +import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState'; export const useUpsertDataTableItems = () => useRecoilCallback( diff --git a/front/src/modules/ui/data-table/hooks/useUpsertTableRowId.ts b/front/src/modules/ui/data/data-table/hooks/useUpsertTableRowId.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useUpsertTableRowId.ts rename to front/src/modules/ui/data/data-table/hooks/useUpsertTableRowId.ts diff --git a/front/src/modules/ui/data-table/hooks/useUpsertTableRowIds.ts b/front/src/modules/ui/data/data-table/hooks/useUpsertTableRowIds.ts similarity index 100% rename from front/src/modules/ui/data-table/hooks/useUpsertTableRowIds.ts rename to front/src/modules/ui/data/data-table/hooks/useUpsertTableRowIds.ts diff --git a/front/src/modules/ui/data-table/options/components/TableOptionsDropdown.tsx b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdown.tsx similarity index 83% rename from front/src/modules/ui/data-table/options/components/TableOptionsDropdown.tsx rename to front/src/modules/ui/data/data-table/options/components/TableOptionsDropdown.tsx index 4213ef875d..f6d2c062d1 100644 --- a/front/src/modules/ui/data-table/options/components/TableOptionsDropdown.tsx +++ b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdown.tsx @@ -1,8 +1,8 @@ import { useResetRecoilState } from 'recoil'; +import { ViewBarDropdownButton } from '@/ui/data/view-bar/components/ViewBarDropdownButton'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; -import { ViewBarDropdownButton } from '@/ui/view-bar/components/ViewBarDropdownButton'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; import { TableOptionsDropdownId } from '../../constants/TableOptionsDropdownId'; diff --git a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownButton.tsx b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx similarity index 55% rename from front/src/modules/ui/data-table/options/components/TableOptionsDropdownButton.tsx rename to front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx index 5de5f62b07..96d1ce4998 100644 --- a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownButton.tsx +++ b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx @@ -1,6 +1,6 @@ -import { TableOptionsDropdownId } from '@/ui/data-table/constants/TableOptionsDropdownId'; -import { StyledHeaderDropdownButton } from '@/ui/dropdown/components/StyledHeaderDropdownButton'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId'; +import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; export const TableOptionsDropdownButton = () => { const { isDropdownOpen, toggleDropdown } = useDropdown({ diff --git a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownContent.tsx similarity index 81% rename from front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx rename to front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownContent.tsx index 1c9148fbf4..5a45cf672f 100644 --- a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx +++ b/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownContent.tsx @@ -3,24 +3,24 @@ import { OnDragEndResponder } from '@hello-pangea/dnd'; import { useRecoilCallback, useRecoilValue, useResetRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; -import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; -import { DropdownMenuInput } from '@/ui/dropdown/components/DropdownMenuInput'; -import { DropdownMenuInputContainer } from '@/ui/dropdown/components/DropdownMenuInputContainer'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { IconChevronLeft, IconFileImport, IconTag } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { ViewFieldsVisibilityDropdownSection } from '@/ui/data/view-bar/components/ViewFieldsVisibilityDropdownSection'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; +import { useUpsertView } from '@/ui/data/view-bar/hooks/useUpsertView'; +import { currentViewScopedSelector } from '@/ui/data/view-bar/states/selectors/currentViewScopedSelector'; +import { viewsByIdScopedSelector } from '@/ui/data/view-bar/states/selectors/viewsByIdScopedSelector'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; +import { IconChevronLeft, IconFileImport, IconTag } from '@/ui/display/icon'; +import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput'; +import { DropdownMenuInputContainer } from '@/ui/layout/dropdown/components/DropdownMenuInputContainer'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { ViewFieldsVisibilityDropdownSection } from '@/ui/view-bar/components/ViewFieldsVisibilityDropdownSection'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; -import { useUpsertView } from '@/ui/view-bar/hooks/useUpsertView'; -import { currentViewScopedSelector } from '@/ui/view-bar/states/selectors/currentViewScopedSelector'; -import { viewsByIdScopedSelector } from '@/ui/view-bar/states/selectors/viewsByIdScopedSelector'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; import { useTableColumns } from '../../hooks/useTableColumns'; import { TableRecoilScopeContext } from '../../states/recoil-scope-contexts/TableRecoilScopeContext'; diff --git a/front/src/modules/ui/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx b/front/src/modules/ui/data/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx similarity index 94% rename from front/src/modules/ui/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx rename to front/src/modules/ui/data/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx index c13387060b..b6df874ef1 100644 --- a/front/src/modules/ui/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx +++ b/front/src/modules/ui/data/data-table/options/components/__stories__/TableOptionsDropdown.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import { userEvent, within } from '@storybook/testing-library'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { TableRecoilScopeContext } from '../../../states/recoil-scope-contexts/TableRecoilScopeContext'; diff --git a/front/src/modules/ui/data-table/states/availableTableColumnsScopedState.ts b/front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts similarity index 79% rename from front/src/modules/ui/data-table/states/availableTableColumnsScopedState.ts rename to front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts index 78d2514136..2a037a2605 100644 --- a/front/src/modules/ui/data-table/states/availableTableColumnsScopedState.ts +++ b/front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/states/currentTableCellInEditModePositionState.ts b/front/src/modules/ui/data/data-table/states/currentTableCellInEditModePositionState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/currentTableCellInEditModePositionState.ts rename to front/src/modules/ui/data/data-table/states/currentTableCellInEditModePositionState.ts diff --git a/front/src/modules/ui/data-table/states/isFetchingDataTableDataState.ts b/front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/isFetchingDataTableDataState.ts rename to front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts diff --git a/front/src/modules/ui/data-table/states/isRowSelectedFamilyState.ts b/front/src/modules/ui/data/data-table/states/isRowSelectedFamilyState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/isRowSelectedFamilyState.ts rename to front/src/modules/ui/data/data-table/states/isRowSelectedFamilyState.ts diff --git a/front/src/modules/ui/data-table/states/isSoftFocusActiveState.ts b/front/src/modules/ui/data/data-table/states/isSoftFocusActiveState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/isSoftFocusActiveState.ts rename to front/src/modules/ui/data/data-table/states/isSoftFocusActiveState.ts diff --git a/front/src/modules/ui/data-table/states/isSoftFocusOnTableCellFamilyState.ts b/front/src/modules/ui/data/data-table/states/isSoftFocusOnTableCellFamilyState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/isSoftFocusOnTableCellFamilyState.ts rename to front/src/modules/ui/data/data-table/states/isSoftFocusOnTableCellFamilyState.ts diff --git a/front/src/modules/ui/data-table/states/isTableCellInEditModeFamilyState.ts b/front/src/modules/ui/data/data-table/states/isTableCellInEditModeFamilyState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/isTableCellInEditModeFamilyState.ts rename to front/src/modules/ui/data/data-table/states/isTableCellInEditModeFamilyState.ts diff --git a/front/src/modules/ui/data-table/states/numberOfTableRowsState.ts b/front/src/modules/ui/data/data-table/states/numberOfTableRowsState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/numberOfTableRowsState.ts rename to front/src/modules/ui/data/data-table/states/numberOfTableRowsState.ts diff --git a/front/src/modules/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts b/front/src/modules/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts similarity index 100% rename from front/src/modules/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts rename to front/src/modules/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts diff --git a/front/src/modules/ui/data-table/states/resizeFieldOffsetState.ts b/front/src/modules/ui/data/data-table/states/resizeFieldOffsetState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/resizeFieldOffsetState.ts rename to front/src/modules/ui/data/data-table/states/resizeFieldOffsetState.ts diff --git a/front/src/modules/ui/data-table/states/savedTableColumnsFamilyState.ts b/front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts similarity index 80% rename from front/src/modules/ui/data-table/states/savedTableColumnsFamilyState.ts rename to front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts index c04c5c2c1b..3cd0e04cc8 100644 --- a/front/src/modules/ui/data-table/states/savedTableColumnsFamilyState.ts +++ b/front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/states/selectors/allRowsSelectedStatusSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/allRowsSelectedStatusSelector.ts similarity index 100% rename from front/src/modules/ui/data-table/states/selectors/allRowsSelectedStatusSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/allRowsSelectedStatusSelector.ts diff --git a/front/src/modules/ui/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts diff --git a/front/src/modules/ui/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts diff --git a/front/src/modules/ui/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts b/front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts similarity index 88% rename from front/src/modules/ui/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts index a520b2c39f..a16413b9a5 100644 --- a/front/src/modules/ui/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts +++ b/front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts @@ -1,6 +1,6 @@ import { selectorFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../../types/ColumnDefinition'; import { savedTableColumnsFamilyState } from '../savedTableColumnsFamilyState'; diff --git a/front/src/modules/ui/data-table/states/selectors/selectedRowIdsSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/selectedRowIdsSelector.ts similarity index 100% rename from front/src/modules/ui/data-table/states/selectors/selectedRowIdsSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/selectedRowIdsSelector.ts diff --git a/front/src/modules/ui/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts similarity index 88% rename from front/src/modules/ui/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts index c3cb0bc86b..3acfd290db 100644 --- a/front/src/modules/ui/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts +++ b/front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts @@ -1,6 +1,6 @@ import { selectorFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../../types/ColumnDefinition'; import { tableColumnsScopedState } from '../tableColumnsScopedState'; diff --git a/front/src/modules/ui/data-table/states/selectors/visibleTableColumnsScopedSelector.ts b/front/src/modules/ui/data/data-table/states/selectors/visibleTableColumnsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/data-table/states/selectors/visibleTableColumnsScopedSelector.ts rename to front/src/modules/ui/data/data-table/states/selectors/visibleTableColumnsScopedSelector.ts diff --git a/front/src/modules/ui/data-table/states/softFocusPositionState.ts b/front/src/modules/ui/data/data-table/states/softFocusPositionState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/softFocusPositionState.ts rename to front/src/modules/ui/data/data-table/states/softFocusPositionState.ts diff --git a/front/src/modules/ui/data-table/states/tableColumnsScopedState.ts b/front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts similarity index 78% rename from front/src/modules/ui/data-table/states/tableColumnsScopedState.ts rename to front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts index c58622db34..9ff30b5bda 100644 --- a/front/src/modules/ui/data-table/states/tableColumnsScopedState.ts +++ b/front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { ColumnDefinition } from '../types/ColumnDefinition'; diff --git a/front/src/modules/ui/data-table/states/tableRowIdsState.ts b/front/src/modules/ui/data/data-table/states/tableRowIdsState.ts similarity index 100% rename from front/src/modules/ui/data-table/states/tableRowIdsState.ts rename to front/src/modules/ui/data/data-table/states/tableRowIdsState.ts diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCell.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx similarity index 86% rename from front/src/modules/ui/data-table/table-cell/components/TableCell.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx index 0ce596cbc0..e48383083d 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCell.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx @@ -1,9 +1,9 @@ import { useContext } from 'react'; -import { FieldDisplay } from '@/ui/field/components/FieldDisplay'; -import { FieldInput } from '@/ui/field/components/FieldInput'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { FieldInputEvent } from '@/ui/field/types/FieldInputEvent'; +import { FieldDisplay } from '@/ui/data/field/components/FieldDisplay'; +import { FieldInput } from '@/ui/data/field/components/FieldInput'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { FieldInputEvent } from '@/ui/data/field/types/FieldInputEvent'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useMoveSoftFocus } from '../../hooks/useMoveSoftFocus'; diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellButton.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellButton.tsx similarity index 79% rename from front/src/modules/ui/data-table/table-cell/components/TableCellButton.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellButton.tsx index 67783fae11..1cdc93b8ff 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCellButton.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCellButton.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton'; const StyledEditButtonContainer = styled(motion.div)` position: absolute; diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellContainer.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx similarity index 95% rename from front/src/modules/ui/data-table/table-cell/components/TableCellContainer.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx index e5bac6f0a3..ee5f460bc5 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCellContainer.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx @@ -1,9 +1,9 @@ import { ReactElement, useContext, useState } from 'react'; import styled from '@emotion/styled'; -import { useIsFieldEmpty } from '@/ui/field/hooks/useIsFieldEmpty'; -import { useIsFieldInputOnly } from '@/ui/field/hooks/useIsFieldInputOnly'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { useIsFieldEmpty } from '@/ui/data/field/hooks/useIsFieldEmpty'; +import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext'; diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellDisplayContainer.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayContainer.tsx similarity index 100% rename from front/src/modules/ui/data-table/table-cell/components/TableCellDisplayContainer.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayContainer.tsx diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellDisplayMode.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx similarity index 90% rename from front/src/modules/ui/data-table/table-cell/components/TableCellDisplayMode.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx index 1054f22d8b..0f117663f4 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCellDisplayMode.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx @@ -1,4 +1,4 @@ -import { useIsFieldInputOnly } from '@/ui/field/hooks/useIsFieldInputOnly'; +import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly'; import { useSetSoftFocusOnCurrentTableCell } from '../hooks/useSetSoftFocusOnCurrentTableCell'; import { useTableCell } from '../hooks/useTableCell'; diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellEditButton.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellEditButton.tsx similarity index 79% rename from front/src/modules/ui/data-table/table-cell/components/TableCellEditButton.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellEditButton.tsx index 67783fae11..1cdc93b8ff 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCellEditButton.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCellEditButton.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton'; const StyledEditButtonContainer = styled(motion.div)` position: absolute; diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellEditMode.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellEditMode.tsx similarity index 100% rename from front/src/modules/ui/data-table/table-cell/components/TableCellEditMode.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellEditMode.tsx diff --git a/front/src/modules/ui/data-table/table-cell/components/TableCellSoftFocusMode.tsx b/front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx similarity index 95% rename from front/src/modules/ui/data-table/table-cell/components/TableCellSoftFocusMode.tsx rename to front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx index af93ab85a4..1a2acbb596 100644 --- a/front/src/modules/ui/data-table/table-cell/components/TableCellSoftFocusMode.tsx +++ b/front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren, useEffect, useRef } from 'react'; -import { useIsFieldInputOnly } from '@/ui/field/hooks/useIsFieldInputOnly'; +import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey'; diff --git a/front/src/modules/ui/data-table/table-cell/hooks/useCurrentCellPosition.ts b/front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentCellPosition.ts similarity index 100% rename from front/src/modules/ui/data-table/table-cell/hooks/useCurrentCellPosition.ts rename to front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentCellPosition.ts diff --git a/front/src/modules/ui/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts b/front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts similarity index 100% rename from front/src/modules/ui/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts rename to front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts diff --git a/front/src/modules/ui/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/data/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts similarity index 100% rename from front/src/modules/ui/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts rename to front/src/modules/ui/data/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts diff --git a/front/src/modules/ui/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/data/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts similarity index 100% rename from front/src/modules/ui/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts rename to front/src/modules/ui/data/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts diff --git a/front/src/modules/ui/data-table/table-cell/hooks/useTableCell.ts b/front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts similarity index 93% rename from front/src/modules/ui/data-table/table-cell/hooks/useTableCell.ts rename to front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts index ff967106d2..a1b7c8d5ac 100644 --- a/front/src/modules/ui/data-table/table-cell/hooks/useTableCell.ts +++ b/front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts @@ -1,8 +1,8 @@ import { useContext } from 'react'; import { useNavigate } from 'react-router-dom'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { useIsFieldEmpty } from '@/ui/field/hooks/useIsFieldEmpty'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { useIsFieldEmpty } from '@/ui/data/field/hooks/useIsFieldEmpty'; import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; diff --git a/front/src/modules/ui/data-table/table-cell/states/isCreateModeScopedState.ts b/front/src/modules/ui/data/data-table/table-cell/states/isCreateModeScopedState.ts similarity index 100% rename from front/src/modules/ui/data-table/table-cell/states/isCreateModeScopedState.ts rename to front/src/modules/ui/data/data-table/table-cell/states/isCreateModeScopedState.ts diff --git a/front/src/modules/ui/data-table/table-header/components/TableHeader.tsx b/front/src/modules/ui/data/data-table/table-header/components/TableHeader.tsx similarity index 92% rename from front/src/modules/ui/data-table/table-header/components/TableHeader.tsx rename to front/src/modules/ui/data/data-table/table-header/components/TableHeader.tsx index f9ca7ad0ba..37c7b4c279 100644 --- a/front/src/modules/ui/data-table/table-header/components/TableHeader.tsx +++ b/front/src/modules/ui/data/data-table/table-header/components/TableHeader.tsx @@ -2,9 +2,9 @@ import { useContext } from 'react'; import { useSearchParams } from 'react-router-dom'; import { useRecoilCallback } from 'recoil'; +import { ViewBar } from '@/ui/data/view-bar/components/ViewBar'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { ViewBar } from '@/ui/view-bar/components/ViewBar'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; import { TableOptionsDropdownId } from '../../constants/TableOptionsDropdownId'; import { TableOptionsDropdown } from '../../options/components/TableOptionsDropdown'; diff --git a/front/src/modules/ui/data-table/types/AllRowSelectedStatus.ts b/front/src/modules/ui/data/data-table/types/AllRowSelectedStatus.ts similarity index 100% rename from front/src/modules/ui/data-table/types/AllRowSelectedStatus.ts rename to front/src/modules/ui/data/data-table/types/AllRowSelectedStatus.ts diff --git a/front/src/modules/ui/data/data-table/types/ColumnDefinition.ts b/front/src/modules/ui/data/data-table/types/ColumnDefinition.ts new file mode 100644 index 0000000000..bbefe0eedd --- /dev/null +++ b/front/src/modules/ui/data/data-table/types/ColumnDefinition.ts @@ -0,0 +1,8 @@ +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; + +export type ColumnDefinition = FieldDefinition & { + size: number; + index: number; + isVisible?: boolean; +}; diff --git a/front/src/modules/ui/data-table/types/TableCellPosition.ts b/front/src/modules/ui/data/data-table/types/TableCellPosition.ts similarity index 100% rename from front/src/modules/ui/data-table/types/TableCellPosition.ts rename to front/src/modules/ui/data/data-table/types/TableCellPosition.ts diff --git a/front/src/modules/ui/data-table/types/TableDimensions.ts b/front/src/modules/ui/data/data-table/types/TableDimensions.ts similarity index 100% rename from front/src/modules/ui/data-table/types/TableDimensions.ts rename to front/src/modules/ui/data/data-table/types/TableDimensions.ts diff --git a/front/src/modules/ui/data-table/types/TableHotkeyScope.ts b/front/src/modules/ui/data/data-table/types/TableHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/data-table/types/TableHotkeyScope.ts rename to front/src/modules/ui/data/data-table/types/TableHotkeyScope.ts diff --git a/front/src/modules/ui/data-table/types/TableOptionsHotkeyScope.ts b/front/src/modules/ui/data/data-table/types/TableOptionsHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/data-table/types/TableOptionsHotkeyScope.ts rename to front/src/modules/ui/data/data-table/types/TableOptionsHotkeyScope.ts diff --git a/front/src/modules/ui/field/components/FieldDisplay.tsx b/front/src/modules/ui/data/field/components/FieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/components/FieldDisplay.tsx rename to front/src/modules/ui/data/field/components/FieldDisplay.tsx diff --git a/front/src/modules/ui/field/components/FieldInput.tsx b/front/src/modules/ui/data/field/components/FieldInput.tsx similarity index 100% rename from front/src/modules/ui/field/components/FieldInput.tsx rename to front/src/modules/ui/data/field/components/FieldInput.tsx diff --git a/front/src/modules/ui/field/contexts/FieldContext.ts b/front/src/modules/ui/data/field/contexts/FieldContext.ts similarity index 100% rename from front/src/modules/ui/field/contexts/FieldContext.ts rename to front/src/modules/ui/data/field/contexts/FieldContext.ts diff --git a/front/src/modules/ui/field/hooks/useIsFieldEmpty.ts b/front/src/modules/ui/data/field/hooks/useIsFieldEmpty.ts similarity index 100% rename from front/src/modules/ui/field/hooks/useIsFieldEmpty.ts rename to front/src/modules/ui/data/field/hooks/useIsFieldEmpty.ts diff --git a/front/src/modules/ui/field/hooks/useIsFieldInputOnly.ts b/front/src/modules/ui/data/field/hooks/useIsFieldInputOnly.ts similarity index 100% rename from front/src/modules/ui/field/hooks/useIsFieldInputOnly.ts rename to front/src/modules/ui/data/field/hooks/useIsFieldInputOnly.ts diff --git a/front/src/modules/ui/field/hooks/usePersistField.ts b/front/src/modules/ui/data/field/hooks/usePersistField.ts similarity index 100% rename from front/src/modules/ui/field/hooks/usePersistField.ts rename to front/src/modules/ui/data/field/hooks/usePersistField.ts diff --git a/front/src/modules/ui/field/meta-types/__stories__/FieldContextProvider.tsx b/front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx similarity index 93% rename from front/src/modules/ui/field/meta-types/__stories__/FieldContextProvider.tsx rename to front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx index c10a4f6724..4282661637 100644 --- a/front/src/modules/ui/field/meta-types/__stories__/FieldContextProvider.tsx +++ b/front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx @@ -1,7 +1,7 @@ import { FieldContext, GenericFieldContextType, -} from '@/ui/field/contexts/FieldContext'; +} from '@/ui/data/field/contexts/FieldContext'; type FieldContextProviderProps = { children: React.ReactNode; diff --git a/front/src/modules/ui/field/meta-types/display/components/ChipFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/ChipFieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/components/ChipFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/ChipFieldDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/components/DateFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx similarity index 64% rename from front/src/modules/ui/field/meta-types/display/components/DateFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx index 46bc4a700c..36d9b53e06 100644 --- a/front/src/modules/ui/field/meta-types/display/components/DateFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { DateDisplay } from '@/ui/field/meta-types/display/content-display/components/DateDisplay'; +import { DateDisplay } from '@/ui/data/field/meta-types/display/content-display/components/DateDisplay'; import { useDateField } from '../../hooks/useDateField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/components/DoubleTextFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/DoubleTextFieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/components/DoubleTextFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/DoubleTextFieldDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/components/EmailFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/EmailFieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/components/EmailFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/EmailFieldDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/components/MoneyFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/MoneyFieldDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/components/MoneyFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/MoneyFieldDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/components/NumberFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx similarity index 64% rename from front/src/modules/ui/field/meta-types/display/components/NumberFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx index f4635da196..ae62090fbb 100644 --- a/front/src/modules/ui/field/meta-types/display/components/NumberFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { NumberDisplay } from '@/ui/field/meta-types/display/content-display/components/NumberDisplay'; +import { NumberDisplay } from '@/ui/data/field/meta-types/display/content-display/components/NumberDisplay'; import { useNumberField } from '../../hooks/useNumberField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/PhoneFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx similarity index 64% rename from front/src/modules/ui/field/meta-types/display/components/PhoneFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx index 839cde784c..fc5d486d3c 100644 --- a/front/src/modules/ui/field/meta-types/display/components/PhoneFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { PhoneDisplay } from '@/ui/field/meta-types/display/content-display/components/PhoneDisplay'; +import { PhoneDisplay } from '@/ui/data/field/meta-types/display/content-display/components/PhoneDisplay'; import { usePhoneField } from '../../hooks/usePhoneField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/RelationFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/RelationFieldDisplay.tsx similarity index 90% rename from front/src/modules/ui/field/meta-types/display/components/RelationFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/RelationFieldDisplay.tsx index d34b714c05..2d1b705f05 100644 --- a/front/src/modules/ui/field/meta-types/display/components/RelationFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/RelationFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { EntityChip } from '@/ui/chip/components/EntityChip'; +import { EntityChip } from '@/ui/display/chip/components/EntityChip'; import { useRelationField } from '../../hooks/useRelationField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/TextFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx similarity index 64% rename from front/src/modules/ui/field/meta-types/display/components/TextFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx index c10f87d6a4..a801f31861 100644 --- a/front/src/modules/ui/field/meta-types/display/components/TextFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { TextDisplay } from '@/ui/field/meta-types/display/content-display/components/TextDisplay'; +import { TextDisplay } from '@/ui/data/field/meta-types/display/content-display/components/TextDisplay'; import { useTextField } from '../../hooks/useTextField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/URLFieldDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx similarity index 64% rename from front/src/modules/ui/field/meta-types/display/components/URLFieldDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx index 1ac055af50..f7a7339e00 100644 --- a/front/src/modules/ui/field/meta-types/display/components/URLFieldDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx @@ -1,4 +1,4 @@ -import { URLDisplay } from '@/ui/field/meta-types/display/content-display/components/URLDisplay'; +import { URLDisplay } from '@/ui/data/field/meta-types/display/content-display/components/URLDisplay'; import { useURLField } from '../../hooks/useURLField'; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx index dfddfdc701..8b47d0fdd1 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx @@ -47,7 +47,7 @@ const DateFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/DateFieldDisplay', + title: 'UI/Field/display/DateFieldDisplay', component: DateFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx index 7e3cbecb91..78ec39d894 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx @@ -60,7 +60,7 @@ const DoubleTextFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/DoubleTextFieldDisplay', + title: 'UI/Field/display/DoubleTextFieldDisplay', component: DoubleTextFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx index 7300a945ab..983ce229dd 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx @@ -49,7 +49,7 @@ const EmailFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/EmailFieldDisplay', + title: 'UI/Field/display/EmailFieldDisplay', component: EmailFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx index c00d48c09e..ba68f17201 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx @@ -50,7 +50,7 @@ const MoneyFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/MoneyFieldDisplay', + title: 'UI/Field/display/MoneyFieldDisplay', component: MoneyFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx index 30bd14a1ea..af739392a3 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx @@ -50,7 +50,7 @@ const NumberFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/NumberFieldDisplay', + title: 'UI/Field/display/NumberFieldDisplay', component: NumberFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx index f1fd4966f9..727baa6479 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx @@ -49,7 +49,7 @@ const PhoneFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/PhoneFieldDisplay', + title: 'UI/Field/display/PhoneFieldDisplay', component: PhoneFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx index 2c1f1764c1..d724a65123 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx @@ -49,7 +49,7 @@ const TextFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/TextFieldDisplay', + title: 'UI/Field/display/TextFieldDisplay', component: TextFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx similarity index 97% rename from front/src/modules/ui/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx index e3f1f122a5..fbabc8067c 100644 --- a/front/src/modules/ui/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx @@ -49,7 +49,7 @@ const URLFieldDisplayWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Display/URLFieldDisplay', + title: 'UI/Field/display/URLFieldDisplay', component: URLFieldDisplayWithContext, }; diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/ChipDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/ChipDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/ChipDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/ChipDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/DateDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/DateDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/DateDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/DateDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/EllipsisDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/EllipsisDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/EllipsisDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/EllipsisDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/EmailDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/EmailDisplay.tsx similarity index 90% rename from front/src/modules/ui/field/meta-types/display/content-display/components/EmailDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/EmailDisplay.tsx index a191478ab3..f393d1a6e1 100644 --- a/front/src/modules/ui/field/meta-types/display/content-display/components/EmailDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/content-display/components/EmailDisplay.tsx @@ -1,6 +1,6 @@ import { MouseEvent } from 'react'; -import { ContactLink } from '@/ui/link/components/ContactLink'; +import { ContactLink } from '@/ui/navigation/link/components/ContactLink'; import { EllipsisDisplay } from './EllipsisDisplay'; diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/MoneyDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/MoneyDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/NumberDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/NumberDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/NumberDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/NumberDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/PhoneDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/PhoneDisplay.tsx similarity index 90% rename from front/src/modules/ui/field/meta-types/display/content-display/components/PhoneDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/PhoneDisplay.tsx index 933b173a6a..7ad5b97ecb 100644 --- a/front/src/modules/ui/field/meta-types/display/content-display/components/PhoneDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/content-display/components/PhoneDisplay.tsx @@ -1,7 +1,7 @@ import { MouseEvent } from 'react'; import { isValidPhoneNumber, parsePhoneNumber } from 'libphonenumber-js'; -import { ContactLink } from '@/ui/link/components/ContactLink'; +import { ContactLink } from '@/ui/navigation/link/components/ContactLink'; import { EllipsisDisplay } from './EllipsisDisplay'; diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/TextDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/TextDisplay.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/TextDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/TextDisplay.tsx diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/URLDisplay.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplay.tsx similarity index 90% rename from front/src/modules/ui/field/meta-types/display/content-display/components/URLDisplay.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplay.tsx index 7739c6f93a..b76662c716 100644 --- a/front/src/modules/ui/field/meta-types/display/content-display/components/URLDisplay.tsx +++ b/front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplay.tsx @@ -1,8 +1,11 @@ import { MouseEvent } from 'react'; import styled from '@emotion/styled'; -import { RoundedLink } from '@/ui/link/components/RoundedLink'; -import { LinkType, SocialLink } from '@/ui/link/components/SocialLink'; +import { RoundedLink } from '@/ui/navigation/link/components/RoundedLink'; +import { + LinkType, + SocialLink, +} from '@/ui/navigation/link/components/SocialLink'; import { EllipsisDisplay } from './EllipsisDisplay'; diff --git a/front/src/modules/ui/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx b/front/src/modules/ui/data/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx rename to front/src/modules/ui/data/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx diff --git a/front/src/modules/ui/field/meta-types/hooks/useBooleanField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useBooleanField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useBooleanField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useBooleanField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useChipField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useChipField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useChipField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useChipField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useDateField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useDateField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useDateField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useDateField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useDoubleTextChipField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextChipField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useDoubleTextChipField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextChipField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useDoubleTextField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useDoubleTextField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useEmailField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useEmailField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useEmailField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useEmailField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useMoneyField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useMoneyField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useMoneyField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useMoneyField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useNumberField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useNumberField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useNumberField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useNumberField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/usePhoneField.ts b/front/src/modules/ui/data/field/meta-types/hooks/usePhoneField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/usePhoneField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/usePhoneField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useProbabilityField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useProbabilityField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useProbabilityField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useProbabilityField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useRelationField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useRelationField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useRelationField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useRelationField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useTextField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useTextField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useTextField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useTextField.ts diff --git a/front/src/modules/ui/field/meta-types/hooks/useURLField.ts b/front/src/modules/ui/data/field/meta-types/hooks/useURLField.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/hooks/useURLField.ts rename to front/src/modules/ui/data/field/meta-types/hooks/useURLField.ts diff --git a/front/src/modules/ui/field/meta-types/input/components/BooleanFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx similarity index 87% rename from front/src/modules/ui/field/meta-types/input/components/BooleanFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx index d6f65de38c..003a2f2ca3 100644 --- a/front/src/modules/ui/field/meta-types/input/components/BooleanFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx @@ -1,4 +1,4 @@ -import { BooleanInput } from '@/ui/field/meta-types/input/components/internal/BooleanInput'; +import { BooleanInput } from '@/ui/data/field/meta-types/input/components/internal/BooleanInput'; import { usePersistField } from '../../../hooks/usePersistField'; import { useBooleanField } from '../../hooks/useBooleanField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/ChipFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/ChipFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx index 8e9694cdfe..232a96290f 100644 --- a/front/src/modules/ui/field/meta-types/input/components/ChipFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { usePersistField } from '../../../hooks/usePersistField'; import { useChipField } from '../../hooks/useChipField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/DateFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/DateFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx index f10d557f7b..70890f8bd1 100644 --- a/front/src/modules/ui/field/meta-types/input/components/DateFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx @@ -1,4 +1,4 @@ -import { DateInput } from '@/ui/field/meta-types/input/components/internal/DateInput'; +import { DateInput } from '@/ui/data/field/meta-types/input/components/internal/DateInput'; import { Nullable } from '~/types/Nullable'; import { usePersistField } from '../../../hooks/usePersistField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/DoubleTextChipFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx similarity index 91% rename from front/src/modules/ui/field/meta-types/input/components/DoubleTextChipFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx index 06f874dc75..fa5551645c 100644 --- a/front/src/modules/ui/field/meta-types/input/components/DoubleTextChipFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx @@ -1,5 +1,5 @@ -import { DoubleTextInput } from '@/ui/field/meta-types/input/components/internal/DoubleTextInput'; -import { FieldDoubleText } from '@/ui/field/types/FieldDoubleText'; +import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput'; +import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText'; import { usePersistField } from '../../../hooks/usePersistField'; import { useDoubleTextChipField } from '../../hooks/useDoubleTextChipField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/DoubleTextFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx similarity index 90% rename from front/src/modules/ui/field/meta-types/input/components/DoubleTextFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx index aa7d0d50db..08b29c634d 100644 --- a/front/src/modules/ui/field/meta-types/input/components/DoubleTextFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx @@ -1,5 +1,5 @@ -import { DoubleTextInput } from '@/ui/field/meta-types/input/components/internal/DoubleTextInput'; -import { FieldDoubleText } from '@/ui/field/types/FieldDoubleText'; +import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput'; +import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText'; import { usePersistField } from '../../../hooks/usePersistField'; import { useDoubleTextField } from '../../hooks/useDoubleTextField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/EmailFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/EmailFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx index a43425a1f5..4c1042db03 100644 --- a/front/src/modules/ui/field/meta-types/input/components/EmailFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { usePersistField } from '../../../hooks/usePersistField'; import { useEmailField } from '../../hooks/useEmailField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/MoneyFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/MoneyFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx index 53a60474cd..18265dd6f0 100644 --- a/front/src/modules/ui/field/meta-types/input/components/MoneyFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { useMoneyField } from '../../hooks/useMoneyField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/NumberFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/NumberFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx index 427fb0c884..81e5660215 100644 --- a/front/src/modules/ui/field/meta-types/input/components/NumberFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { useNumberField } from '../../hooks/useNumberField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/PhoneFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx similarity index 93% rename from front/src/modules/ui/field/meta-types/input/components/PhoneFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx index 3776526169..2b4b9cd8ce 100644 --- a/front/src/modules/ui/field/meta-types/input/components/PhoneFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx @@ -1,4 +1,4 @@ -import { PhoneInput } from '@/ui/field/meta-types/input/components/internal/PhoneInput'; +import { PhoneInput } from '@/ui/data/field/meta-types/input/components/internal/PhoneInput'; import { usePhoneField } from '../../hooks/usePhoneField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/ProbabilityFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx similarity index 86% rename from front/src/modules/ui/field/meta-types/input/components/ProbabilityFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx index f8f2007851..0a82fc7dbf 100644 --- a/front/src/modules/ui/field/meta-types/input/components/ProbabilityFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx @@ -1,4 +1,4 @@ -import { ProbabilityInput } from '@/ui/field/meta-types/input/components/internal/ProbabilityInput'; +import { ProbabilityInput } from '@/ui/data/field/meta-types/input/components/internal/ProbabilityInput'; import { usePersistField } from '../../../hooks/usePersistField'; import { useProbabilityField } from '../../hooks/useProbabilityField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/RelationFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/RelationFieldInput.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/input/components/RelationFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/RelationFieldInput.tsx diff --git a/front/src/modules/ui/field/meta-types/input/components/TextFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx similarity index 94% rename from front/src/modules/ui/field/meta-types/input/components/TextFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx index 55d7b37166..922746dc8c 100644 --- a/front/src/modules/ui/field/meta-types/input/components/TextFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { usePersistField } from '../../../hooks/usePersistField'; import { useTextField } from '../../hooks/useTextField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/URLFieldInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx similarity index 93% rename from front/src/modules/ui/field/meta-types/input/components/URLFieldInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx index aa7909578f..50f4c5d3a6 100644 --- a/front/src/modules/ui/field/meta-types/input/components/URLFieldInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { useURLField } from '../../hooks/useURLField'; diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx index 2e0bf8e26e..f3805277c2 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx @@ -50,7 +50,7 @@ const BooleanFieldInputWithContext = ({ }; const meta: Meta = { - title: 'UI/Field/Input/BooleanFieldInput', + title: 'UI/Field/input/BooleanFieldInput', component: BooleanFieldInputWithContext, args: { value: true, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx similarity index 99% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx index 2b78eed287..f815811d89 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx @@ -88,7 +88,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/ChipFieldInput', + title: 'UI/Field/input/ChipFieldInput', component: ChipFieldInputWithContext, args: { value: 'chip', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx index ac7a108803..fc2fdbc354 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx @@ -70,7 +70,7 @@ const enterJestFn = jest.fn(); const clickOutsideJestFn = jest.fn(); const meta: Meta = { - title: 'UI/Field/Input/DateFieldInput', + title: 'UI/Field/input/DateFieldInput', component: DateFieldInputWithContext, args: { value: formattedDate, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx index ea28dddebf..87002ddede 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx @@ -105,7 +105,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/DoubleTextChipFieldInput', + title: 'UI/Field/input/DoubleTextChipFieldInput', component: DoubleTextChipFieldInputWithContext, args: { firstValue: 'first value', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx index 41a03cb4ee..d6c7656286 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx @@ -99,7 +99,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/DoubleTextFieldInput', + title: 'UI/Field/input/DoubleTextFieldInput', component: DoubleTextFieldInputWithContext, args: { firstValue: 'first value', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx index bc427e1cea..7ae40a503d 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/EmailFieldInput', + title: 'UI/Field/input/EmailFieldInput', component: EmailFieldInputWithContext, args: { value: 'username@email.com', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx similarity index 99% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx index df5add5097..cc60f20c0a 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/MoneyFieldInput', + title: 'UI/Field/input/MoneyFieldInput', component: MoneyFieldInputWithContext, args: { value: 1000, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx index 4be6fbe32b..7eea7e799e 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/NumberFieldInput', + title: 'UI/Field/input/NumberFieldInput', component: NumberFieldInputWithContext, args: { value: 1000, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx similarity index 99% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx index bdadd31c6a..87b018e7a4 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/PhoneFieldInput', + title: 'UI/Field/input/PhoneFieldInput', component: PhoneFieldInputWithContext, args: { value: '+1-12-123-456', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx index e4bf4c767c..d8343fc3c9 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx @@ -66,7 +66,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/ProbabilityFieldInput', + title: 'UI/Field/input/ProbabilityFieldInput', component: ProbabilityFieldInputWithContext, args: { value: 25, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx index d1a5c59aec..171116ed63 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx @@ -76,7 +76,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/RelationFieldInput', + title: 'UI/Field/input/RelationFieldInput', component: RelationFieldInputWithContext, args: { useEditButton: true, diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx similarity index 99% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx index 6235a994f7..90b280af62 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/TextFieldInput', + title: 'UI/Field/input/TextFieldInput', component: TextFieldInputWithContext, args: { value: 'text', diff --git a/front/src/modules/ui/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx similarity index 99% rename from front/src/modules/ui/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx index 30bde150d1..3a9fd2e811 100644 --- a/front/src/modules/ui/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx @@ -85,7 +85,7 @@ const clearMocksDecorator: Decorator = (Story, context) => { }; const meta: Meta = { - title: 'UI/Field/Input/URLFieldInput', + title: 'UI/Field/input/URLFieldInput', component: URLFieldInputWithContext, args: { value: 'https://username.domain', diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/BooleanInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/BooleanInput.tsx similarity index 95% rename from front/src/modules/ui/field/meta-types/input/components/internal/BooleanInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/BooleanInput.tsx index 1498aab565..9cec67c9f7 100644 --- a/front/src/modules/ui/field/meta-types/input/components/internal/BooleanInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/internal/BooleanInput.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconCheck, IconX } from '@/ui/icon'; +import { IconCheck, IconX } from '@/ui/display/icon'; const StyledEditableBooleanFieldContainer = styled.div` align-items: center; diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/DateInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx similarity index 96% rename from front/src/modules/ui/field/meta-types/input/components/internal/DateInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx index bd2b731e01..cc46ef7680 100644 --- a/front/src/modules/ui/field/meta-types/input/components/internal/DateInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx @@ -3,7 +3,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { flip, offset, useFloating } from '@floating-ui/react'; -import { DateDisplay } from '@/ui/field/meta-types/display/content-display/components/DateDisplay'; +import { DateDisplay } from '@/ui/data/field/meta-types/display/content-display/components/DateDisplay'; import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker'; import { Nullable } from '~/types/Nullable'; diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/DoubleTextInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/DoubleTextInput.tsx similarity index 98% rename from front/src/modules/ui/field/meta-types/input/components/internal/DoubleTextInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/DoubleTextInput.tsx index 12f9be6aa1..9a613c9964 100644 --- a/front/src/modules/ui/field/meta-types/input/components/internal/DoubleTextInput.tsx +++ b/front/src/modules/ui/data/field/meta-types/input/components/internal/DoubleTextInput.tsx @@ -2,7 +2,7 @@ import { ChangeEvent, useEffect, useRef, useState } from 'react'; import styled from '@emotion/styled'; import { Key } from 'ts-key-enum'; -import { FieldDoubleText } from '@/ui/field/types/FieldDoubleText'; +import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { isDefined } from '~/utils/isDefined'; diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/PhoneInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/PhoneInput.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/input/components/internal/PhoneInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/PhoneInput.tsx diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/ProbabilityInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/ProbabilityInput.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/input/components/internal/ProbabilityInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/ProbabilityInput.tsx diff --git a/front/src/modules/ui/field/meta-types/input/components/internal/TextInput.tsx b/front/src/modules/ui/data/field/meta-types/input/components/internal/TextInput.tsx similarity index 100% rename from front/src/modules/ui/field/meta-types/input/components/internal/TextInput.tsx rename to front/src/modules/ui/data/field/meta-types/input/components/internal/TextInput.tsx diff --git a/front/src/modules/ui/field/meta-types/input/hooks/useRegisterInputEvents.ts b/front/src/modules/ui/data/field/meta-types/input/hooks/useRegisterInputEvents.ts similarity index 100% rename from front/src/modules/ui/field/meta-types/input/hooks/useRegisterInputEvents.ts rename to front/src/modules/ui/data/field/meta-types/input/hooks/useRegisterInputEvents.ts diff --git a/front/src/modules/ui/field/states/entityFieldsFamilyState.ts b/front/src/modules/ui/data/field/states/entityFieldsFamilyState.ts similarity index 100% rename from front/src/modules/ui/field/states/entityFieldsFamilyState.ts rename to front/src/modules/ui/data/field/states/entityFieldsFamilyState.ts diff --git a/front/src/modules/ui/field/states/isFieldEmptyScopedState.ts b/front/src/modules/ui/data/field/states/isFieldEmptyScopedState.ts similarity index 100% rename from front/src/modules/ui/field/states/isFieldEmptyScopedState.ts rename to front/src/modules/ui/data/field/states/isFieldEmptyScopedState.ts diff --git a/front/src/modules/ui/field/states/selectors/entityFieldsFamilySelector.ts b/front/src/modules/ui/data/field/states/selectors/entityFieldsFamilySelector.ts similarity index 100% rename from front/src/modules/ui/field/states/selectors/entityFieldsFamilySelector.ts rename to front/src/modules/ui/data/field/states/selectors/entityFieldsFamilySelector.ts diff --git a/front/src/modules/ui/field/states/selectors/isEntityFieldEmptyFamilySelector.ts b/front/src/modules/ui/data/field/states/selectors/isEntityFieldEmptyFamilySelector.ts similarity index 100% rename from front/src/modules/ui/field/states/selectors/isEntityFieldEmptyFamilySelector.ts rename to front/src/modules/ui/data/field/states/selectors/isEntityFieldEmptyFamilySelector.ts diff --git a/front/src/modules/ui/field/types/FieldDefinition.ts b/front/src/modules/ui/data/field/types/FieldDefinition.ts similarity index 87% rename from front/src/modules/ui/field/types/FieldDefinition.ts rename to front/src/modules/ui/data/field/types/FieldDefinition.ts index 0003bc221f..1963865835 100644 --- a/front/src/modules/ui/field/types/FieldDefinition.ts +++ b/front/src/modules/ui/data/field/types/FieldDefinition.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { AvatarType } from '@/users/components/Avatar'; import { FieldMetadata } from './FieldMetadata'; diff --git a/front/src/modules/ui/field/types/FieldDefinitionWithTypeOnly.ts b/front/src/modules/ui/data/field/types/FieldDefinitionWithTypeOnly.ts similarity index 100% rename from front/src/modules/ui/field/types/FieldDefinitionWithTypeOnly.ts rename to front/src/modules/ui/data/field/types/FieldDefinitionWithTypeOnly.ts diff --git a/front/src/modules/ui/field/types/FieldDoubleText.ts b/front/src/modules/ui/data/field/types/FieldDoubleText.ts similarity index 100% rename from front/src/modules/ui/field/types/FieldDoubleText.ts rename to front/src/modules/ui/data/field/types/FieldDoubleText.ts diff --git a/front/src/modules/ui/field/types/FieldInputEvent.ts b/front/src/modules/ui/data/field/types/FieldInputEvent.ts similarity index 100% rename from front/src/modules/ui/field/types/FieldInputEvent.ts rename to front/src/modules/ui/data/field/types/FieldInputEvent.ts diff --git a/front/src/modules/ui/field/types/FieldMetadata.ts b/front/src/modules/ui/data/field/types/FieldMetadata.ts similarity index 100% rename from front/src/modules/ui/field/types/FieldMetadata.ts rename to front/src/modules/ui/data/field/types/FieldMetadata.ts diff --git a/front/src/modules/ui/field/types/FieldType.ts b/front/src/modules/ui/data/field/types/FieldType.ts similarity index 100% rename from front/src/modules/ui/field/types/FieldType.ts rename to front/src/modules/ui/data/field/types/FieldType.ts diff --git a/front/src/modules/ui/field/types/guards/assertFieldMetadata.ts b/front/src/modules/ui/data/field/types/guards/assertFieldMetadata.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/assertFieldMetadata.ts rename to front/src/modules/ui/data/field/types/guards/assertFieldMetadata.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldBoolean.ts b/front/src/modules/ui/data/field/types/guards/isFieldBoolean.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldBoolean.ts rename to front/src/modules/ui/data/field/types/guards/isFieldBoolean.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldBooleanValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldBooleanValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldBooleanValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldBooleanValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldChip.ts b/front/src/modules/ui/data/field/types/guards/isFieldChip.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldChip.ts rename to front/src/modules/ui/data/field/types/guards/isFieldChip.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldChipValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldChipValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldChipValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldChipValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDate.ts b/front/src/modules/ui/data/field/types/guards/isFieldDate.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDate.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDate.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDateValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldDateValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDateValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDateValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDoubleText.ts b/front/src/modules/ui/data/field/types/guards/isFieldDoubleText.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDoubleText.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDoubleText.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDoubleTextChip.ts b/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChip.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDoubleTextChip.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChip.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDoubleTextChipValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChipValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDoubleTextChipValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChipValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldDoubleTextValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldDoubleTextValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldDoubleTextValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldEmail.ts b/front/src/modules/ui/data/field/types/guards/isFieldEmail.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldEmail.ts rename to front/src/modules/ui/data/field/types/guards/isFieldEmail.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldEmailValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldEmailValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldEmailValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldEmailValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldMoney.ts b/front/src/modules/ui/data/field/types/guards/isFieldMoney.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldMoney.ts rename to front/src/modules/ui/data/field/types/guards/isFieldMoney.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldMoneyValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldMoneyValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldMoneyValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldMoneyValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldNumber.ts b/front/src/modules/ui/data/field/types/guards/isFieldNumber.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldNumber.ts rename to front/src/modules/ui/data/field/types/guards/isFieldNumber.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldNumberValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldNumberValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldNumberValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldNumberValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldPhone.ts b/front/src/modules/ui/data/field/types/guards/isFieldPhone.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldPhone.ts rename to front/src/modules/ui/data/field/types/guards/isFieldPhone.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldPhoneValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldPhoneValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldPhoneValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldPhoneValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldProbability.ts b/front/src/modules/ui/data/field/types/guards/isFieldProbability.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldProbability.ts rename to front/src/modules/ui/data/field/types/guards/isFieldProbability.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldProbabilityValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldProbabilityValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldProbabilityValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldProbabilityValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldRelation.ts b/front/src/modules/ui/data/field/types/guards/isFieldRelation.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldRelation.ts rename to front/src/modules/ui/data/field/types/guards/isFieldRelation.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldRelationValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldRelationValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldRelationValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldRelationValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldText.ts b/front/src/modules/ui/data/field/types/guards/isFieldText.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldText.ts rename to front/src/modules/ui/data/field/types/guards/isFieldText.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldTextValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldTextValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldTextValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldTextValue.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldURL.ts b/front/src/modules/ui/data/field/types/guards/isFieldURL.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldURL.ts rename to front/src/modules/ui/data/field/types/guards/isFieldURL.ts diff --git a/front/src/modules/ui/field/types/guards/isFieldURLValue.ts b/front/src/modules/ui/data/field/types/guards/isFieldURLValue.ts similarity index 100% rename from front/src/modules/ui/field/types/guards/isFieldURLValue.ts rename to front/src/modules/ui/data/field/types/guards/isFieldURLValue.ts diff --git a/front/src/modules/ui/field/types/resolvers/DoubleTextTypeResolver.ts b/front/src/modules/ui/data/field/types/resolvers/DoubleTextTypeResolver.ts similarity index 100% rename from front/src/modules/ui/field/types/resolvers/DoubleTextTypeResolver.ts rename to front/src/modules/ui/data/field/types/resolvers/DoubleTextTypeResolver.ts diff --git a/front/src/modules/ui/inline-cell/components/InlineCell.tsx b/front/src/modules/ui/data/inline-cell/components/InlineCell.tsx similarity index 79% rename from front/src/modules/ui/inline-cell/components/InlineCell.tsx rename to front/src/modules/ui/data/inline-cell/components/InlineCell.tsx index fbccca4b5b..89343616d9 100644 --- a/front/src/modules/ui/inline-cell/components/InlineCell.tsx +++ b/front/src/modules/ui/data/inline-cell/components/InlineCell.tsx @@ -1,12 +1,12 @@ import { useContext } from 'react'; -import { FieldDisplay } from '@/ui/field/components/FieldDisplay'; -import { FieldInput } from '@/ui/field/components/FieldInput'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { useIsFieldEmpty } from '@/ui/field/hooks/useIsFieldEmpty'; -import { useIsFieldInputOnly } from '@/ui/field/hooks/useIsFieldInputOnly'; -import { FieldInputEvent } from '@/ui/field/types/FieldInputEvent'; -import { isFieldRelation } from '@/ui/field/types/guards/isFieldRelation'; +import { FieldDisplay } from '@/ui/data/field/components/FieldDisplay'; +import { FieldInput } from '@/ui/data/field/components/FieldInput'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { useIsFieldEmpty } from '@/ui/data/field/hooks/useIsFieldEmpty'; +import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly'; +import { FieldInputEvent } from '@/ui/data/field/types/FieldInputEvent'; +import { isFieldRelation } from '@/ui/data/field/types/guards/isFieldRelation'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { useInlineCell } from '../hooks/useInlineCell'; diff --git a/front/src/modules/ui/inline-cell/components/InlineCellContainer.tsx b/front/src/modules/ui/data/inline-cell/components/InlineCellContainer.tsx similarity index 98% rename from front/src/modules/ui/inline-cell/components/InlineCellContainer.tsx rename to front/src/modules/ui/data/inline-cell/components/InlineCellContainer.tsx index af0970dc50..bec3102b6f 100644 --- a/front/src/modules/ui/inline-cell/components/InlineCellContainer.tsx +++ b/front/src/modules/ui/data/inline-cell/components/InlineCellContainer.tsx @@ -3,7 +3,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useInlineCell } from '../hooks/useInlineCell'; diff --git a/front/src/modules/ui/inline-cell/components/InlineCellDisplayMode.tsx b/front/src/modules/ui/data/inline-cell/components/InlineCellDisplayMode.tsx similarity index 100% rename from front/src/modules/ui/inline-cell/components/InlineCellDisplayMode.tsx rename to front/src/modules/ui/data/inline-cell/components/InlineCellDisplayMode.tsx diff --git a/front/src/modules/ui/inline-cell/components/InlineCellEditButton.tsx b/front/src/modules/ui/data/inline-cell/components/InlineCellEditButton.tsx similarity index 71% rename from front/src/modules/ui/inline-cell/components/InlineCellEditButton.tsx rename to front/src/modules/ui/data/inline-cell/components/InlineCellEditButton.tsx index 66c00f3ac2..63d7eb4708 100644 --- a/front/src/modules/ui/inline-cell/components/InlineCellEditButton.tsx +++ b/front/src/modules/ui/data/inline-cell/components/InlineCellEditButton.tsx @@ -1,5 +1,5 @@ -import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton'; import { useInlineCell } from '../hooks/useInlineCell'; diff --git a/front/src/modules/ui/inline-cell/components/InlineCellEditMode.tsx b/front/src/modules/ui/data/inline-cell/components/InlineCellEditMode.tsx similarity index 100% rename from front/src/modules/ui/inline-cell/components/InlineCellEditMode.tsx rename to front/src/modules/ui/data/inline-cell/components/InlineCellEditMode.tsx diff --git a/front/src/modules/ui/inline-cell/contexts/InlineCellMutationContext.ts b/front/src/modules/ui/data/inline-cell/contexts/InlineCellMutationContext.ts similarity index 100% rename from front/src/modules/ui/inline-cell/contexts/InlineCellMutationContext.ts rename to front/src/modules/ui/data/inline-cell/contexts/InlineCellMutationContext.ts diff --git a/front/src/modules/ui/inline-cell/hooks/useInlineCell.ts b/front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts similarity index 95% rename from front/src/modules/ui/inline-cell/hooks/useInlineCell.ts rename to front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts index 336d36db5d..bf4834d564 100644 --- a/front/src/modules/ui/inline-cell/hooks/useInlineCell.ts +++ b/front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { useRecoilState } from 'recoil'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; diff --git a/front/src/modules/ui/inline-cell/property-box/components/PropertyBox.tsx b/front/src/modules/ui/data/inline-cell/property-box/components/PropertyBox.tsx similarity index 100% rename from front/src/modules/ui/inline-cell/property-box/components/PropertyBox.tsx rename to front/src/modules/ui/data/inline-cell/property-box/components/PropertyBox.tsx diff --git a/front/src/modules/ui/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/data/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts similarity index 100% rename from front/src/modules/ui/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts rename to front/src/modules/ui/data/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts diff --git a/front/src/modules/ui/inline-cell/states/isInlineCellInEditModeScopedState.ts b/front/src/modules/ui/data/inline-cell/states/isInlineCellInEditModeScopedState.ts similarity index 100% rename from front/src/modules/ui/inline-cell/states/isInlineCellInEditModeScopedState.ts rename to front/src/modules/ui/data/inline-cell/states/isInlineCellInEditModeScopedState.ts diff --git a/front/src/modules/ui/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/data/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts similarity index 100% rename from front/src/modules/ui/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts rename to front/src/modules/ui/data/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts diff --git a/front/src/modules/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts b/front/src/modules/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts similarity index 100% rename from front/src/modules/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts rename to front/src/modules/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts diff --git a/front/src/modules/ui/inline-cell/types/InlineCellHotkeyScope.ts b/front/src/modules/ui/data/inline-cell/types/InlineCellHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/inline-cell/types/InlineCellHotkeyScope.ts rename to front/src/modules/ui/data/inline-cell/types/InlineCellHotkeyScope.ts diff --git a/front/src/modules/ui/view-bar/components/AddFilterFromDetailsButton.tsx b/front/src/modules/ui/data/view-bar/components/AddFilterFromDetailsButton.tsx similarity index 68% rename from front/src/modules/ui/view-bar/components/AddFilterFromDetailsButton.tsx rename to front/src/modules/ui/data/view-bar/components/AddFilterFromDetailsButton.tsx index 7249b29ccf..a1f3f01ce2 100644 --- a/front/src/modules/ui/view-bar/components/AddFilterFromDetailsButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/AddFilterFromDetailsButton.tsx @@ -1,6 +1,6 @@ -import { LightButton } from '@/ui/button/components/LightButton'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { IconPlus } from '@/ui/icon'; +import { IconPlus } from '@/ui/display/icon'; +import { LightButton } from '@/ui/input/button/components/LightButton'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { FilterDropdownId } from '../constants/FilterDropdownId'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownButton.tsx similarity index 100% rename from front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownButton.tsx diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownDateSearchInput.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownDateSearchInput.tsx similarity index 85% rename from front/src/modules/ui/view-bar/components/FilterDropdownDateSearchInput.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownDateSearchInput.tsx index 068ca11523..0541e0223c 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownDateSearchInput.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownDateSearchInput.tsx @@ -1,8 +1,8 @@ +import { useUpsertFilter } from '@/ui/data/view-bar/hooks/useUpsertFilter'; +import { filterDefinitionUsedInDropdownScopedState } from '@/ui/data/view-bar/states/filterDefinitionUsedInDropdownScopedState'; +import { selectedOperandInDropdownScopedState } from '@/ui/data/view-bar/states/selectedOperandInDropdownScopedState'; import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { useUpsertFilter } from '@/ui/view-bar/hooks/useUpsertFilter'; -import { filterDefinitionUsedInDropdownScopedState } from '@/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState'; -import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { useViewBarContext } from '../hooks/useViewBarContext'; import { isFilterDropdownUnfoldedScopedState } from '../states/isFilterDropdownUnfoldedScopedState'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchInput.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchInput.tsx similarity index 75% rename from front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchInput.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchInput.tsx index 8a57c29c57..d6b118b38f 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchInput.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchInput.tsx @@ -1,10 +1,10 @@ import { ChangeEvent } from 'react'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; +import { filterDefinitionUsedInDropdownScopedState } from '@/ui/data/view-bar/states/filterDefinitionUsedInDropdownScopedState'; +import { filterDropdownSearchInputScopedState } from '@/ui/data/view-bar/states/filterDropdownSearchInputScopedState'; +import { selectedOperandInDropdownScopedState } from '@/ui/data/view-bar/states/selectedOperandInDropdownScopedState'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { filterDefinitionUsedInDropdownScopedState } from '@/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState'; -import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; -import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { useViewBarContext } from '../hooks/useViewBarContext'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchSelect.tsx similarity index 90% rename from front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchSelect.tsx index 9a5d43a2db..e044464d2d 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySearchSelect.tsx @@ -1,15 +1,15 @@ import { useEffect, useState } from 'react'; +import { useFilterCurrentlyEdited } from '@/ui/data/view-bar/hooks/useFilterCurrentlyEdited'; +import { useRemoveFilter } from '@/ui/data/view-bar/hooks/useRemoveFilter'; +import { useUpsertFilter } from '@/ui/data/view-bar/hooks/useUpsertFilter'; +import { filterDefinitionUsedInDropdownScopedState } from '@/ui/data/view-bar/states/filterDefinitionUsedInDropdownScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState'; +import { selectedOperandInDropdownScopedState } from '@/ui/data/view-bar/states/selectedOperandInDropdownScopedState'; import { EntitiesForMultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect'; import { SingleEntitySelectBase } from '@/ui/input/relation-picker/components/SingleEntitySelectBase'; import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { useFilterCurrentlyEdited } from '@/ui/view-bar/hooks/useFilterCurrentlyEdited'; -import { useRemoveFilter } from '@/ui/view-bar/hooks/useRemoveFilter'; -import { useUpsertFilter } from '@/ui/view-bar/hooks/useUpsertFilter'; -import { filterDefinitionUsedInDropdownScopedState } from '@/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; -import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { ViewFilterOperand } from '~/generated/graphql'; import { useViewBarContext } from '../hooks/useViewBarContext'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySelect.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySelect.tsx similarity index 89% rename from front/src/modules/ui/view-bar/components/FilterDropdownEntitySelect.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySelect.tsx index c7db5e0867..59df710714 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySelect.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownEntitySelect.tsx @@ -1,4 +1,4 @@ -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownFilterSelect.tsx similarity index 93% rename from front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownFilterSelect.tsx index 4463fbc8e0..105dd38ced 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownFilterSelect.tsx @@ -1,6 +1,6 @@ -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownNumberSearchInput.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownNumberSearchInput.tsx similarity index 94% rename from front/src/modules/ui/view-bar/components/FilterDropdownNumberSearchInput.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownNumberSearchInput.tsx index 986313a05c..11cb6593f0 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownNumberSearchInput.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownNumberSearchInput.tsx @@ -1,6 +1,6 @@ import { ChangeEvent } from 'react'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRemoveFilter } from '../hooks/useRemoveFilter'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownOperandButton.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownOperandButton.tsx similarity index 89% rename from front/src/modules/ui/view-bar/components/FilterDropdownOperandButton.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownOperandButton.tsx index 670b281fb5..33eb3fd770 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownOperandButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownOperandButton.tsx @@ -1,5 +1,5 @@ -import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; -import { IconChevronDown } from '@/ui/icon'; +import { IconChevronDown } from '@/ui/display/icon'; +import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useViewBarContext } from '../hooks/useViewBarContext'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownOperandSelect.tsx similarity index 93% rename from front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownOperandSelect.tsx index be2cf0cc5e..abd243504c 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownOperandSelect.tsx @@ -1,5 +1,5 @@ -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { ViewFilterOperand } from '~/generated/graphql'; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownTextSearchInput.tsx b/front/src/modules/ui/data/view-bar/components/FilterDropdownTextSearchInput.tsx similarity index 95% rename from front/src/modules/ui/view-bar/components/FilterDropdownTextSearchInput.tsx rename to front/src/modules/ui/data/view-bar/components/FilterDropdownTextSearchInput.tsx index 27eba9ba58..fb1e0b0ef5 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownTextSearchInput.tsx +++ b/front/src/modules/ui/data/view-bar/components/FilterDropdownTextSearchInput.tsx @@ -1,6 +1,6 @@ import { ChangeEvent } from 'react'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useFilterCurrentlyEdited } from '../hooks/useFilterCurrentlyEdited'; diff --git a/front/src/modules/ui/view-bar/components/GenericEntityFilterChip.tsx b/front/src/modules/ui/data/view-bar/components/GenericEntityFilterChip.tsx similarity index 73% rename from front/src/modules/ui/view-bar/components/GenericEntityFilterChip.tsx rename to front/src/modules/ui/data/view-bar/components/GenericEntityFilterChip.tsx index baad6511f1..41df2e51ad 100644 --- a/front/src/modules/ui/view-bar/components/GenericEntityFilterChip.tsx +++ b/front/src/modules/ui/data/view-bar/components/GenericEntityFilterChip.tsx @@ -1,5 +1,5 @@ -import { EntityChip } from '@/ui/chip/components/EntityChip'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { EntityChip } from '@/ui/display/chip/components/EntityChip'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { Filter } from '../types/Filter'; diff --git a/front/src/modules/ui/view-bar/components/MultipleFiltersButton.tsx b/front/src/modules/ui/data/view-bar/components/MultipleFiltersButton.tsx similarity index 91% rename from front/src/modules/ui/view-bar/components/MultipleFiltersButton.tsx rename to front/src/modules/ui/data/view-bar/components/MultipleFiltersButton.tsx index 1ea61b300d..ad5cce81c4 100644 --- a/front/src/modules/ui/view-bar/components/MultipleFiltersButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/MultipleFiltersButton.tsx @@ -1,5 +1,5 @@ -import { StyledHeaderDropdownButton } from '@/ui/dropdown/components/StyledHeaderDropdownButton'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { FilterDropdownId } from '../constants/FilterDropdownId'; diff --git a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/MultipleFiltersDropdownButton.tsx similarity index 100% rename from front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/MultipleFiltersDropdownButton.tsx diff --git a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx b/front/src/modules/ui/data/view-bar/components/MultipleFiltersDropdownContent.tsx similarity index 93% rename from front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx rename to front/src/modules/ui/data/view-bar/components/MultipleFiltersDropdownContent.tsx index 7b4d5d9193..4b9275ede8 100644 --- a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx +++ b/front/src/modules/ui/data/view-bar/components/MultipleFiltersDropdownContent.tsx @@ -1,5 +1,5 @@ -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useViewBarContext } from '../hooks/useViewBarContext'; diff --git a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/SingleEntityFilterDropdownButton.tsx similarity index 82% rename from front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/SingleEntityFilterDropdownButton.tsx index fdcd1afe93..346640b589 100644 --- a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/SingleEntityFilterDropdownButton.tsx @@ -1,20 +1,20 @@ import React from 'react'; import { useTheme } from '@emotion/react'; -import { DropdownMenu } from '@/ui/dropdown/components/DropdownMenu'; -import { DropdownMenuContainer } from '@/ui/dropdown/components/DropdownMenuContainer'; -import { StyledHeaderDropdownButton } from '@/ui/dropdown/components/StyledHeaderDropdownButton'; -import { DropdownScope } from '@/ui/dropdown/scopes/DropdownScope'; -import { IconChevronDown } from '@/ui/icon/index'; +import { IconChevronDown } from '@/ui/display/icon/index'; +import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { DropdownMenuContainer } from '@/ui/layout/dropdown/components/DropdownMenuContainer'; +import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; +import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { filterDefinitionUsedInDropdownScopedState } from '@/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState'; -import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { ViewFilterOperand } from '~/generated/graphql'; import { useViewBarContext } from '../hooks/useViewBarContext'; import { availableFiltersScopedState } from '../states/availableFiltersScopedState'; +import { filterDefinitionUsedInDropdownScopedState } from '../states/filterDefinitionUsedInDropdownScopedState'; import { filtersScopedState } from '../states/filtersScopedState'; +import { selectedOperandInDropdownScopedState } from '../states/selectedOperandInDropdownScopedState'; import { getOperandsForFilterType } from '../utils/getOperandsForFilterType'; import { FilterDropdownEntitySearchInput } from './FilterDropdownEntitySearchInput'; diff --git a/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/SortDropdownButton.tsx similarity index 86% rename from front/src/modules/ui/view-bar/components/SortDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/SortDropdownButton.tsx index d50301808e..4073145197 100644 --- a/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/SortDropdownButton.tsx @@ -1,14 +1,14 @@ import { useCallback, useState } from 'react'; import { produce } from 'immer'; -import { LightButton } from '@/ui/button/components/LightButton'; -import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { IconChevronDown } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { IconChevronDown } from '@/ui/display/icon'; +import { LightButton } from '@/ui/input/button/components/LightButton'; +import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; diff --git a/front/src/modules/ui/view-bar/components/SortOrFilterChip.tsx b/front/src/modules/ui/data/view-bar/components/SortOrFilterChip.tsx similarity index 94% rename from front/src/modules/ui/view-bar/components/SortOrFilterChip.tsx rename to front/src/modules/ui/data/view-bar/components/SortOrFilterChip.tsx index 63e8774be0..070d0c4cae 100644 --- a/front/src/modules/ui/view-bar/components/SortOrFilterChip.tsx +++ b/front/src/modules/ui/data/view-bar/components/SortOrFilterChip.tsx @@ -1,8 +1,8 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconX } from '@/ui/icon/index'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconX } from '@/ui/display/icon/index'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; type SortOrFilterChipProps = { labelKey?: string; diff --git a/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx b/front/src/modules/ui/data/view-bar/components/UpdateViewButtonGroup.tsx similarity index 74% rename from front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx rename to front/src/modules/ui/data/view-bar/components/UpdateViewButtonGroup.tsx index 7bb27a506b..ba7880533d 100644 --- a/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx +++ b/front/src/modules/ui/data/view-bar/components/UpdateViewButtonGroup.tsx @@ -3,23 +3,23 @@ import styled from '@emotion/styled'; import { useRecoilValue, useSetRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; -import { Button } from '@/ui/button/components/Button'; -import { ButtonGroup } from '@/ui/button/components/ButtonGroup'; -import { DropdownMenuContainer } from '@/ui/dropdown/components/DropdownMenuContainer'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { IconChevronDown, IconPlus } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { canPersistFiltersScopedFamilySelector } from '@/ui/data/view-bar/states/selectors/canPersistFiltersScopedFamilySelector'; +import { canPersistSortsScopedFamilySelector } from '@/ui/data/view-bar/states/selectors/canPersistSortsScopedFamilySelector'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; +import { IconChevronDown, IconPlus } from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; +import { ButtonGroup } from '@/ui/input/button/components/ButtonGroup'; +import { DropdownMenuContainer } from '@/ui/layout/dropdown/components/DropdownMenuContainer'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { canPersistFiltersScopedFamilySelector } from '@/ui/view-bar/states/selectors/canPersistFiltersScopedFamilySelector'; -import { canPersistSortsScopedFamilySelector } from '@/ui/view-bar/states/selectors/canPersistSortsScopedFamilySelector'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; import { ViewBarContext } from '../contexts/ViewBarContext'; diff --git a/front/src/modules/ui/view-bar/components/ViewBar.tsx b/front/src/modules/ui/data/view-bar/components/ViewBar.tsx similarity index 93% rename from front/src/modules/ui/view-bar/components/ViewBar.tsx rename to front/src/modules/ui/data/view-bar/components/ViewBar.tsx index 4bc5a4094b..12ad5f3fc9 100644 --- a/front/src/modules/ui/view-bar/components/ViewBar.tsx +++ b/front/src/modules/ui/data/view-bar/components/ViewBar.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { TopBar } from '@/ui/top-bar/TopBar'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { TopBar } from '@/ui/layout/top-bar/TopBar'; import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope'; import { ViewsHotkeyScope } from '../types/ViewsHotkeyScope'; diff --git a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx b/front/src/modules/ui/data/view-bar/components/ViewBarDetails.tsx similarity index 99% rename from front/src/modules/ui/view-bar/components/ViewBarDetails.tsx rename to front/src/modules/ui/data/view-bar/components/ViewBarDetails.tsx index 6bbc2d9895..61ea99d038 100644 --- a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx +++ b/front/src/modules/ui/data/view-bar/components/ViewBarDetails.tsx @@ -2,7 +2,7 @@ import { ReactNode, useContext } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; -import { IconArrowDown, IconArrowUp } from '@/ui/icon/index'; +import { IconArrowDown, IconArrowUp } from '@/ui/display/icon/index'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; diff --git a/front/src/modules/ui/view-bar/components/ViewBarDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/ViewBarDropdownButton.tsx similarity index 88% rename from front/src/modules/ui/view-bar/components/ViewBarDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/ViewBarDropdownButton.tsx index 9dcc60e68b..f764782cfd 100644 --- a/front/src/modules/ui/view-bar/components/ViewBarDropdownButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/ViewBarDropdownButton.tsx @@ -1,8 +1,8 @@ import { Keys } from 'react-hotkeys-hook'; import { Placement } from '@floating-ui/react'; -import { DropdownMenu } from '@/ui/dropdown/components/DropdownMenu'; -import { DropdownScope } from '@/ui/dropdown/scopes/DropdownScope'; +import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; type ViewBarDropdownButtonProps = { diff --git a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx b/front/src/modules/ui/data/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx similarity index 85% rename from front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx rename to front/src/modules/ui/data/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx index f3e8e2d7c4..dd72282819 100644 --- a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx +++ b/front/src/modules/ui/data/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx @@ -6,15 +6,15 @@ import { ResponderProvided, } from '@hello-pangea/dnd'; -import { DraggableItem } from '@/ui/draggable-list/components/DraggableItem'; -import { DraggableList } from '@/ui/draggable-list/components/DraggableList'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenuSubheader } from '@/ui/dropdown/components/StyledDropdownMenuSubheader'; -import { IconMinus, IconPlus } from '@/ui/icon'; +import { IconMinus, IconPlus } from '@/ui/display/icon'; +import { AppTooltip } from '@/ui/display/tooltip/AppTooltip'; import { IconInfoCircle } from '@/ui/input/constants/icons'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemDraggable } from '@/ui/menu-item/components/MenuItemDraggable'; -import { AppTooltip } from '@/ui/tooltip/AppTooltip'; +import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem'; +import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenuSubheader } from '@/ui/layout/dropdown/components/StyledDropdownMenuSubheader'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { isDefined } from '~/utils/isDefined'; diff --git a/front/src/modules/ui/view-bar/components/ViewsDropdownButton.tsx b/front/src/modules/ui/data/view-bar/components/ViewsDropdownButton.tsx similarity index 80% rename from front/src/modules/ui/view-bar/components/ViewsDropdownButton.tsx rename to front/src/modules/ui/data/view-bar/components/ViewsDropdownButton.tsx index b1a1d25108..07396bf4b8 100644 --- a/front/src/modules/ui/view-bar/components/ViewsDropdownButton.tsx +++ b/front/src/modules/ui/data/view-bar/components/ViewsDropdownButton.tsx @@ -8,33 +8,33 @@ import { useSetRecoilState, } from 'recoil'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownButtonContainer } from '@/ui/dropdown/components/StyledDropdownButtonContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { entityCountInCurrentViewState } from '@/ui/data/view-bar/states/entityCountInCurrentViewState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { currentViewScopedSelector } from '@/ui/data/view-bar/states/selectors/currentViewScopedSelector'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; +import { viewsScopedState } from '@/ui/data/view-bar/states/viewsScopedState'; import { IconChevronDown, IconList, IconPencil, IconPlus, IconTrash, -} from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +} from '@/ui/display/icon'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { entityCountInCurrentViewState } from '@/ui/view-bar/states/entityCountInCurrentViewState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { currentViewScopedSelector } from '@/ui/view-bar/states/selectors/currentViewScopedSelector'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; -import { viewsScopedState } from '@/ui/view-bar/states/viewsScopedState'; import { assertNotNull } from '~/utils/assert'; import { ViewsDropdownId } from '../constants/ViewsDropdownId'; diff --git a/front/src/modules/ui/view-bar/constants/FilterDropdownId.ts b/front/src/modules/ui/data/view-bar/constants/FilterDropdownId.ts similarity index 100% rename from front/src/modules/ui/view-bar/constants/FilterDropdownId.ts rename to front/src/modules/ui/data/view-bar/constants/FilterDropdownId.ts diff --git a/front/src/modules/ui/view-bar/constants/SortDropdownId.ts b/front/src/modules/ui/data/view-bar/constants/SortDropdownId.ts similarity index 100% rename from front/src/modules/ui/view-bar/constants/SortDropdownId.ts rename to front/src/modules/ui/data/view-bar/constants/SortDropdownId.ts diff --git a/front/src/modules/ui/view-bar/constants/ViewsDropdownId.ts b/front/src/modules/ui/data/view-bar/constants/ViewsDropdownId.ts similarity index 100% rename from front/src/modules/ui/view-bar/constants/ViewsDropdownId.ts rename to front/src/modules/ui/data/view-bar/constants/ViewsDropdownId.ts diff --git a/front/src/modules/ui/view-bar/contexts/ViewBarContext.ts b/front/src/modules/ui/data/view-bar/contexts/ViewBarContext.ts similarity index 100% rename from front/src/modules/ui/view-bar/contexts/ViewBarContext.ts rename to front/src/modules/ui/data/view-bar/contexts/ViewBarContext.ts diff --git a/front/src/modules/ui/view-bar/hooks/useFilterCurrentlyEdited.ts b/front/src/modules/ui/data/view-bar/hooks/useFilterCurrentlyEdited.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useFilterCurrentlyEdited.ts rename to front/src/modules/ui/data/view-bar/hooks/useFilterCurrentlyEdited.ts diff --git a/front/src/modules/ui/view-bar/hooks/useRemoveFilter.ts b/front/src/modules/ui/data/view-bar/hooks/useRemoveFilter.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useRemoveFilter.ts rename to front/src/modules/ui/data/view-bar/hooks/useRemoveFilter.ts diff --git a/front/src/modules/ui/view-bar/hooks/useRemoveView.ts b/front/src/modules/ui/data/view-bar/hooks/useRemoveView.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useRemoveView.ts rename to front/src/modules/ui/data/view-bar/hooks/useRemoveView.ts diff --git a/front/src/modules/ui/view-bar/hooks/useUpsertFilter.ts b/front/src/modules/ui/data/view-bar/hooks/useUpsertFilter.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useUpsertFilter.ts rename to front/src/modules/ui/data/view-bar/hooks/useUpsertFilter.ts diff --git a/front/src/modules/ui/view-bar/hooks/useUpsertView.ts b/front/src/modules/ui/data/view-bar/hooks/useUpsertView.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useUpsertView.ts rename to front/src/modules/ui/data/view-bar/hooks/useUpsertView.ts diff --git a/front/src/modules/ui/view-bar/hooks/useViewBarContext.ts b/front/src/modules/ui/data/view-bar/hooks/useViewBarContext.ts similarity index 100% rename from front/src/modules/ui/view-bar/hooks/useViewBarContext.ts rename to front/src/modules/ui/data/view-bar/hooks/useViewBarContext.ts diff --git a/front/src/modules/ui/view-bar/states/availableFiltersScopedState.ts b/front/src/modules/ui/data/view-bar/states/availableFiltersScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/availableFiltersScopedState.ts rename to front/src/modules/ui/data/view-bar/states/availableFiltersScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/availableSortsScopedState.ts b/front/src/modules/ui/data/view-bar/states/availableSortsScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/availableSortsScopedState.ts rename to front/src/modules/ui/data/view-bar/states/availableSortsScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/currentViewIdScopedState.ts b/front/src/modules/ui/data/view-bar/states/currentViewIdScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/currentViewIdScopedState.ts rename to front/src/modules/ui/data/view-bar/states/currentViewIdScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/entityCountInCurrentViewState.ts b/front/src/modules/ui/data/view-bar/states/entityCountInCurrentViewState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/entityCountInCurrentViewState.ts rename to front/src/modules/ui/data/view-bar/states/entityCountInCurrentViewState.ts diff --git a/front/src/modules/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts b/front/src/modules/ui/data/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts rename to front/src/modules/ui/data/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/filterDropdownSearchInputScopedState.ts b/front/src/modules/ui/data/view-bar/states/filterDropdownSearchInputScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/filterDropdownSearchInputScopedState.ts rename to front/src/modules/ui/data/view-bar/states/filterDropdownSearchInputScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts b/front/src/modules/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts rename to front/src/modules/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/filtersScopedState.ts b/front/src/modules/ui/data/view-bar/states/filtersScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/filtersScopedState.ts rename to front/src/modules/ui/data/view-bar/states/filtersScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts b/front/src/modules/ui/data/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts rename to front/src/modules/ui/data/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/isFilterDropdownUnfoldedScopedState.ts b/front/src/modules/ui/data/view-bar/states/isFilterDropdownUnfoldedScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/isFilterDropdownUnfoldedScopedState.ts rename to front/src/modules/ui/data/view-bar/states/isFilterDropdownUnfoldedScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/isViewBarExpandedScopedState.ts b/front/src/modules/ui/data/view-bar/states/isViewBarExpandedScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/isViewBarExpandedScopedState.ts rename to front/src/modules/ui/data/view-bar/states/isViewBarExpandedScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/savedFiltersFamilyState.ts b/front/src/modules/ui/data/view-bar/states/savedFiltersFamilyState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/savedFiltersFamilyState.ts rename to front/src/modules/ui/data/view-bar/states/savedFiltersFamilyState.ts diff --git a/front/src/modules/ui/view-bar/states/savedSortsFamilyState.ts b/front/src/modules/ui/data/view-bar/states/savedSortsFamilyState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/savedSortsFamilyState.ts rename to front/src/modules/ui/data/view-bar/states/savedSortsFamilyState.ts diff --git a/front/src/modules/ui/view-bar/states/selectedOperandInDropdownScopedState.ts b/front/src/modules/ui/data/view-bar/states/selectedOperandInDropdownScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectedOperandInDropdownScopedState.ts rename to front/src/modules/ui/data/view-bar/states/selectedOperandInDropdownScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/canPersistFiltersScopedFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/canPersistFiltersScopedFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/canPersistFiltersScopedFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/canPersistFiltersScopedFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/canPersistSortsScopedFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/canPersistSortsScopedFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/canPersistSortsScopedFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/canPersistSortsScopedFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/currentViewScopedSelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/currentViewScopedSelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/currentViewScopedSelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/currentViewScopedSelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/filtersWhereScopedSelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/filtersWhereScopedSelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/filtersWhereScopedSelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/filtersWhereScopedSelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/savedFiltersByKeyFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/savedFiltersByKeyFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/savedFiltersByKeyFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/savedFiltersByKeyFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/savedFiltersFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/savedFiltersFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/savedFiltersFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/savedFiltersFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/savedSortsByKeyFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/savedSortsByKeyFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/savedSortsByKeyFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/savedSortsByKeyFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/savedSortsFamilySelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/savedSortsFamilySelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/savedSortsFamilySelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/savedSortsFamilySelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/sortsOrderByScopedSelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/sortsOrderByScopedSelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/sortsOrderByScopedSelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/sortsOrderByScopedSelector.ts diff --git a/front/src/modules/ui/view-bar/states/selectors/viewsByIdScopedSelector.ts b/front/src/modules/ui/data/view-bar/states/selectors/viewsByIdScopedSelector.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/selectors/viewsByIdScopedSelector.ts rename to front/src/modules/ui/data/view-bar/states/selectors/viewsByIdScopedSelector.ts diff --git a/front/src/modules/ui/view-bar/states/sortsScopedState.ts b/front/src/modules/ui/data/view-bar/states/sortsScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/sortsScopedState.ts rename to front/src/modules/ui/data/view-bar/states/sortsScopedState.ts diff --git a/front/src/modules/ui/view-bar/states/viewEditModeState.ts b/front/src/modules/ui/data/view-bar/states/viewEditModeState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/viewEditModeState.ts rename to front/src/modules/ui/data/view-bar/states/viewEditModeState.ts diff --git a/front/src/modules/ui/view-bar/states/viewsScopedState.ts b/front/src/modules/ui/data/view-bar/states/viewsScopedState.ts similarity index 100% rename from front/src/modules/ui/view-bar/states/viewsScopedState.ts rename to front/src/modules/ui/data/view-bar/states/viewsScopedState.ts diff --git a/front/src/modules/ui/view-bar/types/Filter.ts b/front/src/modules/ui/data/view-bar/types/Filter.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/Filter.ts rename to front/src/modules/ui/data/view-bar/types/Filter.ts diff --git a/front/src/modules/ui/view-bar/types/FilterDefinition.ts b/front/src/modules/ui/data/view-bar/types/FilterDefinition.ts similarity index 78% rename from front/src/modules/ui/view-bar/types/FilterDefinition.ts rename to front/src/modules/ui/data/view-bar/types/FilterDefinition.ts index db1a0c0620..79cc6b74d9 100644 --- a/front/src/modules/ui/view-bar/types/FilterDefinition.ts +++ b/front/src/modules/ui/data/view-bar/types/FilterDefinition.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { FilterType } from './FilterType'; diff --git a/front/src/modules/ui/view-bar/types/FilterDefinitionByEntity.ts b/front/src/modules/ui/data/view-bar/types/FilterDefinitionByEntity.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/FilterDefinitionByEntity.ts rename to front/src/modules/ui/data/view-bar/types/FilterDefinitionByEntity.ts diff --git a/front/src/modules/ui/data/view-bar/types/FilterOperand.ts b/front/src/modules/ui/data/view-bar/types/FilterOperand.ts new file mode 100644 index 0000000000..9e9a893bc0 --- /dev/null +++ b/front/src/modules/ui/data/view-bar/types/FilterOperand.ts @@ -0,0 +1 @@ +export { ViewFilterOperand as FilterOperand } from '~/generated/graphql'; diff --git a/front/src/modules/ui/view-bar/types/FilterType.ts b/front/src/modules/ui/data/view-bar/types/FilterType.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/FilterType.ts rename to front/src/modules/ui/data/view-bar/types/FilterType.ts diff --git a/front/src/modules/ui/view-bar/types/FiltersHotkeyScope.ts b/front/src/modules/ui/data/view-bar/types/FiltersHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/FiltersHotkeyScope.ts rename to front/src/modules/ui/data/view-bar/types/FiltersHotkeyScope.ts diff --git a/front/src/modules/ui/view-bar/types/Sort.ts b/front/src/modules/ui/data/view-bar/types/Sort.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/Sort.ts rename to front/src/modules/ui/data/view-bar/types/Sort.ts diff --git a/front/src/modules/ui/view-bar/types/SortDefinition.ts b/front/src/modules/ui/data/view-bar/types/SortDefinition.ts similarity index 73% rename from front/src/modules/ui/view-bar/types/SortDefinition.ts rename to front/src/modules/ui/data/view-bar/types/SortDefinition.ts index 7657bee6d9..5405e3bd61 100644 --- a/front/src/modules/ui/view-bar/types/SortDefinition.ts +++ b/front/src/modules/ui/data/view-bar/types/SortDefinition.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { SortDirection } from './SortDirection'; diff --git a/front/src/modules/ui/view-bar/types/SortDirection.ts b/front/src/modules/ui/data/view-bar/types/SortDirection.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/SortDirection.ts rename to front/src/modules/ui/data/view-bar/types/SortDirection.ts diff --git a/front/src/modules/ui/view-bar/types/View.ts b/front/src/modules/ui/data/view-bar/types/View.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/View.ts rename to front/src/modules/ui/data/view-bar/types/View.ts diff --git a/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts b/front/src/modules/ui/data/view-bar/types/ViewFieldForVisibility.ts similarity index 59% rename from front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts rename to front/src/modules/ui/data/view-bar/types/ViewFieldForVisibility.ts index c7d2039d5e..7f49a0714f 100644 --- a/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts +++ b/front/src/modules/ui/data/view-bar/types/ViewFieldForVisibility.ts @@ -1,5 +1,5 @@ -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; export type ViewFieldForVisibility = Pick< FieldDefinition, diff --git a/front/src/modules/ui/view-bar/types/ViewsHotkeyScope.ts b/front/src/modules/ui/data/view-bar/types/ViewsHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/view-bar/types/ViewsHotkeyScope.ts rename to front/src/modules/ui/data/view-bar/types/ViewsHotkeyScope.ts diff --git a/front/src/modules/ui/view-bar/types/interface.ts b/front/src/modules/ui/data/view-bar/types/interface.ts similarity index 82% rename from front/src/modules/ui/view-bar/types/interface.ts rename to front/src/modules/ui/data/view-bar/types/interface.ts index 3bb4e43dd8..25345239d4 100644 --- a/front/src/modules/ui/view-bar/types/interface.ts +++ b/front/src/modules/ui/data/view-bar/types/interface.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { SortOrder as Order_By } from '~/generated/graphql'; export type SortType = { diff --git a/front/src/modules/ui/view-bar/utils/getOperandLabel.ts b/front/src/modules/ui/data/view-bar/utils/getOperandLabel.ts similarity index 100% rename from front/src/modules/ui/view-bar/utils/getOperandLabel.ts rename to front/src/modules/ui/data/view-bar/utils/getOperandLabel.ts diff --git a/front/src/modules/ui/view-bar/utils/getOperandsForFilterType.ts b/front/src/modules/ui/data/view-bar/utils/getOperandsForFilterType.ts similarity index 100% rename from front/src/modules/ui/view-bar/utils/getOperandsForFilterType.ts rename to front/src/modules/ui/data/view-bar/utils/getOperandsForFilterType.ts diff --git a/front/src/modules/ui/view-bar/utils/helpers.ts b/front/src/modules/ui/data/view-bar/utils/helpers.ts similarity index 100% rename from front/src/modules/ui/view-bar/utils/helpers.ts rename to front/src/modules/ui/data/view-bar/utils/helpers.ts diff --git a/front/src/modules/ui/view-bar/utils/turnFilterIntoWhereClause.ts b/front/src/modules/ui/data/view-bar/utils/turnFilterIntoWhereClause.ts similarity index 100% rename from front/src/modules/ui/view-bar/utils/turnFilterIntoWhereClause.ts rename to front/src/modules/ui/data/view-bar/utils/turnFilterIntoWhereClause.ts diff --git a/front/src/modules/ui/checkmark/components/AnimatedCheckmark.tsx b/front/src/modules/ui/display/checkmark/components/AnimatedCheckmark.tsx similarity index 100% rename from front/src/modules/ui/checkmark/components/AnimatedCheckmark.tsx rename to front/src/modules/ui/display/checkmark/components/AnimatedCheckmark.tsx diff --git a/front/src/modules/ui/checkmark/components/Checkmark.tsx b/front/src/modules/ui/display/checkmark/components/Checkmark.tsx similarity index 92% rename from front/src/modules/ui/checkmark/components/Checkmark.tsx rename to front/src/modules/ui/display/checkmark/components/Checkmark.tsx index 5956fddb72..71db51f983 100644 --- a/front/src/modules/ui/checkmark/components/Checkmark.tsx +++ b/front/src/modules/ui/display/checkmark/components/Checkmark.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconCheck } from '@/ui/icon'; +import { IconCheck } from '@/ui/display/icon'; const StyledContainer = styled.div` align-items: center; diff --git a/front/src/modules/ui/checkmark/components/__stories__/Checkmark.stories.tsx b/front/src/modules/ui/display/checkmark/components/__stories__/Checkmark.stories.tsx similarity index 100% rename from front/src/modules/ui/checkmark/components/__stories__/Checkmark.stories.tsx rename to front/src/modules/ui/display/checkmark/components/__stories__/Checkmark.stories.tsx diff --git a/front/src/modules/ui/chip/components/Chip.tsx b/front/src/modules/ui/display/chip/components/Chip.tsx similarity index 100% rename from front/src/modules/ui/chip/components/Chip.tsx rename to front/src/modules/ui/display/chip/components/Chip.tsx diff --git a/front/src/modules/ui/chip/components/EntityChip.tsx b/front/src/modules/ui/display/chip/components/EntityChip.tsx similarity index 96% rename from front/src/modules/ui/chip/components/EntityChip.tsx rename to front/src/modules/ui/display/chip/components/EntityChip.tsx index 0b4897aa89..1d7325925e 100644 --- a/front/src/modules/ui/chip/components/EntityChip.tsx +++ b/front/src/modules/ui/display/chip/components/EntityChip.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { useNavigate } from 'react-router-dom'; import { useTheme } from '@emotion/react'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { Avatar, AvatarType } from '@/users/components/Avatar'; import { isNonEmptyString } from '~/utils/isNonEmptyString'; diff --git a/front/src/modules/ui/chip/components/__stories__/Chip.stories.tsx b/front/src/modules/ui/display/chip/components/__stories__/Chip.stories.tsx similarity index 100% rename from front/src/modules/ui/chip/components/__stories__/Chip.stories.tsx rename to front/src/modules/ui/display/chip/components/__stories__/Chip.stories.tsx diff --git a/front/src/modules/ui/chip/components/__stories__/EntityChip.stories.tsx b/front/src/modules/ui/display/chip/components/__stories__/EntityChip.stories.tsx similarity index 100% rename from front/src/modules/ui/chip/components/__stories__/EntityChip.stories.tsx rename to front/src/modules/ui/display/chip/components/__stories__/EntityChip.stories.tsx diff --git a/front/src/modules/ui/icon/assets/address-book.svg b/front/src/modules/ui/display/icon/assets/address-book.svg similarity index 100% rename from front/src/modules/ui/icon/assets/address-book.svg rename to front/src/modules/ui/display/icon/assets/address-book.svg diff --git a/front/src/modules/ui/icon/components/IconAddressBook.tsx b/front/src/modules/ui/display/icon/components/IconAddressBook.tsx similarity index 87% rename from front/src/modules/ui/icon/components/IconAddressBook.tsx rename to front/src/modules/ui/display/icon/components/IconAddressBook.tsx index 03d486b2da..12ad32ac5f 100644 --- a/front/src/modules/ui/icon/components/IconAddressBook.tsx +++ b/front/src/modules/ui/display/icon/components/IconAddressBook.tsx @@ -1,4 +1,4 @@ -import { TablerIconsProps } from '@/ui/icon'; +import { TablerIconsProps } from '@/ui/display/icon'; import { ReactComponent as IconAddressBookRaw } from '../assets/address-book.svg'; diff --git a/front/src/modules/ui/icon/index.ts b/front/src/modules/ui/display/icon/index.ts similarity index 100% rename from front/src/modules/ui/icon/index.ts rename to front/src/modules/ui/display/icon/index.ts diff --git a/front/src/modules/ui/icon/types/IconComponent.ts b/front/src/modules/ui/display/icon/types/IconComponent.ts similarity index 100% rename from front/src/modules/ui/icon/types/IconComponent.ts rename to front/src/modules/ui/display/icon/types/IconComponent.ts diff --git a/front/src/modules/ui/pill/components/SoonPill.tsx b/front/src/modules/ui/display/pill/components/SoonPill.tsx similarity index 100% rename from front/src/modules/ui/pill/components/SoonPill.tsx rename to front/src/modules/ui/display/pill/components/SoonPill.tsx diff --git a/front/src/modules/ui/pill/components/__stories__/SoonPill.stories.tsx b/front/src/modules/ui/display/pill/components/__stories__/SoonPill.stories.tsx similarity index 100% rename from front/src/modules/ui/pill/components/__stories__/SoonPill.stories.tsx rename to front/src/modules/ui/display/pill/components/__stories__/SoonPill.stories.tsx diff --git a/front/src/modules/ui/tag/components/Tag.tsx b/front/src/modules/ui/display/tag/components/Tag.tsx similarity index 100% rename from front/src/modules/ui/tag/components/Tag.tsx rename to front/src/modules/ui/display/tag/components/Tag.tsx diff --git a/front/src/modules/ui/tag/components/__stories__/Tag.stories.tsx b/front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx similarity index 100% rename from front/src/modules/ui/tag/components/__stories__/Tag.stories.tsx rename to front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx diff --git a/front/src/modules/ui/tooltip/AppTooltip.tsx b/front/src/modules/ui/display/tooltip/AppTooltip.tsx similarity index 96% rename from front/src/modules/ui/tooltip/AppTooltip.tsx rename to front/src/modules/ui/display/tooltip/AppTooltip.tsx index bc0a20f570..87d34f1de0 100644 --- a/front/src/modules/ui/tooltip/AppTooltip.tsx +++ b/front/src/modules/ui/display/tooltip/AppTooltip.tsx @@ -1,7 +1,7 @@ import { PlacesType, PositionStrategy, Tooltip } from 'react-tooltip'; import styled from '@emotion/styled'; -import { rgba } from '../theme/constants/colors'; +import { rgba } from '../../theme/constants/colors'; export enum TooltipPosition { Top = 'top', diff --git a/front/src/modules/ui/tooltip/OverflowingTextWithTooltip.tsx b/front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx similarity index 100% rename from front/src/modules/ui/tooltip/OverflowingTextWithTooltip.tsx rename to front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx diff --git a/front/src/modules/ui/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx b/front/src/modules/ui/display/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx similarity index 100% rename from front/src/modules/ui/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx rename to front/src/modules/ui/display/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx diff --git a/front/src/modules/ui/tooltip/__stories__/Tooltip.stories.tsx b/front/src/modules/ui/display/tooltip/__stories__/Tooltip.stories.tsx similarity index 100% rename from front/src/modules/ui/tooltip/__stories__/Tooltip.stories.tsx rename to front/src/modules/ui/display/tooltip/__stories__/Tooltip.stories.tsx diff --git a/front/src/modules/ui/typography/components/H1Title.tsx b/front/src/modules/ui/display/typography/components/H1Title.tsx similarity index 100% rename from front/src/modules/ui/typography/components/H1Title.tsx rename to front/src/modules/ui/display/typography/components/H1Title.tsx diff --git a/front/src/modules/ui/typography/components/H2Title.tsx b/front/src/modules/ui/display/typography/components/H2Title.tsx similarity index 100% rename from front/src/modules/ui/typography/components/H2Title.tsx rename to front/src/modules/ui/display/typography/components/H2Title.tsx diff --git a/front/src/modules/ui/typography/components/__stories__/H1Title.stories.tsx b/front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx similarity index 100% rename from front/src/modules/ui/typography/components/__stories__/H1Title.stories.tsx rename to front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx diff --git a/front/src/modules/ui/typography/components/__stories__/H2Title.stories.tsx b/front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx similarity index 100% rename from front/src/modules/ui/typography/components/__stories__/H2Title.stories.tsx rename to front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx diff --git a/front/src/modules/ui/dialog/components/Dialog.tsx b/front/src/modules/ui/feedback/dialog/components/Dialog.tsx similarity index 98% rename from front/src/modules/ui/dialog/components/Dialog.tsx rename to front/src/modules/ui/feedback/dialog/components/Dialog.tsx index fb7c353d73..f41786ff95 100644 --- a/front/src/modules/ui/dialog/components/Dialog.tsx +++ b/front/src/modules/ui/feedback/dialog/components/Dialog.tsx @@ -3,7 +3,7 @@ import styled from '@emotion/styled'; import { motion } from 'framer-motion'; import { Key } from 'ts-key-enum'; -import { Button } from '@/ui/button/components/Button'; +import { Button } from '@/ui/input/button/components/Button'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { DialogHotkeyScope } from '../types/DialogHotkeyScope'; diff --git a/front/src/modules/ui/dialog/components/DialogProvider.tsx b/front/src/modules/ui/feedback/dialog/components/DialogProvider.tsx similarity index 100% rename from front/src/modules/ui/dialog/components/DialogProvider.tsx rename to front/src/modules/ui/feedback/dialog/components/DialogProvider.tsx diff --git a/front/src/modules/ui/dialog/hooks/useDialog.ts b/front/src/modules/ui/feedback/dialog/hooks/useDialog.ts similarity index 100% rename from front/src/modules/ui/dialog/hooks/useDialog.ts rename to front/src/modules/ui/feedback/dialog/hooks/useDialog.ts diff --git a/front/src/modules/ui/dialog/states/dialogState.ts b/front/src/modules/ui/feedback/dialog/states/dialogState.ts similarity index 100% rename from front/src/modules/ui/dialog/states/dialogState.ts rename to front/src/modules/ui/feedback/dialog/states/dialogState.ts diff --git a/front/src/modules/ui/dialog/types/DialogHotkeyScope.ts b/front/src/modules/ui/feedback/dialog/types/DialogHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/dialog/types/DialogHotkeyScope.ts rename to front/src/modules/ui/feedback/dialog/types/DialogHotkeyScope.ts diff --git a/front/src/modules/ui/progress-bar/components/CircularProgressBar.tsx b/front/src/modules/ui/feedback/progress-bar/components/CircularProgressBar.tsx similarity index 100% rename from front/src/modules/ui/progress-bar/components/CircularProgressBar.tsx rename to front/src/modules/ui/feedback/progress-bar/components/CircularProgressBar.tsx diff --git a/front/src/modules/ui/progress-bar/components/ProgressBar.tsx b/front/src/modules/ui/feedback/progress-bar/components/ProgressBar.tsx similarity index 100% rename from front/src/modules/ui/progress-bar/components/ProgressBar.tsx rename to front/src/modules/ui/feedback/progress-bar/components/ProgressBar.tsx diff --git a/front/src/modules/ui/progress-bar/components/__stories__/CircularProgressBar.stories.tsx b/front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx similarity index 100% rename from front/src/modules/ui/progress-bar/components/__stories__/CircularProgressBar.stories.tsx rename to front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx diff --git a/front/src/modules/ui/progress-bar/components/__stories__/ProgressBar.stories.tsx b/front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx similarity index 100% rename from front/src/modules/ui/progress-bar/components/__stories__/ProgressBar.stories.tsx rename to front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx diff --git a/front/src/modules/ui/snack-bar/components/SnackBar.tsx b/front/src/modules/ui/feedback/snack-bar/components/SnackBar.tsx similarity index 97% rename from front/src/modules/ui/snack-bar/components/SnackBar.tsx rename to front/src/modules/ui/feedback/snack-bar/components/SnackBar.tsx index b16de71aec..0101c709f9 100644 --- a/front/src/modules/ui/snack-bar/components/SnackBar.tsx +++ b/front/src/modules/ui/feedback/snack-bar/components/SnackBar.tsx @@ -2,11 +2,11 @@ import { useCallback, useMemo, useRef } from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconAlertTriangle, IconX } from '@/ui/icon'; +import { IconAlertTriangle, IconX } from '@/ui/display/icon'; import { ProgressBar, ProgressBarControls, -} from '@/ui/progress-bar/components/ProgressBar'; +} from '@/ui/feedback/progress-bar/components/ProgressBar'; import { rgba } from '@/ui/theme/constants/colors'; import { usePausableTimeout } from '../hooks/usePausableTimeout'; diff --git a/front/src/modules/ui/snack-bar/components/SnackBarProvider.tsx b/front/src/modules/ui/feedback/snack-bar/components/SnackBarProvider.tsx similarity index 100% rename from front/src/modules/ui/snack-bar/components/SnackBarProvider.tsx rename to front/src/modules/ui/feedback/snack-bar/components/SnackBarProvider.tsx diff --git a/front/src/modules/ui/snack-bar/hooks/usePausableTimeout.ts b/front/src/modules/ui/feedback/snack-bar/hooks/usePausableTimeout.ts similarity index 100% rename from front/src/modules/ui/snack-bar/hooks/usePausableTimeout.ts rename to front/src/modules/ui/feedback/snack-bar/hooks/usePausableTimeout.ts diff --git a/front/src/modules/ui/snack-bar/hooks/useSnackBar.ts b/front/src/modules/ui/feedback/snack-bar/hooks/useSnackBar.ts similarity index 100% rename from front/src/modules/ui/snack-bar/hooks/useSnackBar.ts rename to front/src/modules/ui/feedback/snack-bar/hooks/useSnackBar.ts diff --git a/front/src/modules/ui/snack-bar/states/snackBarState.ts b/front/src/modules/ui/feedback/snack-bar/states/snackBarState.ts similarity index 100% rename from front/src/modules/ui/snack-bar/states/snackBarState.ts rename to front/src/modules/ui/feedback/snack-bar/states/snackBarState.ts diff --git a/front/src/modules/ui/button/components/Button.tsx b/front/src/modules/ui/input/button/components/Button.tsx similarity index 98% rename from front/src/modules/ui/button/components/Button.tsx rename to front/src/modules/ui/input/button/components/Button.tsx index b43b7fa5a2..decd9d7f4c 100644 --- a/front/src/modules/ui/button/components/Button.tsx +++ b/front/src/modules/ui/input/button/components/Button.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { SoonPill } from '@/ui/pill/components/SoonPill'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { SoonPill } from '@/ui/display/pill/components/SoonPill'; export type ButtonSize = 'medium' | 'small'; export type ButtonPosition = 'standalone' | 'left' | 'middle' | 'right'; diff --git a/front/src/modules/ui/button/components/ButtonGroup.tsx b/front/src/modules/ui/input/button/components/ButtonGroup.tsx similarity index 100% rename from front/src/modules/ui/button/components/ButtonGroup.tsx rename to front/src/modules/ui/input/button/components/ButtonGroup.tsx diff --git a/front/src/modules/ui/button/components/FloatingButton.tsx b/front/src/modules/ui/input/button/components/FloatingButton.tsx similarity index 97% rename from front/src/modules/ui/button/components/FloatingButton.tsx rename to front/src/modules/ui/input/button/components/FloatingButton.tsx index 17f1d8ef12..3a75c1ddd9 100644 --- a/front/src/modules/ui/button/components/FloatingButton.tsx +++ b/front/src/modules/ui/input/button/components/FloatingButton.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type FloatingButtonSize = 'small' | 'medium'; export type FloatingButtonPosition = 'standalone' | 'left' | 'middle' | 'right'; diff --git a/front/src/modules/ui/button/components/FloatingButtonGroup.tsx b/front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx similarity index 100% rename from front/src/modules/ui/button/components/FloatingButtonGroup.tsx rename to front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx diff --git a/front/src/modules/ui/button/components/FloatingIconButton.tsx b/front/src/modules/ui/input/button/components/FloatingIconButton.tsx similarity index 98% rename from front/src/modules/ui/button/components/FloatingIconButton.tsx rename to front/src/modules/ui/input/button/components/FloatingIconButton.tsx index 3f7c7d5169..c1eda01061 100644 --- a/front/src/modules/ui/button/components/FloatingIconButton.tsx +++ b/front/src/modules/ui/input/button/components/FloatingIconButton.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type FloatingIconButtonSize = 'small' | 'medium'; export type FloatingIconButtonPosition = diff --git a/front/src/modules/ui/button/components/FloatingIconButtonGroup.tsx b/front/src/modules/ui/input/button/components/FloatingIconButtonGroup.tsx similarity index 95% rename from front/src/modules/ui/button/components/FloatingIconButtonGroup.tsx rename to front/src/modules/ui/input/button/components/FloatingIconButtonGroup.tsx index 0dd48473a6..f84418a41c 100644 --- a/front/src/modules/ui/button/components/FloatingIconButtonGroup.tsx +++ b/front/src/modules/ui/input/button/components/FloatingIconButtonGroup.tsx @@ -1,7 +1,7 @@ import { MouseEvent } from 'react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { FloatingIconButton, diff --git a/front/src/modules/ui/button/components/IconButton.tsx b/front/src/modules/ui/input/button/components/IconButton.tsx similarity index 99% rename from front/src/modules/ui/button/components/IconButton.tsx rename to front/src/modules/ui/input/button/components/IconButton.tsx index 2c5019d272..bbc8c3cf18 100644 --- a/front/src/modules/ui/button/components/IconButton.tsx +++ b/front/src/modules/ui/input/button/components/IconButton.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type IconButtonSize = 'medium' | 'small'; export type IconButtonPosition = 'standalone' | 'left' | 'middle' | 'right'; diff --git a/front/src/modules/ui/button/components/IconButtonGroup.tsx b/front/src/modules/ui/input/button/components/IconButtonGroup.tsx similarity index 93% rename from front/src/modules/ui/button/components/IconButtonGroup.tsx rename to front/src/modules/ui/input/button/components/IconButtonGroup.tsx index b6b8b79cf9..57488cbd68 100644 --- a/front/src/modules/ui/button/components/IconButtonGroup.tsx +++ b/front/src/modules/ui/input/button/components/IconButtonGroup.tsx @@ -1,7 +1,7 @@ import { MouseEvent } from 'react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { IconButton, IconButtonPosition, IconButtonProps } from './IconButton'; diff --git a/front/src/modules/ui/button/components/LightButton.tsx b/front/src/modules/ui/input/button/components/LightButton.tsx similarity index 98% rename from front/src/modules/ui/button/components/LightButton.tsx rename to front/src/modules/ui/input/button/components/LightButton.tsx index 609f266e53..99f53f7ca1 100644 --- a/front/src/modules/ui/button/components/LightButton.tsx +++ b/front/src/modules/ui/input/button/components/LightButton.tsx @@ -1,7 +1,7 @@ import React, { MouseEvent, useMemo } from 'react'; import styled from '@emotion/styled'; -import { TablerIconsProps } from '@/ui/icon'; +import { TablerIconsProps } from '@/ui/display/icon'; export type LightButtonAccent = 'secondary' | 'tertiary'; diff --git a/front/src/modules/ui/button/components/LightIconButton.tsx b/front/src/modules/ui/input/button/components/LightIconButton.tsx similarity index 97% rename from front/src/modules/ui/button/components/LightIconButton.tsx rename to front/src/modules/ui/input/button/components/LightIconButton.tsx index e085691805..f8e1727a3b 100644 --- a/front/src/modules/ui/button/components/LightIconButton.tsx +++ b/front/src/modules/ui/input/button/components/LightIconButton.tsx @@ -2,7 +2,7 @@ import { ComponentProps, MouseEvent } from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; export type LightIconButtonAccent = 'secondary' | 'tertiary'; export type LightIconButtonSize = 'small' | 'medium'; diff --git a/front/src/modules/ui/button/components/MainButton.tsx b/front/src/modules/ui/input/button/components/MainButton.tsx similarity index 97% rename from front/src/modules/ui/button/components/MainButton.tsx rename to front/src/modules/ui/input/button/components/MainButton.tsx index a6b40ed5f5..082718c49e 100644 --- a/front/src/modules/ui/button/components/MainButton.tsx +++ b/front/src/modules/ui/input/button/components/MainButton.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; type Variant = 'primary' | 'secondary'; diff --git a/front/src/modules/ui/button/components/RoundedIconButton.tsx b/front/src/modules/ui/input/button/components/RoundedIconButton.tsx similarity index 93% rename from front/src/modules/ui/button/components/RoundedIconButton.tsx rename to front/src/modules/ui/input/button/components/RoundedIconButton.tsx index 9f0c4915c9..bde76d6754 100644 --- a/front/src/modules/ui/button/components/RoundedIconButton.tsx +++ b/front/src/modules/ui/input/button/components/RoundedIconButton.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; const StyledIconButton = styled.button` align-items: center; diff --git a/front/src/modules/ui/button/components/__stories__/Button.docs.mdx b/front/src/modules/ui/input/button/components/__stories__/Button.docs.mdx similarity index 100% rename from front/src/modules/ui/button/components/__stories__/Button.docs.mdx rename to front/src/modules/ui/input/button/components/__stories__/Button.docs.mdx diff --git a/front/src/modules/ui/button/components/__stories__/Button.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx similarity index 99% rename from front/src/modules/ui/button/components/__stories__/Button.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx index c5cbb72b05..49a14ea26f 100644 --- a/front/src/modules/ui/button/components/__stories__/Button.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/ButtonGroup.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx similarity index 99% rename from front/src/modules/ui/button/components/__stories__/ButtonGroup.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx index 5ecc69e696..06416eea02 100644 --- a/front/src/modules/ui/button/components/__stories__/ButtonGroup.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon'; +import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/FloatingButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx similarity index 97% rename from front/src/modules/ui/button/components/__stories__/FloatingButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx index ab7c777084..add1ee14cd 100644 --- a/front/src/modules/ui/button/components/__stories__/FloatingButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/FloatingButtonGroup.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx similarity index 99% rename from front/src/modules/ui/button/components/__stories__/FloatingButtonGroup.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx index 18da6a9f56..1a0e348ffa 100644 --- a/front/src/modules/ui/button/components/__stories__/FloatingButtonGroup.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon'; +import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/FloatingIconButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx similarity index 97% rename from front/src/modules/ui/button/components/__stories__/FloatingIconButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx index 65a94fc22c..349588d5a3 100644 --- a/front/src/modules/ui/button/components/__stories__/FloatingIconButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/FloatingIconButtonGroup.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx similarity index 98% rename from front/src/modules/ui/button/components/__stories__/FloatingIconButtonGroup.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx index 79a9fac92c..bab3c863e9 100644 --- a/front/src/modules/ui/button/components/__stories__/FloatingIconButtonGroup.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon'; +import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/IconButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx similarity index 99% rename from front/src/modules/ui/button/components/__stories__/IconButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx index 3fab6cdde6..ea08fbc234 100644 --- a/front/src/modules/ui/button/components/__stories__/IconButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/IconButtonGroup.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx similarity index 99% rename from front/src/modules/ui/button/components/__stories__/IconButtonGroup.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx index 904db7414b..92b3dc10ba 100644 --- a/front/src/modules/ui/button/components/__stories__/IconButtonGroup.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon'; +import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/LightButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx similarity index 97% rename from front/src/modules/ui/button/components/__stories__/LightButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx index b0bf9d753e..50f0b67681 100644 --- a/front/src/modules/ui/button/components/__stories__/LightButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/LightIconButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx similarity index 98% rename from front/src/modules/ui/button/components/__stories__/LightIconButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx index 4f8e87cbb6..190ffd1761 100644 --- a/front/src/modules/ui/button/components/__stories__/LightIconButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconSearch } from '@/ui/icon'; +import { IconSearch } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/button/components/__stories__/MainButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx similarity index 96% rename from front/src/modules/ui/button/components/__stories__/MainButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx index 25d8a2c627..5bc8c743f0 100644 --- a/front/src/modules/ui/button/components/__stories__/MainButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx @@ -2,7 +2,7 @@ import { expect, jest } from '@storybook/jest'; import { Meta, StoryObj } from '@storybook/react'; import { userEvent, within } from '@storybook/testing-library'; -import { IconBrandGoogle } from '@/ui/icon'; +import { IconBrandGoogle } from '@/ui/display/icon'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { MainButton } from '../MainButton'; diff --git a/front/src/modules/ui/button/components/__stories__/RoundedIconButton.stories.tsx b/front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx similarity index 94% rename from front/src/modules/ui/button/components/__stories__/RoundedIconButton.stories.tsx rename to front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx index 3a1ccadb0f..ce0aea1355 100644 --- a/front/src/modules/ui/button/components/__stories__/RoundedIconButton.stories.tsx +++ b/front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx @@ -2,7 +2,7 @@ import { expect, jest } from '@storybook/jest'; import { Meta, StoryObj } from '@storybook/react'; import { userEvent, within } from '@storybook/testing-library'; -import { IconArrowRight } from '@/ui/icon'; +import { IconArrowRight } from '@/ui/display/icon'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { RoundedIconButton } from '../RoundedIconButton'; diff --git a/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx b/front/src/modules/ui/input/color-scheme/components/ColorSchemeCard.tsx similarity index 98% rename from front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx rename to front/src/modules/ui/input/color-scheme/components/ColorSchemeCard.tsx index da2280b979..ed8c5825de 100644 --- a/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx +++ b/front/src/modules/ui/input/color-scheme/components/ColorSchemeCard.tsx @@ -7,7 +7,7 @@ import { useAnimation, } from 'framer-motion'; -import { Checkmark } from '@/ui/checkmark/components/Checkmark'; +import { Checkmark } from '@/ui/display/checkmark/components/Checkmark'; import DarkNoise from '@/ui/theme/assets/dark-noise.jpg'; import LightNoise from '@/ui/theme/assets/light-noise.png'; import { ColorScheme } from '~/generated/graphql'; diff --git a/front/src/modules/ui/color-scheme/components/ColorSchemePicker.tsx b/front/src/modules/ui/input/color-scheme/components/ColorSchemePicker.tsx similarity index 100% rename from front/src/modules/ui/color-scheme/components/ColorSchemePicker.tsx rename to front/src/modules/ui/input/color-scheme/components/ColorSchemePicker.tsx diff --git a/front/src/modules/ui/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx b/front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx similarity index 100% rename from front/src/modules/ui/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx rename to front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx diff --git a/front/src/modules/ui/input/components/AutosizeTextInput.tsx b/front/src/modules/ui/input/components/AutosizeTextInput.tsx index 35092cfb24..06ad728152 100644 --- a/front/src/modules/ui/input/components/AutosizeTextInput.tsx +++ b/front/src/modules/ui/input/components/AutosizeTextInput.tsx @@ -3,9 +3,9 @@ import { HotkeysEvent } from 'react-hotkeys-hook/dist/types'; import TextareaAutosize from 'react-textarea-autosize'; import styled from '@emotion/styled'; -import { Button } from '@/ui/button/components/Button'; -import { RoundedIconButton } from '@/ui/button/components/RoundedIconButton'; -import { IconArrowRight } from '@/ui/icon/index'; +import { IconArrowRight } from '@/ui/display/icon/index'; +import { Button } from '@/ui/input/button/components/Button'; +import { RoundedIconButton } from '@/ui/input/button/components/RoundedIconButton'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { InputHotkeyScope } from '../types/InputHotkeyScope'; diff --git a/front/src/modules/ui/input/components/Checkbox.tsx b/front/src/modules/ui/input/components/Checkbox.tsx index 31734bf45a..1de02defa9 100644 --- a/front/src/modules/ui/input/components/Checkbox.tsx +++ b/front/src/modules/ui/input/components/Checkbox.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import styled from '@emotion/styled'; -import { IconCheck, IconMinus } from '@/ui/icon'; +import { IconCheck, IconMinus } from '@/ui/display/icon'; export enum CheckboxVariant { Primary = 'primary', diff --git a/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx b/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx index 23ca05cadc..d10cad5f06 100644 --- a/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx +++ b/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx @@ -1,7 +1,7 @@ import { ChangeEvent } from 'react'; import styled from '@emotion/styled'; -import { StyledInput } from '@/ui/field/meta-types/input/components/internal/TextInput'; +import { StyledInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput'; import { ComputeNodeDimensions } from '@/ui/utilities/dimensions/components/ComputeNodeDimensions'; export type EntityTitleDoubleTextInputProps = { diff --git a/front/src/modules/ui/input/components/IconPicker.tsx b/front/src/modules/ui/input/components/IconPicker.tsx index 8cf003a587..9c1759ffee 100644 --- a/front/src/modules/ui/input/components/IconPicker.tsx +++ b/front/src/modules/ui/input/components/IconPicker.tsx @@ -1,17 +1,17 @@ import { useEffect, useMemo, useState } from 'react'; import styled from '@emotion/styled'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { LightIconButton } from '@/ui/button/components/LightIconButton'; -import { DropdownMenu } from '@/ui/dropdown/components/DropdownMenu'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { DropdownScope } from '@/ui/dropdown/scopes/DropdownScope'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; +import { IconButton } from '../button/components/IconButton'; +import { LightIconButton } from '../button/components/LightIconButton'; import { IconApps } from '../constants/icons'; import { DropdownMenuSkeletonItem } from '../relation-picker/components/skeletons/DropdownMenuSkeletonItem'; import { IconPickerHotkeyScope } from '../types/IconPickerHotkeyScope'; diff --git a/front/src/modules/ui/input/components/ImageInput.tsx b/front/src/modules/ui/input/components/ImageInput.tsx index e323cc4f60..c7fd7afddd 100644 --- a/front/src/modules/ui/input/components/ImageInput.tsx +++ b/front/src/modules/ui/input/components/ImageInput.tsx @@ -2,8 +2,13 @@ import React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { Button } from '@/ui/button/components/Button'; -import { IconFileUpload, IconTrash, IconUpload, IconX } from '@/ui/icon'; +import { + IconFileUpload, + IconTrash, + IconUpload, + IconX, +} from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; const StyledContainer = styled.div` display: flex; diff --git a/front/src/modules/ui/input/components/TextInput.tsx b/front/src/modules/ui/input/components/TextInput.tsx index e678bcd229..27c1fc4fac 100644 --- a/front/src/modules/ui/input/components/TextInput.tsx +++ b/front/src/modules/ui/input/components/TextInput.tsx @@ -11,8 +11,8 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { Key } from 'ts-key-enum'; -import { IconAlertCircle } from '@/ui/icon'; -import { IconEye, IconEyeOff } from '@/ui/icon/index'; +import { IconAlertCircle } from '@/ui/display/icon'; +import { IconEye, IconEyeOff } from '@/ui/display/icon/index'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useCombinedRefs } from '~/hooks/useCombinedRefs'; diff --git a/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx b/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx index a5f7c3c533..dc310a9391 100644 --- a/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx +++ b/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx @@ -6,11 +6,11 @@ import { hasFlag } from 'country-flag-icons'; import * as Flags from 'country-flag-icons/react/3x2'; import { CountryCallingCode } from 'libphonenumber-js'; -import { DropdownMenu } from '@/ui/dropdown/components/DropdownMenu'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { DropdownScope } from '@/ui/dropdown/scopes/DropdownScope'; -import { IconChevronDown } from '@/ui/icon'; +import { IconChevronDown } from '@/ui/display/icon'; import { IconWorld } from '@/ui/input/constants/icons'; +import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { CountryPickerHotkeyScope } from '../types/CountryPickerHotkeyScope'; diff --git a/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx b/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx index a9b6d39eda..be639df4bc 100644 --- a/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx +++ b/front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx @@ -1,12 +1,12 @@ import { useMemo, useState } from 'react'; import styled from '@emotion/styled'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemSelectAvatar } from '@/ui/menu-item/components/MenuItemSelectAvatar'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar'; import { Country } from './CountryPickerDropdownButton'; diff --git a/front/src/modules/ui/editor/components/BlockEditor.tsx b/front/src/modules/ui/input/editor/components/BlockEditor.tsx similarity index 100% rename from front/src/modules/ui/editor/components/BlockEditor.tsx rename to front/src/modules/ui/input/editor/components/BlockEditor.tsx diff --git a/front/src/modules/ui/input/relation-picker/components/CreateNewButton.tsx b/front/src/modules/ui/input/relation-picker/components/CreateNewButton.tsx index 06d4f836fe..a9c7748c8d 100644 --- a/front/src/modules/ui/input/relation-picker/components/CreateNewButton.tsx +++ b/front/src/modules/ui/input/relation-picker/components/CreateNewButton.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import styled from '@emotion/styled'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; const StyledCreateNewButton = styled(MenuItem)<{ hovered: boolean }>` ${({ hovered, theme }) => diff --git a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx b/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx index 4edc10c191..b7336bbf9c 100644 --- a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx +++ b/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx @@ -1,12 +1,12 @@ import { useRef } from 'react'; import debounce from 'lodash.debounce'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemMultiSelectAvatar } from '@/ui/menu-item/components/MenuItemMultiSelectAvatar'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemMultiSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemMultiSelectAvatar'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { Avatar } from '@/users/components/Avatar'; import { isNonEmptyString } from '~/utils/isNonEmptyString'; diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx index 5fcbaf072a..2e5c5dd99a 100644 --- a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx +++ b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx @@ -1,8 +1,8 @@ import { useRef } from 'react'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { isDefined } from '~/utils/isDefined'; diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx index 5079ef1e41..dba1832bac 100644 --- a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx +++ b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx @@ -1,13 +1,13 @@ import { useRef } from 'react'; import { Key } from 'ts-key-enum'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { IconPlus } from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemSelect } from '@/ui/menu-item/components/MenuItemSelect'; -import { MenuItemSelectAvatar } from '@/ui/menu-item/components/MenuItemSelectAvatar'; +import { IconPlus } from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemSelect } from '@/ui/navigation/menu-item/components/MenuItemSelect'; +import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { Avatar } from '@/users/components/Avatar'; import { assertNotNull } from '~/utils/assert'; diff --git a/front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx b/front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx index 99a8da9d0e..597bb7180c 100644 --- a/front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx +++ b/front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx @@ -2,7 +2,7 @@ import { expect } from '@storybook/jest'; import { Meta, StoryObj } from '@storybook/react'; import { userEvent, within } from '@storybook/testing-library'; -import { IconUserCircle } from '@/ui/icon'; +import { IconUserCircle } from '@/ui/display/icon'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator'; diff --git a/front/src/modules/ui/input/states/iconPickerState.ts b/front/src/modules/ui/input/states/iconPickerState.ts index 0aa9c3dec2..c7785332fe 100644 --- a/front/src/modules/ui/input/states/iconPickerState.ts +++ b/front/src/modules/ui/input/states/iconPickerState.ts @@ -1,6 +1,6 @@ import { atom } from 'recoil'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { IconApps } from '../constants/icons'; diff --git a/front/src/modules/ui/board/components/BoardColumn.tsx b/front/src/modules/ui/layout/board/components/BoardColumn.tsx similarity index 98% rename from front/src/modules/ui/board/components/BoardColumn.tsx rename to front/src/modules/ui/layout/board/components/BoardColumn.tsx index b1a5dcc36d..e25363eb06 100644 --- a/front/src/modules/ui/board/components/BoardColumn.tsx +++ b/front/src/modules/ui/layout/board/components/BoardColumn.tsx @@ -1,7 +1,7 @@ import React, { useContext } from 'react'; import styled from '@emotion/styled'; -import { Tag } from '@/ui/tag/components/Tag'; +import { Tag } from '@/ui/display/tag/components/Tag'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { BoardColumnContext } from '../contexts/BoardColumnContext'; diff --git a/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx b/front/src/modules/ui/layout/board/components/BoardColumnEditTitleMenu.tsx similarity index 90% rename from front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx rename to front/src/modules/ui/layout/board/components/BoardColumnEditTitleMenu.tsx index f7696ad4ee..d018c44f0e 100644 --- a/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx +++ b/front/src/modules/ui/layout/board/components/BoardColumnEditTitleMenu.tsx @@ -2,11 +2,11 @@ import { ChangeEvent, useCallback, useState } from 'react'; import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { IconTrash } from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemSelectColor } from '@/ui/menu-item/components/MenuItemSelectColor'; +import { IconTrash } from '@/ui/display/icon'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemSelectColor } from '@/ui/navigation/menu-item/components/MenuItemSelectColor'; import { ThemeColor } from '@/ui/theme/constants/colors'; import { textInputStyle } from '@/ui/theme/constants/effects'; import { debounce } from '~/utils/debounce'; diff --git a/front/src/modules/ui/board/components/BoardColumnMenu.tsx b/front/src/modules/ui/layout/board/components/BoardColumnMenu.tsx similarity index 92% rename from front/src/modules/ui/board/components/BoardColumnMenu.tsx rename to front/src/modules/ui/layout/board/components/BoardColumnMenu.tsx index 495b5ce136..549f9aed44 100644 --- a/front/src/modules/ui/board/components/BoardColumnMenu.tsx +++ b/front/src/modules/ui/layout/board/components/BoardColumnMenu.tsx @@ -4,15 +4,20 @@ import { Key } from 'ts-key-enum'; import { useCreateCompanyProgress } from '@/companies/hooks/useCreateCompanyProgress'; import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { IconArrowLeft, IconArrowRight, IconPencil, IconPlus } from '@/ui/icon'; +import { + IconArrowLeft, + IconArrowRight, + IconPencil, + IconPlus, +} from '@/ui/display/icon'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect'; import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState'; import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; diff --git a/front/src/modules/ui/board/components/BoardHeader.tsx b/front/src/modules/ui/layout/board/components/BoardHeader.tsx similarity index 94% rename from front/src/modules/ui/board/components/BoardHeader.tsx rename to front/src/modules/ui/layout/board/components/BoardHeader.tsx index e2e3fc600b..cd7d22f602 100644 --- a/front/src/modules/ui/board/components/BoardHeader.tsx +++ b/front/src/modules/ui/layout/board/components/BoardHeader.tsx @@ -3,12 +3,12 @@ import { useSearchParams } from 'react-router-dom'; import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil'; import { BoardContext } from '@/companies/states/contexts/BoardContext'; +import { ViewBar } from '@/ui/data/view-bar/components/ViewBar'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { ViewBar } from '@/ui/view-bar/components/ViewBar'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; import { boardCardFieldsScopedState } from '../states/boardCardFieldsScopedState'; import { boardColumnsState } from '../states/boardColumnsState'; diff --git a/front/src/modules/ui/board/components/BoardOptionsDropdown.tsx b/front/src/modules/ui/layout/board/components/BoardOptionsDropdown.tsx similarity index 85% rename from front/src/modules/ui/board/components/BoardOptionsDropdown.tsx rename to front/src/modules/ui/layout/board/components/BoardOptionsDropdown.tsx index f5fcb65c20..7ebb918c8f 100644 --- a/front/src/modules/ui/board/components/BoardOptionsDropdown.tsx +++ b/front/src/modules/ui/layout/board/components/BoardOptionsDropdown.tsx @@ -1,7 +1,7 @@ import { useResetRecoilState } from 'recoil'; -import { ViewBarDropdownButton } from '@/ui/view-bar/components/ViewBarDropdownButton'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; +import { ViewBarDropdownButton } from '@/ui/data/view-bar/components/ViewBarDropdownButton'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; import { BoardScopeIds } from '../types/enums/BoardScopeIds'; diff --git a/front/src/modules/ui/board/components/BoardOptionsDropdownButton.tsx b/front/src/modules/ui/layout/board/components/BoardOptionsDropdownButton.tsx similarity index 72% rename from front/src/modules/ui/board/components/BoardOptionsDropdownButton.tsx rename to front/src/modules/ui/layout/board/components/BoardOptionsDropdownButton.tsx index 241af60f16..eca0811ef5 100644 --- a/front/src/modules/ui/board/components/BoardOptionsDropdownButton.tsx +++ b/front/src/modules/ui/layout/board/components/BoardOptionsDropdownButton.tsx @@ -1,5 +1,5 @@ -import { StyledHeaderDropdownButton } from '@/ui/dropdown/components/StyledHeaderDropdownButton'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { BoardScopeIds } from '../types/enums/BoardScopeIds'; diff --git a/front/src/modules/ui/board/components/BoardOptionsDropdownContent.tsx b/front/src/modules/ui/layout/board/components/BoardOptionsDropdownContent.tsx similarity index 84% rename from front/src/modules/ui/board/components/BoardOptionsDropdownContent.tsx rename to front/src/modules/ui/layout/board/components/BoardOptionsDropdownContent.tsx index 4449c67818..0fd2755dfb 100644 --- a/front/src/modules/ui/board/components/BoardOptionsDropdownContent.tsx +++ b/front/src/modules/ui/layout/board/components/BoardOptionsDropdownContent.tsx @@ -9,32 +9,32 @@ import { Key } from 'ts-key-enum'; import { v4 } from 'uuid'; import { BoardContext } from '@/companies/states/contexts/BoardContext'; -import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; -import { DropdownMenuInput } from '@/ui/dropdown/components/DropdownMenuInput'; -import { DropdownMenuInputContainer } from '@/ui/dropdown/components/DropdownMenuInputContainer'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { ViewFieldsVisibilityDropdownSection } from '@/ui/data/view-bar/components/ViewFieldsVisibilityDropdownSection'; +import { useUpsertView } from '@/ui/data/view-bar/hooks/useUpsertView'; +import { currentViewScopedSelector } from '@/ui/data/view-bar/states/selectors/currentViewScopedSelector'; +import { viewsByIdScopedSelector } from '@/ui/data/view-bar/states/selectors/viewsByIdScopedSelector'; +import { viewEditModeState } from '@/ui/data/view-bar/states/viewEditModeState'; import { IconChevronLeft, IconLayoutKanban, IconPlus, IconTag, -} from '@/ui/icon'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemNavigate } from '@/ui/menu-item/components/MenuItemNavigate'; +} from '@/ui/display/icon'; +import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput'; +import { DropdownMenuInputContainer } from '@/ui/layout/dropdown/components/DropdownMenuInputContainer'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenuSeparator } from '@/ui/layout/dropdown/components/StyledDropdownMenuSeparator'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemNavigate } from '@/ui/navigation/menu-item/components/MenuItemNavigate'; import { ThemeColor } from '@/ui/theme/constants/colors'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId'; -import { ViewFieldsVisibilityDropdownSection } from '@/ui/view-bar/components/ViewFieldsVisibilityDropdownSection'; -import { useUpsertView } from '@/ui/view-bar/hooks/useUpsertView'; -import { currentViewScopedSelector } from '@/ui/view-bar/states/selectors/currentViewScopedSelector'; -import { viewsByIdScopedSelector } from '@/ui/view-bar/states/selectors/viewsByIdScopedSelector'; -import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; import { useBoardCardFields } from '../hooks/useBoardCardFields'; import { boardCardFieldsScopedState } from '../states/boardCardFieldsScopedState'; diff --git a/front/src/modules/ui/board/components/EntityBoard.tsx b/front/src/modules/ui/layout/board/components/EntityBoard.tsx similarity index 96% rename from front/src/modules/ui/board/components/EntityBoard.tsx rename to front/src/modules/ui/layout/board/components/EntityBoard.tsx index 60eef28d24..51df174e77 100644 --- a/front/src/modules/ui/board/components/EntityBoard.tsx +++ b/front/src/modules/ui/layout/board/components/EntityBoard.tsx @@ -6,9 +6,9 @@ import { useRecoilValue } from 'recoil'; import { GET_PIPELINE_PROGRESS } from '@/pipeline/graphql/queries/getPipelineProgress'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { BoardHeader } from '@/ui/board/components/BoardHeader'; -import { StyledBoard } from '@/ui/board/components/StyledBoard'; -import { BoardColumnContext } from '@/ui/board/contexts/BoardColumnContext'; +import { BoardHeader } from '@/ui/layout/board/components/BoardHeader'; +import { StyledBoard } from '@/ui/layout/board/components/StyledBoard'; +import { BoardColumnContext } from '@/ui/layout/board/contexts/BoardColumnContext'; import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useListenClickOutsideByClassName } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; diff --git a/front/src/modules/ui/board/components/EntityBoardActionBar.tsx b/front/src/modules/ui/layout/board/components/EntityBoardActionBar.tsx similarity index 81% rename from front/src/modules/ui/board/components/EntityBoardActionBar.tsx rename to front/src/modules/ui/layout/board/components/EntityBoardActionBar.tsx index 2173c45e0a..69dadd09d4 100644 --- a/front/src/modules/ui/board/components/EntityBoardActionBar.tsx +++ b/front/src/modules/ui/layout/board/components/EntityBoardActionBar.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRecoilValue } from 'recoil'; -import { ActionBar } from '@/ui/action-bar/components/ActionBar'; +import { ActionBar } from '@/ui/navigation/action-bar/components/ActionBar'; import { selectedCardIdsSelector } from '../states/selectors/selectedCardIdsSelector'; diff --git a/front/src/modules/ui/board/components/EntityBoardCard.tsx b/front/src/modules/ui/layout/board/components/EntityBoardCard.tsx similarity index 87% rename from front/src/modules/ui/board/components/EntityBoardCard.tsx rename to front/src/modules/ui/layout/board/components/EntityBoardCard.tsx index 0153473e0c..e2083e7923 100644 --- a/front/src/modules/ui/board/components/EntityBoardCard.tsx +++ b/front/src/modules/ui/layout/board/components/EntityBoardCard.tsx @@ -1,8 +1,8 @@ import { Draggable } from '@hello-pangea/dnd'; import { useSetRecoilState } from 'recoil'; -import { contextMenuIsOpenState } from '@/ui/context-menu/states/contextMenuIsOpenState'; -import { contextMenuPositionState } from '@/ui/context-menu/states/contextMenuPositionState'; +import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState'; +import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState'; import { useCurrentCardSelected } from '../hooks/useCurrentCardSelected'; import { BoardOptions } from '../types/BoardOptions'; diff --git a/front/src/modules/ui/board/components/EntityBoardColumn.tsx b/front/src/modules/ui/layout/board/components/EntityBoardColumn.tsx similarity index 93% rename from front/src/modules/ui/board/components/EntityBoardColumn.tsx rename to front/src/modules/ui/layout/board/components/EntityBoardColumn.tsx index 74d828ed67..17eb766c5f 100644 --- a/front/src/modules/ui/board/components/EntityBoardColumn.tsx +++ b/front/src/modules/ui/layout/board/components/EntityBoardColumn.tsx @@ -3,9 +3,9 @@ import styled from '@emotion/styled'; import { Draggable, Droppable, DroppableProvided } from '@hello-pangea/dnd'; import { useRecoilValue } from 'recoil'; -import { BoardColumn } from '@/ui/board/components/BoardColumn'; -import { BoardCardIdContext } from '@/ui/board/contexts/BoardCardIdContext'; -import { BoardColumnContext } from '@/ui/board/contexts/BoardColumnContext'; +import { BoardColumn } from '@/ui/layout/board/components/BoardColumn'; +import { BoardCardIdContext } from '@/ui/layout/board/contexts/BoardCardIdContext'; +import { BoardColumnContext } from '@/ui/layout/board/contexts/BoardColumnContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { boardCardIdsByColumnIdFamilyState } from '../states/boardCardIdsByColumnIdFamilyState'; diff --git a/front/src/modules/ui/board/components/EntityBoardContextMenu.tsx b/front/src/modules/ui/layout/board/components/EntityBoardContextMenu.tsx similarity index 80% rename from front/src/modules/ui/board/components/EntityBoardContextMenu.tsx rename to front/src/modules/ui/layout/board/components/EntityBoardContextMenu.tsx index 0efbd93466..5bb7183b5f 100644 --- a/front/src/modules/ui/board/components/EntityBoardContextMenu.tsx +++ b/front/src/modules/ui/layout/board/components/EntityBoardContextMenu.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRecoilValue } from 'recoil'; -import { ContextMenu } from '@/ui/context-menu/components/ContextMenu'; +import { ContextMenu } from '@/ui/navigation/context-menu/components/ContextMenu'; import { selectedCardIdsSelector } from '../states/selectors/selectedCardIdsSelector'; diff --git a/front/src/modules/ui/board/components/NewButton.tsx b/front/src/modules/ui/layout/board/components/NewButton.tsx similarity index 94% rename from front/src/modules/ui/board/components/NewButton.tsx rename to front/src/modules/ui/layout/board/components/NewButton.tsx index e1d3801264..867a570638 100644 --- a/front/src/modules/ui/board/components/NewButton.tsx +++ b/front/src/modules/ui/layout/board/components/NewButton.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconPlus } from '@/ui/icon/index'; +import { IconPlus } from '@/ui/display/icon/index'; const StyledButton = styled.button` align-items: center; diff --git a/front/src/modules/ui/board/components/StyledBoard.tsx b/front/src/modules/ui/layout/board/components/StyledBoard.tsx similarity index 100% rename from front/src/modules/ui/board/components/StyledBoard.tsx rename to front/src/modules/ui/layout/board/components/StyledBoard.tsx diff --git a/front/src/modules/ui/board/components/__stories__/BoardColumnEditTitleMenu.stories.tsx b/front/src/modules/ui/layout/board/components/__stories__/BoardColumnEditTitleMenu.stories.tsx similarity index 100% rename from front/src/modules/ui/board/components/__stories__/BoardColumnEditTitleMenu.stories.tsx rename to front/src/modules/ui/layout/board/components/__stories__/BoardColumnEditTitleMenu.stories.tsx diff --git a/front/src/modules/ui/board/components/__stories__/BoardOptionsDropdown.stories.tsx b/front/src/modules/ui/layout/board/components/__stories__/BoardOptionsDropdown.stories.tsx similarity index 95% rename from front/src/modules/ui/board/components/__stories__/BoardOptionsDropdown.stories.tsx rename to front/src/modules/ui/layout/board/components/__stories__/BoardOptionsDropdown.stories.tsx index 694ad549a0..d4bf850142 100644 --- a/front/src/modules/ui/board/components/__stories__/BoardOptionsDropdown.stories.tsx +++ b/front/src/modules/ui/layout/board/components/__stories__/BoardOptionsDropdown.stories.tsx @@ -3,7 +3,7 @@ import { userEvent, within } from '@storybook/testing-library'; import { BoardContext } from '@/companies/states/contexts/BoardContext'; import { CompanyBoardRecoilScopeContext } from '@/companies/states/recoil-scope-contexts/CompanyBoardRecoilScopeContext'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator'; diff --git a/front/src/modules/ui/board/contexts/BoardCardIdContext.ts b/front/src/modules/ui/layout/board/contexts/BoardCardIdContext.ts similarity index 100% rename from front/src/modules/ui/board/contexts/BoardCardIdContext.ts rename to front/src/modules/ui/layout/board/contexts/BoardCardIdContext.ts diff --git a/front/src/modules/ui/board/contexts/BoardColumnContext.ts b/front/src/modules/ui/layout/board/contexts/BoardColumnContext.ts similarity index 100% rename from front/src/modules/ui/board/contexts/BoardColumnContext.ts rename to front/src/modules/ui/layout/board/contexts/BoardColumnContext.ts diff --git a/front/src/modules/ui/board/contexts/BoardOptionsContext.ts b/front/src/modules/ui/layout/board/contexts/BoardOptionsContext.ts similarity index 63% rename from front/src/modules/ui/board/contexts/BoardOptionsContext.ts rename to front/src/modules/ui/layout/board/contexts/BoardOptionsContext.ts index 0636d0f0ec..fd599cc926 100644 --- a/front/src/modules/ui/board/contexts/BoardOptionsContext.ts +++ b/front/src/modules/ui/layout/board/contexts/BoardOptionsContext.ts @@ -1,5 +1,5 @@ import { createContext } from 'react'; -import { BoardOptions } from '@/ui/board/types/BoardOptions'; +import { BoardOptions } from '@/ui/layout/board/types/BoardOptions'; export const BoardOptionsContext = createContext(null); diff --git a/front/src/modules/ui/board/hooks/useBoardActionBarEntries.tsx b/front/src/modules/ui/layout/board/hooks/useBoardActionBarEntries.tsx similarity index 79% rename from front/src/modules/ui/board/hooks/useBoardActionBarEntries.tsx rename to front/src/modules/ui/layout/board/hooks/useBoardActionBarEntries.tsx index 46796d0ea1..321dc14cfc 100644 --- a/front/src/modules/ui/board/hooks/useBoardActionBarEntries.tsx +++ b/front/src/modules/ui/layout/board/hooks/useBoardActionBarEntries.tsx @@ -1,7 +1,7 @@ import { useSetRecoilState } from 'recoil'; -import { actionBarEntriesState } from '@/ui/action-bar/states/actionBarEntriesState'; -import { IconTrash } from '@/ui/icon'; +import { IconTrash } from '@/ui/display/icon'; +import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState'; import { useDeleteSelectedBoardCards } from './useDeleteSelectedBoardCards'; diff --git a/front/src/modules/ui/board/hooks/useBoardCardFields.ts b/front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts similarity index 90% rename from front/src/modules/ui/board/hooks/useBoardCardFields.ts rename to front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts index a06d697e3b..0a734d4be0 100644 --- a/front/src/modules/ui/board/hooks/useBoardCardFields.ts +++ b/front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts @@ -1,5 +1,5 @@ +import { ViewFieldForVisibility } from '@/ui/data/view-bar/types/ViewFieldForVisibility'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { ViewFieldForVisibility } from '@/ui/view-bar/types/ViewFieldForVisibility'; import { boardCardFieldsScopedState } from '../states/boardCardFieldsScopedState'; diff --git a/front/src/modules/ui/board/hooks/useBoardColumns.ts b/front/src/modules/ui/layout/board/hooks/useBoardColumns.ts similarity index 100% rename from front/src/modules/ui/board/hooks/useBoardColumns.ts rename to front/src/modules/ui/layout/board/hooks/useBoardColumns.ts diff --git a/front/src/modules/ui/board/hooks/useBoardContext.ts b/front/src/modules/ui/layout/board/hooks/useBoardContext.ts similarity index 100% rename from front/src/modules/ui/board/hooks/useBoardContext.ts rename to front/src/modules/ui/layout/board/hooks/useBoardContext.ts diff --git a/front/src/modules/ui/board/hooks/useBoardContextMenuEntries.tsx b/front/src/modules/ui/layout/board/hooks/useBoardContextMenuEntries.tsx similarity index 79% rename from front/src/modules/ui/board/hooks/useBoardContextMenuEntries.tsx rename to front/src/modules/ui/layout/board/hooks/useBoardContextMenuEntries.tsx index 11b4194730..16b3c11e70 100644 --- a/front/src/modules/ui/board/hooks/useBoardContextMenuEntries.tsx +++ b/front/src/modules/ui/layout/board/hooks/useBoardContextMenuEntries.tsx @@ -1,7 +1,7 @@ import { useSetRecoilState } from 'recoil'; -import { contextMenuEntriesState } from '@/ui/context-menu/states/contextMenuEntriesState'; -import { IconTrash } from '@/ui/icon'; +import { IconTrash } from '@/ui/display/icon'; +import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState'; import { useDeleteSelectedBoardCards } from './useDeleteSelectedBoardCards'; diff --git a/front/src/modules/ui/board/hooks/useCurrentCardSelected.ts b/front/src/modules/ui/layout/board/hooks/useCurrentCardSelected.ts similarity index 94% rename from front/src/modules/ui/board/hooks/useCurrentCardSelected.ts rename to front/src/modules/ui/layout/board/hooks/useCurrentCardSelected.ts index 18e266860b..234704a745 100644 --- a/front/src/modules/ui/board/hooks/useCurrentCardSelected.ts +++ b/front/src/modules/ui/layout/board/hooks/useCurrentCardSelected.ts @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil'; -import { actionBarOpenState } from '@/ui/action-bar/states/actionBarIsOpenState'; +import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState'; import { BoardCardIdContext } from '../contexts/BoardCardIdContext'; import { activeCardIdsState } from '../states/activeCardIdsState'; diff --git a/front/src/modules/ui/board/hooks/useDeleteSelectedBoardCards.ts b/front/src/modules/ui/layout/board/hooks/useDeleteSelectedBoardCards.ts similarity index 100% rename from front/src/modules/ui/board/hooks/useDeleteSelectedBoardCards.ts rename to front/src/modules/ui/layout/board/hooks/useDeleteSelectedBoardCards.ts diff --git a/front/src/modules/ui/board/hooks/useRemoveCardIds.ts b/front/src/modules/ui/layout/board/hooks/useRemoveCardIds.ts similarity index 100% rename from front/src/modules/ui/board/hooks/useRemoveCardIds.ts rename to front/src/modules/ui/layout/board/hooks/useRemoveCardIds.ts diff --git a/front/src/modules/ui/board/hooks/useSetCardSelected.ts b/front/src/modules/ui/layout/board/hooks/useSetCardSelected.ts similarity index 90% rename from front/src/modules/ui/board/hooks/useSetCardSelected.ts rename to front/src/modules/ui/layout/board/hooks/useSetCardSelected.ts index 1bd5482b26..66d83275aa 100644 --- a/front/src/modules/ui/board/hooks/useSetCardSelected.ts +++ b/front/src/modules/ui/layout/board/hooks/useSetCardSelected.ts @@ -1,6 +1,6 @@ import { useRecoilCallback, useSetRecoilState } from 'recoil'; -import { actionBarOpenState } from '@/ui/action-bar/states/actionBarIsOpenState'; +import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState'; import { activeCardIdsState } from '../states/activeCardIdsState'; import { isCardSelectedFamilyState } from '../states/isCardSelectedFamilyState'; diff --git a/front/src/modules/ui/board/hooks/useUpdateBoardCardIds.ts b/front/src/modules/ui/layout/board/hooks/useUpdateBoardCardIds.ts similarity index 100% rename from front/src/modules/ui/board/hooks/useUpdateBoardCardIds.ts rename to front/src/modules/ui/layout/board/hooks/useUpdateBoardCardIds.ts diff --git a/front/src/modules/ui/board/states/activeCardIdsState.ts b/front/src/modules/ui/layout/board/states/activeCardIdsState.ts similarity index 100% rename from front/src/modules/ui/board/states/activeCardIdsState.ts rename to front/src/modules/ui/layout/board/states/activeCardIdsState.ts diff --git a/front/src/modules/ui/board/states/availableBoardCardFieldsScopedState.ts b/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts similarity index 80% rename from front/src/modules/ui/board/states/availableBoardCardFieldsScopedState.ts rename to front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts index 691b04d793..e1efde93c4 100644 --- a/front/src/modules/ui/board/states/availableBoardCardFieldsScopedState.ts +++ b/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { BoardFieldDefinition } from '../types/BoardFieldDefinition'; diff --git a/front/src/modules/ui/board/states/boardCardFieldsScopedState.ts b/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts similarity index 79% rename from front/src/modules/ui/board/states/boardCardFieldsScopedState.ts rename to front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts index 2255400040..75afa28124 100644 --- a/front/src/modules/ui/board/states/boardCardFieldsScopedState.ts +++ b/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { BoardFieldDefinition } from '../types/BoardFieldDefinition'; diff --git a/front/src/modules/ui/board/states/boardCardIdsByColumnIdFamilyState.ts b/front/src/modules/ui/layout/board/states/boardCardIdsByColumnIdFamilyState.ts similarity index 100% rename from front/src/modules/ui/board/states/boardCardIdsByColumnIdFamilyState.ts rename to front/src/modules/ui/layout/board/states/boardCardIdsByColumnIdFamilyState.ts diff --git a/front/src/modules/ui/board/states/boardColumnsState.ts b/front/src/modules/ui/layout/board/states/boardColumnsState.ts similarity index 62% rename from front/src/modules/ui/board/states/boardColumnsState.ts rename to front/src/modules/ui/layout/board/states/boardColumnsState.ts index 73fa3ec00a..63b31e4a81 100644 --- a/front/src/modules/ui/board/states/boardColumnsState.ts +++ b/front/src/modules/ui/layout/board/states/boardColumnsState.ts @@ -1,6 +1,6 @@ import { atom } from 'recoil'; -import { BoardColumnDefinition } from '@/ui/board/types/BoardColumnDefinition'; +import { BoardColumnDefinition } from '@/ui/layout/board/types/BoardColumnDefinition'; export const boardColumnsState = atom({ key: 'boardColumnsState', diff --git a/front/src/modules/ui/board/states/isBoardLoadedState.ts b/front/src/modules/ui/layout/board/states/isBoardLoadedState.ts similarity index 100% rename from front/src/modules/ui/board/states/isBoardLoadedState.ts rename to front/src/modules/ui/layout/board/states/isBoardLoadedState.ts diff --git a/front/src/modules/ui/board/states/isCardSelectedFamilyState.ts b/front/src/modules/ui/layout/board/states/isCardSelectedFamilyState.ts similarity index 100% rename from front/src/modules/ui/board/states/isCardSelectedFamilyState.ts rename to front/src/modules/ui/layout/board/states/isCardSelectedFamilyState.ts diff --git a/front/src/modules/ui/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext.ts b/front/src/modules/ui/layout/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext.ts similarity index 100% rename from front/src/modules/ui/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext.ts rename to front/src/modules/ui/layout/board/states/recoil-scope-contexts/BoardColumnRecoilScopeContext.ts diff --git a/front/src/modules/ui/board/states/savedBoardCardFieldsFamilyState.ts b/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts similarity index 81% rename from front/src/modules/ui/board/states/savedBoardCardFieldsFamilyState.ts rename to front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts index 1bd5e0a431..a251bc1737 100644 --- a/front/src/modules/ui/board/states/savedBoardCardFieldsFamilyState.ts +++ b/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts @@ -1,6 +1,6 @@ import { atomFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { BoardFieldDefinition } from '../types/BoardFieldDefinition'; diff --git a/front/src/modules/ui/board/states/savedBoardColumnsState.ts b/front/src/modules/ui/layout/board/states/savedBoardColumnsState.ts similarity index 100% rename from front/src/modules/ui/board/states/savedBoardColumnsState.ts rename to front/src/modules/ui/layout/board/states/savedBoardColumnsState.ts diff --git a/front/src/modules/ui/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts b/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts similarity index 88% rename from front/src/modules/ui/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts rename to front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts index b08f533f69..fc51754691 100644 --- a/front/src/modules/ui/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts +++ b/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts @@ -1,6 +1,6 @@ import { selectorFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { BoardFieldDefinition } from '../../types/BoardFieldDefinition'; import { boardCardFieldsScopedState } from '../boardCardFieldsScopedState'; diff --git a/front/src/modules/ui/board/states/selectors/boardColumnTotalsFamilySelector.ts b/front/src/modules/ui/layout/board/states/selectors/boardColumnTotalsFamilySelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/boardColumnTotalsFamilySelector.ts rename to front/src/modules/ui/layout/board/states/selectors/boardColumnTotalsFamilySelector.ts diff --git a/front/src/modules/ui/board/states/selectors/canPersistBoardCardFieldsScopedFamilySelector.ts b/front/src/modules/ui/layout/board/states/selectors/canPersistBoardCardFieldsScopedFamilySelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/canPersistBoardCardFieldsScopedFamilySelector.ts rename to front/src/modules/ui/layout/board/states/selectors/canPersistBoardCardFieldsScopedFamilySelector.ts diff --git a/front/src/modules/ui/board/states/selectors/canPersistBoardColumnsSelector.ts b/front/src/modules/ui/layout/board/states/selectors/canPersistBoardColumnsSelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/canPersistBoardColumnsSelector.ts rename to front/src/modules/ui/layout/board/states/selectors/canPersistBoardColumnsSelector.ts diff --git a/front/src/modules/ui/board/states/selectors/hiddenBoardCardFieldsScopedSelector.ts b/front/src/modules/ui/layout/board/states/selectors/hiddenBoardCardFieldsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/hiddenBoardCardFieldsScopedSelector.ts rename to front/src/modules/ui/layout/board/states/selectors/hiddenBoardCardFieldsScopedSelector.ts diff --git a/front/src/modules/ui/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts b/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts similarity index 89% rename from front/src/modules/ui/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts rename to front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts index ca3fb59e0a..1700f33022 100644 --- a/front/src/modules/ui/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts +++ b/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts @@ -1,6 +1,6 @@ import { selectorFamily } from 'recoil'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { BoardFieldDefinition } from '../../types/BoardFieldDefinition'; import { savedBoardCardFieldsFamilyState } from '../savedBoardCardFieldsFamilyState'; diff --git a/front/src/modules/ui/board/states/selectors/selectedCardIdsSelector.ts b/front/src/modules/ui/layout/board/states/selectors/selectedCardIdsSelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/selectedCardIdsSelector.ts rename to front/src/modules/ui/layout/board/states/selectors/selectedCardIdsSelector.ts diff --git a/front/src/modules/ui/board/states/selectors/visibleBoardCardFieldsScopedSelector.ts b/front/src/modules/ui/layout/board/states/selectors/visibleBoardCardFieldsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/board/states/selectors/visibleBoardCardFieldsScopedSelector.ts rename to front/src/modules/ui/layout/board/states/selectors/visibleBoardCardFieldsScopedSelector.ts diff --git a/front/src/modules/ui/board/types/BoardColumnDefinition.ts b/front/src/modules/ui/layout/board/types/BoardColumnDefinition.ts similarity index 100% rename from front/src/modules/ui/board/types/BoardColumnDefinition.ts rename to front/src/modules/ui/layout/board/types/BoardColumnDefinition.ts diff --git a/front/src/modules/ui/board/types/BoardColumnHotkeyScope.ts b/front/src/modules/ui/layout/board/types/BoardColumnHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/board/types/BoardColumnHotkeyScope.ts rename to front/src/modules/ui/layout/board/types/BoardColumnHotkeyScope.ts diff --git a/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts b/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts new file mode 100644 index 0000000000..e1fc3a90b4 --- /dev/null +++ b/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts @@ -0,0 +1,8 @@ +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; + +export type BoardFieldDefinition = + FieldDefinition & { + index: number; + isVisible?: boolean; + }; diff --git a/front/src/modules/ui/board/types/BoardOptions.ts b/front/src/modules/ui/layout/board/types/BoardOptions.ts similarity index 62% rename from front/src/modules/ui/board/types/BoardOptions.ts rename to front/src/modules/ui/layout/board/types/BoardOptions.ts index aac342f13d..e4bd8bc0d3 100644 --- a/front/src/modules/ui/board/types/BoardOptions.ts +++ b/front/src/modules/ui/layout/board/types/BoardOptions.ts @@ -1,7 +1,7 @@ import { ComponentType } from 'react'; -import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; +import { FilterDefinitionByEntity } from '@/ui/data/view-bar/types/FilterDefinitionByEntity'; +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; import { PipelineProgress } from '~/generated/graphql'; export type BoardOptions = { diff --git a/front/src/modules/ui/board/types/BoardOptionsHotkeyScope.ts b/front/src/modules/ui/layout/board/types/BoardOptionsHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/board/types/BoardOptionsHotkeyScope.ts rename to front/src/modules/ui/layout/board/types/BoardOptionsHotkeyScope.ts diff --git a/front/src/modules/ui/board/types/ColumnHotkeyScope.ts b/front/src/modules/ui/layout/board/types/ColumnHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/board/types/ColumnHotkeyScope.ts rename to front/src/modules/ui/layout/board/types/ColumnHotkeyScope.ts diff --git a/front/src/modules/ui/board/types/enums/BoardScopeIds.ts b/front/src/modules/ui/layout/board/types/enums/BoardScopeIds.ts similarity index 100% rename from front/src/modules/ui/board/types/enums/BoardScopeIds.ts rename to front/src/modules/ui/layout/board/types/enums/BoardScopeIds.ts diff --git a/front/src/modules/ui/draggable-list/__stories__/DraggableItem.stories.tsx b/front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx similarity index 88% rename from front/src/modules/ui/draggable-list/__stories__/DraggableItem.stories.tsx rename to front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx index 4667a628ed..03afc45376 100644 --- a/front/src/modules/ui/draggable-list/__stories__/DraggableItem.stories.tsx +++ b/front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx @@ -1,8 +1,8 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; -import { MenuItemDraggable } from '@/ui/menu-item/components/MenuItemDraggable'; +import { IconBell } from '@/ui/display/icon'; +import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { DraggableItem } from '../components/DraggableItem'; diff --git a/front/src/modules/ui/draggable-list/__stories__/DraggableList.stories.tsx b/front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx similarity index 90% rename from front/src/modules/ui/draggable-list/__stories__/DraggableList.stories.tsx rename to front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx index 0c259eba5c..6585cbe88e 100644 --- a/front/src/modules/ui/draggable-list/__stories__/DraggableList.stories.tsx +++ b/front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; -import { MenuItemDraggable } from '@/ui/menu-item/components/MenuItemDraggable'; +import { IconBell } from '@/ui/display/icon'; +import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { DraggableItem } from '../components/DraggableItem'; diff --git a/front/src/modules/ui/draggable-list/components/DraggableItem.tsx b/front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsx similarity index 100% rename from front/src/modules/ui/draggable-list/components/DraggableItem.tsx rename to front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsx diff --git a/front/src/modules/ui/draggable-list/components/DraggableList.tsx b/front/src/modules/ui/layout/draggable-list/components/DraggableList.tsx similarity index 100% rename from front/src/modules/ui/draggable-list/components/DraggableList.tsx rename to front/src/modules/ui/layout/draggable-list/components/DraggableList.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownMenu.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/DropdownMenu.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuContainer.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuContainer.tsx similarity index 92% rename from front/src/modules/ui/dropdown/components/DropdownMenuContainer.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuContainer.tsx index 7f6b5f4fec..664c314238 100644 --- a/front/src/modules/ui/dropdown/components/DropdownMenuContainer.tsx +++ b/front/src/modules/ui/layout/dropdown/components/DropdownMenuContainer.tsx @@ -1,7 +1,7 @@ import { HTMLAttributes, useRef } from 'react'; import styled from '@emotion/styled'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; const StyledDropdownMenuContainer = styled.ul<{ diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuHeader.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx similarity index 91% rename from front/src/modules/ui/dropdown/components/DropdownMenuHeader.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx index 6f2b568390..fc959c1a93 100644 --- a/front/src/modules/ui/dropdown/components/DropdownMenuHeader.tsx +++ b/front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx @@ -1,8 +1,8 @@ import { ComponentProps, MouseEvent } from 'react'; import styled from '@emotion/styled'; -import { LightIconButton } from '@/ui/button/components/LightIconButton'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; const StyledHeader = styled.li` align-items: center; diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuInput.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/DropdownMenuInput.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuInputContainer.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuInputContainer.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/DropdownMenuInputContainer.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuInputContainer.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuSearchInput.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownMenuSearchInput.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/DropdownMenuSearchInput.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownMenuSearchInput.tsx diff --git a/front/src/modules/ui/dropdown/components/DropdownToggleEffect.tsx b/front/src/modules/ui/layout/dropdown/components/DropdownToggleEffect.tsx similarity index 85% rename from front/src/modules/ui/dropdown/components/DropdownToggleEffect.tsx rename to front/src/modules/ui/layout/dropdown/components/DropdownToggleEffect.tsx index 390e939c71..ecd6769800 100644 --- a/front/src/modules/ui/dropdown/components/DropdownToggleEffect.tsx +++ b/front/src/modules/ui/layout/dropdown/components/DropdownToggleEffect.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; export const DropdownToggleEffect = ({ onDropdownClose, diff --git a/front/src/modules/ui/dropdown/components/StyledDropdownButtonContainer.tsx b/front/src/modules/ui/layout/dropdown/components/StyledDropdownButtonContainer.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/StyledDropdownButtonContainer.tsx rename to front/src/modules/ui/layout/dropdown/components/StyledDropdownButtonContainer.tsx diff --git a/front/src/modules/ui/dropdown/components/StyledDropdownMenu.tsx b/front/src/modules/ui/layout/dropdown/components/StyledDropdownMenu.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/StyledDropdownMenu.tsx rename to front/src/modules/ui/layout/dropdown/components/StyledDropdownMenu.tsx diff --git a/front/src/modules/ui/dropdown/components/StyledDropdownMenuSeparator.tsx b/front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSeparator.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/StyledDropdownMenuSeparator.tsx rename to front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSeparator.tsx diff --git a/front/src/modules/ui/dropdown/components/StyledDropdownMenuSubheader.tsx b/front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/StyledDropdownMenuSubheader.tsx rename to front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx diff --git a/front/src/modules/ui/dropdown/components/StyledHeaderDropdownButton.tsx b/front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/StyledHeaderDropdownButton.tsx rename to front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx diff --git a/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx b/front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx similarity index 96% rename from front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx rename to front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx index 9a7a86cd55..335bbd66cd 100644 --- a/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx +++ b/front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx @@ -3,9 +3,9 @@ import styled from '@emotion/styled'; import { Decorator, Meta, StoryObj } from '@storybook/react'; import { DropdownMenuSkeletonItem } from '@/ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { MenuItemMultiSelectAvatar } from '@/ui/menu-item/components/MenuItemMultiSelectAvatar'; -import { MenuItemSelectAvatar } from '@/ui/menu-item/components/MenuItemSelectAvatar'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; +import { MenuItemMultiSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemMultiSelectAvatar'; +import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar'; import { Avatar } from '@/users/components/Avatar'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; diff --git a/front/src/modules/ui/dropdown/components/__stories__/DropdownMenuInput.stories.tsx b/front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx similarity index 100% rename from front/src/modules/ui/dropdown/components/__stories__/DropdownMenuInput.stories.tsx rename to front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx diff --git a/front/src/modules/ui/dropdown/hooks/useDropdown.ts b/front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts similarity index 100% rename from front/src/modules/ui/dropdown/hooks/useDropdown.ts rename to front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts diff --git a/front/src/modules/ui/dropdown/hooks/useDropdownStates.ts b/front/src/modules/ui/layout/dropdown/hooks/useDropdownStates.ts similarity index 100% rename from front/src/modules/ui/dropdown/hooks/useDropdownStates.ts rename to front/src/modules/ui/layout/dropdown/hooks/useDropdownStates.ts diff --git a/front/src/modules/ui/dropdown/hooks/useInternalHotkeyScopeManagement.ts b/front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts similarity index 100% rename from front/src/modules/ui/dropdown/hooks/useInternalHotkeyScopeManagement.ts rename to front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts diff --git a/front/src/modules/ui/dropdown/scopes/DropdownScope.tsx b/front/src/modules/ui/layout/dropdown/scopes/DropdownScope.tsx similarity index 100% rename from front/src/modules/ui/dropdown/scopes/DropdownScope.tsx rename to front/src/modules/ui/layout/dropdown/scopes/DropdownScope.tsx diff --git a/front/src/modules/ui/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts b/front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts similarity index 100% rename from front/src/modules/ui/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts rename to front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts diff --git a/front/src/modules/ui/dropdown/states/dropdownHotkeyScopeScopedState.ts b/front/src/modules/ui/layout/dropdown/states/dropdownHotkeyScopeScopedState.ts similarity index 100% rename from front/src/modules/ui/dropdown/states/dropdownHotkeyScopeScopedState.ts rename to front/src/modules/ui/layout/dropdown/states/dropdownHotkeyScopeScopedState.ts diff --git a/front/src/modules/ui/dropdown/states/isDropdownOpenScopedState.ts b/front/src/modules/ui/layout/dropdown/states/isDropdownOpenScopedState.ts similarity index 100% rename from front/src/modules/ui/dropdown/states/isDropdownOpenScopedState.ts rename to front/src/modules/ui/layout/dropdown/states/isDropdownOpenScopedState.ts diff --git a/front/src/modules/ui/modal/components/ConfirmationModal.tsx b/front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx similarity index 93% rename from front/src/modules/ui/modal/components/ConfirmationModal.tsx rename to front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx index fd2afb29dc..c96fcc69c8 100644 --- a/front/src/modules/ui/modal/components/ConfirmationModal.tsx +++ b/front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx @@ -3,15 +3,18 @@ import styled from '@emotion/styled'; import { AnimatePresence, LayoutGroup } from 'framer-motion'; import debounce from 'lodash.debounce'; -import { Button } from '@/ui/button/components/Button'; +import { + H1Title, + H1TitleFontColor, +} from '@/ui/display/typography/components/H1Title'; +import { Button } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; -import { Modal } from '@/ui/modal/components/Modal'; +import { Modal } from '@/ui/layout/modal/components/Modal'; import { Section, SectionAlignment, SectionFontColor, -} from '@/ui/section/components/Section'; -import { H1Title, H1TitleFontColor } from '@/ui/typography/components/H1Title'; +} from '@/ui/layout/section/components/Section'; export type ConfirmationModalProps = { isOpen: boolean; diff --git a/front/src/modules/ui/modal/components/Modal.tsx b/front/src/modules/ui/layout/modal/components/Modal.tsx similarity index 100% rename from front/src/modules/ui/modal/components/Modal.tsx rename to front/src/modules/ui/layout/modal/components/Modal.tsx diff --git a/front/src/modules/ui/modal/components/__stories__/ConfirmModal.stories.tsx b/front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx similarity index 100% rename from front/src/modules/ui/modal/components/__stories__/ConfirmModal.stories.tsx rename to front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx diff --git a/front/src/modules/ui/modal/components/__stories__/Modal.stories.tsx b/front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx similarity index 100% rename from front/src/modules/ui/modal/components/__stories__/Modal.stories.tsx rename to front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx diff --git a/front/src/modules/ui/modal/components/types/ModalHotkeyScope.ts b/front/src/modules/ui/layout/modal/components/types/ModalHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/modal/components/types/ModalHotkeyScope.ts rename to front/src/modules/ui/layout/modal/components/types/ModalHotkeyScope.ts diff --git a/front/src/modules/ui/layout/components/DefaultLayout.tsx b/front/src/modules/ui/layout/page/DefaultLayout.tsx similarity index 95% rename from front/src/modules/ui/layout/components/DefaultLayout.tsx rename to front/src/modules/ui/layout/page/DefaultLayout.tsx index 178639e5f2..eb15111743 100644 --- a/front/src/modules/ui/layout/components/DefaultLayout.tsx +++ b/front/src/modules/ui/layout/page/DefaultLayout.tsx @@ -6,7 +6,7 @@ import { AuthModal } from '@/auth/components/Modal'; import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus'; import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus'; import { CommandMenu } from '@/command-menu/components/CommandMenu'; -import { NavbarAnimatedContainer } from '@/ui/navbar/components/NavbarAnimatedContainer'; +import { NavbarAnimatedContainer } from '@/ui/navigation/navbar/components/NavbarAnimatedContainer'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { AppNavbar } from '~/AppNavbar'; import { CompaniesMockMode } from '~/pages/companies/CompaniesMockMode'; diff --git a/front/src/modules/ui/layout/components/PageAddButton.tsx b/front/src/modules/ui/layout/page/PageAddButton.tsx similarity index 72% rename from front/src/modules/ui/layout/components/PageAddButton.tsx rename to front/src/modules/ui/layout/page/PageAddButton.tsx index bd9e977055..1faf82336a 100644 --- a/front/src/modules/ui/layout/components/PageAddButton.tsx +++ b/front/src/modules/ui/layout/page/PageAddButton.tsx @@ -1,5 +1,5 @@ -import { IconButton } from '@/ui/button/components/IconButton'; -import { IconPlus } from '@/ui/icon'; +import { IconPlus } from '@/ui/display/icon'; +import { IconButton } from '@/ui/input/button/components/IconButton'; type PageAddButtonProps = { onClick: () => void; diff --git a/front/src/modules/ui/layout/components/PageBody.tsx b/front/src/modules/ui/layout/page/PageBody.tsx similarity index 100% rename from front/src/modules/ui/layout/components/PageBody.tsx rename to front/src/modules/ui/layout/page/PageBody.tsx diff --git a/front/src/modules/ui/layout/components/PageContainer.tsx b/front/src/modules/ui/layout/page/PageContainer.tsx similarity index 100% rename from front/src/modules/ui/layout/components/PageContainer.tsx rename to front/src/modules/ui/layout/page/PageContainer.tsx diff --git a/front/src/modules/ui/layout/components/PageFavoriteButton.tsx b/front/src/modules/ui/layout/page/PageFavoriteButton.tsx similarity index 75% rename from front/src/modules/ui/layout/components/PageFavoriteButton.tsx rename to front/src/modules/ui/layout/page/PageFavoriteButton.tsx index 0ffe75cf76..ec719e23c0 100644 --- a/front/src/modules/ui/layout/components/PageFavoriteButton.tsx +++ b/front/src/modules/ui/layout/page/PageFavoriteButton.tsx @@ -1,5 +1,5 @@ -import { IconButton } from '@/ui/button/components/IconButton'; -import { IconHeart } from '@/ui/icon'; +import { IconHeart } from '@/ui/display/icon'; +import { IconButton } from '@/ui/input/button/components/IconButton'; type PageFavoriteButtonProps = { isFavorite: boolean; diff --git a/front/src/modules/ui/layout/components/PageHeader.tsx b/front/src/modules/ui/layout/page/PageHeader.tsx similarity index 89% rename from front/src/modules/ui/layout/components/PageHeader.tsx rename to front/src/modules/ui/layout/page/PageHeader.tsx index 47a2933959..de4a30f29b 100644 --- a/front/src/modules/ui/layout/components/PageHeader.tsx +++ b/front/src/modules/ui/layout/page/PageHeader.tsx @@ -4,11 +4,14 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; -import { IconButton, IconButtonSize } from '@/ui/button/components/IconButton'; -import { IconChevronLeft } from '@/ui/icon/index'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import NavCollapseButton from '@/ui/navbar/components/NavCollapseButton'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; +import { IconChevronLeft } from '@/ui/display/icon/index'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; +import { + IconButton, + IconButtonSize, +} from '@/ui/input/button/components/IconButton'; +import NavCollapseButton from '@/ui/navigation/navbar/components/NavCollapseButton'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { isNavbarOpenedState } from '../states/isNavbarOpenedState'; diff --git a/front/src/modules/ui/layout/components/PageHotkeysEffect.tsx b/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx similarity index 82% rename from front/src/modules/ui/layout/components/PageHotkeysEffect.tsx rename to front/src/modules/ui/layout/page/PageHotkeysEffect.tsx index 6100b75417..50c1252c5e 100644 --- a/front/src/modules/ui/layout/components/PageHotkeysEffect.tsx +++ b/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx @@ -1,4 +1,4 @@ -import { TableHotkeyScope } from '@/ui/data-table/types/TableHotkeyScope'; +import { TableHotkeyScope } from '@/ui/data/data-table/types/TableHotkeyScope'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; type PageHotkeysEffectProps = { diff --git a/front/src/modules/ui/layout/components/PagePanel.tsx b/front/src/modules/ui/layout/page/PagePanel.tsx similarity index 100% rename from front/src/modules/ui/layout/components/PagePanel.tsx rename to front/src/modules/ui/layout/page/PagePanel.tsx diff --git a/front/src/modules/ui/layout/components/RightDrawerContainer.tsx b/front/src/modules/ui/layout/page/RightDrawerContainer.tsx similarity index 93% rename from front/src/modules/ui/layout/components/RightDrawerContainer.tsx rename to front/src/modules/ui/layout/page/RightDrawerContainer.tsx index fa469af703..ce56190b52 100644 --- a/front/src/modules/ui/layout/components/RightDrawerContainer.tsx +++ b/front/src/modules/ui/layout/page/RightDrawerContainer.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -import { RightDrawer } from '@/ui/right-drawer/components/RightDrawer'; +import { RightDrawer } from '@/ui/layout/right-drawer/components/RightDrawer'; import { PagePanel } from './PagePanel'; diff --git a/front/src/modules/ui/layout/components/ShowPageContainer.tsx b/front/src/modules/ui/layout/page/ShowPageContainer.tsx similarity index 100% rename from front/src/modules/ui/layout/components/ShowPageContainer.tsx rename to front/src/modules/ui/layout/page/ShowPageContainer.tsx diff --git a/front/src/modules/ui/layout/components/SubMenuTopBarContainer.tsx b/front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx similarity index 92% rename from front/src/modules/ui/layout/components/SubMenuTopBarContainer.tsx rename to front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx index 1f6c5cd24c..cdd46c91e5 100644 --- a/front/src/modules/ui/layout/components/SubMenuTopBarContainer.tsx +++ b/front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx @@ -1,7 +1,7 @@ import { JSX } from 'react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { PageHeader } from './PageHeader'; diff --git a/front/src/modules/ui/right-drawer/components/RightDrawer.tsx b/front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx similarity index 97% rename from front/src/modules/ui/right-drawer/components/RightDrawer.tsx rename to front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx index 6fe646bc24..379c4ec0ef 100644 --- a/front/src/modules/ui/right-drawer/components/RightDrawer.tsx +++ b/front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx @@ -13,7 +13,7 @@ import { import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { isDefined } from '~/utils/isDefined'; -import { leftNavbarWidth } from '../../navbar/constants'; +import { leftNavbarWidth } from '../../../navigation/navbar/constants'; import { useRightDrawer } from '../hooks/useRightDrawer'; import { isRightDrawerExpandedState } from '../states/isRightDrawerExpandedState'; import { isRightDrawerOpenState } from '../states/isRightDrawerOpenState'; diff --git a/front/src/modules/ui/right-drawer/components/RightDrawerRouter.tsx b/front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx similarity index 100% rename from front/src/modules/ui/right-drawer/components/RightDrawerRouter.tsx rename to front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx diff --git a/front/src/modules/ui/right-drawer/components/RightDrawerTopBar.tsx b/front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx similarity index 100% rename from front/src/modules/ui/right-drawer/components/RightDrawerTopBar.tsx rename to front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx diff --git a/front/src/modules/ui/right-drawer/components/RightDrawerTopBarCloseButton.tsx b/front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx similarity index 73% rename from front/src/modules/ui/right-drawer/components/RightDrawerTopBarCloseButton.tsx rename to front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx index f07701d094..f7acb0a8d8 100644 --- a/front/src/modules/ui/right-drawer/components/RightDrawerTopBarCloseButton.tsx +++ b/front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx @@ -1,5 +1,5 @@ -import { LightIconButton } from '@/ui/button/components/LightIconButton'; -import { IconChevronsRight } from '@/ui/icon/index'; +import { IconChevronsRight } from '@/ui/display/icon/index'; +import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { useRightDrawer } from '../hooks/useRightDrawer'; diff --git a/front/src/modules/ui/right-drawer/components/RightDrawerTopBarExpandButton.tsx b/front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx similarity index 87% rename from front/src/modules/ui/right-drawer/components/RightDrawerTopBarExpandButton.tsx rename to front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx index 0f5d8b6867..701c69edfa 100644 --- a/front/src/modules/ui/right-drawer/components/RightDrawerTopBarExpandButton.tsx +++ b/front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx @@ -1,10 +1,10 @@ import { useRecoilState } from 'recoil'; -import { LightIconButton } from '@/ui/button/components/LightIconButton'; import { IconLayoutSidebarRightCollapse, IconLayoutSidebarRightExpand, -} from '@/ui/icon'; +} from '@/ui/display/icon'; +import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { isRightDrawerExpandedState } from '../states/isRightDrawerExpandedState'; diff --git a/front/src/modules/ui/right-drawer/components/__stories__/RightDrawerTopBar.stories.tsx b/front/src/modules/ui/layout/right-drawer/components/__stories__/RightDrawerTopBar.stories.tsx similarity index 100% rename from front/src/modules/ui/right-drawer/components/__stories__/RightDrawerTopBar.stories.tsx rename to front/src/modules/ui/layout/right-drawer/components/__stories__/RightDrawerTopBar.stories.tsx diff --git a/front/src/modules/ui/right-drawer/hooks/useRightDrawer.ts b/front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts similarity index 100% rename from front/src/modules/ui/right-drawer/hooks/useRightDrawer.ts rename to front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts diff --git a/front/src/modules/ui/right-drawer/states/isRightDrawerExpandedState.ts b/front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts similarity index 100% rename from front/src/modules/ui/right-drawer/states/isRightDrawerExpandedState.ts rename to front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts diff --git a/front/src/modules/ui/right-drawer/states/isRightDrawerOpenState.ts b/front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts similarity index 100% rename from front/src/modules/ui/right-drawer/states/isRightDrawerOpenState.ts rename to front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts diff --git a/front/src/modules/ui/right-drawer/states/rightDrawerPageState.ts b/front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts similarity index 100% rename from front/src/modules/ui/right-drawer/states/rightDrawerPageState.ts rename to front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts diff --git a/front/src/modules/ui/right-drawer/types/RightDrawerHotkeyScope.ts b/front/src/modules/ui/layout/right-drawer/types/RightDrawerHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/right-drawer/types/RightDrawerHotkeyScope.ts rename to front/src/modules/ui/layout/right-drawer/types/RightDrawerHotkeyScope.ts diff --git a/front/src/modules/ui/right-drawer/types/RightDrawerPages.ts b/front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts similarity index 100% rename from front/src/modules/ui/right-drawer/types/RightDrawerPages.ts rename to front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts diff --git a/front/src/modules/ui/section/components/Section.tsx b/front/src/modules/ui/layout/section/components/Section.tsx similarity index 100% rename from front/src/modules/ui/section/components/Section.tsx rename to front/src/modules/ui/layout/section/components/Section.tsx diff --git a/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx b/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx index c5adf075da..ef3c0ec95b 100644 --- a/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx +++ b/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx @@ -3,13 +3,13 @@ import styled from '@emotion/styled'; import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; -import { IconCheckbox, IconNotes, IconPlus } from '@/ui/icon/index'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; -import { ViewBarDropdownButton } from '@/ui/view-bar/components/ViewBarDropdownButton'; +import { ViewBarDropdownButton } from '@/ui/data/view-bar/components/ViewBarDropdownButton'; +import { IconCheckbox, IconNotes, IconPlus } from '@/ui/display/icon/index'; +import { IconButton } from '@/ui/input/button/components/IconButton'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { ActivityType } from '~/generated/graphql'; const StyledContainer = styled.div` diff --git a/front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx b/front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx index edb0ef894b..4914dda972 100644 --- a/front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx +++ b/front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx @@ -9,9 +9,9 @@ import { IconMail, IconNotes, IconTimelineEvent, -} from '@/ui/icon'; -import { TabList } from '@/ui/tab/components/TabList'; -import { activeTabIdScopedState } from '@/ui/tab/states/activeTabIdScopedState'; +} from '@/ui/display/icon'; +import { TabList } from '@/ui/layout/tab/components/TabList'; +import { activeTabIdScopedState } from '@/ui/layout/tab/states/activeTabIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; diff --git a/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx b/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx index 8b7196286f..741f8eb1be 100644 --- a/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx +++ b/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx @@ -9,7 +9,7 @@ import { beautifyPastDateRelativeToNow, } from '~/utils/date-utils'; -import { OverflowingTextWithTooltip } from '../../../tooltip/OverflowingTextWithTooltip'; +import { OverflowingTextWithTooltip } from '../../../display/tooltip/OverflowingTextWithTooltip'; type ShowPageSummaryCardProps = { id?: string; diff --git a/front/src/modules/ui/tab/components/Tab.tsx b/front/src/modules/ui/layout/tab/components/Tab.tsx similarity index 96% rename from front/src/modules/ui/tab/components/Tab.tsx rename to front/src/modules/ui/layout/tab/components/Tab.tsx index d75c51535b..b9241833c8 100644 --- a/front/src/modules/ui/tab/components/Tab.tsx +++ b/front/src/modules/ui/layout/tab/components/Tab.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; type TabProps = { id: string; diff --git a/front/src/modules/ui/tab/components/TabList.tsx b/front/src/modules/ui/layout/tab/components/TabList.tsx similarity index 95% rename from front/src/modules/ui/tab/components/TabList.tsx rename to front/src/modules/ui/layout/tab/components/TabList.tsx index 4083c188a6..28fc254e10 100644 --- a/front/src/modules/ui/tab/components/TabList.tsx +++ b/front/src/modules/ui/layout/tab/components/TabList.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { activeTabIdScopedState } from '../states/activeTabIdScopedState'; diff --git a/front/src/modules/ui/tab/components/__stories__/Tab.stories.tsx b/front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx similarity index 97% rename from front/src/modules/ui/tab/components/__stories__/Tab.stories.tsx rename to front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx index 8af53d2777..2056ed0dd2 100644 --- a/front/src/modules/ui/tab/components/__stories__/Tab.stories.tsx +++ b/front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconCheckbox } from '@/ui/icon'; +import { IconCheckbox } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/tab/components/__stories__/Tablist.stories.tsx b/front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx similarity index 96% rename from front/src/modules/ui/tab/components/__stories__/Tablist.stories.tsx rename to front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx index 09faf26a36..913a621fdc 100644 --- a/front/src/modules/ui/tab/components/__stories__/Tablist.stories.tsx +++ b/front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx @@ -2,7 +2,7 @@ import { expect } from '@storybook/jest'; import { Meta, StoryObj } from '@storybook/react'; import { within } from '@storybook/testing-library'; -import { IconCheckbox } from '@/ui/icon'; +import { IconCheckbox } from '@/ui/display/icon'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; diff --git a/front/src/modules/ui/tab/states/activeTabIdScopedState.ts b/front/src/modules/ui/layout/tab/states/activeTabIdScopedState.ts similarity index 100% rename from front/src/modules/ui/tab/states/activeTabIdScopedState.ts rename to front/src/modules/ui/layout/tab/states/activeTabIdScopedState.ts diff --git a/front/src/modules/ui/table/components/Table.tsx b/front/src/modules/ui/layout/table/components/Table.tsx similarity index 100% rename from front/src/modules/ui/table/components/Table.tsx rename to front/src/modules/ui/layout/table/components/Table.tsx diff --git a/front/src/modules/ui/table/components/TableCell.tsx b/front/src/modules/ui/layout/table/components/TableCell.tsx similarity index 100% rename from front/src/modules/ui/table/components/TableCell.tsx rename to front/src/modules/ui/layout/table/components/TableCell.tsx diff --git a/front/src/modules/ui/table/components/TableHeader.tsx b/front/src/modules/ui/layout/table/components/TableHeader.tsx similarity index 100% rename from front/src/modules/ui/table/components/TableHeader.tsx rename to front/src/modules/ui/layout/table/components/TableHeader.tsx diff --git a/front/src/modules/ui/table/components/TableRow.tsx b/front/src/modules/ui/layout/table/components/TableRow.tsx similarity index 100% rename from front/src/modules/ui/table/components/TableRow.tsx rename to front/src/modules/ui/layout/table/components/TableRow.tsx diff --git a/front/src/modules/ui/table/components/TableSection.tsx b/front/src/modules/ui/layout/table/components/TableSection.tsx similarity index 96% rename from front/src/modules/ui/table/components/TableSection.tsx rename to front/src/modules/ui/layout/table/components/TableSection.tsx index 6e799514be..849206a713 100644 --- a/front/src/modules/ui/table/components/TableSection.tsx +++ b/front/src/modules/ui/layout/table/components/TableSection.tsx @@ -2,7 +2,7 @@ import { ReactNode, useState } from 'react'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconChevronDown, IconChevronUp } from '@/ui/icon'; +import { IconChevronDown, IconChevronUp } from '@/ui/display/icon'; type TableSectionProps = { children: ReactNode; diff --git a/front/src/modules/ui/table/components/__stories__/Table.stories.tsx b/front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx similarity index 100% rename from front/src/modules/ui/table/components/__stories__/Table.stories.tsx rename to front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx diff --git a/front/src/modules/ui/top-bar/TopBar.tsx b/front/src/modules/ui/layout/top-bar/TopBar.tsx similarity index 100% rename from front/src/modules/ui/top-bar/TopBar.tsx rename to front/src/modules/ui/layout/top-bar/TopBar.tsx diff --git a/front/src/modules/ui/action-bar/components/ActionBar.tsx b/front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx similarity index 89% rename from front/src/modules/ui/action-bar/components/ActionBar.tsx rename to front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx index 080003d649..7e78bc810a 100644 --- a/front/src/modules/ui/action-bar/components/ActionBar.tsx +++ b/front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx @@ -2,8 +2,8 @@ import React, { useRef } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; -import { actionBarEntriesState } from '@/ui/action-bar/states/actionBarEntriesState'; -import { contextMenuIsOpenState } from '@/ui/context-menu/states/contextMenuIsOpenState'; +import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState'; +import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState'; import { actionBarOpenState } from '../states/actionBarIsOpenState'; diff --git a/front/src/modules/ui/action-bar/components/ActionBarItem.tsx b/front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx similarity index 94% rename from front/src/modules/ui/action-bar/components/ActionBarItem.tsx rename to front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx index 311cfdff4b..bff8f6ecad 100644 --- a/front/src/modules/ui/action-bar/components/ActionBarItem.tsx +++ b/front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { ActionBarItemAccent } from '../types/ActionBarItemAccent'; diff --git a/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx b/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx similarity index 92% rename from front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx rename to front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx index 8630839650..8852c7a2b7 100644 --- a/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx +++ b/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx @@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil'; import { useCompanyTableActionBarEntries } from '@/companies/hooks/useCompanyTableActionBarEntries'; import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; diff --git a/front/src/modules/ui/action-bar/states/actionBarEntriesState.ts b/front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts similarity index 100% rename from front/src/modules/ui/action-bar/states/actionBarEntriesState.ts rename to front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts diff --git a/front/src/modules/ui/action-bar/states/actionBarIsOpenState.ts b/front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts similarity index 100% rename from front/src/modules/ui/action-bar/states/actionBarIsOpenState.ts rename to front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts diff --git a/front/src/modules/ui/action-bar/types/ActionBarEntry.ts b/front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts similarity index 73% rename from front/src/modules/ui/action-bar/types/ActionBarEntry.ts rename to front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts index e683361d49..842de337f8 100644 --- a/front/src/modules/ui/action-bar/types/ActionBarEntry.ts +++ b/front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { ActionBarItemAccent } from './ActionBarItemAccent'; diff --git a/front/src/modules/ui/action-bar/types/ActionBarItemAccent.ts b/front/src/modules/ui/navigation/action-bar/types/ActionBarItemAccent.ts similarity index 100% rename from front/src/modules/ui/action-bar/types/ActionBarItemAccent.ts rename to front/src/modules/ui/navigation/action-bar/types/ActionBarItemAccent.ts diff --git a/front/src/modules/ui/breadcrumb/components/Breadcrumb.tsx b/front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx similarity index 100% rename from front/src/modules/ui/breadcrumb/components/Breadcrumb.tsx rename to front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx diff --git a/front/src/modules/ui/breadcrumb/components/__stories__/Breadcrumb.stories.tsx b/front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx similarity index 100% rename from front/src/modules/ui/breadcrumb/components/__stories__/Breadcrumb.stories.tsx rename to front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx diff --git a/front/src/modules/ui/context-menu/components/ContextMenu.tsx b/front/src/modules/ui/navigation/context-menu/components/ContextMenu.tsx similarity index 87% rename from front/src/modules/ui/context-menu/components/ContextMenu.tsx rename to front/src/modules/ui/navigation/context-menu/components/ContextMenu.tsx index d4807687b9..e411946559 100644 --- a/front/src/modules/ui/context-menu/components/ContextMenu.tsx +++ b/front/src/modules/ui/navigation/context-menu/components/ContextMenu.tsx @@ -2,10 +2,10 @@ import React, { useRef } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue, useSetRecoilState } from 'recoil'; -import { actionBarOpenState } from '@/ui/action-bar/states/actionBarIsOpenState'; -import { contextMenuPositionState } from '@/ui/context-menu/states/contextMenuPositionState'; -import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; -import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; +import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { StyledDropdownMenu } from '@/ui/layout/dropdown/components/StyledDropdownMenu'; +import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState'; +import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { contextMenuEntriesState } from '../states/contextMenuEntriesState'; diff --git a/front/src/modules/ui/context-menu/components/ContextMenuItem.tsx b/front/src/modules/ui/navigation/context-menu/components/ContextMenuItem.tsx similarity index 73% rename from front/src/modules/ui/context-menu/components/ContextMenuItem.tsx rename to front/src/modules/ui/navigation/context-menu/components/ContextMenuItem.tsx index 159edf8e65..c5af324b27 100644 --- a/front/src/modules/ui/context-menu/components/ContextMenuItem.tsx +++ b/front/src/modules/ui/navigation/context-menu/components/ContextMenuItem.tsx @@ -1,5 +1,5 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { MenuItem } from '@/ui/menu-item/components/MenuItem'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; import { ContextMenuItemAccent } from '../types/ContextMenuItemAccent'; diff --git a/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx b/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx similarity index 93% rename from front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx rename to front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx index e382dfc211..2d78214e03 100644 --- a/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx +++ b/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx @@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil'; import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries'; import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; diff --git a/front/src/modules/ui/context-menu/states/contextMenuEntriesState.ts b/front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts similarity index 100% rename from front/src/modules/ui/context-menu/states/contextMenuEntriesState.ts rename to front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts diff --git a/front/src/modules/ui/context-menu/states/contextMenuIsOpenState.ts b/front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts similarity index 100% rename from front/src/modules/ui/context-menu/states/contextMenuIsOpenState.ts rename to front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts diff --git a/front/src/modules/ui/context-menu/states/contextMenuPositionState.ts b/front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts similarity index 68% rename from front/src/modules/ui/context-menu/states/contextMenuPositionState.ts rename to front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts index 7cd20a1c67..efa4c44732 100644 --- a/front/src/modules/ui/context-menu/states/contextMenuPositionState.ts +++ b/front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts @@ -1,6 +1,6 @@ import { atom } from 'recoil'; -import { PositionType } from '@/ui/context-menu/types/PositionType'; +import { PositionType } from '@/ui/navigation/context-menu/types/PositionType'; export const contextMenuPositionState = atom({ key: 'contextMenuPositionState', diff --git a/front/src/modules/ui/context-menu/types/ContextMenuEntry.ts b/front/src/modules/ui/navigation/context-menu/types/ContextMenuEntry.ts similarity index 73% rename from front/src/modules/ui/context-menu/types/ContextMenuEntry.ts rename to front/src/modules/ui/navigation/context-menu/types/ContextMenuEntry.ts index 8c39d27001..96c85dde13 100644 --- a/front/src/modules/ui/context-menu/types/ContextMenuEntry.ts +++ b/front/src/modules/ui/navigation/context-menu/types/ContextMenuEntry.ts @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { ContextMenuItemAccent } from './ContextMenuItemAccent'; diff --git a/front/src/modules/ui/context-menu/types/ContextMenuItemAccent.ts b/front/src/modules/ui/navigation/context-menu/types/ContextMenuItemAccent.ts similarity index 100% rename from front/src/modules/ui/context-menu/types/ContextMenuItemAccent.ts rename to front/src/modules/ui/navigation/context-menu/types/ContextMenuItemAccent.ts diff --git a/front/src/modules/ui/context-menu/types/PositionType.ts b/front/src/modules/ui/navigation/context-menu/types/PositionType.ts similarity index 100% rename from front/src/modules/ui/context-menu/types/PositionType.ts rename to front/src/modules/ui/navigation/context-menu/types/PositionType.ts diff --git a/front/src/modules/ui/link/components/ContactLink.tsx b/front/src/modules/ui/navigation/link/components/ContactLink.tsx similarity index 100% rename from front/src/modules/ui/link/components/ContactLink.tsx rename to front/src/modules/ui/navigation/link/components/ContactLink.tsx diff --git a/front/src/modules/ui/link/components/RawLink.tsx b/front/src/modules/ui/navigation/link/components/RawLink.tsx similarity index 100% rename from front/src/modules/ui/link/components/RawLink.tsx rename to front/src/modules/ui/navigation/link/components/RawLink.tsx diff --git a/front/src/modules/ui/link/components/RoundedLink.tsx b/front/src/modules/ui/navigation/link/components/RoundedLink.tsx similarity index 88% rename from front/src/modules/ui/link/components/RoundedLink.tsx rename to front/src/modules/ui/navigation/link/components/RoundedLink.tsx index dae52c6de5..d55c53631a 100644 --- a/front/src/modules/ui/link/components/RoundedLink.tsx +++ b/front/src/modules/ui/navigation/link/components/RoundedLink.tsx @@ -2,8 +2,7 @@ import * as React from 'react'; import { Link as ReactLink } from 'react-router-dom'; import styled from '@emotion/styled'; -import { Chip } from '@/ui/chip/components/Chip'; -import { ChipSize, ChipVariant } from '@/ui/chip/components/Chip'; +import { Chip, ChipSize, ChipVariant } from '@/ui/display/chip/components/Chip'; type RoundedLinkProps = { href: string; diff --git a/front/src/modules/ui/link/components/SocialLink.tsx b/front/src/modules/ui/navigation/link/components/SocialLink.tsx similarity index 100% rename from front/src/modules/ui/link/components/SocialLink.tsx rename to front/src/modules/ui/navigation/link/components/SocialLink.tsx diff --git a/front/src/modules/ui/link/components/__stories__/ContactLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/ContactLink.stories.tsx similarity index 96% rename from front/src/modules/ui/link/components/__stories__/ContactLink.stories.tsx rename to front/src/modules/ui/navigation/link/components/__stories__/ContactLink.stories.tsx index 35c367238b..af1e50a3a4 100644 --- a/front/src/modules/ui/link/components/__stories__/ContactLink.stories.tsx +++ b/front/src/modules/ui/navigation/link/components/__stories__/ContactLink.stories.tsx @@ -6,7 +6,7 @@ import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWith import { ContactLink } from '../ContactLink'; const meta: Meta = { - title: 'UI/Links/ContactLink', + title: 'UI/Link/ContactLink', component: ContactLink, decorators: [ComponentWithRouterDecorator], args: { diff --git a/front/src/modules/ui/link/components/__stories__/RawLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx similarity index 97% rename from front/src/modules/ui/link/components/__stories__/RawLink.stories.tsx rename to front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx index 709e4b79b2..4588f843cd 100644 --- a/front/src/modules/ui/link/components/__stories__/RawLink.stories.tsx +++ b/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx @@ -8,7 +8,7 @@ import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWith import { RawLink } from '../RawLink'; const meta: Meta = { - title: 'UI/Links/RawLink', + title: 'UI/Link/RawLink', component: RawLink, decorators: [ComponentWithRouterDecorator], args: { diff --git a/front/src/modules/ui/link/components/__stories__/RoundedLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx similarity index 96% rename from front/src/modules/ui/link/components/__stories__/RoundedLink.stories.tsx rename to front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx index 7491de8148..37276c9080 100644 --- a/front/src/modules/ui/link/components/__stories__/RoundedLink.stories.tsx +++ b/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx @@ -8,7 +8,7 @@ import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWith import { RoundedLink } from '../RoundedLink'; const meta: Meta = { - title: 'UI/Links/RoundedLink', + title: 'UI/Link/RoundedLink', component: RoundedLink, decorators: [ComponentWithRouterDecorator], args: { diff --git a/front/src/modules/ui/link/components/__stories__/SocialLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx similarity index 97% rename from front/src/modules/ui/link/components/__stories__/SocialLink.stories.tsx rename to front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx index 3d83f4e410..7d08e9c2e7 100644 --- a/front/src/modules/ui/link/components/__stories__/SocialLink.stories.tsx +++ b/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx @@ -8,7 +8,7 @@ import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWith import { LinkType, SocialLink } from '../SocialLink'; const meta: Meta = { - title: 'UI/Links/SocialLink', + title: 'UI/Link/SocialLink', component: SocialLink, decorators: [ComponentWithRouterDecorator], args: { diff --git a/front/src/modules/ui/menu-item/components/MenuItem.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx similarity index 89% rename from front/src/modules/ui/menu-item/components/MenuItem.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx index 2da1bef045..17f7d70414 100644 --- a/front/src/modules/ui/menu-item/components/MenuItem.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx @@ -1,7 +1,7 @@ import { MouseEvent } from 'react'; -import { FloatingIconButtonGroup } from '@/ui/button/components/FloatingIconButtonGroup'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { FloatingIconButtonGroup } from '@/ui/input/button/components/FloatingIconButtonGroup'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; import { diff --git a/front/src/modules/ui/menu-item/components/MenuItemCommand.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemCommand.tsx similarity index 97% rename from front/src/modules/ui/menu-item/components/MenuItemCommand.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemCommand.tsx index 81183ce44a..ed69d7731f 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemCommand.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemCommand.tsx @@ -2,7 +2,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { Command } from 'cmdk'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { StyledMenuItemLabel, diff --git a/front/src/modules/ui/menu-item/components/MenuItemDraggable.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemDraggable.tsx similarity index 88% rename from front/src/modules/ui/menu-item/components/MenuItemDraggable.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemDraggable.tsx index ac5bc09ed3..6182771f89 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemDraggable.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemDraggable.tsx @@ -1,5 +1,5 @@ -import { FloatingIconButtonGroup } from '@/ui/button/components/FloatingIconButtonGroup'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { FloatingIconButtonGroup } from '@/ui/input/button/components/FloatingIconButtonGroup'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; import { StyledHoverableMenuItemBase } from '../internals/components/StyledMenuItemBase'; diff --git a/front/src/modules/ui/menu-item/components/MenuItemMultiSelect.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx similarity index 94% rename from front/src/modules/ui/menu-item/components/MenuItemMultiSelect.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx index 1c205e80e8..84f851e217 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemMultiSelect.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { Checkbox } from '@/ui/input/components/Checkbox'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; diff --git a/front/src/modules/ui/menu-item/components/MenuItemMultiSelectAvatar.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx similarity index 100% rename from front/src/modules/ui/menu-item/components/MenuItemMultiSelectAvatar.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx diff --git a/front/src/modules/ui/menu-item/components/MenuItemNavigate.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx similarity index 86% rename from front/src/modules/ui/menu-item/components/MenuItemNavigate.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx index 5c2c271d93..f470273e83 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemNavigate.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; -import { IconChevronRight } from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconChevronRight } from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; import { diff --git a/front/src/modules/ui/menu-item/components/MenuItemSelect.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx similarity index 93% rename from front/src/modules/ui/menu-item/components/MenuItemSelect.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx index 895ec5aa89..12fba7064a 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemSelect.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx @@ -1,8 +1,8 @@ import { css, useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconCheck } from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconCheck } from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; import { StyledMenuItemBase } from '../internals/components/StyledMenuItemBase'; diff --git a/front/src/modules/ui/menu-item/components/MenuItemSelectAvatar.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx similarity index 89% rename from front/src/modules/ui/menu-item/components/MenuItemSelectAvatar.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx index 909dad912a..59026208de 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemSelectAvatar.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx @@ -1,8 +1,8 @@ import { ReactNode } from 'react'; import { useTheme } from '@emotion/react'; -import { IconCheck } from '@/ui/icon'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; +import { IconCheck } from '@/ui/display/icon'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; import { StyledMenuItemLabel, diff --git a/front/src/modules/ui/menu-item/components/MenuItemSelectColor.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx similarity index 96% rename from front/src/modules/ui/menu-item/components/MenuItemSelectColor.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx index 0254368f82..10b603e84d 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemSelectColor.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconCheck } from '@/ui/icon'; +import { IconCheck } from '@/ui/display/icon'; import { ThemeColor } from '@/ui/theme/constants/colors'; import { diff --git a/front/src/modules/ui/menu-item/components/MenuItemToggle.tsx b/front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx similarity index 92% rename from front/src/modules/ui/menu-item/components/MenuItemToggle.tsx rename to front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx index 05c09faac8..cdb9323c3f 100644 --- a/front/src/modules/ui/menu-item/components/MenuItemToggle.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx @@ -1,4 +1,4 @@ -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { Toggle } from '@/ui/input/components/Toggle'; import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent'; diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItem.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx similarity index 98% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItem.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx index ecb628a19f..14dac6043f 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItem.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemCommand.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx similarity index 98% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemCommand.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx index b33888462c..d41e7a06fa 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemCommand.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; import { Command } from 'cmdk'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { CatalogStory } from '~/testing/types'; diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemDraggable.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx similarity index 98% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemDraggable.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx index fd22bb299f..653b21b52f 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemDraggable.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell, IconMinus } from '@/ui/icon'; +import { IconBell, IconMinus } from '@/ui/display/icon'; import { CatalogDecorator, CatalogDimension, diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx similarity index 97% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx index fc94028ab5..c7bdf105df 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator, CatalogDimension, diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx similarity index 100% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemNavigate.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx similarity index 97% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemNavigate.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx index 4f577c8991..e5f628507c 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemNavigate.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator, CatalogDimension, diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemSelect.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx similarity index 97% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemSelect.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx index a9202a5bdf..52028ab317 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemSelect.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator, CatalogDimension, diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx similarity index 100% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx similarity index 100% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx diff --git a/front/src/modules/ui/menu-item/components/__stories__/MenuItemToggle.stories.tsx b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx similarity index 97% rename from front/src/modules/ui/menu-item/components/__stories__/MenuItemToggle.stories.tsx rename to front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx index d7dd489315..8901e1e574 100644 --- a/front/src/modules/ui/menu-item/components/__stories__/MenuItemToggle.stories.tsx +++ b/front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { IconBell } from '@/ui/icon'; +import { IconBell } from '@/ui/display/icon'; import { CatalogDecorator, CatalogDimension, diff --git a/front/src/modules/ui/menu-item/internals/components/MenuItemLeftContent.tsx b/front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx similarity index 80% rename from front/src/modules/ui/menu-item/internals/components/MenuItemLeftContent.tsx rename to front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx index 716df92983..b119848122 100644 --- a/front/src/modules/ui/menu-item/internals/components/MenuItemLeftContent.tsx +++ b/front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx @@ -1,8 +1,8 @@ import { useTheme } from '@emotion/react'; -import { IconGripVertical } from '@/ui/icon'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { OverflowingTextWithTooltip } from '@/ui/tooltip/OverflowingTextWithTooltip'; +import { IconGripVertical } from '@/ui/display/icon'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; +import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip'; import { StyledMenuItemLabel, diff --git a/front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx b/front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx similarity index 100% rename from front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx rename to front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx diff --git a/front/src/modules/ui/menu-item/types/MenuItemAccent.ts b/front/src/modules/ui/navigation/menu-item/types/MenuItemAccent.ts similarity index 100% rename from front/src/modules/ui/menu-item/types/MenuItemAccent.ts rename to front/src/modules/ui/navigation/menu-item/types/MenuItemAccent.ts diff --git a/front/src/modules/ui/navbar/components/MainNavbar.tsx b/front/src/modules/ui/navigation/navbar/components/MainNavbar.tsx similarity index 100% rename from front/src/modules/ui/navbar/components/MainNavbar.tsx rename to front/src/modules/ui/navigation/navbar/components/MainNavbar.tsx diff --git a/front/src/modules/ui/navbar/components/NavBackButton.tsx b/front/src/modules/ui/navigation/navbar/components/NavBackButton.tsx similarity index 95% rename from front/src/modules/ui/navbar/components/NavBackButton.tsx rename to front/src/modules/ui/navigation/navbar/components/NavBackButton.tsx index 9574ae025d..eb4118cd13 100644 --- a/front/src/modules/ui/navbar/components/NavBackButton.tsx +++ b/front/src/modules/ui/navigation/navbar/components/NavBackButton.tsx @@ -2,7 +2,7 @@ import { useNavigate } from 'react-router-dom'; import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; -import { IconChevronLeft } from '@/ui/icon/index'; +import { IconChevronLeft } from '@/ui/display/icon/index'; import { isNavbarSwitchingSizeState } from '@/ui/layout/states/isNavbarSwitchingSizeState'; type NavBackButtonProps = { diff --git a/front/src/modules/ui/navbar/components/NavCollapseButton.tsx b/front/src/modules/ui/navigation/navbar/components/NavCollapseButton.tsx similarity index 94% rename from front/src/modules/ui/navbar/components/NavCollapseButton.tsx rename to front/src/modules/ui/navigation/navbar/components/NavCollapseButton.tsx index 49ab85075b..0c5c0fc776 100644 --- a/front/src/modules/ui/navbar/components/NavCollapseButton.tsx +++ b/front/src/modules/ui/navigation/navbar/components/NavCollapseButton.tsx @@ -3,11 +3,11 @@ import styled from '@emotion/styled'; import { motion } from 'framer-motion'; import { useRecoilState } from 'recoil'; -import { IconButton } from '@/ui/button/components/IconButton'; import { IconLayoutSidebarLeftCollapse, IconLayoutSidebarRightCollapse, -} from '@/ui/icon'; +} from '@/ui/display/icon'; +import { IconButton } from '@/ui/input/button/components/IconButton'; import { isNavbarOpenedState } from '@/ui/layout/states/isNavbarOpenedState'; const StyledCollapseButton = styled(motion.div)` diff --git a/front/src/modules/ui/navbar/components/NavItem.tsx b/front/src/modules/ui/navigation/navbar/components/NavItem.tsx similarity index 96% rename from front/src/modules/ui/navbar/components/NavItem.tsx rename to front/src/modules/ui/navigation/navbar/components/NavItem.tsx index 3d064f1863..28f78ca868 100644 --- a/front/src/modules/ui/navbar/components/NavItem.tsx +++ b/front/src/modules/ui/navigation/navbar/components/NavItem.tsx @@ -3,11 +3,11 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; +import { IconComponent } from '@/ui/display/icon/types/IconComponent'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { isNavbarOpenedState } from '../../layout/states/isNavbarOpenedState'; +import { isNavbarOpenedState } from '../../../layout/states/isNavbarOpenedState'; type NavItemProps = { label: string; diff --git a/front/src/modules/ui/navbar/components/NavItemsContainer.tsx b/front/src/modules/ui/navigation/navbar/components/NavItemsContainer.tsx similarity index 100% rename from front/src/modules/ui/navbar/components/NavItemsContainer.tsx rename to front/src/modules/ui/navigation/navbar/components/NavItemsContainer.tsx diff --git a/front/src/modules/ui/navbar/components/NavTitle.tsx b/front/src/modules/ui/navigation/navbar/components/NavTitle.tsx similarity index 100% rename from front/src/modules/ui/navbar/components/NavTitle.tsx rename to front/src/modules/ui/navigation/navbar/components/NavTitle.tsx diff --git a/front/src/modules/ui/navbar/components/NavWorkspaceButton.tsx b/front/src/modules/ui/navigation/navbar/components/NavWorkspaceButton.tsx similarity index 100% rename from front/src/modules/ui/navbar/components/NavWorkspaceButton.tsx rename to front/src/modules/ui/navigation/navbar/components/NavWorkspaceButton.tsx diff --git a/front/src/modules/ui/navbar/components/NavbarAnimatedContainer.tsx b/front/src/modules/ui/navigation/navbar/components/NavbarAnimatedContainer.tsx similarity index 100% rename from front/src/modules/ui/navbar/components/NavbarAnimatedContainer.tsx rename to front/src/modules/ui/navigation/navbar/components/NavbarAnimatedContainer.tsx diff --git a/front/src/modules/ui/navbar/components/SubMenuNavbar.tsx b/front/src/modules/ui/navigation/navbar/components/SubMenuNavbar.tsx similarity index 95% rename from front/src/modules/ui/navbar/components/SubMenuNavbar.tsx rename to front/src/modules/ui/navigation/navbar/components/SubMenuNavbar.tsx index e97d17068a..d12bf9193d 100644 --- a/front/src/modules/ui/navbar/components/SubMenuNavbar.tsx +++ b/front/src/modules/ui/navigation/navbar/components/SubMenuNavbar.tsx @@ -1,10 +1,10 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconBrandGithub } from '@/ui/icon'; +import { IconBrandGithub } from '@/ui/display/icon'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import packageJson from '../../../../../package.json'; +import packageJson from '../../../../../../package.json'; import { githubLink, leftNavbarWidth } from '../constants'; import NavBackButton from './NavBackButton'; diff --git a/front/src/modules/ui/navbar/components/SupportChat.tsx b/front/src/modules/ui/navigation/navbar/components/SupportChat.tsx similarity index 95% rename from front/src/modules/ui/navbar/components/SupportChat.tsx rename to front/src/modules/ui/navigation/navbar/components/SupportChat.tsx index cce71eb951..a1119b06ee 100644 --- a/front/src/modules/ui/navbar/components/SupportChat.tsx +++ b/front/src/modules/ui/navigation/navbar/components/SupportChat.tsx @@ -4,8 +4,8 @@ import { useRecoilValue } from 'recoil'; import { currentUserState } from '@/auth/states/currentUserState'; import { supportChatState } from '@/client-config/states/supportChatState'; -import { Button } from '@/ui/button/components/Button'; -import { IconHelpCircle } from '@/ui/icon'; +import { IconHelpCircle } from '@/ui/display/icon'; +import { Button } from '@/ui/input/button/components/Button'; import { User } from '~/generated/graphql'; const StyledButtonContainer = styled.div` diff --git a/front/src/modules/ui/navbar/__stories__/MainNavbar.stories.tsx b/front/src/modules/ui/navigation/navbar/components/__stories__/MainNavbar.stories.tsx similarity index 88% rename from front/src/modules/ui/navbar/__stories__/MainNavbar.stories.tsx rename to front/src/modules/ui/navigation/navbar/components/__stories__/MainNavbar.stories.tsx index 07277ac086..c595636735 100644 --- a/front/src/modules/ui/navbar/__stories__/MainNavbar.stories.tsx +++ b/front/src/modules/ui/navigation/navbar/components/__stories__/MainNavbar.stories.tsx @@ -9,12 +9,12 @@ import { IconSettings, IconTargetArrow, IconUser, -} from '@/ui/icon'; +} from '@/ui/display/icon'; import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator'; -import MainNavbar from '../components/MainNavbar'; -import NavItem from '../components/NavItem'; -import NavTitle from '../components/NavTitle'; +import MainNavbar from '../MainNavbar'; +import NavItem from '../NavItem'; +import NavTitle from '../NavTitle'; const meta: Meta = { title: 'UI/Navbar/MainNavbar', diff --git a/front/src/modules/ui/navbar/__stories__/NavCollapseButton.stories.tsx b/front/src/modules/ui/navigation/navbar/components/__stories__/NavCollapseButton.stories.tsx similarity index 88% rename from front/src/modules/ui/navbar/__stories__/NavCollapseButton.stories.tsx rename to front/src/modules/ui/navigation/navbar/components/__stories__/NavCollapseButton.stories.tsx index 4c6b001adb..9edda95f77 100644 --- a/front/src/modules/ui/navbar/__stories__/NavCollapseButton.stories.tsx +++ b/front/src/modules/ui/navigation/navbar/components/__stories__/NavCollapseButton.stories.tsx @@ -2,7 +2,7 @@ import { Meta, StoryObj } from '@storybook/react'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; -import NavCollapseButton from '../components/NavCollapseButton'; +import NavCollapseButton from '../NavCollapseButton'; const meta: Meta = { title: 'UI/Navbar/NavCollapseButton', diff --git a/front/src/modules/ui/navbar/__stories__/NavItem.stories.tsx b/front/src/modules/ui/navigation/navbar/components/__stories__/NavItem.stories.tsx similarity index 96% rename from front/src/modules/ui/navbar/__stories__/NavItem.stories.tsx rename to front/src/modules/ui/navigation/navbar/components/__stories__/NavItem.stories.tsx index 574bdcc646..1046f9ca88 100644 --- a/front/src/modules/ui/navbar/__stories__/NavItem.stories.tsx +++ b/front/src/modules/ui/navigation/navbar/components/__stories__/NavItem.stories.tsx @@ -1,12 +1,12 @@ import styled from '@emotion/styled'; import { Decorator, Meta, StoryObj } from '@storybook/react'; -import { IconSearch, IconSettings } from '@/ui/icon'; +import { IconSearch, IconSettings } from '@/ui/display/icon'; import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator'; import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator'; import { CatalogStory } from '~/testing/types'; -import NavItem from '../components/NavItem'; +import NavItem from '../NavItem'; const meta: Meta = { title: 'UI/Navbar/NavItem', diff --git a/front/src/modules/ui/navbar/__stories__/SubMenuNavbar.stories.tsx b/front/src/modules/ui/navigation/navbar/components/__stories__/SubMenuNavbar.stories.tsx similarity index 87% rename from front/src/modules/ui/navbar/__stories__/SubMenuNavbar.stories.tsx rename to front/src/modules/ui/navigation/navbar/components/__stories__/SubMenuNavbar.stories.tsx index 9e5c7d524e..57b26a4628 100644 --- a/front/src/modules/ui/navbar/__stories__/SubMenuNavbar.stories.tsx +++ b/front/src/modules/ui/navigation/navbar/components/__stories__/SubMenuNavbar.stories.tsx @@ -6,12 +6,12 @@ import { IconSettings, IconUserCircle, IconUsers, -} from '@/ui/icon'; +} from '@/ui/display/icon'; import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator'; -import NavItem from '../components/NavItem'; -import NavTitle from '../components/NavTitle'; -import SubMenuNavbar from '../components/SubMenuNavbar'; +import NavItem from '../NavItem'; +import NavTitle from '../NavTitle'; +import SubMenuNavbar from '../SubMenuNavbar'; const meta: Meta = { title: 'UI/Navbar/SubMenuNavbar', diff --git a/front/src/modules/ui/navbar/constants/index.ts b/front/src/modules/ui/navigation/navbar/constants/index.ts similarity index 100% rename from front/src/modules/ui/navbar/constants/index.ts rename to front/src/modules/ui/navigation/navbar/constants/index.ts diff --git a/front/src/modules/ui/step-bar/components/Step.tsx b/front/src/modules/ui/navigation/step-bar/components/Step.tsx similarity index 97% rename from front/src/modules/ui/step-bar/components/Step.tsx rename to front/src/modules/ui/navigation/step-bar/components/Step.tsx index f0efed22b6..ebfdd2992a 100644 --- a/front/src/modules/ui/step-bar/components/Step.tsx +++ b/front/src/modules/ui/navigation/step-bar/components/Step.tsx @@ -2,7 +2,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import { AnimatedCheckmark } from '@/ui/checkmark/components/AnimatedCheckmark'; +import { AnimatedCheckmark } from '@/ui/display/checkmark/components/AnimatedCheckmark'; import { MOBILE_VIEWPORT } from '@/ui/theme/constants/theme'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; diff --git a/front/src/modules/ui/step-bar/components/StepBar.tsx b/front/src/modules/ui/navigation/step-bar/components/StepBar.tsx similarity index 100% rename from front/src/modules/ui/step-bar/components/StepBar.tsx rename to front/src/modules/ui/navigation/step-bar/components/StepBar.tsx diff --git a/front/src/modules/ui/step-bar/hooks/useStepBar.ts b/front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts similarity index 100% rename from front/src/modules/ui/step-bar/hooks/useStepBar.ts rename to front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts diff --git a/front/src/modules/ui/step-bar/states/stepBarInternalState.ts b/front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts similarity index 100% rename from front/src/modules/ui/step-bar/states/stepBarInternalState.ts rename to front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts diff --git a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx index b9d2802735..b87ffa8965 100644 --- a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx +++ b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx @@ -1,12 +1,12 @@ import { Context } from 'react'; import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery'; +import { FilterDropdownEntitySearchSelect } from '@/ui/data/view-bar/components/FilterDropdownEntitySearchSelect'; +import { filterDropdownSearchInputScopedState } from '@/ui/data/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/data/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; -import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useSearchUserQuery } from '~/generated/graphql'; export const FilterDropdownUserSearchSelect = ({ diff --git a/front/src/modules/users/components/UserChip.tsx b/front/src/modules/users/components/UserChip.tsx index 88474a1238..85a3073e7e 100644 --- a/front/src/modules/users/components/UserChip.tsx +++ b/front/src/modules/users/components/UserChip.tsx @@ -1,4 +1,4 @@ -import { EntityChip } from '@/ui/chip/components/EntityChip'; +import { EntityChip } from '@/ui/display/chip/components/EntityChip'; export type UserChipProps = { id: string; diff --git a/front/src/modules/users/components/UserPicker.tsx b/front/src/modules/users/components/UserPicker.tsx index 4da8f73ef0..dee2e14c71 100644 --- a/front/src/modules/users/components/UserPicker.tsx +++ b/front/src/modules/users/components/UserPicker.tsx @@ -1,5 +1,5 @@ import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery'; -import { IconUserCircle } from '@/ui/icon'; +import { IconUserCircle } from '@/ui/display/icon'; import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect'; import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState'; import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect'; diff --git a/front/src/modules/views/hooks/useBoardViewFields.ts b/front/src/modules/views/hooks/useBoardViewFields.ts index bc2ad63692..9172ec628e 100644 --- a/front/src/modules/views/hooks/useBoardViewFields.ts +++ b/front/src/modules/views/hooks/useBoardViewFields.ts @@ -1,15 +1,15 @@ import { useRecoilValue, useSetRecoilState } from 'recoil'; import { RecoilScopeContext } from '@/types/RecoilScopeContext'; -import { availableBoardCardFieldsScopedState } from '@/ui/board/states/availableBoardCardFieldsScopedState'; -import { boardCardFieldsScopedState } from '@/ui/board/states/boardCardFieldsScopedState'; -import { savedBoardCardFieldsFamilyState } from '@/ui/board/states/savedBoardCardFieldsFamilyState'; -import { savedBoardCardFieldsByKeyFamilySelector } from '@/ui/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector'; -import { BoardFieldDefinition } from '@/ui/board/types/BoardFieldDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { availableBoardCardFieldsScopedState } from '@/ui/layout/board/states/availableBoardCardFieldsScopedState'; +import { boardCardFieldsScopedState } from '@/ui/layout/board/states/boardCardFieldsScopedState'; +import { savedBoardCardFieldsFamilyState } from '@/ui/layout/board/states/savedBoardCardFieldsFamilyState'; +import { savedBoardCardFieldsByKeyFamilySelector } from '@/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector'; +import { BoardFieldDefinition } from '@/ui/layout/board/types/BoardFieldDefinition'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; import { SortOrder, useCreateViewFieldsMutation, diff --git a/front/src/modules/views/hooks/useBoardViews.ts b/front/src/modules/views/hooks/useBoardViews.ts index 125c4a76e0..9f90283e66 100644 --- a/front/src/modules/views/hooks/useBoardViews.ts +++ b/front/src/modules/views/hooks/useBoardViews.ts @@ -1,13 +1,13 @@ import { useSearchParams } from 'react-router-dom'; import { RecoilScopeContext } from '@/types/RecoilScopeContext'; -import { useBoardColumns } from '@/ui/board/hooks/useBoardColumns'; -import { boardCardFieldsScopedState } from '@/ui/board/states/boardCardFieldsScopedState'; -import { BoardFieldDefinition } from '@/ui/board/types/BoardFieldDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { useBoardColumns } from '@/ui/layout/board/hooks/useBoardColumns'; +import { boardCardFieldsScopedState } from '@/ui/layout/board/states/boardCardFieldsScopedState'; +import { BoardFieldDefinition } from '@/ui/layout/board/types/BoardFieldDefinition'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; import { ViewType } from '~/generated/graphql'; import { useBoardViewFields } from './useBoardViewFields'; diff --git a/front/src/modules/views/hooks/useTableViewFields.ts b/front/src/modules/views/hooks/useTableViewFields.ts index 54c29d3348..e841a1da87 100644 --- a/front/src/modules/views/hooks/useTableViewFields.ts +++ b/front/src/modules/views/hooks/useTableViewFields.ts @@ -2,16 +2,16 @@ import { useCallback, useState } from 'react'; import { getOperationName } from '@apollo/client/utilities'; import { useRecoilValue, useSetRecoilState } from 'recoil'; -import { availableTableColumnsScopedState } from '@/ui/data-table/states/availableTableColumnsScopedState'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { savedTableColumnsFamilyState } from '@/ui/data-table/states/savedTableColumnsFamilyState'; -import { savedTableColumnsByKeyFamilySelector } from '@/ui/data-table/states/selectors/savedTableColumnsByKeyFamilySelector'; -import { tableColumnsScopedState } from '@/ui/data-table/states/tableColumnsScopedState'; -import { ColumnDefinition } from '@/ui/data-table/types/ColumnDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { savedTableColumnsFamilyState } from '@/ui/data/data-table/states/savedTableColumnsFamilyState'; +import { savedTableColumnsByKeyFamilySelector } from '@/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector'; +import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState'; +import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; import { SortOrder, useCreateViewFieldsMutation, diff --git a/front/src/modules/views/hooks/useTableViews.ts b/front/src/modules/views/hooks/useTableViews.ts index 3bb495391f..f145a91c60 100644 --- a/front/src/modules/views/hooks/useTableViews.ts +++ b/front/src/modules/views/hooks/useTableViews.ts @@ -1,12 +1,12 @@ import { useSearchParams } from 'react-router-dom'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { tableColumnsScopedState } from '@/ui/data-table/states/tableColumnsScopedState'; -import { ColumnDefinition } from '@/ui/data-table/types/ColumnDefinition'; -import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState'; +import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition'; +import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; import { ViewType } from '~/generated/graphql'; import { useTableViewFields } from './useTableViewFields'; diff --git a/front/src/modules/views/hooks/useViewFilters.ts b/front/src/modules/views/hooks/useViewFilters.ts index 6ba935eb4a..ed5563dbfb 100644 --- a/front/src/modules/views/hooks/useViewFilters.ts +++ b/front/src/modules/views/hooks/useViewFilters.ts @@ -2,14 +2,14 @@ import { useCallback } from 'react'; import { useRecoilState, useRecoilValue } from 'recoil'; import { RecoilScopeContext } from '@/types/RecoilScopeContext'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; +import { savedFiltersFamilyState } from '@/ui/data/view-bar/states/savedFiltersFamilyState'; +import { savedFiltersByKeyFamilySelector } from '@/ui/data/view-bar/states/selectors/savedFiltersByKeyFamilySelector'; +import { Filter } from '@/ui/data/view-bar/types/Filter'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; -import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState'; -import { savedFiltersByKeyFamilySelector } from '@/ui/view-bar/states/selectors/savedFiltersByKeyFamilySelector'; -import { Filter } from '@/ui/view-bar/types/Filter'; import { useCreateViewFiltersMutation, useDeleteViewFiltersMutation, diff --git a/front/src/modules/views/hooks/useViewSorts.ts b/front/src/modules/views/hooks/useViewSorts.ts index bc903b6d47..dcb13ae27f 100644 --- a/front/src/modules/views/hooks/useViewSorts.ts +++ b/front/src/modules/views/hooks/useViewSorts.ts @@ -2,14 +2,14 @@ import { useCallback } from 'react'; import { useRecoilState, useRecoilValue } from 'recoil'; import { RecoilScopeContext } from '@/types/RecoilScopeContext'; +import { availableSortsScopedState } from '@/ui/data/view-bar/states/availableSortsScopedState'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { savedSortsFamilyState } from '@/ui/data/view-bar/states/savedSortsFamilyState'; +import { savedSortsByKeyFamilySelector } from '@/ui/data/view-bar/states/selectors/savedSortsByKeyFamilySelector'; +import { sortsScopedState } from '@/ui/data/view-bar/states/sortsScopedState'; +import { Sort } from '@/ui/data/view-bar/types/Sort'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; -import { availableSortsScopedState } from '@/ui/view-bar/states/availableSortsScopedState'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState'; -import { savedSortsByKeyFamilySelector } from '@/ui/view-bar/states/selectors/savedSortsByKeyFamilySelector'; -import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; -import { Sort } from '@/ui/view-bar/types/Sort'; import { useCreateViewSortsMutation, useDeleteViewSortsMutation, diff --git a/front/src/modules/views/hooks/useViews.ts b/front/src/modules/views/hooks/useViews.ts index 4887bb0890..d41240b11e 100644 --- a/front/src/modules/views/hooks/useViews.ts +++ b/front/src/modules/views/hooks/useViews.ts @@ -1,10 +1,10 @@ import { getOperationName } from '@apollo/client/utilities'; import { RecoilScopeContext } from '@/types/RecoilScopeContext'; +import { currentViewIdScopedState } from '@/ui/data/view-bar/states/currentViewIdScopedState'; +import { viewsScopedState } from '@/ui/data/view-bar/states/viewsScopedState'; +import { View } from '@/ui/data/view-bar/types/View'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState'; -import { viewsScopedState } from '@/ui/view-bar/states/viewsScopedState'; -import { View } from '@/ui/view-bar/types/View'; import { useCreateViewMutation, useDeleteViewMutation, diff --git a/front/src/modules/workspace/components/WorkspaceInviteLink.tsx b/front/src/modules/workspace/components/WorkspaceInviteLink.tsx index 0738e8f2f7..15d630947c 100644 --- a/front/src/modules/workspace/components/WorkspaceInviteLink.tsx +++ b/front/src/modules/workspace/components/WorkspaceInviteLink.tsx @@ -1,10 +1,10 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { Button } from '@/ui/button/components/Button'; -import { IconCopy, IconLink } from '@/ui/icon'; +import { IconCopy, IconLink } from '@/ui/display/icon'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { Button } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; const StyledContainer = styled.div` align-items: center; diff --git a/front/src/pages/auth/CreateProfile.tsx b/front/src/pages/auth/CreateProfile.tsx index e354a60438..e6ce80d4cc 100644 --- a/front/src/pages/auth/CreateProfile.tsx +++ b/front/src/pages/auth/CreateProfile.tsx @@ -13,10 +13,10 @@ import { Title } from '@/auth/components/Title'; import { currentUserState } from '@/auth/states/currentUserState'; import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { MainButton } from '@/ui/button/components/MainButton'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { MainButton } from '@/ui/input/button/components/MainButton'; import { TextInput } from '@/ui/input/components/TextInput'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; -import { H2Title } from '@/ui/typography/components/H2Title'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser'; import { useUpdateUserMutation } from '~/generated/graphql'; diff --git a/front/src/pages/auth/CreateWorkspace.tsx b/front/src/pages/auth/CreateWorkspace.tsx index ab706ea0be..80a26d5bbc 100644 --- a/front/src/pages/auth/CreateWorkspace.tsx +++ b/front/src/pages/auth/CreateWorkspace.tsx @@ -10,10 +10,10 @@ import { SubTitle } from '@/auth/components/SubTitle'; import { Title } from '@/auth/components/Title'; import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { MainButton } from '@/ui/button/components/MainButton'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar'; +import { MainButton } from '@/ui/input/button/components/MainButton'; import { TextInput } from '@/ui/input/components/TextInput'; -import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; -import { H2Title } from '@/ui/typography/components/H2Title'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser'; import { useUpdateWorkspaceMutation } from '~/generated/graphql'; diff --git a/front/src/pages/companies/Companies.tsx b/front/src/pages/companies/Companies.tsx index e35a1f5668..05c8d856fd 100644 --- a/front/src/pages/companies/Companies.tsx +++ b/front/src/pages/companies/Companies.tsx @@ -6,17 +6,17 @@ import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimis import { CompanyTable } from '@/companies/table/components/CompanyTable'; import { SEARCH_COMPANY_QUERY } from '@/search/graphql/queries/searchCompanyQuery'; import { SpreadsheetImportProvider } from '@/spreadsheet-import/provider/components/SpreadsheetImportProvider'; -import { DataTableActionBar } from '@/ui/data-table/action-bar/components/DataTableActionBar'; -import { DataTableContextMenu } from '@/ui/data-table/context-menu/components/DataTableContextMenu'; -import { useUpsertDataTableItem } from '@/ui/data-table/hooks/useUpsertDataTableItem'; -import { useUpsertTableRowId } from '@/ui/data-table/hooks/useUpsertTableRowId'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { IconBuildingSkyscraper } from '@/ui/icon'; -import { PageAddButton } from '@/ui/layout/components/PageAddButton'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; -import { PageHotkeysEffect } from '@/ui/layout/components/PageHotkeysEffect'; +import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar'; +import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu'; +import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem'; +import { useUpsertTableRowId } from '@/ui/data/data-table/hooks/useUpsertTableRowId'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { IconBuildingSkyscraper } from '@/ui/display/icon'; +import { PageAddButton } from '@/ui/layout/page/PageAddButton'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; +import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useInsertOneCompanyMutation } from '~/generated/graphql'; diff --git a/front/src/pages/companies/CompaniesMockMode.tsx b/front/src/pages/companies/CompaniesMockMode.tsx index a59230fd4b..5e25a29a76 100644 --- a/front/src/pages/companies/CompaniesMockMode.tsx +++ b/front/src/pages/companies/CompaniesMockMode.tsx @@ -1,11 +1,11 @@ import styled from '@emotion/styled'; import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { IconBuildingSkyscraper } from '@/ui/icon'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { IconBuildingSkyscraper } from '@/ui/display/icon'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; const StyledTableContainer = styled.div` diff --git a/front/src/pages/companies/CompanyShow.tsx b/front/src/pages/companies/CompanyShow.tsx index 86666319c3..8f7e631797 100644 --- a/front/src/pages/companies/CompanyShow.tsx +++ b/front/src/pages/companies/CompanyShow.tsx @@ -6,15 +6,15 @@ import { CompanyTeam } from '@/companies/components/CompanyTeam'; import { useCompanyQuery } from '@/companies/hooks/useCompanyQuery'; import { useFavorites } from '@/favorites/hooks/useFavorites'; import { AppPath } from '@/types/AppPath'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { IconBuildingSkyscraper } from '@/ui/icon'; -import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; -import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; -import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageFavoriteButton } from '@/ui/layout/components/PageFavoriteButton'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell'; +import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox'; +import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope'; +import { IconBuildingSkyscraper } from '@/ui/display/icon'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageFavoriteButton } from '@/ui/layout/page/PageFavoriteButton'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; import { ShowPageAddButton } from '@/ui/layout/show-page/components/ShowPageAddButton'; import { ShowPageLeftContainer } from '@/ui/layout/show-page/components/ShowPageLeftContainer'; import { ShowPageRightContainer } from '@/ui/layout/show-page/components/ShowPageRightContainer'; @@ -26,7 +26,7 @@ import { useUpdateOneCompanyMutation } from '~/generated/graphql'; import { getLogoUrlFromDomainName } from '~/utils'; import { CompanyNameEditableField } from '../../modules/companies/editable-field/components/CompanyNameEditableField'; -import { ShowPageContainer } from '../../modules/ui/layout/components/ShowPageContainer'; +import { ShowPageContainer } from '../../modules/ui/layout/page/ShowPageContainer'; import { companyShowFieldDefinition } from './constants/companyShowFieldDefinition'; diff --git a/front/src/pages/companies/ObjectsTable.tsx b/front/src/pages/companies/ObjectsTable.tsx index 75f909e390..d7e3be471d 100644 --- a/front/src/pages/companies/ObjectsTable.tsx +++ b/front/src/pages/companies/ObjectsTable.tsx @@ -2,15 +2,15 @@ import styled from '@emotion/styled'; import { v4 } from 'uuid'; import { ObjectTable } from '@/metadata/components/ObjectTable'; -import { DataTableActionBar } from '@/ui/data-table/action-bar/components/DataTableActionBar'; -import { DataTableContextMenu } from '@/ui/data-table/context-menu/components/DataTableContextMenu'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { IconBuildingSkyscraper } from '@/ui/icon'; -import { PageAddButton } from '@/ui/layout/components/PageAddButton'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; -import { PageHotkeysEffect } from '@/ui/layout/components/PageHotkeysEffect'; +import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar'; +import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { IconBuildingSkyscraper } from '@/ui/display/icon'; +import { PageAddButton } from '@/ui/layout/page/PageAddButton'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; +import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; const StyledTableContainer = styled.div` diff --git a/front/src/pages/companies/companies-filters.tsx b/front/src/pages/companies/companies-filters.tsx index 2e63a728ce..3234eb81ba 100644 --- a/front/src/pages/companies/companies-filters.tsx +++ b/front/src/pages/companies/companies-filters.tsx @@ -1,4 +1,5 @@ -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { FilterDefinitionByEntity } from '@/ui/data/view-bar/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -6,8 +7,7 @@ import { IconMap, IconUser, IconUsers, -} from '@/ui/icon/index'; -import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; +} from '@/ui/display/icon/index'; import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect'; import { Company } from '~/generated/graphql'; diff --git a/front/src/pages/companies/companies-sorts.tsx b/front/src/pages/companies/companies-sorts.tsx index 4bfdde7231..251ba479aa 100644 --- a/front/src/pages/companies/companies-sorts.tsx +++ b/front/src/pages/companies/companies-sorts.tsx @@ -1,11 +1,11 @@ +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; import { IconBuildingSkyscraper, IconCalendarEvent, IconLink, IconMap, IconUsers, -} from '@/ui/icon/index'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; +} from '@/ui/display/icon/index'; export const companyAvailableSorts: SortDefinition[] = [ { diff --git a/front/src/pages/companies/constants/companyShowFieldDefinition.tsx b/front/src/pages/companies/constants/companyShowFieldDefinition.tsx index b3fd4f2eba..5509ba05ce 100644 --- a/front/src/pages/companies/constants/companyShowFieldDefinition.tsx +++ b/front/src/pages/companies/constants/companyShowFieldDefinition.tsx @@ -1,4 +1,4 @@ -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; import { FieldBooleanMetadata, FieldDateMetadata, @@ -7,7 +7,7 @@ import { FieldRelationMetadata, FieldTextMetadata, FieldURLMetadata, -} from '@/ui/field/types/FieldMetadata'; +} from '@/ui/data/field/types/FieldMetadata'; import { IconBrandX, IconCalendar, @@ -17,7 +17,7 @@ import { IconTarget, IconUserCircle, IconUsers, -} from '@/ui/icon'; +} from '@/ui/display/icon'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { User } from '~/generated/graphql'; diff --git a/front/src/pages/not-found/NotFound.tsx b/front/src/pages/not-found/NotFound.tsx index 99d776a41d..535888dc9d 100644 --- a/front/src/pages/not-found/NotFound.tsx +++ b/front/src/pages/not-found/NotFound.tsx @@ -1,7 +1,7 @@ import { useNavigate } from 'react-router-dom'; import styled from '@emotion/styled'; -import { MainButton } from '@/ui/button/components/MainButton'; +import { MainButton } from '@/ui/input/button/components/MainButton'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { CompaniesMockMode } from '../companies/CompaniesMockMode'; diff --git a/front/src/pages/opportunities/Opportunities.tsx b/front/src/pages/opportunities/Opportunities.tsx index b4bd84aba0..c4a14fd94f 100644 --- a/front/src/pages/opportunities/Opportunities.tsx +++ b/front/src/pages/opportunities/Opportunities.tsx @@ -2,11 +2,11 @@ import { CompanyBoard } from '@/companies/board/components/CompanyBoard'; import { CompanyBoardRecoilScopeContext } from '@/companies/states/recoil-scope-contexts/CompanyBoardRecoilScopeContext'; import { PipelineAddButton } from '@/pipeline/components/PipelineAddButton'; import { usePipelineStages } from '@/pipeline/hooks/usePipelineStages'; -import { BoardOptionsContext } from '@/ui/board/contexts/BoardOptionsContext'; -import { IconTargetArrow } from '@/ui/icon'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; +import { IconTargetArrow } from '@/ui/display/icon'; +import { BoardOptionsContext } from '@/ui/layout/board/contexts/BoardOptionsContext'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useUpdatePipelineStageMutation } from '~/generated/graphql'; import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions'; diff --git a/front/src/pages/opportunities/opportunities-filters.tsx b/front/src/pages/opportunities/opportunities-filters.tsx index fad0f61986..99e0c9ff35 100644 --- a/front/src/pages/opportunities/opportunities-filters.tsx +++ b/front/src/pages/opportunities/opportunities-filters.tsx @@ -1,11 +1,11 @@ import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect'; +import { FilterDefinitionByEntity } from '@/ui/data/view-bar/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, IconCurrencyDollar, IconUser, -} from '@/ui/icon/index'; -import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; +} from '@/ui/display/icon/index'; import { PipelineProgress } from '~/generated/graphql'; import { FilterDropdownPeopleSearchSelect } from '../../modules/people/components/FilterDropdownPeopleSearchSelect'; diff --git a/front/src/pages/opportunities/opportunities-sorts.tsx b/front/src/pages/opportunities/opportunities-sorts.tsx index d794db5be6..171bbe5e65 100644 --- a/front/src/pages/opportunities/opportunities-sorts.tsx +++ b/front/src/pages/opportunities/opportunities-sorts.tsx @@ -1,5 +1,5 @@ -import { IconCalendarEvent, IconCurrencyDollar } from '@/ui/icon/index'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; +import { IconCalendarEvent, IconCurrencyDollar } from '@/ui/display/icon/index'; export const opportunitiesSorts: SortDefinition[] = [ { diff --git a/front/src/pages/opportunities/opportunitiesBoardOptions.tsx b/front/src/pages/opportunities/opportunitiesBoardOptions.tsx index 00955dc4e6..48617f5e9b 100644 --- a/front/src/pages/opportunities/opportunitiesBoardOptions.tsx +++ b/front/src/pages/opportunities/opportunitiesBoardOptions.tsx @@ -1,6 +1,6 @@ import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard'; import { NewCompanyProgressButton } from '@/companies/components/NewCompanyProgressButton'; -import { BoardOptions } from '@/ui/board/types/BoardOptions'; +import { BoardOptions } from '@/ui/layout/board/types/BoardOptions'; import { opportunitiesFilters } from './opportunities-filters'; import { opportunitiesSorts } from './opportunities-sorts'; diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx index e0a570ef9d..4145d29c2c 100644 --- a/front/src/pages/people/People.tsx +++ b/front/src/pages/people/People.tsx @@ -4,17 +4,17 @@ import { v4 } from 'uuid'; import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect'; import { PeopleTable } from '@/people/table/components/PeopleTable'; import { SpreadsheetImportProvider } from '@/spreadsheet-import/provider/components/SpreadsheetImportProvider'; -import { DataTableActionBar } from '@/ui/data-table/action-bar/components/DataTableActionBar'; -import { DataTableContextMenu } from '@/ui/data-table/context-menu/components/DataTableContextMenu'; -import { useUpsertDataTableItem } from '@/ui/data-table/hooks/useUpsertDataTableItem'; -import { useUpsertTableRowId } from '@/ui/data-table/hooks/useUpsertTableRowId'; -import { TableRecoilScopeContext } from '@/ui/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; -import { IconUser } from '@/ui/icon'; -import { PageAddButton } from '@/ui/layout/components/PageAddButton'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; -import { PageHotkeysEffect } from '@/ui/layout/components/PageHotkeysEffect'; +import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar'; +import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu'; +import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem'; +import { useUpsertTableRowId } from '@/ui/data/data-table/hooks/useUpsertTableRowId'; +import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { IconUser } from '@/ui/display/icon'; +import { PageAddButton } from '@/ui/layout/page/PageAddButton'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; +import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useInsertOnePersonMutation } from '~/generated/graphql'; diff --git a/front/src/pages/people/PersonShow.tsx b/front/src/pages/people/PersonShow.tsx index f61f49fff3..ce9b64ca4a 100644 --- a/front/src/pages/people/PersonShow.tsx +++ b/front/src/pages/people/PersonShow.tsx @@ -7,15 +7,15 @@ import { useFavorites } from '@/favorites/hooks/useFavorites'; import { GET_PERSON } from '@/people/graphql/queries/getPerson'; import { usePersonQuery } from '@/people/hooks/usePersonQuery'; import { AppPath } from '@/types/AppPath'; -import { FieldContext } from '@/ui/field/contexts/FieldContext'; -import { IconUser } from '@/ui/icon'; -import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; -import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; -import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageFavoriteButton } from '@/ui/layout/components/PageFavoriteButton'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; +import { FieldContext } from '@/ui/data/field/contexts/FieldContext'; +import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell'; +import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox'; +import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope'; +import { IconUser } from '@/ui/display/icon'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageFavoriteButton } from '@/ui/layout/page/PageFavoriteButton'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; import { ShowPageAddButton } from '@/ui/layout/show-page/components/ShowPageAddButton'; import { ShowPageLeftContainer } from '@/ui/layout/show-page/components/ShowPageLeftContainer'; import { ShowPageRightContainer } from '@/ui/layout/show-page/components/ShowPageRightContainer'; @@ -29,7 +29,7 @@ import { } from '~/generated/graphql'; import { PeopleFullNameEditableField } from '../../modules/people/editable-field/components/PeopleFullNameEditableField'; -import { ShowPageContainer } from '../../modules/ui/layout/components/ShowPageContainer'; +import { ShowPageContainer } from '../../modules/ui/layout/page/ShowPageContainer'; import { personShowFieldDefinition } from './constants/personShowFieldDefinition'; diff --git a/front/src/pages/people/constants/personShowFieldDefinition.tsx b/front/src/pages/people/constants/personShowFieldDefinition.tsx index b0010fcff0..e6f1a52db7 100644 --- a/front/src/pages/people/constants/personShowFieldDefinition.tsx +++ b/front/src/pages/people/constants/personShowFieldDefinition.tsx @@ -1,4 +1,4 @@ -import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; +import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition'; import { FieldDateMetadata, FieldMetadata, @@ -6,7 +6,7 @@ import { FieldRelationMetadata, FieldTextMetadata, FieldURLMetadata, -} from '@/ui/field/types/FieldMetadata'; +} from '@/ui/data/field/types/FieldMetadata'; import { IconBrandLinkedin, IconBrandX, @@ -17,7 +17,7 @@ import { IconMap, IconPencil, IconPhone, -} from '@/ui/icon'; +} from '@/ui/display/icon'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { Company } from '~/generated/graphql'; import { getLogoUrlFromDomainName } from '~/utils'; diff --git a/front/src/pages/people/people-filters.tsx b/front/src/pages/people/people-filters.tsx index c1087b451b..7f83e26a82 100644 --- a/front/src/pages/people/people-filters.tsx +++ b/front/src/pages/people/people-filters.tsx @@ -1,4 +1,5 @@ import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect'; +import { FilterDefinitionByEntity } from '@/ui/data/view-bar/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -6,8 +7,7 @@ import { IconMap, IconPhone, IconUser, -} from '@/ui/icon/index'; -import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; +} from '@/ui/display/icon/index'; import { Person } from '~/generated/graphql'; export const peopleFilters: FilterDefinitionByEntity[] = [ diff --git a/front/src/pages/people/people-sorts.tsx b/front/src/pages/people/people-sorts.tsx index 10a47cada7..95abf2a6f9 100644 --- a/front/src/pages/people/people-sorts.tsx +++ b/front/src/pages/people/people-sorts.tsx @@ -1,3 +1,5 @@ +import { SortDefinition } from '@/ui/data/view-bar/types/SortDefinition'; +import { SortDirection } from '@/ui/data/view-bar/types/SortDirection'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -5,9 +7,7 @@ import { IconMap, IconPhone, IconUser, -} from '@/ui/icon/index'; -import { SortDefinition } from '@/ui/view-bar/types/SortDefinition'; -import { SortDirection } from '@/ui/view-bar/types/SortDirection'; +} from '@/ui/display/icon/index'; export const peopleAvailableSorts: SortDefinition[] = [ { diff --git a/front/src/pages/settings/SettingsExperience.tsx b/front/src/pages/settings/SettingsExperience.tsx index be538dfb0a..8ce4c23667 100644 --- a/front/src/pages/settings/SettingsExperience.tsx +++ b/front/src/pages/settings/SettingsExperience.tsx @@ -1,12 +1,12 @@ import styled from '@emotion/styled'; -import { ColorSchemePicker } from '@/ui/color-scheme/components/ColorSchemePicker'; -import { IconSettings } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { Section } from '@/ui/section/components/Section'; +import { IconSettings } from '@/ui/display/icon'; +import { H1Title } from '@/ui/display/typography/components/H1Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { ColorSchemePicker } from '@/ui/input/color-scheme/components/ColorSchemePicker'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Section } from '@/ui/layout/section/components/Section'; import { useColorScheme } from '@/ui/theme/hooks/useColorScheme'; -import { H1Title } from '@/ui/typography/components/H1Title'; -import { H2Title } from '@/ui/typography/components/H2Title'; const StyledContainer = styled.div` display: flex; diff --git a/front/src/pages/settings/SettingsNewObject.tsx b/front/src/pages/settings/SettingsNewObject.tsx index 3655e62e4e..9bb9774b61 100644 --- a/front/src/pages/settings/SettingsNewObject.tsx +++ b/front/src/pages/settings/SettingsNewObject.tsx @@ -2,10 +2,10 @@ import styled from '@emotion/styled'; import { SettingsIconSection } from '@/settings/components/SettingsIconSection'; import { objectSettingsWidth } from '@/settings/objects/constants/objectSettings'; -import { Breadcrumb } from '@/ui/breadcrumb/components/Breadcrumb'; -import { IconSettings } from '@/ui/icon'; +import { IconSettings } from '@/ui/input/constants/icons'; import { useIconPicker } from '@/ui/input/hooks/useIconPicker'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; const StyledContainer = styled.div` align-items: flex-start; diff --git a/front/src/pages/settings/SettingsObjectDetail.tsx b/front/src/pages/settings/SettingsObjectDetail.tsx index e635beb228..8f18829912 100644 --- a/front/src/pages/settings/SettingsObjectDetail.tsx +++ b/front/src/pages/settings/SettingsObjectDetail.tsx @@ -13,14 +13,14 @@ import { } from '@/settings/objects/constants/mockObjects'; import { objectSettingsWidth } from '@/settings/objects/constants/objectSettings'; import { AppPath } from '@/types/AppPath'; -import { Breadcrumb } from '@/ui/breadcrumb/components/Breadcrumb'; -import { Button } from '@/ui/button/components/Button'; -import { IconPlus, IconSettings } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { Table } from '@/ui/table/components/Table'; -import { TableHeader } from '@/ui/table/components/TableHeader'; -import { TableSection } from '@/ui/table/components/TableSection'; -import { H2Title } from '@/ui/typography/components/H2Title'; +import { IconPlus, IconSettings } from '@/ui/display/icon'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { Button } from '@/ui/input/button/components/Button'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Table } from '@/ui/layout/table/components/Table'; +import { TableHeader } from '@/ui/layout/table/components/TableHeader'; +import { TableSection } from '@/ui/layout/table/components/TableSection'; +import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; const StyledContainer = styled.div` display: flex; diff --git a/front/src/pages/settings/SettingsObjectEdit.tsx b/front/src/pages/settings/SettingsObjectEdit.tsx index a0740143be..f9730290c7 100644 --- a/front/src/pages/settings/SettingsObjectEdit.tsx +++ b/front/src/pages/settings/SettingsObjectEdit.tsx @@ -5,9 +5,9 @@ import styled from '@emotion/styled'; import { activeObjectItems } from '@/settings/objects/constants/mockObjects'; import { objectSettingsWidth } from '@/settings/objects/constants/objectSettings'; import { AppPath } from '@/types/AppPath'; -import { Breadcrumb } from '@/ui/breadcrumb/components/Breadcrumb'; -import { IconSettings } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; +import { IconSettings } from '@/ui/display/icon'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; const StyledContainer = styled.div` height: fit-content; diff --git a/front/src/pages/settings/SettingsObjects.tsx b/front/src/pages/settings/SettingsObjects.tsx index 16221c10be..c87ded1006 100644 --- a/front/src/pages/settings/SettingsObjects.tsx +++ b/front/src/pages/settings/SettingsObjects.tsx @@ -2,27 +2,28 @@ import { useNavigate } from 'react-router-dom'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { - activeObjectItems, - disabledObjectItems, -} from '@/settings/objects/constants/mockObjects'; import { objectSettingsWidth } from '@/settings/objects/constants/objectSettings'; -import { Button } from '@/ui/button/components/Button'; import { IconChevronRight, IconDotsVertical, IconPlus, IconSettings, -} from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { Table } from '@/ui/table/components/Table'; -import { TableCell } from '@/ui/table/components/TableCell'; -import { TableHeader } from '@/ui/table/components/TableHeader'; -import { TableRow } from '@/ui/table/components/TableRow'; -import { TableSection } from '@/ui/table/components/TableSection'; -import { Tag } from '@/ui/tag/components/Tag'; -import { H1Title } from '@/ui/typography/components/H1Title'; -import { H2Title } from '@/ui/typography/components/H2Title'; +} from '@/ui/display/icon'; +import { Tag } from '@/ui/display/tag/components/Tag'; +import { H1Title } from '@/ui/display/typography/components/H1Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { Button } from '@/ui/input/button/components/Button'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Table } from '@/ui/layout/table/components/Table'; +import { TableCell } from '@/ui/layout/table/components/TableCell'; +import { TableHeader } from '@/ui/layout/table/components/TableHeader'; +import { TableRow } from '@/ui/layout/table/components/TableRow'; +import { TableSection } from '@/ui/layout/table/components/TableSection'; + +import { + activeObjectItems, + disabledObjectItems, +} from './constants/mockObjects'; const StyledContainer = styled.div` height: fit-content; diff --git a/front/src/pages/settings/SettingsProfile.tsx b/front/src/pages/settings/SettingsProfile.tsx index e426092ce9..a50a33524d 100644 --- a/front/src/pages/settings/SettingsProfile.tsx +++ b/front/src/pages/settings/SettingsProfile.tsx @@ -5,11 +5,11 @@ import { EmailField } from '@/settings/profile/components/EmailField'; import { NameFields } from '@/settings/profile/components/NameFields'; import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader'; import { ToggleField } from '@/settings/profile/components/ToggleField'; -import { IconSettings } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { Section } from '@/ui/section/components/Section'; -import { H1Title } from '@/ui/typography/components/H1Title'; -import { H2Title } from '@/ui/typography/components/H2Title'; +import { IconSettings } from '@/ui/display/icon'; +import { H1Title } from '@/ui/display/typography/components/H1Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Section } from '@/ui/layout/section/components/Section'; const StyledContainer = styled.div` display: flex; diff --git a/front/src/pages/settings/SettingsWorkspace.tsx b/front/src/pages/settings/SettingsWorkspace.tsx index 125d247cbf..be87f5d9c7 100644 --- a/front/src/pages/settings/SettingsWorkspace.tsx +++ b/front/src/pages/settings/SettingsWorkspace.tsx @@ -3,11 +3,11 @@ import styled from '@emotion/styled'; import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace'; import { NameField } from '@/settings/workspace/components/NameField'; import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader'; -import { IconSettings } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { Section } from '@/ui/section/components/Section'; -import { H1Title } from '@/ui/typography/components/H1Title'; -import { H2Title } from '@/ui/typography/components/H2Title'; +import { IconSettings } from '@/ui/display/icon'; +import { H1Title } from '@/ui/display/typography/components/H1Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Section } from '@/ui/layout/section/components/Section'; const StyledContainer = styled.div` display: flex; diff --git a/front/src/pages/settings/SettingsWorkspaceMembers.tsx b/front/src/pages/settings/SettingsWorkspaceMembers.tsx index 6ef7ccfe39..5476ee316e 100644 --- a/front/src/pages/settings/SettingsWorkspaceMembers.tsx +++ b/front/src/pages/settings/SettingsWorkspaceMembers.tsx @@ -3,13 +3,13 @@ import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; import { currentUserState } from '@/auth/states/currentUserState'; -import { IconButton } from '@/ui/button/components/IconButton'; -import { IconSettings, IconTrash } from '@/ui/icon'; -import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer'; -import { ConfirmationModal } from '@/ui/modal/components/ConfirmationModal'; -import { Section } from '@/ui/section/components/Section'; -import { H1Title } from '@/ui/typography/components/H1Title'; -import { H2Title } from '@/ui/typography/components/H2Title'; +import { IconSettings, IconTrash } from '@/ui/display/icon'; +import { H1Title } from '@/ui/display/typography/components/H1Title'; +import { H2Title } from '@/ui/display/typography/components/H2Title'; +import { IconButton } from '@/ui/input/button/components/IconButton'; +import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; +import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; +import { Section } from '@/ui/layout/section/components/Section'; import { WorkspaceInviteLink } from '@/workspace/components/WorkspaceInviteLink'; import { WorkspaceMemberCard } from '@/workspace/components/WorkspaceMemberCard'; import { diff --git a/front/src/pages/settings/constants/mockObjects.ts b/front/src/pages/settings/constants/mockObjects.ts new file mode 100644 index 0000000000..4552e82977 --- /dev/null +++ b/front/src/pages/settings/constants/mockObjects.ts @@ -0,0 +1,40 @@ +import { + IconBuildingSkyscraper, + IconLuggage, + IconPlane, + IconUser, +} from '@/ui/display/icon'; + +export const activeObjectItems = [ + { + name: 'Companies', + Icon: IconBuildingSkyscraper, + type: 'standard', + fields: 23, + instances: 165, + }, + { + name: 'People', + Icon: IconUser, + type: 'standard', + fields: 16, + instances: 462, + }, +]; + +export const disabledObjectItems = [ + { + name: 'Travels', + Icon: IconLuggage, + type: 'custom', + fields: 23, + instances: 165, + }, + { + name: 'Flights', + Icon: IconPlane, + type: 'custom', + fields: 23, + instances: 165, + }, +]; diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx index 3e1ace4105..63549d8b5f 100644 --- a/front/src/pages/tasks/Tasks.tsx +++ b/front/src/pages/tasks/Tasks.tsx @@ -3,16 +3,16 @@ import styled from '@emotion/styled'; import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButton'; import { TaskGroups } from '@/activities/tasks/components/TaskGroups'; -import { IconArchive, IconCheck, IconCheckbox } from '@/ui/icon/index'; +import { FilterDropdownButton } from '@/ui/data/view-bar/components/FilterDropdownButton'; +import { ViewBarContext } from '@/ui/data/view-bar/contexts/ViewBarContext'; +import { IconArchive, IconCheck, IconCheckbox } from '@/ui/display/icon/index'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; -import { PageBody } from '@/ui/layout/components/PageBody'; -import { PageContainer } from '@/ui/layout/components/PageContainer'; -import { PageHeader } from '@/ui/layout/components/PageHeader'; -import { TabList } from '@/ui/tab/components/TabList'; -import { TopBar } from '@/ui/top-bar/TopBar'; +import { PageBody } from '@/ui/layout/page/PageBody'; +import { PageContainer } from '@/ui/layout/page/PageContainer'; +import { PageHeader } from '@/ui/layout/page/PageHeader'; +import { TabList } from '@/ui/layout/tab/components/TabList'; +import { TopBar } from '@/ui/layout/top-bar/TopBar'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; -import { FilterDropdownButton } from '@/ui/view-bar/components/FilterDropdownButton'; -import { ViewBarContext } from '@/ui/view-bar/contexts/ViewBarContext'; import { TasksEffect } from './TasksEffect'; diff --git a/front/src/pages/tasks/TasksEffect.tsx b/front/src/pages/tasks/TasksEffect.tsx index fa5c3d53e5..5155c02e89 100644 --- a/front/src/pages/tasks/TasksEffect.tsx +++ b/front/src/pages/tasks/TasksEffect.tsx @@ -3,9 +3,9 @@ import { useRecoilState } from 'recoil'; import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; import { currentUserState } from '@/auth/states/currentUserState'; +import { availableFiltersScopedState } from '@/ui/data/view-bar/states/availableFiltersScopedState'; +import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; -import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; -import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; import { ViewFilterOperand } from '~/generated/graphql'; import { tasksFilters } from './tasks-filters'; diff --git a/front/src/pages/tasks/tasks-filters.tsx b/front/src/pages/tasks/tasks-filters.tsx index a7864aaf6c..20ba7d61c2 100644 --- a/front/src/pages/tasks/tasks-filters.tsx +++ b/front/src/pages/tasks/tasks-filters.tsx @@ -1,6 +1,6 @@ import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; -import { IconUser, IconUserCircle } from '@/ui/icon'; -import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; +import { FilterDefinitionByEntity } from '@/ui/data/view-bar/types/FilterDefinitionByEntity'; +import { IconUser, IconUserCircle } from '@/ui/display/icon'; import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect'; import { Activity } from '~/generated/graphql'; diff --git a/front/src/testing/decorators/PageDecorator.tsx b/front/src/testing/decorators/PageDecorator.tsx index b7a8815ae4..ebd6d5a952 100644 --- a/front/src/testing/decorators/PageDecorator.tsx +++ b/front/src/testing/decorators/PageDecorator.tsx @@ -3,7 +3,7 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom'; import { Decorator } from '@storybook/react'; import { ClientConfigProvider } from '~/modules/client-config/components/ClientConfigProvider'; -import { DefaultLayout } from '~/modules/ui/layout/components/DefaultLayout'; +import { DefaultLayout } from '~/modules/ui/layout/page/DefaultLayout'; import { UserProvider } from '~/modules/users/components/UserProvider'; import { FullHeightStorybookLayout } from '../FullHeightStorybookLayout';