Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix: Trusted and Premium tiers bypass eligibility checks

Dave Earleya85180c7cd4b
diff --git a/backend/app/Services/Domain/Message/MessagingEligibilityService.php b/backend/app/Services/Domain/Message/MessagingEligibilityService.php
index afdfa4a53..5a5b1df3b 100644
--- a/backend/app/Services/Domain/Message/MessagingEligibilityService.php
+++ b/backend/app/Services/Domain/Message/MessagingEligibilityService.php
@@ -30,12 +30,19 @@ class MessagingEligibilityService
public function checkEligibility(int $accountId, int $eventId): ?MessagingEligibilityFailureDTO
{
- $failures = [];
-
$account = $this->accountRepository
->loadRelation(AccountStripePlatformDomainObject::class)
->findById($accountId);
+ $tier = $this->getAccountMessagingTier($account->getAccountMessagingTierId());
+
+ // Trusted and Premium tiers bypass eligibility checks
+ if ($tier->getName() !== self::UNTRUSTED_TIER_NAME) {
+ return null;
+ }
+
+ $failures = [];
+
if (!$account->isStripeSetupComplete()) {
$failures[] = MessagingEligibilityFailureEnum::STRIPE_NOT_CONNECTED;
}
@@ -69,11 +76,11 @@ class MessagingEligibilityService
$messagesInLast24h = $this->messageRepository->countMessagesInLast24Hours($accountId);
if ($messagesInLast24h >= $tier->getMaxMessagesPer24h()) {
- // $violations[] = MessagingTierViolationEnum::MESSAGE_LIMIT_EXCEEDED;
+ $violations[] = MessagingTierViolationEnum::MESSAGE_LIMIT_EXCEEDED;
}
if ($recipientCount > $tier->getMaxRecipientsPerMessage()) {
- // $violations[] = MessagingTierViolationEnum::RECIPIENT_LIMIT_EXCEEDED;
+ $violations[] = MessagingTierViolationEnum::RECIPIENT_LIMIT_EXCEEDED;
}
if (!$tier->getLinksAllowed() && $this->containsLinks($messageContent)) {
diff --git a/frontend/src/components/common/AdminEventsTable/AdminEventsTable.module.scss b/frontend/src/components/common/AdminEventsTable/AdminEventsTable.module.scss
deleted file mode 100644
index b378c7b60..000000000
--- a/frontend/src/components/common/AdminEventsTable/AdminEventsTable.module.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.tableContainer {
- overflow-x: auto;
- border-radius: 8px;
- border: 1px solid var(--mantine-color-gray-3);
-}
-
-.emptyState {
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 60px 20px;
- text-align: center;
-}
diff --git a/frontend/src/components/common/AdminEventsTable/index.tsx b/frontend/src/components/common/AdminEventsTable/index.tsx
index 7797f01c3..78a12feb5 100644
--- a/frontend/src/components/common/AdminEventsTable/index.tsx
+++ b/frontend/src/components/common/AdminEventsTable/index.tsx
@@ -3,7 +3,7 @@ import {t} from "@lingui/macro";
import {AdminEvent} from "../../../api/admin.client";
import {IconChevronDown, IconChevronUp, IconEye, IconUserCheck} from "@tabler/icons-react";
import {IdParam} from "../../../types";
-import classes from "./AdminEventsTable.module.scss";
+import tableStyles from "../../../styles/admin-table.module.scss";
interface AdminEventsTableProps {
events: AdminEvent[];
@@ -18,7 +18,7 @@ interface AdminEventsTableProps {
const AdminEventsTable = ({events, onSort, sortBy, sortDirection, onViewEvent, onImpersonate, isImpersonating}: AdminEventsTableProps) => {
if (!events || events.length === 0) {
return (
- <div className={classes.emptyState}>
+ <div className={tableStyles.emptyState}>
<Text size="lg" c="dimmed">{t`No events found`}</Text>
</div>
);
@@ -68,113 +68,118 @@ const AdminEventsTable = ({events, onSort, sortBy, sortDirection, onViewEvent, o
};
return (
- <div className={classes.tableContainer}>
- <Table striped highlightOnHover>
- <Table.Thead>
- <Table.Tr>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('title')}
- rightSection={<SortIcon column="title" />}
- >
- {t`Event Title`}
- </Button>
- </Table.Th>
- <Table.Th>{t`Organizer`}</Table.Th>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('start_date')}
- rightSection={<SortIcon column="start_date" />}
- >
- {t`Start Date`}
- </Button>
- </Table.Th>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('end_date')}
- rightSection={<SortIcon column="end_date" />}
- >
- {t`End Date`}
- </Button>
- </Table.Th>
- <Table.Th>{t`Statistics`}</Table.Th>
- <Table.Th>{t`Status`}</Table.Th>
- <Table.Th>{t`Actions`}</Table.Th>
- </Table.Tr>
- </Table.Thead>
- <Table.Tbody>
- {events.map((event) => (
- <Table.Tr key={event.id}>
- <Table.Td>
- <Text fw={500}>{event.title}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{event.organizer_name}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{formatDate(event.start_date)}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{formatDate(event.end_date)}</Text>
- </Table.Td>
- <Table.Td>
- {event.statistics ? (
- <Stack gap={4}>
- <Group gap={6}>
- <Text size="xs" c="dimmed">{t`Sales:`}</Text>
- <Text size="xs" fw={600}>{formatCurrency(event.statistics.total_gross_sales)}</Text>
- </Group>
- <Group gap={6}>
- <Text size="xs" c="dimmed">{t`Attendees:`}</Text>
- <Text size="xs" fw={500}>{formatNumber(event.statistics.attendees_registered)}</Text>
- </Group>
- <Group gap={6}>
- <Text size="xs" c="dimmed">{t`Orders:`}</Text>
- <Text size="xs" fw={500}>{formatNumber(event.statistics.orders_created)}</Text>
- </Group>
- </Stack>
- ) : (
- <Text size="sm" c="dimmed">-</Text>
- )}
- </Table.Td>
- <Table.Td>
- <Badge color={getStatusBadgeColor(event.status)}>
- {event.status}
- </Badge>
- </Table.Td>
- <Table.Td>
- <Group gap="xs">
- <Tooltip label={t`View Event`}>
- <ActionIcon
- variant="subtle"
- color="blue"
- onClick={() => onViewEvent?.(event)}
- >
- <IconEye size={18} />
- </ActionIcon>
- </Tooltip>
- <Tooltip label={t`Impersonate User`}>
- <ActionIcon
- variant="subtle"
- color="grape"
- onClick={() => onImpersonate?.(event.user_id, event.account_id)}
- disabled={isImpersonating}
- >
- <IconUserCheck size={18} />
- </ActionIcon>
- </Tooltip>
- </Group>
- </Table.Td>
+ <div className={tableStyles.tableWrapper}>
+ <div className={tableStyles.tableScroll}>
+ <Table className={tableStyles.table} highlightOnHover>
+ <Table.Thead>
+ <Table.Tr>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('title')}
+ rightSection={<SortIcon column="title" />}
+ className={tableStyles.sortButton}
+ >
+ {t`Event Title`}
+ </Button>
+ </Table.Th>
+ <Table.Th>{t`Organizer`}</Table.Th>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('start_date')}
+ rightSection={<SortIcon column="start_date" />}
+ className={tableStyles.sortButton}
+ >
+ {t`Start Date`}
+ </Button>
+ </Table.Th>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('end_date')}
+ rightSection={<SortIcon column="end_date" />}
+ className={tableStyles.sortButton}
+ >
+ {t`End Date`}
+ </Button>
+ </Table.Th>
+ <Table.Th>{t`Statistics`}</Table.Th>
+ <Table.Th>{t`Status`}</Table.Th>
+ <Table.Th>{t`Actions`}</Table.Th>
</Table.Tr>
- ))}
- </Table.Tbody>
- </Table>
+ </Table.Thead>
+ <Table.Tbody>
+ {events.map((event) => (
+ <Table.Tr key={event.id}>
+ <Table.Td>
+ <Text fw={500}>{event.title}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{event.organizer_name}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{formatDate(event.start_date)}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{formatDate(event.end_date)}</Text>
+ </Table.Td>
+ <Table.Td>
+ {event.statistics ? (
+ <Stack gap={4}>
+ <Group gap={6}>
+ <Text size="xs" c="dimmed">{t`Sales:`}</Text>
+ <Text size="xs" fw={600}>{formatCurrency(event.statistics.total_gross_sales)}</Text>
+ </Group>
+ <Group gap={6}>
+ <Text size="xs" c="dimmed">{t`Attendees:`}</Text>
+ <Text size="xs" fw={500}>{formatNumber(event.statistics.attendees_registered)}</Text>
+ </Group>
+ <Group gap={6}>
+ <Text size="xs" c="dimmed">{t`Orders:`}</Text>
+ <Text size="xs" fw={500}>{formatNumber(event.statistics.orders_created)}</Text>
+ </Group>
+ </Stack>
+ ) : (
+ <Text size="sm" c="dimmed">-</Text>
+ )}
+ </Table.Td>
+ <Table.Td>
+ <Badge color={getStatusBadgeColor(event.status)} variant="light">
+ {event.status}
+ </Badge>
+ </Table.Td>
+ <Table.Td>
+ <Group gap="xs">
+ <Tooltip label={t`View Event`}>
+ <ActionIcon
+ variant="subtle"
+ color="blue"
+ onClick={() => onViewEvent?.(event)}
+ >
+ <IconEye size={18} />
+ </ActionIcon>
+ </Tooltip>
+ <Tooltip label={t`Impersonate User`}>
+ <ActionIcon
+ variant="subtle"
+ color="grape"
+ onClick={() => onImpersonate?.(event.user_id, event.account_id)}
+ disabled={isImpersonating}
+ >
+ <IconUserCheck size={18} />
+ </ActionIcon>
+ </Tooltip>
+ </Group>
+ </Table.Td>
+ </Table.Tr>
+ ))}
+ </Table.Tbody>
+ </Table>
+ </div>
</div>
);
};
diff --git a/frontend/src/components/common/AdminOrdersTable/AdminOrdersTable.module.scss b/frontend/src/components/common/AdminOrdersTable/AdminOrdersTable.module.scss
deleted file mode 100644
index b378c7b60..000000000
--- a/frontend/src/components/common/AdminOrdersTable/AdminOrdersTable.module.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.tableContainer {
- overflow-x: auto;
- border-radius: 8px;
- border: 1px solid var(--mantine-color-gray-3);
-}
-
-.emptyState {
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 60px 20px;
- text-align: center;
-}
diff --git a/frontend/src/components/common/AdminOrdersTable/index.tsx b/frontend/src/components/common/AdminOrdersTable/index.tsx
index 425d19b1d..7a05f1e91 100644
--- a/frontend/src/components/common/AdminOrdersTable/index.tsx
+++ b/frontend/src/components/common/AdminOrdersTable/index.tsx
@@ -4,7 +4,7 @@ import {AdminOrder} from "../../../api/admin.client";
import {IconChevronDown, IconChevronUp} from "@tabler/icons-react";
import {formatCurrency} from "../../../utilites/currency";
import {prettyDate} from "../../../utilites/dates";
-import classes from "./AdminOrdersTable.module.scss";
+import tableStyles from "../../../styles/admin-table.module.scss";
interface AdminOrdersTableProps {
orders: AdminOrder[];
@@ -16,7 +16,7 @@ interface AdminOrdersTableProps {
const AdminOrdersTable = ({orders, onSort, sortBy, sortDirection}: AdminOrdersTableProps) => {
if (!orders || orders.length === 0) {
return (
- <div className={classes.emptyState}>
+ <div className={tableStyles.emptyState}>
<Text size="lg" c="dimmed">{t`No orders found`}</Text>
</div>
);
@@ -51,85 +51,90 @@ const AdminOrdersTable = ({orders, onSort, sortBy, sortDirection}: AdminOrdersTa
};
return (
- <div className={classes.tableContainer}>
- <Table striped highlightOnHover>
- <Table.Thead>
- <Table.Tr>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('short_id')}
- rightSection={<SortIcon column="short_id" />}
- >
- {t`Order ID`}
- </Button>
- </Table.Th>
- <Table.Th>{t`Account`}</Table.Th>
- <Table.Th>{t`Customer`}</Table.Th>
- <Table.Th>{t`Event`}</Table.Th>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('total_gross')}
- rightSection={<SortIcon column="total_gross" />}
- >
- {t`Total`}
- </Button>
- </Table.Th>
- <Table.Th>{t`Tax`}</Table.Th>
- <Table.Th>{t`Status`}</Table.Th>
- <Table.Th>
- <Button
- variant="subtle"
- size="compact-sm"
- onClick={() => handleSort('created_at')}
- rightSection={<SortIcon column="created_at" />}
- >
- {t`Date`}
- </Button>
- </Table.Th>
- </Table.Tr>
- </Table.Thead>
- <Table.Tbody>
- {orders.map((order) => (
- <Table.Tr key={order.id}>
- <Table.Td>
- <Text fw={500} size="sm">#{order.short_id}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{order.account_name}</Text>
- </Table.Td>
- <Table.Td>
- <div>
- <Text size="sm" fw={500}>{order.first_name} {order.last_name}</Text>
- <Text size="xs" c="dimmed">{order.email}</Text>
- </div>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{order.event_title}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm" fw={600}>{formatCurrency(order.total_gross, order.currency)}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{formatCurrency(order.total_tax, order.currency)}</Text>
- </Table.Td>
- <Table.Td>
- <Group gap="xs">
- <Badge color={getStatusBadgeColor(order.status)} size="sm">
- {order.status}
- </Badge>
- </Group>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{prettyDate(order.created_at, 'UTC')}</Text>
- </Table.Td>
+ <div className={tableStyles.tableWrapper}>
+ <div className={tableStyles.tableScroll}>
+ <Table className={tableStyles.table} highlightOnHover>
+ <Table.Thead>
+ <Table.Tr>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('short_id')}
+ rightSection={<SortIcon column="short_id" />}
+ className={tableStyles.sortButton}
+ >
+ {t`Order ID`}
+ </Button>
+ </Table.Th>
+ <Table.Th>{t`Account`}</Table.Th>
+ <Table.Th>{t`Customer`}</Table.Th>
+ <Table.Th>{t`Event`}</Table.Th>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('total_gross')}
+ rightSection={<SortIcon column="total_gross" />}
+ className={tableStyles.sortButton}
+ >
+ {t`Total`}
+ </Button>
+ </Table.Th>
+ <Table.Th>{t`Tax`}</Table.Th>
+ <Table.Th>{t`Status`}</Table.Th>
+ <Table.Th>
+ <Button
+ variant="subtle"
+ size="compact-sm"
+ onClick={() => handleSort('created_at')}
+ rightSection={<SortIcon column="created_at" />}
+ className={tableStyles.sortButton}
+ >
+ {t`Date`}
+ </Button>
+ </Table.Th>
</Table.Tr>
- ))}
- </Table.Tbody>
- </Table>
+ </Table.Thead>
+ <Table.Tbody>
+ {orders.map((order) => (
+ <Table.Tr key={order.id}>
+ <Table.Td>
+ <Text fw={500} size="sm">#{order.short_id}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{order.account_name}</Text>
+ </Table.Td>
+ <Table.Td>
+ <div>
+ <Text size="sm" fw={500}>{order.first_name} {order.last_name}</Text>
+ <Text size="xs" c="dimmed">{order.email}</Text>
+ </div>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{order.event_title}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm" fw={600}>{formatCurrency(order.total_gross, order.currency)}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{formatCurrency(order.total_tax, order.currency)}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Group gap="xs">
+ <Badge color={getStatusBadgeColor(order.status)} size="sm" variant="light">
+ {order.status}
+ </Badge>
+ </Group>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{prettyDate(order.created_at, 'UTC')}</Text>
+ </Table.Td>
+ </Table.Tr>
+ ))}
+ </Table.Tbody>
+ </Table>
+ </div>
</div>
);
};
diff --git a/frontend/src/components/routes/admin/Attribution/Attribution.module.scss b/frontend/src/components/routes/admin/Attribution/Attribution.module.scss
deleted file mode 100644
index df6cd7faf..000000000
--- a/frontend/src/components/routes/admin/Attribution/Attribution.module.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.tableContainer {
- overflow-x: auto;
-}
diff --git a/frontend/src/components/routes/admin/Attribution/index.tsx b/frontend/src/components/routes/admin/Attribution/index.tsx
index 6bb416872..89369183f 100644
--- a/frontend/src/components/routes/admin/Attribution/index.tsx
+++ b/frontend/src/components/routes/admin/Attribution/index.tsx
@@ -3,7 +3,7 @@ import {t, Trans} from "@lingui/macro";
import {useGetUtmAttributionStats} from "../../../../queries/useGetUtmAttributionStats";
import {useState} from "react";
import {formatCurrency} from "../../../../utilites/currency";
-import classes from "./Attribution.module.scss";
+import tableStyles from "../../../../styles/admin-table.module.scss";
const Attribution = () => {
const [groupBy, setGroupBy] = useState<'source' | 'campaign' | 'medium' | 'source_type'>('source');
@@ -115,33 +115,31 @@ const Attribution = () => {
<Stack gap="md">
<Skeleton height={400} radius="md" />
</Stack>
+ ) : stats.length === 0 ? (
+ <div className={tableStyles.emptyState}>
+ <Text c="dimmed" size="lg">
+ <Trans>No attribution data found</Trans>
+ </Text>
+ </div>
) : (
- <Paper shadow="sm" p="md" radius="md" withBorder>
- <div className={classes.tableContainer}>
- <Table striped highlightOnHover>
- <Table.Thead>
- <Table.Tr>
- <Table.Th>{t`Attribution Value`}</Table.Th>
- <Table.Th>{t`Accounts`}</Table.Th>
- <Table.Th>{t`Events`}</Table.Th>
- <Table.Th>{t`Live Events`}</Table.Th>
- <Table.Th>{t`Stripe Connected`}</Table.Th>
- <Table.Th>{t`Verified`}</Table.Th>
- <Table.Th>{t`Revenue`}</Table.Th>
- <Table.Th>{t`Orders`}</Table.Th>
- </Table.Tr>
- </Table.Thead>
- <Table.Tbody>
- {stats.length === 0 ? (
+ <>
+ <div className={tableStyles.tableWrapper}>
+ <div className={tableStyles.tableScroll}>
+ <Table className={tableStyles.table} highlightOnHover>
+ <Table.Thead>
<Table.Tr>
- <Table.Td colSpan={8}>
- <Text ta="center" c="dimmed" py="xl">
- <Trans>No attribution data found</Trans>
- </Text>
- </Table.Td>
+ <Table.Th>{t`Attribution Value`}</Table.Th>
+ <Table.Th>{t`Accounts`}</Table.Th>
+ <Table.Th>{t`Events`}</Table.Th>
+ <Table.Th>{t`Live Events`}</Table.Th>
+ <Table.Th>{t`Stripe Connected`}</Table.Th>
+ <Table.Th>{t`Verified`}</Table.Th>
+ <Table.Th>{t`Revenue`}</Table.Th>
+ <Table.Th>{t`Orders`}</Table.Th>
</Table.Tr>
- ) : (
- stats.map((stat, index) => (
+ </Table.Thead>
+ <Table.Tbody>
+ {stats.map((stat, index) => (
<Table.Tr key={index}>
<Table.Td>
<Text fw={600} size="sm">
@@ -170,10 +168,10 @@ const Attribution = () => {
<Text size="sm">{stat.total_orders.toLocaleString()}</Text>
</Table.Td>
</Table.Tr>
- ))
- )}
- </Table.Tbody>
- </Table>
+ ))}
+ </Table.Tbody>
+ </Table>
+ </div>
</div>
{totalPages > 1 && (
@@ -185,7 +183,7 @@ const Attribution = () => {
/>
</Group>
)}
- </Paper>
+ </>
)}
</div>
</Stack>
diff --git a/frontend/src/components/routes/admin/FailedJobs/index.tsx b/frontend/src/components/routes/admin/FailedJobs/index.tsx
index ddaec3cbc..3e100be3b 100644
--- a/frontend/src/components/routes/admin/FailedJobs/index.tsx
+++ b/frontend/src/components/routes/admin/FailedJobs/index.tsx
@@ -11,6 +11,8 @@ import {showError, showSuccess} from "../../../../utilites/notifications";
import {AdminFailedJob} from "../../../../api/admin.client";
import {useDisclosure} from "@mantine/hooks";
import {relativeDate} from "../../../../utilites/dates";
+import tableStyles from "../../../../styles/admin-table.module.scss";
+import {IdParam} from "../../../../types";
const FailedJobs = () => {
const [page, setPage] = useState(1);
@@ -44,7 +46,8 @@ const FailedJobs = () => {
openDetailModal();
};
- const handleRetryJob = (jobId: number | string) => {
+ const handleRetryJob = (jobId: IdParam) => {
+ if (!jobId) return;
retryJobMutation.mutate(jobId, {
onSuccess: () => {
showSuccess(t`Job queued for retry`);
@@ -55,7 +58,8 @@ const FailedJobs = () => {
});
};
- const handleDeleteJob = (jobId: number | string) => {
+ const handleDeleteJob = (jobId: IdParam) => {
+ if (!jobId) return;
deleteJobMutation.mutate(jobId, {
onSuccess: () => {
showSuccess(t`Job deleted`);
@@ -147,73 +151,79 @@ const FailedJobs = () => {
<Skeleton height={400} radius="md" />
</Stack>
) : totalJobs === 0 ? (
- <Text c="dimmed" ta="center" py="xl">{t`No failed jobs`}</Text>
+ <div className={tableStyles.emptyState}>
+ <Text c="dimmed" size="lg">{t`No failed jobs`}</Text>
+ </div>
) : (
- <Table striped highlightOnHover>
- <Table.Thead>
- <Table.Tr>
- <Table.Th>{t`Job`}</Table.Th>
- <Table.Th>{t`Queue`}</Table.Th>
- <Table.Th>{t`Failed At`}</Table.Th>
- <Table.Th>{t`Exception`}</Table.Th>
- <Table.Th w={120}>{t`Actions`}</Table.Th>
- </Table.Tr>
- </Table.Thead>
- <Table.Tbody>
- {jobsData?.data?.map((job) => (
- <Table.Tr key={job.id}>
- <Table.Td>
- <Text size="sm" fw={500}>{job.job_name}</Text>
- <Text size="xs" c="dimmed">{job.uuid}</Text>
- </Table.Td>
- <Table.Td>
- <Badge variant="light">{job.queue}</Badge>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{relativeDate(job.failed_at)}</Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm" lineClamp={1} maw={300}>
- {job.exception_summary}
- </Text>
- </Table.Td>
- <Table.Td>
- <Group gap="xs">
- <Tooltip label={t`View Details`}>
- <ActionIcon
- variant="subtle"
- color="gray"
- onClick={() => handleViewDetails(job)}
- >
- <IconEye size={16} />
- </ActionIcon>
- </Tooltip>
- <Tooltip label={t`Retry`}>
- <ActionIcon
- variant="subtle"
- color="blue"
- onClick={() => handleRetryJob(job.id)}
- loading={retryJobMutation.isPending}
- >
- <IconRefresh size={16} />
- </ActionIcon>
- </Tooltip>
- <Tooltip label={t`Delete`}>
- <ActionIcon
- variant="subtle"
- color="red"
- onClick={() => handleDeleteJob(job.id)}
- loading={deleteJobMutation.isPending}
- >
- <IconTrash size={16} />
- </ActionIcon>
- </Tooltip>
- </Group>
- </Table.Td>
- </Table.Tr>
- ))}
- </Table.Tbody>
- </Table>
+ <div className={tableStyles.tableWrapper}>
+ <div className={tableStyles.tableScroll}>
+ <Table className={tableStyles.table} highlightOnHover>
+ <Table.Thead>
+ <Table.Tr>
+ <Table.Th>{t`Job`}</Table.Th>
+ <Table.Th>{t`Queue`}</Table.Th>
+ <Table.Th>{t`Failed At`}</Table.Th>
+ <Table.Th>{t`Exception`}</Table.Th>
+ <Table.Th style={{width: 120}}>{t`Actions`}</Table.Th>
+ </Table.Tr>
+ </Table.Thead>
+ <Table.Tbody>
+ {jobsData?.data?.map((job) => (
+ <Table.Tr key={job.id}>
+ <Table.Td>
+ <Text size="sm" fw={500}>{job.job_name}</Text>
+ <Text size="xs" c="dimmed">{job.uuid}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Badge variant="light">{job.queue}</Badge>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{relativeDate(job.failed_at)}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm" lineClamp={1} maw={300}>
+ {job.exception_summary}
+ </Text>
+ </Table.Td>
+ <Table.Td>
+ <Group gap="xs">
+ <Tooltip label={t`View Details`}>
+ <ActionIcon
+ variant="subtle"
+ color="gray"
+ onClick={() => handleViewDetails(job)}
+ >
+ <IconEye size={16} />
+ </ActionIcon>
+ </Tooltip>
+ <Tooltip label={t`Retry`}>
+ <ActionIcon
+ variant="subtle"
+ color="blue"
+ onClick={() => handleRetryJob(job.id)}
+ loading={retryJobMutation.isPending}
+ >
+ <IconRefresh size={16} />
+ </ActionIcon>
+ </Tooltip>
+ <Tooltip label={t`Delete`}>
+ <ActionIcon
+ variant="subtle"
+ color="red"
+ onClick={() => handleDeleteJob(job.id)}
+ loading={deleteJobMutation.isPending}
+ >
+ <IconTrash size={16} />
+ </ActionIcon>
+ </Tooltip>
+ </Group>
+ </Table.Td>
+ </Table.Tr>
+ ))}
+ </Table.Tbody>
+ </Table>
+ </div>
+ </div>
)}
{jobsData?.meta && jobsData.meta.last_page > 1 && (
diff --git a/frontend/src/components/routes/admin/Messages/index.tsx b/frontend/src/components/routes/admin/Messages/index.tsx
index 4c5452a73..e5e7cb5c9 100644
--- a/frontend/src/components/routes/admin/Messages/index.tsx
+++ b/frontend/src/components/routes/admin/Messages/index.tsx
@@ -9,6 +9,7 @@ import {useDisclosure} from "@mantine/hooks";
import {AdminMessage} from "../../../../api/admin.client";
import {showSuccess} from "../../../../utilites/notifications";
import {IdParam} from "../../../../types";
+import tableStyles from "../../../../styles/admin-table.module.scss";
const Messages = () => {
const [page, setPage] = useState(1);
@@ -143,98 +144,104 @@ const Messages = () => {
<Skeleton height={400} radius="md" />
</Stack>
) : totalMessages === 0 ? (
- <Text c="dimmed" ta="center" py="xl">{t`No messages found`}</Text>
+ <div className={tableStyles.emptyState}>
+ <Text c="dimmed" size="lg">{t`No messages found`}</Text>
+ </div>
) : (
- <Table striped highlightOnHover>
- <Table.Thead>
- <Table.Tr>
- <Table.Th>{t`Subject`}</Table.Th>
- <Table.Th>{t`Event`}</Table.Th>
- <Table.Th>{t`Account`}</Table.Th>
- <Table.Th>{t`Type`}</Table.Th>
- <Table.Th>{t`Recipients`}</Table.Th>
- <Table.Th>{t`Status`}</Table.Th>
- <Table.Th>{t`Sent By`}</Table.Th>
- <Table.Th>{t`Created`}</Table.Th>
- <Table.Th w={60}></Table.Th>
- </Table.Tr>
- </Table.Thead>
- <Table.Tbody>
- {messagesData?.data?.map((message) => (
- <Table.Tr key={message.id}>
- <Table.Td>
- <Group gap="xs">
- <IconMail size={16} color="gray" />
- <Text size="sm" fw={500} lineClamp={1} maw={200}>
- {message.subject}
- </Text>
- </Group>
- </Table.Td>
- <Table.Td>
- <Text size="sm" lineClamp={1} maw={150}>
- {message.event_title}
- </Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm" c="dimmed" lineClamp={1} maw={120}>
- {message.account_name}
- </Text>
- </Table.Td>
- <Table.Td>
- <Badge variant="light" color="gray">
- {getTypeLabel(message.type)}
- </Badge>
- </Table.Td>
- <Table.Td>
- <Group gap={4}>
- <IconUsers size={14} color="gray" />
- <Text size="sm" fw={500}>
- {message.recipients_count}
- </Text>
- </Group>
- </Table.Td>
- <Table.Td>
- <Badge color={getStatusColor(message.status)} variant="filled">
- {message.status}
- </Badge>
- </Table.Td>
- <Table.Td>
- <Text size="sm" c="dimmed">
- {message.sent_by || '-'}
- </Text>
- </Table.Td>
- <Table.Td>
- <Text size="sm">{relativeDate(message.created_at)}</Text>
- </Table.Td>
- <Table.Td>
- <Group gap="xs">
- <Tooltip label={t`View Message`}>
- <ActionIcon
- variant="subtle"
- color="gray"
- onClick={() => handleViewMessage(message)}
- >
- <IconEye size={16} />
- </ActionIcon>
- </Tooltip>
- {message.status === 'PENDING_REVIEW' && (
- <Tooltip label={t`Approve Message`}>
- <ActionIcon
- variant="subtle"
- color="green"
- onClick={() => handleApprove(message.id)}
- loading={approveMutation.isPending}
- >
- <IconCheck size={16} />
- </ActionIcon>
- </Tooltip>
- )}
- </Group>
- </Table.Td>
- </Table.Tr>
- ))}
- </Table.Tbody>
- </Table>
+ <div className={tableStyles.tableWrapper}>
+ <div className={tableStyles.tableScroll}>
+ <Table className={tableStyles.table} highlightOnHover>
+ <Table.Thead>
+ <Table.Tr>
+ <Table.Th>{t`Subject`}</Table.Th>
+ <Table.Th>{t`Event`}</Table.Th>
+ <Table.Th>{t`Account`}</Table.Th>
+ <Table.Th>{t`Type`}</Table.Th>
+ <Table.Th>{t`Recipients`}</Table.Th>
+ <Table.Th>{t`Status`}</Table.Th>
+ <Table.Th>{t`Sent By`}</Table.Th>
+ <Table.Th>{t`Created`}</Table.Th>
+ <Table.Th style={{width: 60}}></Table.Th>
+ </Table.Tr>
+ </Table.Thead>
+ <Table.Tbody>
+ {messagesData?.data?.map((message) => (
+ <Table.Tr key={message.id}>
+ <Table.Td>
+ <Group gap="xs">
+ <IconMail size={16} color="gray" />
+ <Text size="sm" fw={500} lineClamp={1} maw={200}>
+ {message.subject}
+ </Text>
+ </Group>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm" lineClamp={1} maw={150}>
+ {message.event_title}
+ </Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm" c="dimmed" lineClamp={1} maw={120}>
+ {message.account_name}
+ </Text>
+ </Table.Td>
+ <Table.Td>
+ <Badge variant="light" color="gray">
+ {getTypeLabel(message.type)}
+ </Badge>
+ </Table.Td>
+ <Table.Td>
+ <Group gap={4}>
+ <IconUsers size={14} color="gray" />
+ <Text size="sm" fw={500}>
+ {message.recipients_count}
+ </Text>
+ </Group>
+ </Table.Td>
+ <Table.Td>
+ <Badge color={getStatusColor(message.status)} variant="light">
+ {message.status}
+ </Badge>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm" c="dimmed">
+ {message.sent_by || '-'}
+ </Text>
+ </Table.Td>
+ <Table.Td>
+ <Text size="sm">{relativeDate(message.created_at)}</Text>
+ </Table.Td>
+ <Table.Td>
+ <Group gap="xs">
+ <Tooltip label={t`View Message`}>
+ <ActionIcon
+ variant="subtle"
+ color="gray"
+ onClick={() => handleViewMessage(message)}
+ >
+ <IconEye size={16} />
+ </ActionIcon>
+ </Tooltip>
+ {message.status === 'PENDING_REVIEW' && (
+ <Tooltip label={t`Approve Message`}>
+ <ActionIcon
+ variant="subtle"
+ color="green"
+ onClick={() => handleApprove(message.id)}
+ loading={approveMutation.isPending}
+ >
+ <IconCheck size={16} />
+ </ActionIcon>
+ </Tooltip>
+ )}
+ </Group>
+ </Table.Td>
+ </Table.Tr>
+ ))}
+ </Table.Tbody>
+ </Table>
+ </div>
+ </div>
)}
{messagesData?.meta && messagesData.meta.last_page > 1 && (
@@ -278,7 +285,7 @@ const Messages = () => {
</div>
<div>
<Text size="sm" fw={500} c="dimmed">{t`Status`}</Text>
- <Badge color={getStatusColor(selectedMessage.status)} variant="filled">
+ <Badge color={getStatusColor(selectedMessage.status)} variant="light">
{selectedMessage.status}
</Badge>
</div>
@@ -311,7 +318,7 @@ const Messages = () => {
<Text size="sm" fw={500} c="dimmed" mb="xs">{t`Eligibility Failures`}</Text>
<Group gap="xs">
{selectedMessage.eligibility_failures.map((failure) => (
- <Badge key={failure} color="orange" variant="filled">
+ <Badge key={failure} color="orange" variant="light">
{getEligibilityFailureLabel(failure)}
</Badge>
))}
diff --git a/frontend/src/styles/admin-table.module.scss b/frontend/src/styles/admin-table.module.scss
new file mode 100644
index 000000000..5eee36694
--- /dev/null
+++ b/frontend/src/styles/admin-table.module.scss
@@ -0,0 +1,112 @@
+@use "./mixins" as *;
+
+.tableWrapper {
+ background: var(--mantine-color-body);
+ border: 1px solid var(--mantine-color-gray-2);
+ border-radius: var(--mantine-radius-md);
+ overflow: hidden;
+
+ [data-mantine-color-scheme="dark"] & {
+ border-color: var(--mantine-color-dark-4);
+ }
+}
+
+.tableScroll {
+ overflow-x: auto;
+ @include scrollbar();
+ min-width: 0;
+}
+
+.table {
+ :global {
+ thead tr th {
+ padding: 12px 16px;
+ font-weight: 500;
+ font-size: 12px;
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: var(--mantine-color-gray-6);
+ background: var(--mantine-color-gray-0);
+ border-bottom: 1px solid var(--mantine-color-gray-2);
+ white-space: nowrap;
+
+ [data-mantine-color-scheme="dark"] & {
+ background: var(--mantine-color-dark-6);
+ border-bottom-color: var(--mantine-color-dark-4);
+ color: var(--mantine-color-dark-2);
+ }
+ }
+
+ tbody tr td {
+ padding: 12px 16px;
+ vertical-align: middle;
+ border-bottom: 1px solid var(--mantine-color-gray-1);
+
+ [data-mantine-color-scheme="dark"] & {
+ border-bottom-color: var(--mantine-color-dark-5);
+ }
+ }
+
+ tbody tr:last-child td {
+ border-bottom: none;
+ }
+
+ tbody tr:hover td {
+ background: rgba(0, 0, 0, 0.02);
+
+ [data-mantine-color-scheme="dark"] & {
+ background: rgba(255, 255, 255, 0.02);
+ }
+ }
+ }
+}
+
+.sortButton {
+ font-weight: 500;
+ font-size: 12px;
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: var(--mantine-color-gray-6);
+ padding: 0;
+ height: auto;
+
+ [data-mantine-color-scheme="dark"] & {
+ color: var(--mantine-color-dark-2);
+ }
+
+ &:hover {
+ background: transparent;
+ color: var(--mantine-color-gray-8);
+
+ [data-mantine-color-scheme="dark"] & {
+ color: var(--mantine-color-gray-4);
+ }
+ }
+}
+
+.emptyState {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 48px 24px;
+ text-align: center;
+ background: var(--mantine-color-body);
+ border: 1px solid var(--mantine-color-gray-2);
+ border-radius: var(--mantine-radius-md);
+
+ [data-mantine-color-scheme="dark"] & {
+ border-color: var(--mantine-color-dark-4);
+ }
+}
+
+@include respond-below('md') {
+ .table {
+ :global {
+ thead tr th,
+ tbody tr td {
+ padding: 10px 12px;
+ }
+ }
+ }
+}