revert fb8e77bb68
Local Build and Deploy / deploy (push) Successful in 1m11s

revert style: clean up code with prettier and eslint
This commit is contained in:
remco committed 2026-07-12 21:02:03 +02:00
1 parent 27de078f54
commit e85e4d74ea
378 files changed
+20710 -22428

No files matched your search

+41 -42
View File
@@ -1,17 +1,17 @@
import { MessageSquare, Shield, Terminal, Users } from "lucide-react";
import { redirect } from "next/navigation";
import { StatsCard } from "@/components/admin/stats-card";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { MessageSquare, Shield, Terminal, Users } from 'lucide-react'
import { redirect } from 'next/navigation'
import { StatsCard } from '@/components/admin/stats-card'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { canAccess, getAdminContext, PERMS } from '@/lib/permissions'
import { prisma } from '@/lib/prisma'
async function getActivityData() {
const now = Math.floor(Date.now() / 1000);
const todayStart = now - (now % 86400);
const weekAgo = now - 7 * 86400;
const now = Math.floor(Date.now() / 1000)
const todayStart = now - (now % 86400)
const weekAgo = now - 7 * 86400
// Daily activity breakdown — 4 GROUP BY queries instead of 28 sequential queries
const rangeStart = todayStart - 6 * 86400;
const rangeStart = todayStart - 6 * 86400
const [chatRows, cmdRows, banRows, regRows] = await Promise.all([
prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
SELECT FLOOR(timestamp / 86400) AS day_bucket, COUNT(*) AS count
@@ -25,61 +25,57 @@ async function getActivityData() {
prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
SELECT FLOOR(account_created / 86400) AS day_bucket, COUNT(*) AS count
FROM users WHERE account_created >= ${rangeStart} GROUP BY day_bucket`,
]);
])
const toMap = (rows: { day_bucket: bigint; count: bigint }[]) =>
new Map(rows.map((r) => [Number(r.day_bucket), Number(r.count)]));
const chatMap = toMap(chatRows);
const cmdMap = toMap(cmdRows);
const banMap = toMap(banRows);
const regMap = toMap(regRows);
new Map(rows.map((r) => [Number(r.day_bucket), Number(r.count)]))
const chatMap = toMap(chatRows)
const cmdMap = toMap(cmdRows)
const banMap = toMap(banRows)
const regMap = toMap(regRows)
const dailyData = [];
const dailyData = []
for (let i = 6; i >= 0; i--) {
const dayStart = todayStart - i * 86400;
const bucket = Math.floor(dayStart / 86400);
const date = new Date(dayStart * 1000);
const dayStart = todayStart - i * 86400
const bucket = Math.floor(dayStart / 86400)
const date = new Date(dayStart * 1000)
dailyData.push({
label: date.toLocaleDateString("en", { weekday: "short", month: "short", day: "numeric" }),
label: date.toLocaleDateString('en', { weekday: 'short', month: 'short', day: 'numeric' }),
chats: chatMap.get(bucket) ?? 0,
commands: cmdMap.get(bucket) ?? 0,
bans: banMap.get(bucket) ?? 0,
registrations: regMap.get(bucket) ?? 0,
});
})
}
// Totals
const [weekChatRows, weekCommandRows, weekBans, weekRegistrations] = await Promise.all([
prisma.$queryRaw<
{ count: bigint }[]
>`SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`,
prisma.$queryRaw<
{ count: bigint }[]
>`SELECT COUNT(*) AS count FROM commandlogs WHERE timestamp >= ${weekAgo}`,
prisma.$queryRaw<{ count: bigint }[]>`SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`,
prisma.$queryRaw<{ count: bigint }[]>`SELECT COUNT(*) AS count FROM commandlogs WHERE timestamp >= ${weekAgo}`,
prisma.ban.count({ where: { timestamp: { gte: weekAgo } } }),
prisma.user.count({ where: { accountCreated: { gte: weekAgo } } }),
]);
const weekChats = Number(weekChatRows[0]?.count ?? 0);
const weekCommands = Number(weekCommandRows[0]?.count ?? 0);
])
const weekChats = Number(weekChatRows[0]?.count ?? 0)
const weekCommands = Number(weekCommandRows[0]?.count ?? 0)
// Most active users (by chat messages)
const topChatters = await prisma.$queryRaw<{ userId: number; messages: bigint }[]>`
SELECT user_from_id AS userId, COUNT(*) AS messages
FROM chatlogs_room WHERE timestamp >= ${weekAgo}
GROUP BY user_from_id ORDER BY messages DESC LIMIT 10
`;
`
const userIds = topChatters.map((c) => c.userId);
const userIds = topChatters.map((c) => c.userId)
const users = await prisma.user.findMany({
where: { id: { in: userIds } },
select: { id: true, username: true },
});
const userMap = new Map(users.map((u) => [u.id, u.username]));
})
const userMap = new Map(users.map((u) => [u.id, u.username]))
const topChattersWithNames = topChatters.map((c) => ({
userId: c.userId,
username: userMap.get(c.userId) ?? `User #${c.userId}`,
messages: Number(c.messages),
}));
}))
return {
dailyData,
@@ -88,16 +84,16 @@ async function getActivityData() {
weekBans,
weekRegistrations,
topChatters: topChattersWithNames,
};
}
}
export default async function ActivityPage() {
const { session, permissions } = await getAdminContext();
const { session, permissions } = await getAdminContext()
if (!canAccess(permissions, PERMS.ANALYTICS_VIEW, session.user.rank)) {
redirect("/admin");
redirect('/admin')
}
const data = await getActivityData();
const data = await getActivityData()
return (
<div className="space-y-6">
@@ -178,7 +174,10 @@ export default async function ActivityPage() {
) : (
<div className="divide-y">
{data.topChatters.map((user, i) => (
<div key={user.userId} className="flex items-center gap-3 py-2.5 first:pt-0 last:pb-0">
<div
key={user.userId}
className="flex items-center gap-3 py-2.5 first:pt-0 last:pb-0"
>
<span className="flex h-6 w-6 items-center justify-center rounded-full bg-accent text-xs font-bold">
{i + 1}
</span>
@@ -194,5 +193,5 @@ export default async function ActivityPage() {
</Card>
</div>
</div>
);
)
}
+44 -39
View File
@@ -1,47 +1,47 @@
import { ArrowLeftRight, Coins, TrendingDown, TrendingUp } from "lucide-react";
import dynamic from "next/dynamic";
import { redirect } from "next/navigation";
import { StatsCard } from "@/components/admin/stats-card";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { ArrowLeftRight, Coins, TrendingDown, TrendingUp } from 'lucide-react'
import dynamic from 'next/dynamic'
import { redirect } from 'next/navigation'
import { StatsCard } from '@/components/admin/stats-card'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Skeleton } from '@/components/ui/skeleton'
import { canAccess, getAdminContext, PERMS } from '@/lib/permissions'
import { prisma } from '@/lib/prisma'
const RevenueChart = dynamic(
() => import("@/components/admin/revenue-chart").then((m) => ({ default: m.RevenueChart })),
() => import('@/components/admin/revenue-chart').then((m) => ({ default: m.RevenueChart })),
{ loading: () => <Skeleton className="h-[300px] w-full rounded-xl" /> },
);
)
async function getEconomyData() {
const now = Math.floor(Date.now() / 1000);
const todayStart = now - (now % 86400);
const weekAgo = now - 7 * 86400;
const now = Math.floor(Date.now() / 1000)
const todayStart = now - (now % 86400)
const weekAgo = now - 7 * 86400
// Total currency in circulation — parallel instead of sequential
const [creditsAgg, pixelsAgg, pointsAgg] = await Promise.all([
prisma.user.aggregate({ _sum: { credits: true } }),
prisma.user.aggregate({ _sum: { pixels: true } }),
prisma.user.aggregate({ _sum: { points: true } }),
]);
const totalCredits = creditsAgg._sum.credits ?? 0;
const totalPixels = pixelsAgg._sum.pixels ?? 0;
const totalPoints = pointsAgg._sum.points ?? 0;
])
const totalCredits = creditsAgg._sum.credits ?? 0
const totalPixels = pixelsAgg._sum.pixels ?? 0
const totalPoints = pointsAgg._sum.points ?? 0
// Shop revenue (7 days)
const shopRevenue = await prisma.logsShopPurchases.aggregate({
where: { timestamp: { gte: weekAgo } },
_sum: { costCredits: true, costPoints: true },
_count: true,
});
})
// Marketplace stats
const marketplaceActive = await prisma.marketplaceItems.count({ where: { state: 1 } });
const marketplaceActive = await prisma.marketplaceItems.count({ where: { state: 1 } })
const marketplaceSold = await prisma.marketplaceItems.count({
where: { state: 2, soldTimestamp: { gte: weekAgo } },
});
})
// Revenue chart (7 days) — single GROUP BY query instead of 7 sequential queries
const rangeStart = todayStart - 6 * 86400;
const rangeStart = todayStart - 6 * 86400
const revRows = await prisma.$queryRaw<{ day_bucket: bigint; credits: number; points: number }[]>`
SELECT FLOOR(timestamp / 86400) AS day_bucket,
COALESCE(SUM(cost_credits), 0) AS credits,
@@ -49,55 +49,60 @@ async function getEconomyData() {
FROM logs_shop_purchases
WHERE timestamp >= ${rangeStart}
GROUP BY day_bucket ORDER BY day_bucket
`;
`
const revMap = new Map(
revRows.map((r) => [Number(r.day_bucket), { credits: Number(r.credits), points: Number(r.points) }]),
);
const revenueData = [];
revRows.map((r) => [
Number(r.day_bucket),
{ credits: Number(r.credits), points: Number(r.points) },
]),
)
const revenueData = []
for (let i = 6; i >= 0; i--) {
const dayStart = todayStart - i * 86400;
const bucket = Math.floor(dayStart / 86400);
const date = new Date(dayStart * 1000);
const entry = revMap.get(bucket);
const dayStart = todayStart - i * 86400
const bucket = Math.floor(dayStart / 86400)
const date = new Date(dayStart * 1000)
const entry = revMap.get(bucket)
revenueData.push({
label: date.toLocaleDateString("en", { weekday: "short" }),
label: date.toLocaleDateString('en', { weekday: 'short' }),
credits: entry?.credits ?? 0,
points: entry?.points ?? 0,
});
})
}
// Trades (7 days)
const weekTrades = await prisma.roomTradeLog.count({
where: { timestamp: { gte: weekAgo } },
});
})
return {
totalCredits,
totalPixels,
totalPoints,
shopPurchases: typeof shopRevenue._count === "number" ? shopRevenue._count : 0,
shopPurchases: typeof shopRevenue._count === 'number' ? shopRevenue._count : 0,
shopCreditsSpent: shopRevenue._sum?.costCredits ?? 0,
shopPointsSpent: shopRevenue._sum?.costPoints ?? 0,
marketplaceActive,
marketplaceSold,
weekTrades,
revenueData,
};
}
}
export default async function EconomyPage() {
const { session, permissions } = await getAdminContext();
const { session, permissions } = await getAdminContext()
if (!canAccess(permissions, PERMS.ANALYTICS_VIEW, session.user.rank)) {
redirect("/admin");
redirect('/admin')
}
const data = await getEconomyData();
const data = await getEconomyData()
return (
<div className="space-y-6">
<div>
<h1 className="text-3xl font-bold tracking-tight">Economy</h1>
<p className="text-muted-foreground">Currency circulation, shop revenue and marketplace activity</p>
<p className="text-muted-foreground">
Currency circulation, shop revenue and marketplace activity
</p>
</div>
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
@@ -191,5 +196,5 @@ export default async function EconomyPage() {
</Card>
</div>
</div>
);
)
}
+39 -40
View File
@@ -1,27 +1,28 @@
import { ArrowLeftRight, Clock, DoorOpen, MessageSquare, TrendingUp, Users } from "lucide-react";
import dynamic from "next/dynamic";
import { redirect } from "next/navigation";
import { StatsCard } from "@/components/admin/stats-card";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { ArrowLeftRight, Clock, DoorOpen, MessageSquare, TrendingUp, Users } from 'lucide-react'
import dynamic from 'next/dynamic'
import { redirect } from 'next/navigation'
import { StatsCard } from '@/components/admin/stats-card'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Skeleton } from '@/components/ui/skeleton'
import { canAccess, getAdminContext, PERMS } from '@/lib/permissions'
import { prisma } from '@/lib/prisma'
const DashboardChart = dynamic(
() => import("@/components/admin/dashboard-chart").then((m) => ({ default: m.DashboardChart })),
() => import('@/components/admin/dashboard-chart').then((m) => ({ default: m.DashboardChart })),
{ loading: () => <Skeleton className="h-[300px] w-full rounded-xl" /> },
);
)
const PeakHoursHeatmap = dynamic(
() => import("@/components/admin/peak-hours-heatmap").then((m) => ({ default: m.PeakHoursHeatmap })),
() =>
import('@/components/admin/peak-hours-heatmap').then((m) => ({ default: m.PeakHoursHeatmap })),
{ loading: () => <Skeleton className="h-[250px] w-full rounded-xl" /> },
);
)
async function getAnalyticsData() {
const now = Math.floor(Date.now() / 1000);
const todayStart = now - (now % 86400);
const weekAgo = now - 7 * 86400;
const monthAgo = now - 30 * 86400;
const now = Math.floor(Date.now() / 1000)
const todayStart = now - (now % 86400)
const weekAgo = now - 7 * 86400
const monthAgo = now - 30 * 86400
const [
totalUsers,
@@ -35,17 +36,15 @@ async function getAnalyticsData() {
weekBans,
] = await Promise.all([
prisma.user.count(),
prisma.user.count({ where: { online: "1" } }),
prisma.user.count({ where: { online: '1' } }),
prisma.user.count({ where: { accountCreated: { gte: weekAgo } } }),
prisma.user.count({ where: { accountCreated: { gte: monthAgo } } }),
prisma.rooms.count(),
prisma.rooms.count({ where: { users: { gt: 0 } } }),
prisma.$queryRaw<
{ count: bigint }[]
>`SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`,
prisma.$queryRaw<{ count: bigint }[]>`SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`,
prisma.roomTradeLog.count({ where: { timestamp: { gte: weekAgo } } }),
prisma.ban.count({ where: { timestamp: { gte: weekAgo } } }),
]);
])
// Registration chart (30 days) — single GROUP BY query instead of 30 sequential queries
const regRows = await prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
@@ -53,17 +52,17 @@ async function getAnalyticsData() {
FROM users
WHERE account_created >= ${monthAgo}
GROUP BY day_bucket ORDER BY day_bucket
`;
const regCountMap = new Map(regRows.map((r) => [Number(r.day_bucket), Number(r.count)]));
const registrationChart = [];
`
const regCountMap = new Map(regRows.map((r) => [Number(r.day_bucket), Number(r.count)]))
const registrationChart = []
for (let i = 29; i >= 0; i--) {
const dayStart = todayStart - i * 86400;
const bucket = Math.floor(dayStart / 86400);
const date = new Date(dayStart * 1000);
const dayStart = todayStart - i * 86400
const bucket = Math.floor(dayStart / 86400)
const date = new Date(dayStart * 1000)
registrationChart.push({
label: date.toLocaleDateString("en", { month: "short", day: "numeric" }),
label: date.toLocaleDateString('en', { month: 'short', day: 'numeric' }),
value: regCountMap.get(bucket) ?? 0,
});
})
}
// Peak hours — single GROUP BY query instead of fetching all user rows
@@ -74,13 +73,13 @@ async function getAnalyticsData() {
FROM users
WHERE last_online >= ${weekAgo}
GROUP BY d, h
`;
const grid: number[][] = Array.from({ length: 7 }, () => Array(24).fill(0));
let max = 0;
`
const grid: number[][] = Array.from({ length: 7 }, () => Array(24).fill(0))
let max = 0
for (const r of peakRows) {
const count = Number(r.c);
grid[r.d][r.h] = count;
if (count > max) max = count;
const count = Number(r.c)
grid[r.d][r.h] = count
if (count > max) max = count
}
return {
@@ -95,16 +94,16 @@ async function getAnalyticsData() {
weekBans,
registrationChart,
peakHours: { grid, max },
};
}
}
export default async function AnalyticsPage() {
const { session, permissions } = await getAdminContext();
const { session, permissions } = await getAdminContext()
if (!canAccess(permissions, PERMS.ANALYTICS_VIEW, session.user.rank)) {
redirect("/admin");
redirect('/admin')
}
const data = await getAnalyticsData();
const data = await getAnalyticsData()
return (
<div className="space-y-6">
@@ -188,5 +187,5 @@ export default async function AnalyticsPage() {
</Card>
</div>
</div>
);
)
}