diff --git a/packages/twenty-front/public/images/integrations/Github.png b/packages/twenty-front/public/images/integrations/Github.png deleted file mode 100644 index a8aff42a6..000000000 Binary files a/packages/twenty-front/public/images/integrations/Github.png and /dev/null differ diff --git a/packages/twenty-front/public/images/integrations/Cal.png b/packages/twenty-front/public/images/integrations/cal-logo.png similarity index 100% rename from packages/twenty-front/public/images/integrations/Cal.png rename to packages/twenty-front/public/images/integrations/cal-logo.png diff --git a/packages/twenty-front/public/images/integrations/github-logo.png b/packages/twenty-front/public/images/integrations/github-logo.png new file mode 100644 index 000000000..6cb3b705d Binary files /dev/null and b/packages/twenty-front/public/images/integrations/github-logo.png differ diff --git a/packages/twenty-front/public/images/integrations/MailChimp.png b/packages/twenty-front/public/images/integrations/mailchimp-logo.png similarity index 100% rename from packages/twenty-front/public/images/integrations/MailChimp.png rename to packages/twenty-front/public/images/integrations/mailchimp-logo.png diff --git a/packages/twenty-front/public/images/integrations/Slack.png b/packages/twenty-front/public/images/integrations/slack-logo.png similarity index 100% rename from packages/twenty-front/public/images/integrations/Slack.png rename to packages/twenty-front/public/images/integrations/slack-logo.png diff --git a/packages/twenty-front/public/images/integrations/Tally.png b/packages/twenty-front/public/images/integrations/tally-logo.png similarity index 100% rename from packages/twenty-front/public/images/integrations/Tally.png rename to packages/twenty-front/public/images/integrations/tally-logo.png diff --git a/packages/twenty-front/public/images/integrations/Twenty.svg b/packages/twenty-front/public/images/integrations/twenty-logo.svg similarity index 100% rename from packages/twenty-front/public/images/integrations/Twenty.svg rename to packages/twenty-front/public/images/integrations/twenty-logo.svg diff --git a/packages/twenty-front/public/images/integrations/Windmill.png b/packages/twenty-front/public/images/integrations/windmill-logo.png similarity index 100% rename from packages/twenty-front/public/images/integrations/Windmill.png rename to packages/twenty-front/public/images/integrations/windmill-logo.png diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx index d5ae7b3a7..b588faa30 100644 --- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx +++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx @@ -32,7 +32,6 @@ export const SettingsNavigationDrawerItems = () => { }, [signOut, navigate]); const isMessagingEnabled = useIsFeatureEnabled('IS_MESSAGING_ENABLED'); - const isIntegrationsEnabled = useIsFeatureEnabled('IS_INTEGRATIONS_ENABLED'); const isIntegrationsItemActive = !!useMatch({ path: useResolvedPath('/settings/integrations').pathname, end: true, @@ -144,14 +143,12 @@ export const SettingsNavigationDrawerItems = () => { }) } /> - {isIntegrationsEnabled && ( - - )} + diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts index 3d23fb7d2..b0b10fef2 100644 --- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts +++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts @@ -1,6 +1,5 @@ export type FeatureFlagKey = | 'IS_MESSAGING_ENABLED' | 'IS_BLOCKLIST_ENABLED' - | 'IS_INTEGRATIONS_ENABLED' | 'IS_QUICK_ACTIONS_ENABLED' | 'IS_NEW_RECORD_BOARD_ENABLED'; diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx index 19345b702..0886dbd65 100644 --- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx +++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx @@ -1,12 +1,12 @@ -import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { SoonPill } from 'tsup.ui.index'; import { IconArrowUpRight, IconBolt } from '@/ui/display/icon'; +import { SoonPill } from '@/ui/display/pill/components/SoonPill'; +import { Button } from '@/ui/input/button/components/Button'; +import { SettingsIntegration } from '~/pages/settings/integrations/types/SettingsIntegration'; -import { Integration, IntegrationType } from './constants/IntegrationTypes'; interface SettingsIntegrationComponentProps { - integration: Integration; + integration: SettingsIntegration; } const StyledContainer = styled.div` @@ -36,20 +36,6 @@ const StyledIntegrationLogo = styled.div` color: ${({ theme }) => theme.border.color.strong}; `; -const StyledButton = styled.button` - align-items: center; - background: ${({ theme }) => theme.background.secondary}; - border: 1px solid ${({ theme }) => theme.border.color.light}; - border-radius: ${({ theme }) => theme.border.radius.sm}; - color: ${({ theme }) => theme.font.color.secondary}; - display: flex; - flex-direction: row; - font-size: ${({ theme }) => theme.font.size.md}; - gap: ${({ theme }) => theme.spacing(1)}; - padding: ${({ theme }) => theme.spacing(1)} ${({ theme }) => theme.spacing(2)}; - cursor: pointer; -`; - const StyledSoonPill = styled(SoonPill)` padding: ${({ theme }) => theme.spacing(1)} ${({ theme }) => theme.spacing(2)}; `; @@ -62,7 +48,6 @@ const StyledLogo = styled.img` export const SettingsIntegrationComponent = ({ integration, }: SettingsIntegrationComponentProps) => { - const theme = useTheme(); const openLinkInTab = (link: string) => { window.open(link); }; @@ -83,21 +68,15 @@ export const SettingsIntegrationComponent = ({ {integration.text} - {integration.type === IntegrationType.Soon ? ( + {integration.type === 'Soon' ? ( ) : ( - openLinkInTab(integration.link)}> - {integration.type === IntegrationType.Use ? ( - - ) : ( - - )} - {integration.type === IntegrationType.Goto ? ( -
{integration.linkText}
- ) : ( -
Use
- )} -
+