resolve conflicts after rebasing

This commit is contained in:
Hongbo Wu
2024-03-27 16:53:29 +08:00
parent 051e6a2b56
commit 5e7a82562b
5 changed files with 27 additions and 38 deletions

View File

@ -279,22 +279,7 @@ export default function Integrations(): JSX.Element {
],
},
},
{
icon: '/static/icons/notion.png',
title: 'Notion',
subText:
'Notion is an all-in-one workspace. Use our Notion integration to sync your Omnivore items to Notion.',
button: {
text: notion ? 'Settings' : 'Connect',
icon: <Link size={16} weight={'bold'} />,
style: notion ? 'ctaWhite' : 'ctaDarkYellow',
action: () => {
notion
? router.push('/settings/integrations/notion')
: redirectToIntegration('NOTION')
},
},
},
// {
// icon: '/static/icons/webhooks.svg',
// title: 'Webhooks',
@ -331,11 +316,11 @@ export default function Integrations(): JSX.Element {
subText:
'Notion is an all-in-one workspace. Use our Notion integration to sync your Omnivore items to Notion.',
button: {
text: isConnected('NOTION') ? 'Settings' : 'Connect',
text: notion ? 'Settings' : 'Connect',
icon: <Link size={16} weight={'bold'} />,
style: isConnected('NOTION') ? 'ctaWhite' : 'ctaDarkYellow',
style: notion ? 'ctaWhite' : 'ctaDarkYellow',
action: () => {
isConnected('NOTION')
notion
? router.push('/settings/integrations/notion')
: redirectToIntegration('NOTION')
},