From d1cbd709bdf5b892d51f610f6b46e1c44400bfc8 Mon Sep 17 00:00:00 2001 From: Abdullah <125115953+mabdullahabaid@users.noreply.github.com> Date: Wed, 22 May 2024 13:52:35 +0500 Subject: [PATCH] Extract typography components from twenty-front to twenty-ui. (#5466) Removed the following components from twenty-front and moved them to twenty-ui. - H1Title. - H2Title. - H3Title. Moving components in smaller chunks to ease the process of resolving conflicts. image Co-authored-by: Charles Bochet --- .../activities/calendar/components/Calendar.tsx | 2 +- .../activities/emails/components/EmailThreads.tsx | 5 +---- .../SettingsAccountsEmailsBlocklistSection.tsx | 2 +- .../components/SettingsAccountsSettingsSection.tsx | 3 +-- .../accounts/components/SettingsNewAccountSection.tsx | 3 ++- .../SettingsAvailableStandardObjectsSection.tsx | 3 ++- .../components/SettingsIntegrationGroup.tsx | 2 +- ...tingsIntegrationDatabaseConnectionShowContainer.tsx | 2 +- ...ettingsIntegrationEditDatabaseConnectionContent.tsx | 2 +- .../settings/profile/components/ChangePassword.tsx | 2 +- .../settings/profile/components/DeleteAccount.tsx | 2 +- .../settings/profile/components/DeleteWorkspace.tsx | 2 +- .../ui/layout/modal/components/ConfirmationModal.tsx | 5 +---- packages/twenty-front/src/pages/auth/CreateProfile.tsx | 2 +- .../twenty-front/src/pages/auth/CreateWorkspace.tsx | 2 +- packages/twenty-front/src/pages/settings/Releases.tsx | 3 +-- .../src/pages/settings/SettingsAppearance.tsx | 4 +--- .../src/pages/settings/SettingsBilling.tsx | 4 ++-- .../src/pages/settings/SettingsProfile.tsx | 4 +--- .../src/pages/settings/SettingsWorkspace.tsx | 4 +--- .../src/pages/settings/SettingsWorkspaceMembers.tsx | 4 +--- .../src/pages/settings/accounts/SettingsAccounts.tsx | 3 +-- .../settings/accounts/SettingsAccountsCalendars.tsx | 3 +-- .../accounts/SettingsAccountsCalendarsSettings.tsx | 3 +-- .../pages/settings/accounts/SettingsAccountsEmails.tsx | 3 +-- .../accounts/SettingsAccountsEmailsInboxSettings.tsx | 3 +-- .../pages/settings/data-model/SettingsNewObject.tsx | 3 +-- .../pages/settings/data-model/SettingsObjectDetail.tsx | 3 +-- .../pages/settings/data-model/SettingsObjectEdit.tsx | 3 +-- .../settings/data-model/SettingsObjectFieldEdit.tsx | 3 +-- .../SettingsObjectNewFieldStep1.tsx | 3 +-- .../SettingsObjectNewFieldStep2.tsx | 3 +-- .../src/pages/settings/data-model/SettingsObjects.tsx | 10 +++++++--- .../pages/settings/developers/SettingsDevelopers.tsx | 3 +-- .../api-keys/SettingsDevelopersApiKeyDetail.tsx | 3 +-- .../api-keys/SettingsDevelopersApiKeysNew.tsx | 3 +-- .../webhooks/SettingsDevelopersWebhookDetail.tsx | 3 +-- .../webhooks/SettingsDevelopersWebhooksNew.tsx | 3 +-- .../integrations/SettingsIntegrationDatabase.tsx | 3 +-- .../SettingsIntegrationNewDatabaseConnection.tsx | 3 +-- packages/twenty-ui/src/display/index.ts | 3 +++ .../src}/display/typography/components/H1Title.tsx | 0 .../src}/display/typography/components/H2Title.tsx | 0 .../src}/display/typography/components/H3Title.tsx | 0 .../components/__stories__/H1Title.stories.tsx | 5 ++++- .../components/__stories__/H2Title.stories.tsx | 3 ++- .../components/__stories__/H3Title.stories.tsx | 3 ++- 47 files changed, 60 insertions(+), 80 deletions(-) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/H1Title.tsx (100%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/H2Title.tsx (100%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/H3Title.tsx (100%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/__stories__/H1Title.stories.tsx (78%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/__stories__/H2Title.stories.tsx (87%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/display/typography/components/__stories__/H3Title.stories.tsx (83%) diff --git a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx index 11a41c8c2..c9d5f80f6 100644 --- a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx +++ b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx @@ -1,5 +1,6 @@ import styled from '@emotion/styled'; import { format, getYear } from 'date-fns'; +import { H3Title } from 'twenty-ui'; import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard'; import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from '@/activities/calendar/constants/Calendar'; @@ -11,7 +12,6 @@ import { FetchMoreLoader } from '@/activities/components/CustomResolverFetchMore import { useCustomResolver } from '@/activities/hooks/useCustomResolver'; import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; -import { H3Title } from '@/ui/display/typography/components/H3Title'; import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder'; import { AnimatedPlaceholderEmptyContainer, diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx index 8577d7f1a..31cc98f36 100644 --- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx +++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; +import { H1Title, H1TitleFontColor } from 'twenty-ui'; import { FetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader'; import { EmailLoader } from '@/activities/emails/components/EmailLoader'; @@ -9,10 +10,6 @@ import { getTimelineThreadsFromPersonId } from '@/activities/emails/queries/getT import { useCustomResolver } from '@/activities/hooks/useCustomResolver'; import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; -import { - H1Title, - H1TitleFontColor, -} from '@/ui/display/typography/components/H1Title'; import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder'; import { AnimatedPlaceholderEmptyContainer, diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistSection.tsx index aa32c6ee9..39b789fae 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistSection.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistSection.tsx @@ -1,4 +1,5 @@ import { useRecoilValue } from 'recoil'; +import { H2Title } from 'twenty-ui'; import { BlocklistItem } from '@/accounts/types/BlocklistItem'; import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState'; @@ -8,7 +9,6 @@ import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord'; import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { SettingsAccountsEmailsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistInput'; import { SettingsAccountsEmailsBlocklistTable } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistTable'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Section } from '@/ui/layout/section/components/Section'; export const SettingsAccountsEmailsBlocklistSection = () => { diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx index 724e3826b..659e0445e 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx @@ -1,11 +1,10 @@ import { useNavigate } from 'react-router-dom'; import styled from '@emotion/styled'; -import { IconCalendarEvent, IconMailCog } from 'twenty-ui'; +import { H2Title, IconCalendarEvent, IconMailCog } from 'twenty-ui'; import { SettingsNavigationCard } from '@/settings/components/SettingsNavigationCard'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Section } from '@/ui/layout/section/components/Section'; const StyledCardsContainer = styled.div` diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx index 06e07a063..3e7303a2e 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx @@ -1,5 +1,6 @@ +import { H2Title } from 'twenty-ui'; + import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Section } from '@/ui/layout/section/components/Section'; export const SettingsNewAccountSection = () => { diff --git a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx index 1f2b3aa80..22651f0ca 100644 --- a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx @@ -1,5 +1,6 @@ +import { H2Title } from 'twenty-ui'; + import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Section } from '@/ui/layout/section/components/Section'; import { Table } from '@/ui/layout/table/components/Table'; import { TableBody } from '@/ui/layout/table/components/TableBody'; diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx index f3e20bc3b..fb516ebb4 100644 --- a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx +++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx @@ -1,9 +1,9 @@ import { Link } from 'react-router-dom'; import styled from '@emotion/styled'; +import { H2Title } from 'twenty-ui'; import { SettingsIntegrationComponent } from '@/settings/integrations/components/SettingsIntegrationComponent'; import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Section } from '@/ui/layout/section/components/Section'; interface SettingsIntegrationGroupProps { diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx index ec5841c2e..9bc3f420e 100644 --- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx +++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx @@ -1,5 +1,6 @@ import { useNavigate } from 'react-router-dom'; import { Section } from '@react-email/components'; +import { H2Title } from 'twenty-ui'; import { useDeleteOneDatabaseConnection } from '@/databases/hooks/useDeleteOneDatabaseConnection'; import { SettingsIntegrationDatabaseConnectionSummaryCard } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSummaryCard'; @@ -8,7 +9,6 @@ import { useDatabaseConnection } from '@/settings/integrations/database-connecti import { getConnectionDbName } from '@/settings/integrations/utils/getConnectionDbName'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; export const SettingsIntegrationDatabaseConnectionShowContainer = () => { diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx index 797e618da..ccf7c4223 100644 --- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx +++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx @@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { zodResolver } from '@hookform/resolvers/zod'; import { Section } from '@react-email/components'; import pick from 'lodash.pick'; +import { H2Title } from 'twenty-ui'; import { z } from 'zod'; import { useUpdateOneDatabaseConnection } from '@/databases/hooks/useUpdateOneDatabaseConnection'; @@ -19,7 +20,6 @@ import { getConnectionDbName } from '@/settings/integrations/utils/getConnection import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; import { Info } from '@/ui/display/info/components/Info'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; import { diff --git a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx index ee6097152..4066bfba8 100644 --- a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx +++ b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx @@ -1,7 +1,7 @@ import { useRecoilValue } from 'recoil'; +import { H2Title } from 'twenty-ui'; import { currentUserState } from '@/auth/states/currentUserState'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Button } from '@/ui/input/button/components/Button'; import { useEmailPasswordResetLinkMutation } from '~/generated/graphql'; diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx index 12cdc2a12..6f6326dcd 100644 --- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx +++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; import { useRecoilValue } from 'recoil'; +import { H2Title } from 'twenty-ui'; import { useSignOutAndRedirect } from '@/auth/hooks/useSignOutAndRedirect'; import { currentUserState } from '@/auth/states/currentUserState'; -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'; diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx index 5c32f4421..a0c02cd38 100644 --- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx +++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; import { useRecoilValue } from 'recoil'; +import { H2Title } from 'twenty-ui'; import { useSignOutAndRedirect } from '@/auth/hooks/useSignOutAndRedirect'; import { currentUserState } from '@/auth/states/currentUserState'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { ConfirmationModal, StyledConfirmationButton, diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx index 53eef42d4..c6775ba1e 100644 --- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx +++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx @@ -1,12 +1,9 @@ import { ReactNode, useState } from 'react'; import styled from '@emotion/styled'; import { AnimatePresence, LayoutGroup } from 'framer-motion'; +import { H1Title, H1TitleFontColor } from 'twenty-ui'; import { useDebouncedCallback } from 'use-debounce'; -import { - H1Title, - H1TitleFontColor, -} from '@/ui/display/typography/components/H1Title'; import { Button, ButtonAccent } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; import { Modal } from '@/ui/layout/modal/components/Modal'; diff --git a/packages/twenty-front/src/pages/auth/CreateProfile.tsx b/packages/twenty-front/src/pages/auth/CreateProfile.tsx index a66f6994c..fe052b3a8 100644 --- a/packages/twenty-front/src/pages/auth/CreateProfile.tsx +++ b/packages/twenty-front/src/pages/auth/CreateProfile.tsx @@ -4,6 +4,7 @@ import styled from '@emotion/styled'; import { zodResolver } from '@hookform/resolvers/zod'; import { useRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; +import { H2Title } from 'twenty-ui'; import { z } from 'zod'; import { SubTitle } from '@/auth/components/SubTitle'; @@ -15,7 +16,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord'; import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { MainButton } from '@/ui/input/button/components/MainButton'; import { TextInputV2 } from '@/ui/input/components/TextInputV2'; diff --git a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx index 5d598430b..c6ff8f8c9 100644 --- a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx +++ b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx @@ -5,6 +5,7 @@ import styled from '@emotion/styled'; import { zodResolver } from '@hookform/resolvers/zod'; import { useSetRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; +import { H2Title } from 'twenty-ui'; import { z } from 'zod'; import { SubTitle } from '@/auth/components/SubTitle'; @@ -16,7 +17,6 @@ import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queri import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient'; import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader'; import { AppPath } from '@/types/AppPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Loader } from '@/ui/feedback/loader/components/Loader'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { MainButton } from '@/ui/input/button/components/MainButton'; diff --git a/packages/twenty-front/src/pages/settings/Releases.tsx b/packages/twenty-front/src/pages/settings/Releases.tsx index 7fa08d3bf..1d2d728a6 100644 --- a/packages/twenty-front/src/pages/settings/Releases.tsx +++ b/packages/twenty-front/src/pages/settings/Releases.tsx @@ -3,12 +3,11 @@ import styled from '@emotion/styled'; import rehypeStringify from 'rehype-stringify'; import remarkParse from 'remark-parse'; import remarkRehype from 'remark-rehype'; -import { IconSettings } from 'twenty-ui'; +import { H1Title, IconSettings } from 'twenty-ui'; import { unified } from 'unified'; import { visit } from 'unist-util-visit'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -import { H1Title } from '@/ui/display/typography/components/H1Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; diff --git a/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx b/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx index 30db3ecf8..2a6dc6445 100644 --- a/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx +++ b/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx @@ -1,9 +1,7 @@ import styled from '@emotion/styled'; -import { IconSettings } from 'twenty-ui'; +import { H1Title, H2Title, IconSettings } from 'twenty-ui'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -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'; diff --git a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx index 343bc2e7b..4641972d1 100644 --- a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx +++ b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx @@ -3,6 +3,8 @@ import { useNavigate } from 'react-router-dom'; import styled from '@emotion/styled'; import { useRecoilValue, useSetRecoilState } from 'recoil'; import { + H1Title, + H2Title, IconCalendarEvent, IconCircleX, IconCreditCard, @@ -17,8 +19,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain import { SupportChat } from '@/support/components/SupportChat'; import { AppPath } from '@/types/AppPath'; import { Info } from '@/ui/display/info/components/Info'; -import { H1Title } from '@/ui/display/typography/components/H1Title'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Button } from '@/ui/input/button/components/Button'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; diff --git a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx index ad846c603..4f876639c 100644 --- a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx +++ b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { IconSettings } from 'twenty-ui'; +import { H1Title, H2Title, IconSettings } from 'twenty-ui'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { ChangePassword } from '@/settings/profile/components/ChangePassword'; @@ -7,8 +7,6 @@ import { DeleteAccount } from '@/settings/profile/components/DeleteAccount'; import { EmailField } from '@/settings/profile/components/EmailField'; import { NameFields } from '@/settings/profile/components/NameFields'; import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader'; -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'; diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx index c52bf6e5e..bfcee4cc1 100644 --- a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx +++ b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx @@ -1,13 +1,11 @@ import styled from '@emotion/styled'; -import { IconSettings } from 'twenty-ui'; +import { H1Title, H2Title, IconSettings } from 'twenty-ui'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace'; import { NameField } from '@/settings/workspace/components/NameField'; import { ToggleImpersonate } from '@/settings/workspace/components/ToggleImpersonate'; import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader'; -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'; diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx index 6881feeb5..f020885f8 100644 --- a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx +++ b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; -import { IconSettings, IconTrash } from 'twenty-ui'; +import { H1Title, H2Title, IconSettings, IconTrash } from 'twenty-ui'; import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState'; import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState'; @@ -9,8 +9,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord'; import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -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'; diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx index 7f457f28b..17766adb6 100644 --- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx +++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx @@ -1,5 +1,5 @@ import { useRecoilValue } from 'recoil'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { ConnectedAccount } from '@/accounts/types/ConnectedAccount'; import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState'; @@ -12,7 +12,6 @@ import { SettingsAccountsConnectedAccountsListCard } from '@/settings/accounts/c import { SettingsAccountsEmailsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistSection'; import { SettingsAccountsSettingsSection } from '@/settings/accounts/components/SettingsAccountsSettingsSection'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx index 234b54540..313ed75ad 100644 --- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx +++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx @@ -1,6 +1,6 @@ import { addMinutes, endOfDay, min, startOfDay } from 'date-fns'; import { useRecoilValue } from 'recoil'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { CalendarChannel } from '@/accounts/types/CalendarChannel'; import { ConnectedAccount } from '@/accounts/types/ConnectedAccount'; @@ -14,7 +14,6 @@ import { SettingsAccountsCalendarDisplaySettings } from '@/settings/accounts/com import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx index ed0866e96..dd85f1980 100644 --- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx +++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx @@ -2,7 +2,7 @@ import { useEffect } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconRefresh, IconSettings, IconUser } from 'twenty-ui'; +import { H2Title, IconRefresh, IconSettings, IconUser } from 'twenty-ui'; import { CalendarChannel, @@ -18,7 +18,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx index c6ba3a5e3..d2827187f 100644 --- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx +++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx @@ -1,8 +1,7 @@ -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { SettingsAccountsMessageChannelsListCard } from '@/settings/accounts/components/SettingsAccountsMessageChannelsListCard'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx index b1b717509..6935475bc 100644 --- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx +++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { useTheme } from '@emotion/react'; -import { IconRefresh, IconSettings, IconUser } from 'twenty-ui'; +import { H2Title, IconRefresh, IconSettings, IconUser } from 'twenty-ui'; import { MessageChannel } from '@/accounts/types/MessageChannel'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; @@ -15,7 +15,6 @@ import { import { SettingsAccountsToggleSettingCard } from '@/settings/accounts/components/SettingsAccountsToggleSettingCard'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { AppPath } from '@/types/AppPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx index 97072bef4..dfbddcd7c 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx @@ -1,7 +1,7 @@ import { FormProvider, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; import { zodResolver } from '@hookform/resolvers/zod'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { z } from 'zod'; import { useCreateOneObjectMetadataItem } from '@/object-metadata/hooks/useCreateOneObjectMetadataItem'; @@ -16,7 +16,6 @@ import { import { settingsCreateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsCreateObjectInputSchema'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx index f442e4391..999334e0a 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import styled from '@emotion/styled'; -import { IconPlus, IconSettings } from 'twenty-ui'; +import { H2Title, IconPlus, IconSettings } from 'twenty-ui'; import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes'; import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem'; @@ -24,7 +24,6 @@ import { getFieldIdentifierType } from '@/settings/data-model/utils/getFieldIden import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx index d9460720a..9e0fdb800 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx @@ -3,7 +3,7 @@ import { FormProvider, useForm } from 'react-hook-form'; import { useNavigate, useParams } from 'react-router-dom'; import { zodResolver } from '@hookform/resolvers/zod'; import pick from 'lodash.pick'; -import { IconArchive, IconSettings } from 'twenty-ui'; +import { H2Title, IconArchive, IconSettings } from 'twenty-ui'; import { z } from 'zod'; import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; @@ -22,7 +22,6 @@ import { settingsUpdateObjectInputSchema } from '@/settings/data-model/validatio import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Button } from '@/ui/input/button/components/Button'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx index 6c0d5c1cc..e464b0ab2 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx @@ -5,7 +5,7 @@ import styled from '@emotion/styled'; import { zodResolver } from '@hookform/resolvers/zod'; import omit from 'lodash.omit'; import pick from 'lodash.pick'; -import { IconArchive, IconSettings } from 'twenty-ui'; +import { H2Title, IconArchive, IconSettings } from 'twenty-ui'; import { z } from 'zod'; import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem'; @@ -24,7 +24,6 @@ import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fi import { SettingsDataModelFieldTypeSelect } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect'; import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema'; import { AppPath } from '@/types/AppPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Button } from '@/ui/input/button/components/Button'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx index 96ec28cc0..98d5d0859 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import styled from '@emotion/styled'; -import { IconMinus, IconPlus, IconSettings } from 'twenty-ui'; +import { H2Title, IconMinus, IconPlus, IconSettings } from 'twenty-ui'; import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem'; import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; @@ -14,7 +14,6 @@ import { StyledObjectFieldTableRow, } from '@/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow'; import { AppPath } from '@/types/AppPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx index 65fea4b72..f148217c3 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx @@ -5,7 +5,7 @@ import { Reference, useApolloClient } from '@apollo/client'; import styled from '@emotion/styled'; import { zodResolver } from '@hookform/resolvers/zod'; import pick from 'lodash.pick'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { z } from 'zod'; import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem'; @@ -25,7 +25,6 @@ import { SettingsDataModelFieldTypeSelect } from '@/settings/data-model/fields/f import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema'; import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType'; import { AppPath } from '@/types/AppPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx index d5460ec73..142178020 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx @@ -1,7 +1,13 @@ import { useNavigate } from 'react-router-dom'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconChevronRight, IconPlus, IconSettings } from 'twenty-ui'; +import { + H1Title, + H2Title, + IconChevronRight, + IconPlus, + IconSettings, +} from 'twenty-ui'; import { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeleteOneObjectMetadataItem'; import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; @@ -17,8 +23,6 @@ import { SettingsObjectCoverImage } from '@/settings/data-model/objects/Settings import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/SettingsObjectInactiveMenuDropDown'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; -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 { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx index 88888a1b9..c2dc7014b 100644 --- a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx +++ b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx @@ -1,12 +1,11 @@ import styled from '@emotion/styled'; -import { IconPlus, IconSettings } from 'twenty-ui'; +import { H2Title, IconPlus, IconSettings } from 'twenty-ui'; import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { SettingsApiKeysTable } from '@/settings/developers/components/SettingsApiKeysTable'; import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton'; import { SettingsWebhooksTable } from '@/settings/developers/components/SettingsWebhooksTable'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx index d272141d3..0a718cf76 100644 --- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx +++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx @@ -4,7 +4,7 @@ import styled from '@emotion/styled'; import { isNonEmptyString } from '@sniptt/guards'; import { DateTime } from 'luxon'; import { useRecoilState } from 'recoil'; -import { IconRepeat, IconSettings, IconTrash } from 'twenty-ui'; +import { H2Title, IconRepeat, IconSettings, IconTrash } from 'twenty-ui'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord'; @@ -18,7 +18,6 @@ import { generatedApiKeyFamilyState } from '@/settings/developers/states/generat import { ApiKey } from '@/settings/developers/types/api-key/ApiKey'; import { computeNewExpirationDate } from '@/settings/developers/utils/compute-new-expiration-date'; import { formatExpiration } from '@/settings/developers/utils/format-expiration'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx index 37c3e5d2f..9dea99bd2 100644 --- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx +++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { DateTime } from 'luxon'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord'; @@ -11,7 +11,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain import { EXPIRATION_DATES } from '@/settings/developers/constants/ExpirationDates'; import { useGeneratedApiKeys } from '@/settings/developers/hooks/useGeneratedApiKeys'; import { ApiKey } from '@/settings/developers/types/api-key/ApiKey'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Select } from '@/ui/input/components/Select'; import { TextInput } from '@/ui/input/components/TextInput'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx index dbc2b7722..a55a2dd4c 100644 --- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx +++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx @@ -1,13 +1,12 @@ import { useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; -import { IconSettings, IconTrash } from 'twenty-ui'; +import { H2Title, IconSettings, IconTrash } from 'twenty-ui'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord'; import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord'; import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx index 568831cec..c83640d9d 100644 --- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx +++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord'; @@ -8,7 +8,6 @@ import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { Webhook } from '@/settings/developers/types/webhook/Webhook'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { TextInput } from '@/ui/input/components/TextInput'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx index bdddc5693..adb50e51f 100644 --- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx +++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { useGetDatabaseConnections } from '@/databases/hooks/useGetDatabaseConnections'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; @@ -11,7 +11,6 @@ import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/ import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx index 883b8801e..88f0e5fd5 100644 --- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx +++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx @@ -2,7 +2,7 @@ import { useEffect } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import { useNavigate, useParams } from 'react-router-dom'; import { zodResolver } from '@hookform/resolvers/zod'; -import { IconSettings } from 'twenty-ui'; +import { H2Title, IconSettings } from 'twenty-ui'; import { z } from 'zod'; import { useCreateOneDatabaseConnection } from '@/databases/hooks/useCreateOneDatabaseConnection'; @@ -20,7 +20,6 @@ import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/ import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; diff --git a/packages/twenty-ui/src/display/index.ts b/packages/twenty-ui/src/display/index.ts index 9e898de78..df849749b 100644 --- a/packages/twenty-ui/src/display/index.ts +++ b/packages/twenty-ui/src/display/index.ts @@ -18,3 +18,6 @@ export * from './icon/states/iconsState'; export * from './icon/types/IconComponent'; export * from './tooltip/AppTooltip'; export * from './tooltip/OverflowingTextWithTooltip'; +export * from './typography/components/H1Title'; +export * from './typography/components/H2Title'; +export * from './typography/components/H3Title'; diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/H1Title.tsx b/packages/twenty-ui/src/display/typography/components/H1Title.tsx similarity index 100% rename from packages/twenty-front/src/modules/ui/display/typography/components/H1Title.tsx rename to packages/twenty-ui/src/display/typography/components/H1Title.tsx diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/H2Title.tsx b/packages/twenty-ui/src/display/typography/components/H2Title.tsx similarity index 100% rename from packages/twenty-front/src/modules/ui/display/typography/components/H2Title.tsx rename to packages/twenty-ui/src/display/typography/components/H2Title.tsx diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx b/packages/twenty-ui/src/display/typography/components/H3Title.tsx similarity index 100% rename from packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx rename to packages/twenty-ui/src/display/typography/components/H3Title.tsx diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx b/packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx similarity index 78% rename from packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx rename to packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx index e48e873b9..ede08cefc 100644 --- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx +++ b/packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx @@ -1,5 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui'; + +import { CatalogDecorator } from '@ui/testing/decorators/CatalogDecorator'; +import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator'; +import { CatalogStory } from '@ui/testing/types/CatalogStory'; import { H1Title, H1TitleFontColor } from '../H1Title'; diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx b/packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx similarity index 87% rename from packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx rename to packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx index e896bf3e5..fee3afcd0 100644 --- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx +++ b/packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx @@ -1,5 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { ComponentDecorator } from 'twenty-ui'; + +import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator'; import { H2Title } from '../H2Title'; diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx b/packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx similarity index 83% rename from packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx rename to packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx index 41254a9f5..27b1338ba 100644 --- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx +++ b/packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx @@ -1,5 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import { ComponentDecorator } from 'twenty-ui'; + +import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator'; import { H3Title } from '../H3Title';