Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

better tables UI

Blue Mouse35eb448d52cc
diff --git a/web/app/pages/UserSettings/components/Integrations.tsx b/web/app/pages/UserSettings/components/Integrations.tsx
index 887afdaeb..4d80c0d7f 100644
--- a/web/app/pages/UserSettings/components/Integrations.tsx
+++ b/web/app/pages/UserSettings/components/Integrations.tsx
@@ -53,6 +53,12 @@ interface IntegrationsProps {
handleIntegrationSave: (data: Partial<User>, cb: (isSuccess: boolean) => void) => void
}
+interface IntegrationStatus {
+ connected?: string | null
+ confirmed?: boolean | string | null
+ id?: string | null
+}
+
const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
const { user, mergeUser } = useAuth()
@@ -124,7 +130,7 @@ const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
const getIntegrationStatus = (key: string) => {
if (!user) {
- return {}
+ return {} as IntegrationStatus
}
if (key === 'telegram') {
@@ -132,7 +138,7 @@ const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
connected: user.telegramChatId,
confirmed: user.isTelegramChatIdConfirmed,
id: user.telegramChatId,
- }
+ } satisfies IntegrationStatus
}
if (key === 'discord') {
@@ -140,7 +146,7 @@ const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
connected: user.discordWebhookUrl,
confirmed: user.discordWebhookUrl,
id: null,
- }
+ } satisfies IntegrationStatus
}
if (key === 'slack') {
@@ -148,10 +154,10 @@ const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
connected: user.slackWebhookUrl,
confirmed: user.slackWebhookUrl,
id: null,
- }
+ } satisfies IntegrationStatus
}
- return {}
+ return {} as IntegrationStatus
}
const removeIntegration = async (key: string) => {
@@ -387,62 +393,89 @@ const Integrations = ({ handleIntegrationSave }: IntegrationsProps) => {
return (
<>
<p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>{t('profileSettings.integrationsDesc')}</p>
- <div className='mt-2 overflow-hidden bg-white ring-1 ring-black/10 sm:rounded-md dark:bg-slate-800'>
- <ul className='divide-y divide-gray-200 dark:divide-slate-700'>
- {_map(available, ({ name, key, description, Icon }) => {
- const { connected, confirmed, id } = getIntegrationStatus(key)
- const status = connected ? (confirmed ? 'connected' : 'pending') : 'notConnected'
-
- return (
- <li key={key} className='items-center px-1 py-4 sm:flex sm:px-6'>
- <div className='flex min-w-0 flex-1 items-center'>
- <div className='hidden shrink-0 sm:block'>
- <Icon className='size-12 max-h-12 max-w-12' />
- </div>
- <div className='min-w-0 flex-1 px-2 sm:px-4 md:grid md:grid-cols-2 md:gap-4'>
- <div>
- <p className='text-md font-medium text-gray-800 dark:text-gray-50'>{name}</p>
- <p className='mt-2 flex items-center text-sm text-gray-500 dark:text-gray-100'>
- <span>{description}</span>
- </p>
+ <div className='mt-2 overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700 dark:bg-slate-900'>
+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>
+ <thead className='bg-gray-50 dark:bg-slate-800'>
+ <tr>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.name')}
+ </th>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.details')}
+ </th>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.status')}
+ </th>
+ <th scope='col' className='px-4 py-3' />
+ </tr>
+ </thead>
+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>
+ {_map(available, ({ name, key, description, Icon }) => {
+ const { connected, confirmed, id } = getIntegrationStatus(key)
+ const status = connected ? (confirmed ? 'connected' : 'pending') : 'notConnected'
+
+ return (
+ <tr key={key} className='hover:bg-gray-50 dark:hover:bg-slate-800/50'>
+ <td className='px-4 py-3 text-sm text-gray-900 dark:text-gray-100'>
+ <div className='flex items-center gap-3'>
+ <div className='hidden shrink-0 sm:block'>
+ <Icon className='size-9' />
+ </div>
+ <span className='font-medium'>{name}</span>
</div>
- <div>
+ </td>
+ <td className='px-4 py-3 text-sm text-gray-700 dark:text-gray-300'>
+ <div className='space-y-1'>
+ <p className='text-sm text-gray-700 dark:text-gray-300'>{description}</p>
{id ? (
- <p className='text-sm text-gray-900 dark:text-gray-50'>
+ <p className='text-sm text-gray-900 dark:text-gray-100'>
{t('profileSettings.chatID')}
{`: ${id}`}
</p>
) : null}
- <p className='mt-2 flex items-center text-sm text-gray-500 dark:text-gray-100'>
- {status === 'notConnected' ? (
- <XCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-red-400' aria-hidden='true' />
- ) : null}
- {status === 'pending' ? (
- <ClockIcon className='mr-1.5 h-5 w-5 shrink-0 text-yellow-400' aria-hidden='true' />
- ) : null}
- {status === 'connected' ? (
- <CheckCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-green-400' aria-hidden='true' />
- ) : null}
- {t(`common.${status}`)}
- </p>
</div>
- </div>
- </div>
- <div className='mt-2 flex justify-center sm:mt-0 sm:block'>
- {connected ? (
- <Button onClick={() => removeIntegration(key)} small danger>
- {t('profileSettings.removeIntegration')}
- </Button>
- ) : (
- <Button onClick={setupIntegration(key)} small primary>
- {t('profileSettings.addIntegration')}
- </Button>
- )}
- </div>
- </li>
- )
- })}
- </ul>
+ </td>
+ <td className='px-4 py-3 text-sm text-gray-700 dark:text-gray-300'>
+ <div className='flex items-center'>
+ {status === 'notConnected' ? (
+ <XCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-red-400' aria-hidden='true' />
+ ) : null}
+ {status === 'pending' ? (
+ <ClockIcon className='mr-1.5 h-5 w-5 shrink-0 text-yellow-400' aria-hidden='true' />
+ ) : null}
+ {status === 'connected' ? (
+ <CheckCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-green-400' aria-hidden='true' />
+ ) : null}
+ {t(`common.${status}`)}
+ </div>
+ </td>
+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>
+ <div className='flex items-center justify-end gap-2'>
+ {connected ? (
+ <Button onClick={() => removeIntegration(key)} small danger>
+ {t('profileSettings.removeIntegration')}
+ </Button>
+ ) : (
+ <Button onClick={setupIntegration(key)} small primary>
+ {t('profileSettings.addIntegration')}
+ </Button>
+ )}
+ </div>
+ </td>
+ </tr>
+ )
+ })}
+ </tbody>
+ </table>
</div>
</>
)
diff --git a/web/app/pages/UserSettings/components/Socialisations.tsx b/web/app/pages/UserSettings/components/Socialisations.tsx
index 9e5db3e4c..6ad6056b9 100644
--- a/web/app/pages/UserSettings/components/Socialisations.tsx
+++ b/web/app/pages/UserSettings/components/Socialisations.tsx
@@ -42,13 +42,13 @@ const getStatusByUser = (user: User | null, socialisation: string) => {
}
if (socialisation === SSO_PROVIDERS.GOOGLE) {
- const connected = user.googleId
+ const connected = !!user.googleId
const unlinkable = !user.registeredWithGoogle
return [connected, unlinkable]
}
if (socialisation === SSO_PROVIDERS.GITHUB) {
- const connected = user.githubId
+ const connected = !!user.githubId
const unlinkable = !user.registeredWithGithub
return [connected, unlinkable]
}
@@ -130,64 +130,82 @@ const Socialisations = () => {
return (
<>
<p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>{t('profileSettings.socialisationsDesc')}</p>
- <div className='mt-2 overflow-hidden bg-white ring-1 ring-black/10 sm:rounded-md dark:bg-slate-800'>
- <ul className='divide-y divide-gray-200 dark:divide-slate-700'>
- {_map(AVAILABLE_SSO_PROVIDERS, ({ name, key, icons }) => {
- const [connected, unlinkable] = getStatusByUser(user, key)
- const { Light, Dark } = icons
-
- const status = connected ? 'connected' : 'notConnected'
-
- return (
- <li key={key}>
- <div className='items-center px-1 py-4 sm:flex sm:px-6'>
- <div className='flex min-w-0 flex-1 items-center'>
- <div className='hidden shrink-0 sm:block'>
- {theme === 'dark' ? (
- <Light className='h-12 max-h-12 w-12 max-w-12 rounded-full' />
- ) : (
- <Dark className='h-12 max-h-12 w-12 max-w-12 rounded-full' />
- )}
- </div>
- <div className='min-w-0 flex-1 px-2 sm:px-4 md:grid md:grid-cols-2 md:gap-4'>
- <div>
- <p className='text-md font-medium text-gray-800 dark:text-gray-50'>{name}</p>
- <p className='mt-2 flex items-center text-sm text-gray-500 dark:text-gray-100'>
- {status === 'notConnected' ? (
- <XCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-red-400' aria-hidden='true' />
- ) : null}
- {status === 'connected' ? (
- <CheckCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-green-400' aria-hidden='true' />
- ) : null}
- {t(`common.${status}`)}
- </p>
+ <div className='mt-2 overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700 dark:bg-slate-900'>
+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>
+ <thead className='bg-gray-50 dark:bg-slate-800'>
+ <tr>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.name')}
+ </th>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.status')}
+ </th>
+ <th scope='col' className='px-4 py-3' />
+ </tr>
+ </thead>
+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>
+ {_map(AVAILABLE_SSO_PROVIDERS, ({ name, key, icons }) => {
+ const [connected, unlinkable] = getStatusByUser(user, key)
+ const { Light, Dark } = icons
+ const status = connected ? 'connected' : 'notConnected'
+
+ return (
+ <tr key={key} className='hover:bg-gray-50 dark:hover:bg-slate-800/50'>
+ <td className='px-4 py-3 text-sm text-gray-900 dark:text-gray-100'>
+ <div className='flex items-center gap-3'>
+ <div className='hidden shrink-0 sm:block'>
+ {theme === 'dark' ? (
+ <Light className='h-9 w-9 rounded-md' />
+ ) : (
+ <Dark className='h-9 w-9 rounded-md' />
+ )}
</div>
+ <span className='font-medium'>{name}</span>
+ </div>
+ </td>
+ <td className='px-4 py-3 text-sm text-gray-700 dark:text-gray-300'>
+ <div className='flex items-center'>
+ {status === 'notConnected' ? (
+ <XCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-red-400' aria-hidden='true' />
+ ) : null}
+ {status === 'connected' ? (
+ <CheckCircleIcon className='mr-1.5 h-5 w-5 shrink-0 text-green-400' aria-hidden='true' />
+ ) : null}
+ {t(`common.${status}`)}
+ </div>
+ </td>
+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>
+ <div className='flex items-center justify-end gap-2'>
+ {connected && !unlinkable ? (
+ <Button onClick={() => toast.error(t('profileSettings.cantUnlinkSocialisation'))} small danger>
+ {t('common.unlink')}
+ </Button>
+ ) : null}
+
+ {connected && unlinkable ? (
+ <Button onClick={() => onUnlinkSSO(key)} loading={isLoading} small danger>
+ {t('common.unlink')}
+ </Button>
+ ) : null}
+
+ {!connected ? (
+ <Button onClick={() => linkSSO(key)} loading={isLoading} small primary>
+ {t('common.link')}
+ </Button>
+ ) : null}
</div>
- </div>
- <div className='mt-2 flex justify-center sm:mt-0 sm:block'>
- {connected && !unlinkable ? (
- <Button onClick={() => toast.error(t('profileSettings.cantUnlinkSocialisation'))} small danger>
- {t('common.unlink')}
- </Button>
- ) : null}
-
- {connected && unlinkable ? (
- <Button onClick={() => onUnlinkSSO(key)} loading={isLoading} small danger>
- {t('common.unlink')}
- </Button>
- ) : null}
-
- {!connected ? (
- <Button onClick={() => linkSSO(key)} loading={isLoading} small primary>
- {t('common.link')}
- </Button>
- ) : null}
- </div>
- </div>
- </li>
- )
- })}
- </ul>
+ </td>
+ </tr>
+ )
+ })}
+ </tbody>
+ </table>
</div>
</>
)
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index de475b2d1..8d7da543f 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -88,6 +88,7 @@
}
},
"common": {
+ "status": "Status",
"connect": "Connect",
"disconnect": "Disconnect",
"features": "Features",