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!

imptoved alerts / sessions / funnels UI (#407)

Andrii Romasiun7ee42c7024f7
diff --git a/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
index 5f9c8dd3f..372c8d85f 100644
--- a/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
+++ b/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
@@ -1,17 +1,24 @@
/* eslint-disable react/forbid-prop-types */
import React, { useMemo, memo, useState } from 'react'
import dayjs from 'dayjs'
+import cx from 'clsx'
import _map from 'lodash/map'
import _isEmpty from 'lodash/isEmpty'
import _replace from 'lodash/replace'
import _values from 'lodash/values'
import _reduce from 'lodash/reduce'
import _filter from 'lodash/filter'
-import _trucate from 'lodash/truncate'
-import { useNavigate } from '@remix-run/react'
+import { useNavigate, Link } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import PropTypes from 'prop-types'
-import { BellIcon, CurrencyDollarIcon, PencilSquareIcon, FolderPlusIcon } from '@heroicons/react/24/outline'
+import {
+ BellIcon,
+ CurrencyDollarIcon,
+ AdjustmentsVerticalIcon,
+ TrashIcon,
+ PlusCircleIcon,
+ ExclamationTriangleIcon,
+} from '@heroicons/react/24/outline'
import routes from 'routesPath'
import Button from 'ui/Button'
@@ -20,6 +27,142 @@ import { QUERY_METRIC, PLAN_LIMITS } from 'redux/constants'
import { IAlerts } from 'redux/models/IAlerts'
import { IUser } from 'redux/models/IUser'
+const Separator = () => (
+ <svg viewBox='0 0 2 2' className='h-0.5 w-0.5 flex-none fill-gray-400'>
+ <circle cx={1} cy={1} r={1} />
+ </svg>
+)
+
+const NoNotificationChannelSet = () => {
+ const { t } = useTranslation('common')
+
+ return (
+ <div className='bg-yellow-300 dark:bg-yellow-500 rounded-lg'>
+ <div className='max-w-7xl mx-auto py-3 px-3 sm:px-6 lg:px-8'>
+ <div className='flex items-center justify-between flex-wrap'>
+ <div className='flex-1 flex items-center'>
+ <span className='flex p-2 rounded-lg bg-yellow-500 dark:bg-yellow-600'>
+ <ExclamationTriangleIcon className='h-6 w-6 text-white' aria-hidden='true' />
+ </span>
+ <p className='ml-3 font-medium text-black'>{t('alert.noNotificationChannel')}</p>
+ </div>
+ <div className='order-3 mt-2 flex-shrink-0 w-full sm:order-2 sm:mt-0 sm:w-auto'>
+ <Link
+ to={routes.user_settings}
+ className='flex items-center justify-center cursor-pointer px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-gray-800 bg-gray-50 hover:bg-yellow-50 dark:text-gray-50 dark:bg-slate-800 dark:hover:bg-slate-700'
+ >
+ {t('common.fixIt')}
+ </Link>
+ </div>
+ </div>
+ </div>
+ </div>
+ )
+}
+
+interface IAlertCard {
+ id: string
+ name: string
+ queryMetric: string | number
+ lastTriggered: string | null
+ deleteAlert: (id: string) => void
+ openAlert: (id: string) => void
+ queryMetricTMapping: any
+}
+
+const AlertCard = ({
+ id,
+ name,
+ queryMetric,
+ lastTriggered,
+ openAlert,
+ deleteAlert,
+ queryMetricTMapping,
+}: IAlertCard): JSX.Element => {
+ const {
+ t,
+ i18n: { language },
+ } = useTranslation()
+
+ return (
+ <li
+ onClick={() => openAlert(id)}
+ className='overflow-hidden min-h-[120px] rounded-xl border border-gray-200 cursor-pointer bg-gray-50 hover:bg-gray-100 dark:bg-[#162032] dark:hover:bg-slate-800 dark:border-slate-800/25'
+ >
+ <div className='py-4 px-4'>
+ <div className='flex justify-between'>
+ <div>
+ <p className='flex items-center gap-x-2 text-lg text-slate-900 dark:text-gray-50'>
+ <span className='font-semibold'>{name}</span>
+ <Separator />
+ <span>{queryMetricTMapping[queryMetric]}</span>
+ </p>
+ <p className='text-base text-slate-900 dark:text-gray-50'>
+ {lastTriggered
+ ? t('alert.lastTriggeredOn', {
+ date:
+ language === 'en'
+ ? dayjs(lastTriggered).locale(language).format('MMMM D, YYYY')
+ : dayjs(lastTriggered).locale(language).format('D MMMM, YYYY'),
+ })
+ : t('alert.notYetTriggered')}
+ </p>
+ </div>
+ <div className='flex gap-2'>
+ <AdjustmentsVerticalIcon
+ role='button'
+ aria-label={t('common.settings')}
+ onClick={(e) => {
+ e.stopPropagation()
+ openAlert(id)
+ }}
+ className='w-6 h-6 text-gray-800 dark:text-slate-400 hover:text-gray-900 dark:hover:text-slate-500'
+ />
+ <TrashIcon
+ onClick={(e) => {
+ e.stopPropagation()
+ deleteAlert(id)
+ }}
+ role='button'
+ aria-label={t('common.delete')}
+ className={cx('w-6 h-6 text-gray-800 dark:text-slate-400 hover:text-gray-900 dark:hover:text-slate-500', {
+ // 'cursor-not-allowed': loading,
+ })}
+ />
+ </div>
+ </div>
+ </div>
+ </li>
+ )
+}
+
+interface IAddAlert {
+ handleNewAlert: () => void
+ isLimitReached: boolean
+}
+
+const AddAlert = ({ handleNewAlert, isLimitReached }: IAddAlert): JSX.Element => {
+ const { t } = useTranslation()
+
+ return (
+ <li
+ onClick={handleNewAlert}
+ className='flex cursor-pointer justify-center items-center rounded-lg border-2 border-dashed h-auto min-h-[120px] group border-gray-300 hover:border-gray-400 dark:border-gray-500 dark:hover:border-gray-600'
+ >
+ <div>
+ {isLimitReached ? (
+ <CurrencyDollarIcon className='mx-auto h-12 w-12 text-gray-400 dark:text-gray-200 group-hover:text-gray-500 group-hover:dark:text-gray-400' />
+ ) : (
+ <PlusCircleIcon className='mx-auto h-12 w-12 text-gray-400 dark:text-gray-200 group-hover:text-gray-500 group-hover:dark:text-gray-400' />
+ )}
+ <span className='mt-2 block text-sm font-semibold text-gray-900 dark:text-gray-50 group-hover:dark:text-gray-400'>
+ {t('alert.add')}
+ </span>
+ </div>
+ </li>
+ )
+}
+
const ProjectAlerts = ({
projectId,
alerts,
@@ -35,13 +178,7 @@ const ProjectAlerts = ({
total: number
authenticated: boolean
}): JSX.Element => {
- const {
- t,
- i18n: { language },
- }: {
- t: (key: string) => string
- i18n: { language: string }
- } = useTranslation()
+ const { t } = useTranslation()
const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState<boolean>(false)
const navigate = useNavigate()
@@ -84,23 +221,6 @@ const ProjectAlerts = ({
return (
<div>
- <div className='flex justify-between items-center mt-4'>
- {!loading && !_isEmpty(projectAlerts) && (
- <>
- <h2 className='text-2xl font-bold dark:text-white text-gray-800'>{t('dashboard.alerts')}</h2>
- <Button type='button' primary large onClick={handleNewAlert}>
- <>
- {isLimitReached ? (
- <CurrencyDollarIcon className='w-5 h-5 mr-1' />
- ) : (
- <FolderPlusIcon className='w-5 h-5 mr-1' />
- )}
- {t('alert.add')}
- </>
- </Button>
- </>
- )}
- </div>
<div className='mt-4'>
{loading && <div>{t('common.loading')}</div>}
{!loading && _isEmpty(projectAlerts) && (
@@ -123,63 +243,24 @@ const ProjectAlerts = ({
</Button>
</div>
)}
-
{!loading && !_isEmpty(projectAlerts) && (
- <table className='w-full mb-3 border-separate border-spacing-y-4'>
- <tbody>
- {_map(projectAlerts, ({ id, name, queryMetric, lastTriggered }) => (
- <tr key={id} className='bg-white dark:bg-slate-900 rounded-lg shadow-lg'>
- <td className='p-4 pr-0 rounded-l-lg justify-start'>
- <div className='flex flex-col'>
- <div className='text-lg font-bold dark:text-white text-gray-800 hidden lg:block'>{name}</div>
- <div className='text-lg font-bold dark:text-white text-gray-800 hidden md:block lg:hidden'>
- {_trucate(name, { length: 35 })}
- </div>
- <div className='text-lg font-bold dark:text-white text-gray-800 hidden sm:block md:hidden'>
- {_trucate(name, { length: 20 })}
- </div>
- <div className='text-lg font-bold dark:text-white text-gray-800 sm:hidden'>
- {_trucate(name, { length: 10 })}
- </div>
- <div className='text-sm dark:text-gray-400 text-gray-600'>{queryMetricTMapping[queryMetric]}</div>
- </div>
- </td>
- <td className='py-4'>
- <div className='flex flex-col'>
- <div className='text-sm dark:text-gray-400 text-gray-600'>{t('alert.lastTriggered')}</div>
- <div className='text-lg font-bold dark:text-white text-gray-800'>
- {lastTriggered
- ? language === 'en'
- ? dayjs(lastTriggered).locale(language).format('MMMM D, YYYY')
- : dayjs(lastTriggered).locale(language).format('D MMMM, YYYY')
- : t('alert.never')}
- </div>
- </div>
- </td>
- <td className='rounded-r-lg p-4 pl-0'>
- <div className='flex items-center justify-end'>
- {!isIntegrationLinked && (
- <p className='text-gray-800 dark:text-gray-200 text-sm mr-3'>{t('alert.noNotification')}</p>
- )}
- <Button
- onClick={() => {
- navigate(_replace(_replace(routes.alert_settings, ':pid', projectId), ':id', id))
- }}
- className='dark:text-gray-50 dark:bg-slate-800 dark:hover:bg-slate-700'
- secondary
- large
- >
- <>
- <PencilSquareIcon className='w-4 h-4 mr-1' />
- {t('common.edit')}
- </>
- </Button>
- </div>
- </td>
- </tr>
+ <>
+ {!isIntegrationLinked && <NoNotificationChannelSet />}
+ <ul className='grid grid-cols-1 gap-x-6 gap-y-3 lg:gap-y-6 lg:grid-cols-3 mt-4'>
+ {_map(projectAlerts, (alert) => (
+ <AlertCard
+ key={alert.id}
+ {...alert}
+ openAlert={(id) => {
+ navigate(_replace(_replace(routes.alert_settings, ':pid', projectId), ':id', id))
+ }}
+ deleteAlert={() => {}}
+ queryMetricTMapping={queryMetricTMapping}
+ />
))}
- </tbody>
- </table>
+ <AddAlert handleNewAlert={handleNewAlert} isLimitReached={isLimitReached} />
+ </ul>
+ </>
)}
</div>
<PaidFeature isOpened={isPaidFeatureOpened} onClose={() => setIsPaidFeatureOpened(false)} />
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsx
index b2c653591..a3457a275 100644
--- a/app/pages/Project/View/ViewProject.tsx
+++ b/app/pages/Project/View/ViewProject.tsx
@@ -3536,23 +3536,18 @@ const ViewProject = ({
)}
{activeTab === PROJECT_TABS.sessions && activeSession && (
<>
- <div className='flex items-baseline space-x-2 mt-2'>
- <h2 className='text-xl font-bold text-gray-900 dark:text-gray-50 break-words break-all'>
- {activeSession?.psid}
- </h2>
- <button
- onClick={() => {
- setActiveSession(null)
- const url = new URL(window.location.href)
- url.searchParams.delete('psid')
- window.history.pushState({}, '', url.toString())
- }}
- className='flex items-center text-base font-normal underline decoration-dashed hover:decoration-solid mb-4 mx-auto lg:mx-0 mt-2 lg:mt-0 text-gray-900 dark:text-gray-100'
- >
- <ChevronLeftIcon className='w-4 h-4' />
- {t('project.backToSessions')}
- </button>
- </div>
+ <button
+ onClick={() => {
+ setActiveSession(null)
+ const url = new URL(window.location.href)
+ url.searchParams.delete('psid')
+ window.history.pushState({}, '', url.toString())
+ }}
+ className='flex items-center text-base font-normal underline decoration-dashed hover:decoration-solid mb-4 mx-auto lg:mx-0 mt-2 text-gray-900 dark:text-gray-100'
+ >
+ <ChevronLeftIcon className='w-4 h-4' />
+ {t('project.backToSessions')}
+ </button>
{activeSession?.details && (
<SessionDetails details={activeSession?.details} psid={activeSession?.psid} />
)}
diff --git a/app/pages/Project/View/components/FunnelsList.tsx b/app/pages/Project/View/components/FunnelsList.tsx
index 89fa1ccc4..b067ead98 100644
--- a/app/pages/Project/View/components/FunnelsList.tsx
+++ b/app/pages/Project/View/components/FunnelsList.tsx
@@ -32,7 +32,7 @@ const FunnelCard = ({ funnel, openFunnelSettings, openFunnel, deleteFunnel, load
return (
<li
onClick={() => openFunnel(funnel)}
- className='overflow-hidden min-h-[120px] rounded-xl border border-gray-200 cursor-pointer bg-gray-50 hover:bg-gray-100 dark:bg-slate-800 dark:hover:bg-slate-700 dark:border-slate-800/25'
+ className='overflow-hidden min-h-[120px] rounded-xl border border-gray-200 cursor-pointer bg-gray-50 hover:bg-gray-100 dark:bg-[#162032] dark:hover:bg-slate-800 dark:border-slate-800/25'
>
<div className='py-4 px-4'>
<div className='flex justify-between items-center'>
@@ -76,7 +76,7 @@ const AddFunnel = ({ openFunnelSettings }: IAddFunnel): JSX.Element => {
return (
<li
onClick={onClick}
- className='flex cursor-pointer justify-center items-center rounded-lg border-2 border-dashed h-auto min-h-[120px] group border-gray-300 hover:border-gray-400'
+ className='flex cursor-pointer justify-center items-center rounded-lg border-2 border-dashed h-auto min-h-[120px] group border-gray-300 hover:border-gray-400 dark:border-gray-500 dark:hover:border-gray-600'
>
<div>
<PlusCircleIcon className='mx-auto h-12 w-12 text-gray-400 dark:text-gray-200 group-hover:text-gray-500 group-hover:dark:text-gray-400' />
@@ -102,7 +102,7 @@ const FunnelsList = ({
loading,
authenticated,
}: IFunnelsList): JSX.Element => (
- <ul className='grid grid-cols-1 gap-x-6 gap-y-3 lg:gap-y-6 lg:grid-cols-3 mt-2'>
+ <ul className='grid grid-cols-1 gap-x-6 gap-y-3 lg:gap-y-6 lg:grid-cols-3 mt-4'>
{_map(funnels, (funnel) => (
<FunnelCard
key={funnel.id}
diff --git a/app/pages/Project/View/components/MetricCards.tsx b/app/pages/Project/View/components/MetricCards.tsx
index abb6ca70d..7718d129e 100644
--- a/app/pages/Project/View/components/MetricCards.tsx
+++ b/app/pages/Project/View/components/MetricCards.tsx
@@ -19,6 +19,10 @@ interface IMetricCard {
change?: number
type?: 'percent' | 'string'
valueMapper?: (value: any, type: 'main' | 'badge') => any
+ classes?: {
+ value?: string
+ label?: string
+ }
}
const ChangeBadge = ({ change, type, goodChangeDirection, valueMapper }: Partial<IMetricCard>) => {
@@ -57,15 +61,27 @@ const ChangeBadge = ({ change, type, goodChangeDirection, valueMapper }: Partial
}
}
-export const MetricCard: React.FC<IMetricCard> = ({ label, value, change, type, goodChangeDirection, valueMapper }) => (
+export const MetricCard: React.FC<IMetricCard> = ({
+ label,
+ value,
+ change,
+ type,
+ goodChangeDirection,
+ valueMapper,
+ classes,
+}) => (
<div className='flex flex-col'>
- <div className='font-bold text-4xl whitespace-nowrap text-slate-900 dark:text-gray-50'>
+ <div className={cx('font-bold text-4xl whitespace-nowrap text-slate-900 dark:text-gray-50', classes?.value)}>
{valueMapper ? valueMapper(value, 'main') : value}
</div>
<div
- className={cx('flex items-center font-bold whitespace-nowrap text-sm', {
- 'space-x-2': _isNumber(change),
- })}
+ className={cx(
+ 'flex items-center font-bold whitespace-nowrap text-sm',
+ {
+ 'space-x-2': _isNumber(change),
+ },
+ classes?.label,
+ )}
>
<span className='text-slate-900 dark:text-gray-50'>{label}</span>
<ChangeBadge change={change} type={type} goodChangeDirection={goodChangeDirection} valueMapper={valueMapper} />
@@ -80,9 +96,13 @@ interface IMetricCardSelect {
}[]
valueMapper?: (value: any, index: number) => any
selectLabel: string
+ classes?: {
+ value?: string
+ label?: string
+ }
}
-export const MetricCardSelect: React.FC<IMetricCardSelect> = ({ values, valueMapper, selectLabel }) => {
+export const MetricCardSelect: React.FC<IMetricCardSelect> = ({ values, valueMapper, selectLabel, classes }) => {
const [selected, setSelected] = useState(0)
const [show, setShow] = useState<boolean>(false)
@@ -93,12 +113,15 @@ export const MetricCardSelect: React.FC<IMetricCardSelect> = ({ values, valueMap
return (
<div className='flex flex-col'>
- <div className='font-bold text-4xl whitespace-nowrap text-slate-900 dark:text-gray-50'>
+ <div className={cx('font-bold text-4xl whitespace-nowrap text-slate-900 dark:text-gray-50', classes?.value)}>
{valueMapper ? valueMapper(values[selected], selected) : values[selected].value}
</div>
<div className='flex items-center font-bold whitespace-nowrap text-sm relative'>
<OutsideClickHandler onOutsideClick={() => setShow(false)}>
- <span className='text-slate-900 dark:text-gray-50 cursor-pointer' onClick={() => setShow(!show)}>
+ <span
+ className={cx('text-slate-900 dark:text-gray-50 cursor-pointer', classes?.label)}
+ onClick={() => setShow(!show)}
+ >
{values[selected].label}{' '}
{show ? <ChevronUpIcon className='inline w-4 h-4' /> : <ChevronDownIcon className='inline w-4 h-4' />}
</span>
diff --git a/app/pages/Project/View/components/SessionDetails.tsx b/app/pages/Project/View/components/SessionDetails.tsx
index f7333684a..42f73c270 100644
--- a/app/pages/Project/View/components/SessionDetails.tsx
+++ b/app/pages/Project/View/components/SessionDetails.tsx
@@ -52,6 +52,9 @@ export const SessionDetails = ({ details, psid }: ISessionDetailsComponent) => {
return (
<div className='flex justify-center lg:justify-start gap-5 mb-5 flex-wrap'>
<MetricCardSelect
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
values={geo}
selectLabel={t('project.geo')}
valueMapper={({ value }, index) => {
@@ -70,14 +73,32 @@ export const SessionDetails = ({ details, psid }: ISessionDetailsComponent) => {
)
}}
/>
- <MetricCard label={t('project.mapping.os')} value={details.os || 'N/A'} />
<MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
+ label={t('project.mapping.os')}
+ value={details.os || 'N/A'}
+ />
+ <MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
label={t('project.mapping.dv')}
value={details.dv || 'N/A'}
valueMapper={(value) => _capitalize(value)}
/>
- <MetricCard label={t('project.mapping.br')} value={details.br || 'N/A'} />
<MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
+ label={t('project.mapping.br')}
+ value={details.br || 'N/A'}
+ />
+ <MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
label={t('project.mapping.lc')}
value={details.lc || 'N/A'}
valueMapper={(value) => {
@@ -89,6 +110,9 @@ export const SessionDetails = ({ details, psid }: ISessionDetailsComponent) => {
}}
/>
<MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
label={t('project.mapping.ref')}
value={details.ref || 'N/A'}
valueMapper={(value) => {
@@ -105,8 +129,17 @@ export const SessionDetails = ({ details, psid }: ISessionDetailsComponent) => {
)
}}
/>
- <MetricCardSelect values={utm} selectLabel={t('project.campaigns')} />
+ <MetricCardSelect
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
+ values={utm}
+ selectLabel={t('project.campaigns')}
+ />
<MetricCard
+ classes={{
+ value: 'max-md:text-xl md:text-3xl',
+ }}
label={t('dashboard.sessionDuration')}
value={details.sdur as number}
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value))}
diff --git a/app/pages/Project/View/components/Sessions.tsx b/app/pages/Project/View/components/Sessions.tsx
index c6280eb1b..90a2d1d56 100644
--- a/app/pages/Project/View/components/Sessions.tsx
+++ b/app/pages/Project/View/components/Sessions.tsx
@@ -3,11 +3,9 @@ import { Link } from '@remix-run/react'
import { ClientOnly } from 'remix-utils'
import { useTranslation } from 'react-i18next'
import _map from 'lodash/map'
-import cx from 'clsx'
import { ChevronRightIcon } from '@heroicons/react/24/outline'
import Loader from 'ui/Loader'
import { ISession } from '../interfaces/session'
-import { Badge } from 'ui/Badge'
import CCRow from './CCRow'
interface ISessions {
@@ -18,10 +16,15 @@ interface ISessions {
interface ISessionComponent {
session: ISession
onClick: (psid: string) => void
- className?: string
}
-const Session = ({ session, onClick, className }: ISessionComponent) => {
+const Separator = () => (
+ <svg viewBox='0 0 2 2' className='h-0.5 w-0.5 flex-none fill-gray-400'>
+ <circle cx={1} cy={1} r={1} />
+ </svg>
+)
+
+const Session = ({ session, onClick }: ISessionComponent) => {
const {
t,
i18n: { language },
@@ -38,6 +41,9 @@ const Session = ({ session, onClick, className }: ISessionComponent) => {
psidUrl.searchParams.set('psid', session.psid)
const stringifiedUrl = psidUrl.toString()
+ const pageviewCount =
+ session.pageviews === 1 ? t('dashboard.onePageview') : t('dashboard.xPageviews', { x: session.pageviews })
+
return (
<Link
onClick={(e: React.MouseEvent<HTMLAnchorElement>) => {
@@ -49,36 +55,27 @@ const Session = ({ session, onClick, className }: ISessionComponent) => {
}}
to={stringifiedUrl}
>
- <li
- className={cx(
- 'relative flex justify-between gap-x-6 py-5 bg-gray-50 hover:bg-gray-200 dark:bg-slate-900 dark:hover:bg-slate-800 cursor-pointer px-4 sm:px-6 lg:px-8',
- className,
- )}
- >
+ <li className='relative flex justify-between gap-x-6 py-4 bg-gray-200/60 hover:bg-gray-200 dark:bg-[#162032] dark:hover:bg-slate-800 cursor-pointer px-4 sm:px-6 mb-4 rounded-lg'>
<div className='flex min-w-0 gap-x-4'>
<div className='min-w-0 flex-auto'>
- <p className='text-sm font-semibold leading-6 text-gray-900 dark:text-gray-50'>
- {session.psid}
- <span className='text-gray-400 mx-1'>|</span>
+ <p className='flex items-center gap-x-2 text-sm font-semibold leading-6 text-gray-900 dark:text-gray-50'>
{date}
</p>
- <p className='mt-1 flex text-xs leading-5 text-gray-500 dark:text-gray-300'>
- {session.cc ? <CCRow size={18} cc={session.cc} language={language} /> : t('project.unknownCountry')}
- <span className='text-gray-400 mx-1'>|</span>
+ <p className='mt-1 flex items-center gap-x-2 text-xs leading-5 text-gray-500 dark:text-gray-300'>
+ <span className='flex'>
+ {session.cc ? <CCRow size={18} cc={session.cc} language={language} /> : t('project.unknownCountry')}
+ </span>
+ <Separator />
{session.os}
- <span className='text-gray-400 mx-1'>|</span>
+ <Separator />
{session.br}
</p>
+ <p className='mt-1 flex sm:hidden text-xs leading-5 text-gray-500 dark:text-gray-300'>{pageviewCount}</p>
</div>
</div>
<div className='flex shrink-0 items-center gap-x-4'>
<div className='hidden sm:flex sm:flex-col sm:items-end'>
- <p className='text-sm leading-6 text-gray-900 dark:text-gray-50'>{`${session.pageviews} pageviews`}</p>
- {session.active ? (
- <Badge label={t('dashboard.active')} colour='green' />
- ) : (
- <Badge label={t('billing.inactive')} colour='yellow' />
- )}
+ <p className='text-sm leading-6 text-gray-900 dark:text-gray-50'>{pageviewCount}</p>
</div>
<ChevronRightIcon className='h-5 w-5 flex-none text-gray-400' aria-hidden='true' />
</div>
@@ -97,14 +94,9 @@ export const Sessions: React.FC<ISessions> = ({ sessions, onClick }) => {
}
>
{() => (
- <ul className='divide-y divide-gray-100 dark:divide-slate-700 mt-2'>
- {_map(sessions, (session, index) => (
- <Session
- key={session.psid}
- session={session}
- onClick={onClick}
- className={`${index === 0 && 'rounded-t-md'} ${index === sessions.length - 1 && 'rounded-b-md'}`}
- />
+ <ul className='mt-4'>
+ {_map(sessions, (session) => (
+ <Session key={session.psid} session={session} onClick={onClick} />
))}
</ul>
)}
diff --git a/public/locales/en.json b/public/locales/en.json
index 605a8a33d..110de98ce 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -92,7 +92,8 @@
"nothingFound": "Nothing found",
"oneMember": "1 Member",
"xMembers": "{{number}} Members",
- "general": "General"
+ "general": "General",
+ "fixIt": "Fix it"
},
"performance": {
"slogan": "End user <span>performance monitoring</span> to deliver fast websites.",
@@ -532,6 +533,8 @@
"performance": "Performance",
"funnels": "Funnels",
"sessions": "Sessions",
+ "xPageviews": "{{x}} pageviews",
+ "onePageview": "1 pageview",
"alerts": "Alerts",
"alertsDesc": "Automated alerts is a powerful tool that allows you to run automated tasks when specific events occur.\nWe can automatically monitor your project for traffic spikes and notify you via Telegram.",
"funnelsDesc": "Funnels is a powerful tool that allows you to track the conversion rate of your users through a series of steps.\nThe analysis provided by the marketing funnel gives you the ability to discover potential problems, improve your website, and boost your conversion rate.",
@@ -556,13 +559,15 @@
"alert": {
"create": "Create an alert",
"customEvent": "Custom event name",
- "add": "Add Alert",
+ "add": "Add alert",
"delete": "Delete alert",
"noNameError": "Please enter a name for the alert.",
"queryValueError": "Please fill threshold and the query value has to be a number.",
"noIntegration": "You have not configured an integration yet. Create one in your <url>account settings</url>.",
- "noNotification": "No notification channels set",
+ "noNotificationChannel": "You do not have a notification channel set up, please set it up to be notified when one of your alerts is triggered.",
"lastTriggered": "Last Triggered",
+ "lastTriggeredOn": "Last triggered on {{date}}",
+ "notYetTriggered": "Not yet triggered",
"never": "Never",
"qDelete": "Delete the alert?",
"settingsOf": "Settings of {{name}}",