feat(admin): P1 — clearer tickets labels, pagination, min_staff_rank, analytics errors
Co-authored-by: Cursor <[email protected]>
This commit is contained in:
1 parent
75cdfdebe4
commit
f150aea8b9
13 files changed
+311
-101
No files matched your search
@@ -6,8 +6,8 @@ import {
|
||||
TrendingUp,
|
||||
Users,
|
||||
} from "lucide-react";
|
||||
import { getLocale, getTranslations } from "next-intl/server";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getLocale, getTranslations } from "next-intl/server";
|
||||
import { DashboardChart } from "@/components/admin/dashboard-chart";
|
||||
import { PeakHoursHeatmap } from "@/components/admin/peak-hours-heatmap";
|
||||
import { StatsCard } from "@/components/admin/stats-card";
|
||||
@@ -46,19 +46,24 @@ const EMPTY: AnalyticsData = {
|
||||
},
|
||||
};
|
||||
|
||||
async function safeCount(fn: () => Promise<number>): Promise<number> {
|
||||
async function safeCount(
|
||||
fn: () => Promise<number>,
|
||||
): Promise<{ value: number; ok: boolean }> {
|
||||
try {
|
||||
return await fn();
|
||||
return { value: await fn(), ok: true };
|
||||
} catch {
|
||||
return 0;
|
||||
return { value: 0, ok: false };
|
||||
}
|
||||
}
|
||||
|
||||
async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
async function getAnalyticsData(
|
||||
locale: string,
|
||||
): Promise<{ data: AnalyticsData; degraded: boolean }> {
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const todayStart = now - (now % 86400);
|
||||
const weekAgo = now - 7 * 86400;
|
||||
const monthAgo = now - 30 * 86400;
|
||||
let degraded = false;
|
||||
|
||||
try {
|
||||
const [
|
||||
@@ -86,9 +91,9 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
try {
|
||||
const rows = await prisma.$queryRaw<{ count: bigint }[]>`
|
||||
SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`;
|
||||
return Number(rows[0]?.count ?? 0);
|
||||
return { value: Number(rows[0]?.count ?? 0), ok: true };
|
||||
} catch {
|
||||
return 0;
|
||||
return { value: 0, ok: false };
|
||||
}
|
||||
})(),
|
||||
safeCount(() =>
|
||||
@@ -99,6 +104,20 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
),
|
||||
]);
|
||||
|
||||
for (const r of [
|
||||
totalUsers,
|
||||
onlineUsers,
|
||||
weekRegistrations,
|
||||
monthRegistrations,
|
||||
totalRooms,
|
||||
activeRooms,
|
||||
weekChatMessages,
|
||||
weekTrades,
|
||||
weekBans,
|
||||
]) {
|
||||
if (!r.ok) degraded = true;
|
||||
}
|
||||
|
||||
let registrationChart: { label: string; value: number }[] = [];
|
||||
try {
|
||||
const regRows = await prisma.$queryRaw<
|
||||
@@ -126,6 +145,7 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
}
|
||||
} catch {
|
||||
registrationChart = [];
|
||||
degraded = true;
|
||||
}
|
||||
|
||||
const grid: number[][] = Array.from({ length: 7 }, () => Array(24).fill(0));
|
||||
@@ -150,24 +170,27 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
if (count > max) max = count;
|
||||
}
|
||||
} catch {
|
||||
/* keep empty grid */
|
||||
degraded = true;
|
||||
}
|
||||
|
||||
return {
|
||||
totalUsers,
|
||||
onlineUsers,
|
||||
weekRegistrations,
|
||||
monthRegistrations,
|
||||
totalRooms,
|
||||
activeRooms,
|
||||
weekChatMessages,
|
||||
weekTrades,
|
||||
weekBans,
|
||||
registrationChart,
|
||||
peakHours: { grid, max },
|
||||
degraded,
|
||||
data: {
|
||||
totalUsers: totalUsers.value,
|
||||
onlineUsers: onlineUsers.value,
|
||||
weekRegistrations: weekRegistrations.value,
|
||||
monthRegistrations: monthRegistrations.value,
|
||||
totalRooms: totalRooms.value,
|
||||
activeRooms: activeRooms.value,
|
||||
weekChatMessages: weekChatMessages.value,
|
||||
weekTrades: weekTrades.value,
|
||||
weekBans: weekBans.value,
|
||||
registrationChart,
|
||||
peakHours: { grid, max },
|
||||
},
|
||||
};
|
||||
} catch {
|
||||
return EMPTY;
|
||||
return { data: EMPTY, degraded: true };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,10 +202,15 @@ export default async function AnalyticsPage() {
|
||||
|
||||
const locale = await getLocale();
|
||||
const t = await getTranslations("pages.admin.analytics");
|
||||
const data = await getAnalyticsData(locale);
|
||||
const { data, degraded } = await getAnalyticsData(locale);
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
{degraded ? (
|
||||
<div className="rounded-lg bg-[var(--admin-error-subtle)] p-3 text-xs text-[var(--admin-error)]">
|
||||
{t("loadError")}
|
||||
</div>
|
||||
) : null}
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
|
||||
<StatsCard
|
||||
title={t("totalUsers")}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import Link from "next/link";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { StatusCard } from "@/components/admin/dashboard";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { redirect } from "next/navigation";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
@@ -31,6 +31,7 @@ export default async function AdminCalendar() {
|
||||
const t = await getTranslations("pages.admin.calendar");
|
||||
|
||||
let campaigns: Campaign[] = [];
|
||||
let loadError = false;
|
||||
try {
|
||||
campaigns = await prisma.calendarCampaigns.findMany({
|
||||
select: {
|
||||
@@ -43,27 +44,37 @@ export default async function AdminCalendar() {
|
||||
enabled: true,
|
||||
},
|
||||
orderBy: { id: "desc" },
|
||||
take: 200,
|
||||
});
|
||||
} catch {
|
||||
campaigns = [];
|
||||
loadError = true;
|
||||
}
|
||||
|
||||
const rewardCounts = new Map<number, number>();
|
||||
let totalRewards = 0;
|
||||
try {
|
||||
const rewards = await prisma.calendarRewards.findMany({
|
||||
select: { campaignId: true },
|
||||
const grouped = await prisma.calendarRewards.groupBy({
|
||||
by: ["campaignId"],
|
||||
_count: { _all: true },
|
||||
});
|
||||
totalRewards = rewards.length;
|
||||
for (const r of rewards) {
|
||||
rewardCounts.set(r.campaignId, (rewardCounts.get(r.campaignId) ?? 0) + 1);
|
||||
for (const g of grouped) {
|
||||
rewardCounts.set(g.campaignId, g._count._all);
|
||||
totalRewards += g._count._all;
|
||||
}
|
||||
} catch {}
|
||||
} catch {
|
||||
loadError = true;
|
||||
}
|
||||
|
||||
const enabledCount = campaigns.filter((c) => c.enabled === "1").length;
|
||||
|
||||
return (
|
||||
<main>
|
||||
{loadError ? (
|
||||
<div className="mb-4 rounded-lg bg-[var(--admin-error-subtle)] p-3 text-xs text-[var(--admin-error)]">
|
||||
Could not load some calendar data (database unavailable).
|
||||
</div>
|
||||
) : null}
|
||||
<div className="grid grid-cols-[repeat(auto-fit,minmax(180px,1fr))] gap-3.5 mb-6">
|
||||
<StatusCard label={t("campaigns")} value={campaigns.length} icon="📅" />
|
||||
<StatusCard
|
||||
|
||||
@@ -12,6 +12,7 @@ import { redirect } from "next/navigation";
|
||||
import { StatsCard } from "@/components/admin/stats-card";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { getMinStaffRank } from "@/lib/admin/min-staff-rank";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
||||
@@ -34,6 +35,7 @@ export default async function ModerationDashboard() {
|
||||
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const todayStart = now - (now % 86400);
|
||||
const minStaffRank = await getMinStaffRank();
|
||||
|
||||
const [
|
||||
openCfh,
|
||||
@@ -46,7 +48,9 @@ export default async function ModerationDashboard() {
|
||||
prisma.supportTickets.count({ where: { state: 0 } }),
|
||||
prisma.supportTickets.count({ where: { state: 1 } }),
|
||||
prisma.ban.count({ where: { timestamp: { gte: todayStart } } }),
|
||||
prisma.user.count({ where: { online: "1", rank: { gte: 4 } } }),
|
||||
prisma.user.count({
|
||||
where: { online: "1", rank: { gte: minStaffRank } },
|
||||
}),
|
||||
prisma.supportTickets.findMany({
|
||||
orderBy: { id: "desc" },
|
||||
take: 10,
|
||||
|
||||
@@ -3,6 +3,7 @@ import { redirect } from "next/navigation";
|
||||
import { AvatarImage } from "@/components/shared/avatar-image";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { getMinStaffRank } from "@/lib/admin/min-staff-rank";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
||||
@@ -11,9 +12,9 @@ export default async function ModTeamPage() {
|
||||
if (!canAccess(permissions, PERMS.MODERATION_VIEW, session.user.rank))
|
||||
redirect("/admin");
|
||||
|
||||
// Get all staff (rank >= 4)
|
||||
const minStaffRank = await getMinStaffRank();
|
||||
const staff = await prisma.user.findMany({
|
||||
where: { rank: { gte: 4 } },
|
||||
where: { rank: { gte: minStaffRank } },
|
||||
select: {
|
||||
id: true,
|
||||
username: true,
|
||||
@@ -77,9 +78,9 @@ export default async function ModTeamPage() {
|
||||
<Card>
|
||||
<CardContent className="pt-4 text-center">
|
||||
<p className="text-2xl font-bold text-primary">
|
||||
{staff.filter((s) => s.rank >= 7).length}
|
||||
{staff.filter((s) => s.rank > minStaffRank).length}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">Super Admins</p>
|
||||
<p className="text-xs text-muted-foreground">Above min rank</p>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { HABBO_GAMEDATA_HOTELS } from "@/lib/habbo-gamedata-hotel";
|
||||
import { FALLBACK_HOTEL_NAME } from "@/lib/brand";
|
||||
import { HABBO_GAMEDATA_HOTELS } from "@/lib/habbo-gamedata-hotel";
|
||||
|
||||
export type FieldType =
|
||||
| "text"
|
||||
@@ -82,7 +82,8 @@ export const SETTINGS_GROUPS: SettingsGroup[] = [
|
||||
{
|
||||
key: "min_staff_rank",
|
||||
label: "Minimum staff rank",
|
||||
description: "Rank shown on the public staff page.",
|
||||
description:
|
||||
"Minimum rank treated as staff (admin lists and public staff page).",
|
||||
type: "number",
|
||||
defaultValue: "7",
|
||||
},
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
import Link from "next/link";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { AdminSimplePager } from "@/components/admin/admin-simple-pager";
|
||||
import { StatusCard } from "@/components/admin/dashboard";
|
||||
import { CurrencyIcon } from "@/components/shared/currency-icon";
|
||||
import { calcPagination, parseListParams } from "@/lib/admin-helpers";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
const PAID_STATUS = new Set(["completed", "paid", "success", "approved"]);
|
||||
const RECENT_ORDERS = 25;
|
||||
|
||||
function statusState(
|
||||
status: string | null | undefined,
|
||||
@@ -45,36 +48,60 @@ function CurrencyCell({
|
||||
);
|
||||
}
|
||||
|
||||
export default async function AdminShop() {
|
||||
export default async function AdminShop({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<Record<string, string>>;
|
||||
}) {
|
||||
const { session, permissions } = await getAdminContext();
|
||||
if (!canAccess(permissions, PERMS.SHOP_VIEW, session.user.rank)) {
|
||||
redirect("/admin");
|
||||
}
|
||||
|
||||
const t = await getTranslations("pages.admin.shop");
|
||||
const raw = await searchParams;
|
||||
const parsed = parseListParams(new URLSearchParams(raw));
|
||||
|
||||
let packageTotal = 0;
|
||||
let packages: Awaited<
|
||||
ReturnType<typeof prisma.websiteShopArticles.findMany>
|
||||
> = [];
|
||||
let loadError = false;
|
||||
try {
|
||||
packageTotal = await prisma.websiteShopArticles.count();
|
||||
const pagination = calcPagination(
|
||||
packageTotal,
|
||||
parsed.page,
|
||||
parsed.perPage,
|
||||
);
|
||||
packages = await prisma.websiteShopArticles.findMany({
|
||||
orderBy: [{ position: "asc" }, { name: "asc" }],
|
||||
take: 500,
|
||||
skip: pagination.offset,
|
||||
take: pagination.perPage,
|
||||
});
|
||||
} catch {
|
||||
packages = [];
|
||||
packageTotal = 0;
|
||||
loadError = true;
|
||||
}
|
||||
|
||||
const pkgPagination = calcPagination(
|
||||
packageTotal,
|
||||
parsed.page,
|
||||
parsed.perPage,
|
||||
);
|
||||
|
||||
let orders: Awaited<
|
||||
ReturnType<typeof prisma.websitePaypalTransactions.findMany>
|
||||
> = [];
|
||||
try {
|
||||
orders = await prisma.websitePaypalTransactions.findMany({
|
||||
orderBy: { createdAt: "desc" },
|
||||
take: 50,
|
||||
take: RECENT_ORDERS,
|
||||
});
|
||||
} catch {
|
||||
orders = [];
|
||||
loadError = true;
|
||||
}
|
||||
|
||||
const paidOrders = orders.filter(
|
||||
@@ -83,6 +110,11 @@ export default async function AdminShop() {
|
||||
|
||||
return (
|
||||
<main>
|
||||
{loadError ? (
|
||||
<div className="mb-4 rounded-lg bg-[var(--admin-error-subtle)] p-3 text-xs text-[var(--admin-error)]">
|
||||
Could not load some shop data (database unavailable).
|
||||
</div>
|
||||
) : null}
|
||||
<div className="flex items-center justify-end gap-4">
|
||||
<Link href="/admin/shop/new" className="btn btn-primary">
|
||||
{t("newPackage")}
|
||||
@@ -90,7 +122,7 @@ export default async function AdminShop() {
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-[repeat(auto-fit,minmax(180px,1fr))] gap-3.5 mb-6">
|
||||
<StatusCard label={t("packages")} value={packages.length} icon="🛍️" />
|
||||
<StatusCard label={t("packages")} value={packageTotal} icon="🛍️" />
|
||||
<StatusCard label={t("recentOrders")} value={orders.length} icon="🧾" />
|
||||
<StatusCard
|
||||
label={t("paidOrders")}
|
||||
@@ -102,7 +134,7 @@ export default async function AdminShop() {
|
||||
|
||||
<section className="mt-6">
|
||||
<h2 className="admin-section-title">
|
||||
{t("packages")} ({packages.length})
|
||||
{t("packagesTotal", { count: packageTotal })}
|
||||
</h2>
|
||||
{packages.length === 0 ? (
|
||||
<div className="admin-empty">{t("noPackages")}</div>
|
||||
@@ -146,6 +178,12 @@ export default async function AdminShop() {
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
<AdminSimplePager
|
||||
page={pkgPagination.page}
|
||||
lastPage={pkgPagination.lastPage}
|
||||
total={packageTotal}
|
||||
basePath="/admin/shop"
|
||||
/>
|
||||
</section>
|
||||
|
||||
<section className="mt-6">
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { StatusCard } from "@/components/admin/dashboard";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { AdminSimplePager } from "@/components/admin/admin-simple-pager";
|
||||
import { StatusCard } from "@/components/admin/dashboard";
|
||||
import { calcPagination, parseListParams } from "@/lib/admin-helpers";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
||||
type SubRow = {
|
||||
id: number;
|
||||
@@ -15,7 +17,11 @@ function fmt(ts: number): string {
|
||||
return new Date(ts * 1000).toISOString().slice(0, 16).replace("T", " ");
|
||||
}
|
||||
|
||||
export default async function AdminSubscriptions() {
|
||||
export default async function AdminSubscriptions({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<Record<string, string>>;
|
||||
}) {
|
||||
const { session, permissions } = await getAdminContext();
|
||||
if (!canAccess(permissions, PERMS.SHOP_VIEW, session.user.rank)) {
|
||||
redirect("/admin");
|
||||
@@ -23,36 +29,86 @@ export default async function AdminSubscriptions() {
|
||||
|
||||
const t = await getTranslations("pages.admin.subscriptions");
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const raw = await searchParams;
|
||||
const parsed = parseListParams(new URLSearchParams(raw));
|
||||
|
||||
let active: SubRow[] = [];
|
||||
let total = 0;
|
||||
let types = 0;
|
||||
let expiringSoon = 0;
|
||||
let loadError = false;
|
||||
try {
|
||||
const rows = await prisma.usersSubscriptions.findMany({
|
||||
where: { active: 1 },
|
||||
orderBy: { id: "desc" },
|
||||
take: 500,
|
||||
});
|
||||
const [countRows, typeRows, soonRows] = await Promise.all([
|
||||
prisma.$queryRaw<{ c: bigint }[]>`
|
||||
SELECT COUNT(*) AS c
|
||||
FROM users_subscriptions
|
||||
WHERE active = 1
|
||||
AND COALESCE(timestamp_start, 0) + COALESCE(duration, 0) > ${now}
|
||||
`,
|
||||
prisma.$queryRaw<{ c: bigint }[]>`
|
||||
SELECT COUNT(DISTINCT subscription_type) AS c
|
||||
FROM users_subscriptions
|
||||
WHERE active = 1
|
||||
AND COALESCE(timestamp_start, 0) + COALESCE(duration, 0) > ${now}
|
||||
`,
|
||||
prisma.$queryRaw<{ c: bigint }[]>`
|
||||
SELECT COUNT(*) AS c
|
||||
FROM users_subscriptions
|
||||
WHERE active = 1
|
||||
AND COALESCE(timestamp_start, 0) + COALESCE(duration, 0) > ${now}
|
||||
AND COALESCE(timestamp_start, 0) + COALESCE(duration, 0) <= ${now + 7 * 24 * 60 * 60}
|
||||
`,
|
||||
]);
|
||||
total = Number(countRows[0]?.c ?? 0);
|
||||
types = Number(typeRows[0]?.c ?? 0);
|
||||
expiringSoon = Number(soonRows[0]?.c ?? 0);
|
||||
const pagination = calcPagination(total, parsed.page, parsed.perPage);
|
||||
|
||||
active = rows
|
||||
.map((r) => ({
|
||||
id: r.id,
|
||||
userId: r.userId,
|
||||
subscriptionType: r.subscriptionType,
|
||||
expiresAt: (r.timestampStart ?? 0) + (r.duration ?? 0),
|
||||
}))
|
||||
.filter((r) => r.expiresAt > now)
|
||||
.sort((a, b) => a.expiresAt - b.expiresAt);
|
||||
const rows = await prisma.$queryRaw<
|
||||
{
|
||||
id: number;
|
||||
user_id: number | null;
|
||||
subscription_type: string | null;
|
||||
expires_at: number;
|
||||
}[]
|
||||
>`
|
||||
SELECT id,
|
||||
user_id,
|
||||
subscription_type,
|
||||
COALESCE(timestamp_start, 0) + COALESCE(duration, 0) AS expires_at
|
||||
FROM users_subscriptions
|
||||
WHERE active = 1
|
||||
AND COALESCE(timestamp_start, 0) + COALESCE(duration, 0) > ${now}
|
||||
ORDER BY expires_at ASC
|
||||
LIMIT ${pagination.perPage} OFFSET ${pagination.offset}
|
||||
`;
|
||||
|
||||
active = rows.map((r) => ({
|
||||
id: Number(r.id),
|
||||
userId: r.user_id == null ? null : Number(r.user_id),
|
||||
subscriptionType: r.subscription_type,
|
||||
expiresAt: Number(r.expires_at),
|
||||
}));
|
||||
} catch {
|
||||
active = [];
|
||||
total = 0;
|
||||
types = 0;
|
||||
expiringSoon = 0;
|
||||
loadError = true;
|
||||
}
|
||||
|
||||
const pagination = calcPagination(total, parsed.page, parsed.perPage);
|
||||
const soonCutoff = now + 7 * 24 * 60 * 60;
|
||||
const expiringSoon = active.filter((s) => s.expiresAt <= soonCutoff).length;
|
||||
const types = new Set(active.map((s) => s.subscriptionType ?? "—")).size;
|
||||
|
||||
return (
|
||||
<main>
|
||||
{loadError ? (
|
||||
<div className="mb-4 rounded-lg bg-[var(--admin-error-subtle)] p-3 text-xs text-[var(--admin-error)]">
|
||||
Could not load subscriptions (database unavailable).
|
||||
</div>
|
||||
) : null}
|
||||
<div className="grid grid-cols-[repeat(auto-fit,minmax(180px,1fr))] gap-3.5 mb-6">
|
||||
<StatusCard label={t("activeSubs")} value={active.length} icon="⭐" />
|
||||
<StatusCard label={t("activeSubs")} value={total} icon="⭐" />
|
||||
<StatusCard label={t("types")} value={types} icon="🏷️" />
|
||||
<StatusCard
|
||||
label={t("expiringSoon")}
|
||||
@@ -64,7 +120,7 @@ export default async function AdminSubscriptions() {
|
||||
|
||||
<section className="mt-6">
|
||||
<h2 className="admin-section-title">
|
||||
{t("activeSubscriptions")} ({active.length})
|
||||
{t("activeSubscriptions")} ({total})
|
||||
</h2>
|
||||
<div className="admin-card">
|
||||
<table>
|
||||
@@ -78,34 +134,34 @@ export default async function AdminSubscriptions() {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{active.map((s) => {
|
||||
const soon = s.expiresAt <= soonCutoff;
|
||||
return (
|
||||
{active.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={5} className="muted">
|
||||
—
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
active.map((s) => (
|
||||
<tr key={s.id}>
|
||||
<td className="text-sm theme-text-muted dark:theme-text-muted whitespace-nowrap">
|
||||
{s.id}
|
||||
</td>
|
||||
<td>{s.id}</td>
|
||||
<td>{s.userId ?? "—"}</td>
|
||||
<td>{s.subscriptionType ?? "—"}</td>
|
||||
<td>
|
||||
<span
|
||||
className={`inline-block text-[0.72rem] font-bold px-2 py-0.5 rounded-full ${soon ? "bg-[var(--admin-accent)]/18 text-[var(--admin-text)]" : "bg-[var(--admin-success-subtle)] text-[var(--admin-text)]"}`}
|
||||
>
|
||||
{soon ? t("statusExpiring") : t("statusActive")}
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-sm theme-text-muted dark:theme-text-muted whitespace-nowrap">
|
||||
{fmt(s.expiresAt)}
|
||||
{s.expiresAt <= soonCutoff ? t("expiringSoon") : "OK"}
|
||||
</td>
|
||||
<td>{fmt(s.expiresAt)}</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
))
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
{active.length === 0 ? (
|
||||
<div className="admin-empty">{t("noSubscriptions")}</div>
|
||||
) : null}
|
||||
</div>
|
||||
<AdminSimplePager
|
||||
page={pagination.page}
|
||||
lastPage={pagination.lastPage}
|
||||
total={total}
|
||||
basePath="/admin/subscriptions"
|
||||
/>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { notFound, redirect } from "next/navigation";
|
||||
import { getMinStaffRank } from "@/lib/admin/min-staff-rank";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { AdminTicketDetail } from "./admin-ticket-detail";
|
||||
@@ -45,9 +46,10 @@ export default async function AdminTicketDetailPage({
|
||||
|
||||
if (!ticket) notFound();
|
||||
|
||||
// Get staff members for assignment
|
||||
// Staff assignees: min_staff_rank and above
|
||||
const minStaffRank = await getMinStaffRank();
|
||||
const staffMembers = await prisma.user.findMany({
|
||||
where: { rank: { gte: 4 } },
|
||||
where: { rank: { gte: minStaffRank } },
|
||||
select: { id: true, username: true },
|
||||
orderBy: { username: "asc" },
|
||||
});
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import Link from "next/link";
|
||||
|
||||
/** Minimal prev/next pager for admin list pages without DataTable. */
|
||||
export function AdminSimplePager({
|
||||
page,
|
||||
lastPage,
|
||||
total,
|
||||
basePath,
|
||||
label,
|
||||
}: {
|
||||
page: number;
|
||||
lastPage: number;
|
||||
total: number;
|
||||
basePath: string;
|
||||
label?: string;
|
||||
}) {
|
||||
if (lastPage <= 1) return null;
|
||||
|
||||
const href = (p: number) => {
|
||||
const u = new URLSearchParams();
|
||||
u.set("page", String(p));
|
||||
return `${basePath}?${u.toString()}`;
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="mt-3 flex flex-wrap items-center justify-between gap-2 text-sm text-[var(--admin-text-muted)]">
|
||||
<span>
|
||||
{label ? `${label} · ` : null}
|
||||
{total} total · page {page}/{lastPage}
|
||||
</span>
|
||||
<div className="flex items-center gap-2">
|
||||
{page > 1 ? (
|
||||
<Link className="btn btn-ghost btn-sm" href={href(page - 1)}>
|
||||
Previous
|
||||
</Link>
|
||||
) : (
|
||||
<span className="opacity-40">Previous</span>
|
||||
)}
|
||||
{page < lastPage ? (
|
||||
<Link className="btn btn-ghost btn-sm" href={href(page + 1)}>
|
||||
Next
|
||||
</Link>
|
||||
) : (
|
||||
<span className="opacity-40">Next</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import { siteSettings } from "@/lib/services/site-settings";
|
||||
|
||||
/**
|
||||
* Minimum hotel rank treated as staff (admin lists + public staff page).
|
||||
* Setting: `min_staff_rank` (default 7).
|
||||
*/
|
||||
export async function getMinStaffRank(fallback = 7): Promise<number> {
|
||||
const raw = await siteSettings.get("min_staff_rank", String(fallback));
|
||||
const n = Number(raw);
|
||||
return Number.isFinite(n) && n > 0 ? Math.floor(n) : fallback;
|
||||
}
|
||||
+10
-7
@@ -1018,8 +1018,8 @@
|
||||
"advertisements": "Advertisements",
|
||||
"writeableBoxes": "Writeable boxes",
|
||||
"photos": "Photos",
|
||||
"tickets": "Tickets",
|
||||
"helpTickets": "Help center tickets",
|
||||
"tickets": "Support desk",
|
||||
"helpTickets": "Help-center tickets",
|
||||
"events": "Events",
|
||||
"polls": "Polls",
|
||||
"banners": "Banners",
|
||||
@@ -1735,7 +1735,9 @@
|
||||
"orders": "Orders",
|
||||
"recentOrders": "Recent orders",
|
||||
"paidOrders": "Paid orders",
|
||||
"ordersHint": "Latest PayPal transactions",
|
||||
"ordersHint": "Latest PayPal transactions (most recent 25)",
|
||||
"pageOf": "Page {page} of {lastPage}",
|
||||
"packagesTotal": "{count} packages",
|
||||
"newPackage": "+ New package",
|
||||
"edit": "Edit",
|
||||
"delete": "Delete",
|
||||
@@ -2448,8 +2450,8 @@
|
||||
"events": "Events",
|
||||
"eventTypes": "Event types",
|
||||
"polls": "Polls",
|
||||
"tickets": "Tickets",
|
||||
"helpTickets": "Help center tickets",
|
||||
"tickets": "CMS tickets",
|
||||
"helpTickets": "Help-center tickets",
|
||||
"templates": "Templates",
|
||||
"directory": "Directory",
|
||||
"multiAccounts": "Multi-accounts",
|
||||
@@ -2510,8 +2512,8 @@
|
||||
},
|
||||
"events": "Events",
|
||||
"eventsSubtitle": "Hotel events and event types",
|
||||
"tickets": "Tickets",
|
||||
"ticketsSubtitle": "Support tickets and reply templates",
|
||||
"tickets": "Support desk",
|
||||
"ticketsSubtitle": "CMS tickets, help-center tickets, and reply templates",
|
||||
"staffAccess": "Ranks & permissions",
|
||||
"staffAccessSubtitle": "Staff ranks, ACL permissions and housekeeping access",
|
||||
"analytics": "Analytics",
|
||||
@@ -2889,6 +2891,7 @@
|
||||
}
|
||||
},
|
||||
"analytics": {
|
||||
"loadError": "Some analytics queries failed. Numbers below may be incomplete — check the database connection and emulator tables.",
|
||||
"totalUsers": "Total users",
|
||||
"onlineNow": "{count} online now",
|
||||
"weekRegistrations": "Week registrations",
|
||||
|
||||
@@ -952,7 +952,7 @@
|
||||
"advertisements": "Pubblicità",
|
||||
"writeableBoxes": "Box modificabili",
|
||||
"photos": "Foto",
|
||||
"tickets": "Ticket",
|
||||
"tickets": "Assistenza",
|
||||
"helpTickets": "Ticket centro assistenza",
|
||||
"events": "Eventi",
|
||||
"polls": "Sondaggi",
|
||||
@@ -1673,7 +1673,9 @@
|
||||
"orders": "Ordini",
|
||||
"recentOrders": "Ordini recenti",
|
||||
"paidOrders": "Ordini pagati",
|
||||
"ordersHint": "Ultime transazioni PayPal",
|
||||
"ordersHint": "Ultime transazioni PayPal (ultime 25)",
|
||||
"pageOf": "Pagina {page} di {lastPage}",
|
||||
"packagesTotal": "{count} pacchetti",
|
||||
"newPackage": "+ Nuovo pacchetto",
|
||||
"edit": "Modifica",
|
||||
"delete": "Elimina",
|
||||
@@ -2665,7 +2667,7 @@
|
||||
"events": "Eventi",
|
||||
"eventTypes": "Tipi evento",
|
||||
"polls": "Sondaggi",
|
||||
"tickets": "Ticket",
|
||||
"tickets": "Ticket CMS",
|
||||
"helpTickets": "Ticket centro assistenza",
|
||||
"templates": "Template",
|
||||
"directory": "Directory",
|
||||
@@ -2727,8 +2729,8 @@
|
||||
},
|
||||
"events": "Eventi",
|
||||
"eventsSubtitle": "Eventi hotel e tipi evento",
|
||||
"tickets": "Ticket",
|
||||
"ticketsSubtitle": "Ticket di supporto e template risposte",
|
||||
"tickets": "Assistenza",
|
||||
"ticketsSubtitle": "Ticket CMS, ticket centro assistenza e template risposte",
|
||||
"staffAccess": "Gradi e permessi",
|
||||
"staffAccessSubtitle": "Gradi staff, permessi ACL e accesso housekeeping",
|
||||
"analytics": "Analitiche",
|
||||
@@ -2829,6 +2831,7 @@
|
||||
}
|
||||
},
|
||||
"analytics": {
|
||||
"loadError": "Alcune query analytics sono fallite. I numeri sotto possono essere incompleti — controlla DB e tabelle emulator.",
|
||||
"totalUsers": "Utenti totali",
|
||||
"onlineNow": "{count} online ora",
|
||||
"weekRegistrations": "Registrazioni della settimana",
|
||||
|
||||
@@ -997,7 +997,7 @@
|
||||
"advertisements": "Advertenties",
|
||||
"writeableBoxes": "Bewerkbare boxes",
|
||||
"photos": "Foto's",
|
||||
"tickets": "Tickets",
|
||||
"tickets": "Supportbalie",
|
||||
"helpTickets": "Helpcentrum-tickets",
|
||||
"events": "Events",
|
||||
"polls": "Polls",
|
||||
@@ -1649,7 +1649,9 @@
|
||||
"orders": "Bestellingen",
|
||||
"recentOrders": "Recente bestellingen",
|
||||
"paidOrders": "Betaalde bestellingen",
|
||||
"ordersHint": "Laatste PayPal-transacties",
|
||||
"ordersHint": "Laatste PayPal-transacties (meest recente 25)",
|
||||
"pageOf": "Pagina {page} van {lastPage}",
|
||||
"packagesTotal": "{count} pakketten",
|
||||
"newPackage": "+ Nieuw pakket",
|
||||
"edit": "Bewerken",
|
||||
"delete": "Verwijderen",
|
||||
@@ -2731,7 +2733,7 @@
|
||||
"events": "Evenementen",
|
||||
"eventTypes": "Evenementtypen",
|
||||
"polls": "Polls",
|
||||
"tickets": "Tickets",
|
||||
"tickets": "CMS-tickets",
|
||||
"helpTickets": "Helpcentrum-tickets",
|
||||
"templates": "Sjablonen",
|
||||
"directory": "Adresboek",
|
||||
@@ -2793,8 +2795,8 @@
|
||||
},
|
||||
"events": "Evenementen",
|
||||
"eventsSubtitle": "Hotel-evenementen en evenementtypes",
|
||||
"tickets": "Tickets",
|
||||
"ticketsSubtitle": "Supporttickets en antwoordtemplates",
|
||||
"tickets": "Supportbalie",
|
||||
"ticketsSubtitle": "CMS-tickets, helpcentrum-tickets en antwoordtemplates",
|
||||
"staffAccess": "Rangen & rechten",
|
||||
"staffAccessSubtitle": "Staffrangen, ACL-rechten en housekeeping-toegang",
|
||||
"analytics": "Analytics",
|
||||
@@ -2872,6 +2874,7 @@
|
||||
"colStatus": "Status"
|
||||
},
|
||||
"analytics": {
|
||||
"loadError": "Sommige analytics-queries zijn mislukt. Onderstaande cijfers kunnen onvolledig zijn — controleer de database en emulator-tabellen.",
|
||||
"totalUsers": "Totaal gebruikers",
|
||||
"onlineNow": "{count} nu online",
|
||||
"weekRegistrations": "Registraties deze week",
|
||||
|
||||
Reference in new issue
Block a user