Compare commits
41
Commits
v0.6.0
...
140ba10df6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
140ba10df6 | ||
|
|
48c31388db | ||
|
|
68b0e4d0bd | ||
|
|
cf5353dfe4 | ||
|
|
44755c6e85 | ||
|
|
494e963fa3 | ||
|
|
f8f687af4e | ||
|
|
69e4fb286c | ||
|
|
ea320548b6 | ||
|
|
27d0db0f72 | ||
|
|
e436ced95b | ||
|
|
fe017497a2 | ||
|
|
fc7fd74d17 | ||
|
|
8c3d4e4e33 | ||
|
|
581c3c0e6c | ||
|
|
afa6e8d473 | ||
|
|
1bad1f4e33 | ||
|
|
c06f119dcf | ||
|
|
20433a6749 | ||
|
|
1d88ab96c8 | ||
|
|
dde6adb089 | ||
|
|
b0394d5c9d | ||
|
|
5c92b416c0 | ||
|
|
2a52b5db9b | ||
|
|
39539b6f94 | ||
|
|
a0211f90e4 | ||
|
|
26897e1621 | ||
|
|
1bd38f8194 | ||
|
|
ffc63f0b03 | ||
|
|
a94f2f33b6 | ||
|
|
e9d5bb37d2 | ||
|
|
354c30d641 | ||
|
|
7bf4b3d4bf | ||
|
|
884ced7a47 | ||
|
|
005d729119 | ||
|
|
fa04cb32b4 | ||
|
|
c778ab3cf2 | ||
|
|
7643e9d509 | ||
|
|
d5a8cb81cf | ||
|
|
c4ed849d37 | ||
|
|
e459ccd0ed |
+8
-18
@@ -2,6 +2,7 @@ import Link from "next/link";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { BrandMark } from "@/components/layout/BrandMark";
|
||||
import { SessionsTable } from "@/components/sessions/SessionsTable";
|
||||
import { listSessions } from "@/lib/db/queries/sessions";
|
||||
import { getSessionsSummary } from "@/lib/db/queries/stats";
|
||||
|
||||
@@ -17,7 +18,7 @@ export default async function DashboardPage() {
|
||||
return (
|
||||
<div className="flex flex-col gap-8">
|
||||
<Card className="bp-glass overflow-hidden">
|
||||
<CardContent className="flex flex-col items-start gap-4 py-8">
|
||||
<CardContent className="flex flex-col items-start gap-4 py-4">
|
||||
<BrandMark size={48} animated className="rounded-[9px]" />
|
||||
<h1 className="font-heading text-3xl font-semibold">Welcome back</h1>
|
||||
<p className="max-w-xl text-sm text-muted-foreground">
|
||||
@@ -33,13 +34,13 @@ export default async function DashboardPage() {
|
||||
<div className="grid gap-4 sm:grid-cols-3">
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Completed sessions</CardTitle>
|
||||
<CardTitle className="text-sm">Completed sessions</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">{summary.count}</CardContent>
|
||||
</Card>
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Total play time</CardTitle>
|
||||
<CardTitle className="text-sm">Total play time</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">
|
||||
{(summary.totalDurationMs / 3_600_000).toFixed(1)}h
|
||||
@@ -47,7 +48,7 @@ export default async function DashboardPage() {
|
||||
</Card>
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Replays</CardTitle>
|
||||
<CardTitle className="text-sm">Replays</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">{summary.totalReplays}</CardContent>
|
||||
</Card>
|
||||
@@ -55,21 +56,10 @@ export default async function DashboardPage() {
|
||||
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle>Recent sessions</CardTitle>
|
||||
<CardTitle className="text-base">Recent sessions</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="flex flex-col">
|
||||
{recentSessions.length === 0 && <p className="text-sm text-muted-foreground">No sessions yet.</p>}
|
||||
{recentSessions.map((s, i) => (
|
||||
<Link key={s.id} href={`/sessions/${s.id}`} className="group">
|
||||
{i > 0 && <div className="bp-hairline" />}
|
||||
<div className="flex items-center justify-between px-1 py-2 text-sm">
|
||||
<span className="group-hover:text-primary">{s.name ?? `Session #${s.id}`}</span>
|
||||
<span className="bp-readout text-xs text-muted-foreground">
|
||||
{new Date(s.startedAt).toLocaleDateString()}
|
||||
</span>
|
||||
</div>
|
||||
</Link>
|
||||
))}
|
||||
<CardContent className="flex flex-col gap-3">
|
||||
<SessionsTable sessions={recentSessions} />
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
import type { Metadata } from "next";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { SessionTimelineChart } from "@/components/sessions/SessionTimelineChart";
|
||||
import { SessionTitleEditor } from "@/components/sessions/SessionTitleEditor";
|
||||
import { SessionDescriptionEditor } from "@/components/sessions/SessionDescriptionEditor";
|
||||
import { SessionDeleteButton } from "@/components/sessions/SessionDeleteButton";
|
||||
import { STATUS_VARIANT } from "@/components/sessions/session-status";
|
||||
import { getSessionDetail, getSessionName } from "@/lib/db/queries/sessions";
|
||||
import { getSessionTimeline } from "@/lib/db/queries/stats";
|
||||
import { Play } from "lucide-react";
|
||||
@@ -32,26 +37,28 @@ export default async function SessionDetailPage({ params }: { params: Promise<{
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-6">
|
||||
<div className="flex items-center justify-between gap-4">
|
||||
<div>
|
||||
<h1 className="font-heading text-2xl font-semibold">{detail.session.name ?? `Session #${detail.session.id}`}</h1>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{detail.session.status} · {formatDuration(detail.session.durationMs)}
|
||||
<div className="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
|
||||
<div className="min-w-0 flex-1">
|
||||
<SessionTitleEditor sessionId={detail.session.id} initialName={detail.session.name} />
|
||||
{(detail.session.kind === "replay" || detail.session.playCount > 0) && (
|
||||
<p className="mt-1 text-sm text-muted-foreground">
|
||||
{detail.session.kind === "replay" && detail.replayedFromName !== undefined && (
|
||||
<> · replayed from {detail.replayedFromName ?? `session #${detail.session.replayedSessionId}`}</>
|
||||
<>replayed from {detail.replayedFromName ?? `session #${detail.session.replayedSessionId}`}</>
|
||||
)}
|
||||
{detail.session.playCount > 0 && (
|
||||
<>
|
||||
{" "}
|
||||
· replayed {detail.session.playCount}×
|
||||
{detail.session.kind === "replay" && detail.replayedFromName !== undefined && " · "}
|
||||
replayed {detail.session.playCount}×
|
||||
{detail.session.lastPlayedAt && ` (last ${new Date(detail.session.lastPlayedAt).toLocaleString()})`}
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
{detail.session.description && (
|
||||
<p className="mt-1 text-sm text-muted-foreground">{detail.session.description}</p>
|
||||
)}
|
||||
<SessionDescriptionEditor sessionId={detail.session.id} initialDescription={detail.session.description} />
|
||||
</div>
|
||||
<div className="flex shrink-0 items-center gap-3 self-end sm:self-auto">
|
||||
<Badge variant={STATUS_VARIANT[detail.session.status]}>{detail.session.status}</Badge>
|
||||
<span className="bp-readout text-sm text-muted-foreground">{formatDuration(detail.session.durationMs)}</span>
|
||||
{canReplay && (
|
||||
<Button asChild>
|
||||
<Link href={`/sessions/${detail.session.id}/replay`}>
|
||||
@@ -59,6 +66,8 @@ export default async function SessionDetailPage({ params }: { params: Promise<{
|
||||
</Link>
|
||||
</Button>
|
||||
)}
|
||||
<SessionDeleteButton sessionId={detail.session.id} sessionName={detail.session.name} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Card className="bp-glass">
|
||||
|
||||
@@ -5,14 +5,21 @@ import { getSessionName } from "@/lib/db/queries/sessions";
|
||||
export async function generateMetadata({ params }: { params: Promise<{ id: string }> }): Promise<Metadata> {
|
||||
const { id } = await params;
|
||||
const name = await getSessionName(Number(id));
|
||||
return { title: name ? `Replay ${name}` : "Replay" };
|
||||
return { title: name ? `${name} - Replay` : "Replay" };
|
||||
}
|
||||
|
||||
export default async function ReplayPage({ params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const name = await getSessionName(Number(id));
|
||||
return (
|
||||
<div className="flex flex-col gap-6">
|
||||
<h1 className="font-heading text-2xl font-semibold">Replay</h1>
|
||||
<div>
|
||||
<h1 className="font-heading text-2xl font-semibold">{name ?? `Session #${id}`} - Replay</h1>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Connect the devices you want to replay onto, then match them to this session's original device
|
||||
slots and play its recorded intensity back live over Web Bluetooth.
|
||||
</p>
|
||||
</div>
|
||||
<ReplayPlayerLoader sessionId={Number(id)} />
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import type { Metadata } from "next";
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
||||
import { SessionsSummaryCards } from "@/components/stats/SessionsSummaryCards";
|
||||
import { DeviceUsageTable } from "@/components/stats/DeviceUsageTable";
|
||||
import { getDeviceCommandCounts, getDeviceUsageStats, getSessionsSummary } from "@/lib/db/queries/stats";
|
||||
@@ -24,18 +23,8 @@ export default async function StatsPage() {
|
||||
<p className="text-sm text-muted-foreground">Usage across sessions and devices.</p>
|
||||
</div>
|
||||
|
||||
<Tabs defaultValue="sessions">
|
||||
<TabsList className="bp-glass">
|
||||
<TabsTrigger value="sessions">Sessions</TabsTrigger>
|
||||
<TabsTrigger value="devices">Devices</TabsTrigger>
|
||||
</TabsList>
|
||||
<TabsContent value="sessions" className="pt-4">
|
||||
<SessionsSummaryCards summary={sessionsSummary} />
|
||||
</TabsContent>
|
||||
<TabsContent value="devices" className="pt-4">
|
||||
<DeviceUsageTable devices={devices} />
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
+6
-14
@@ -181,23 +181,15 @@ body {
|
||||
}
|
||||
|
||||
/* Console-module surface: translucent + blurred so the animated background
|
||||
sweep shines through, with a hairline border and soft inset top highlight. */
|
||||
sweep shines through. Card's own default ring (components/ui/card.tsx:
|
||||
`ring-1 ring-foreground/10`) still shows - ring-accent recolors it to the
|
||||
accent token instead of resetting it. border-accent is currently a no-op
|
||||
(neither Card nor this rule sets a border-width utility to give it a
|
||||
border to color). */
|
||||
.bp-glass {
|
||||
@apply shadow-xs ring-accent border-accent;
|
||||
background: color-mix(in srgb, var(--card) 55%, transparent);
|
||||
backdrop-filter: blur(20px) saturate(150%);
|
||||
border: 1px solid var(--border);
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, var(--foreground) 8%, transparent);
|
||||
transition:
|
||||
border-color 0.2s ease,
|
||||
box-shadow 0.2s ease,
|
||||
background-color 0.2s ease;
|
||||
}
|
||||
.bp-glass:hover {
|
||||
background: color-mix(in srgb, var(--card) 62%, transparent);
|
||||
border-color: color-mix(in srgb, var(--primary) 45%, var(--border));
|
||||
box-shadow:
|
||||
inset 0 1px 0 color-mix(in srgb, var(--foreground) 10%, transparent),
|
||||
0 10px 30px -14px rgba(0, 0, 0, 0.45);
|
||||
}
|
||||
|
||||
/* Illuminated indicator dot - reused on connection status and per-actuator
|
||||
|
||||
@@ -22,6 +22,8 @@ import { DeviceCard } from "./DeviceCard";
|
||||
import { RecordControls } from "./RecordControls";
|
||||
import { NameSessionDialog } from "./NameSessionDialog";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
|
||||
import { Info } from "lucide-react";
|
||||
|
||||
interface ActiveSession {
|
||||
id: number;
|
||||
@@ -225,7 +227,7 @@ export function ButtplugConsole() {
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-6">
|
||||
<div className="flex flex-wrap items-center justify-between gap-4">
|
||||
<div className="flex flex-wrap items-center gap-4">
|
||||
<DeviceScanPanel scanning={scanning} onScan={handleScan} onStopScan={() => void stopScanning()} />
|
||||
<RecordControls
|
||||
active={activeSession !== null}
|
||||
@@ -240,12 +242,13 @@ export function ButtplugConsole() {
|
||||
{storeError && <p className="text-sm text-destructive">{storeError}</p>}
|
||||
|
||||
{Object.keys(devices).length === 0 ? (
|
||||
<Card className="bp-glass">
|
||||
<CardContent className="py-6 text-sm text-muted-foreground">
|
||||
No devices connected yet. Scan to discover nearby toys, then select one from your browser's
|
||||
pairing prompt.
|
||||
</CardContent>
|
||||
</Card>
|
||||
<Alert className="bp-glass">
|
||||
<Info />
|
||||
<AlertTitle>No devices connected yet</AlertTitle>
|
||||
<AlertDescription>
|
||||
Scan to discover nearby toys, then select one from your browser's pairing prompt.
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
) : (
|
||||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
{Object.values(devices).map((device) => (
|
||||
|
||||
@@ -37,9 +37,9 @@ export function DeviceCard({
|
||||
}: DeviceCardProps) {
|
||||
return (
|
||||
<Card className="bp-glass">
|
||||
<CardHeader className="flex flex-row items-center justify-between pb-3">
|
||||
<span className="text-sm font-medium text-foreground">{device.displayName ?? device.name}</span>
|
||||
<div className="flex items-center gap-3">
|
||||
<CardHeader className="flex flex-row flex-wrap items-center justify-between gap-2 pb-3">
|
||||
<span className="min-w-0 truncate text-sm font-medium text-foreground">{device.displayName ?? device.name}</span>
|
||||
<div className="flex shrink-0 items-center gap-3">
|
||||
{device.hasBattery &&
|
||||
(batteryLevel !== null ? (
|
||||
<BatteryIndicator level={batteryLevel} />
|
||||
|
||||
@@ -15,7 +15,7 @@ interface RecordControlsProps {
|
||||
export function RecordControls({ active, elapsedLabel, disabled, busy, onStart, onEnd }: RecordControlsProps) {
|
||||
if (active) {
|
||||
return (
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex flex-wrap items-center gap-3">
|
||||
<span className="flex items-center gap-2 text-sm font-medium">
|
||||
<Circle className="bp-pulse size-2.5 fill-destructive text-destructive" />
|
||||
Session live · {elapsedLabel}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Check, Loader2 } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
export interface DeviceRow {
|
||||
id: number;
|
||||
@@ -14,34 +14,67 @@ export interface DeviceRow {
|
||||
lastConnectedAt: number | null;
|
||||
}
|
||||
|
||||
const AUTOSAVE_DELAY_MS = 600;
|
||||
|
||||
function DeviceNameCell({ device }: { device: DeviceRow }) {
|
||||
const router = useRouter();
|
||||
const [value, setValue] = useState(device.displayName ?? device.bleName);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const initial = device.displayName ?? device.bleName;
|
||||
const [value, setValue] = useState(initial);
|
||||
const [status, setStatus] = useState<"idle" | "saving" | "saved">("idle");
|
||||
const lastSaved = useRef(initial);
|
||||
|
||||
async function handleSave() {
|
||||
if (value.trim().length === 0) return;
|
||||
setSaving(true);
|
||||
useEffect(() => {
|
||||
const trimmed = value.trim();
|
||||
if (trimmed.length === 0 || trimmed === lastSaved.current) return;
|
||||
|
||||
setStatus("saving");
|
||||
const timer = setTimeout(async () => {
|
||||
const res = await fetch(`/api/devices/${device.id}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ displayName: value.trim() }),
|
||||
body: JSON.stringify({ displayName: trimmed }),
|
||||
});
|
||||
setSaving(false);
|
||||
if (res.ok) {
|
||||
toast.success("Renamed");
|
||||
lastSaved.current = trimmed;
|
||||
setStatus("saved");
|
||||
router.refresh();
|
||||
} else {
|
||||
setStatus("idle");
|
||||
toast.error("Could not rename device");
|
||||
}
|
||||
}
|
||||
}, AUTOSAVE_DELAY_MS);
|
||||
|
||||
return () => clearTimeout(timer);
|
||||
}, [value, device.id, router]);
|
||||
|
||||
useEffect(() => {
|
||||
if (status !== "saved") return;
|
||||
const timer = setTimeout(() => setStatus("idle"), 1500);
|
||||
return () => clearTimeout(timer);
|
||||
}, [status]);
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
<Input value={value} onChange={(e) => setValue(e.target.value)} className="h-8 w-40 min-w-40" />
|
||||
<Button size="sm" variant="outline" onClick={handleSave} disabled={saving} className="shrink-0">
|
||||
Save
|
||||
</Button>
|
||||
<input
|
||||
value={value}
|
||||
onChange={(e) => setValue(e.target.value)}
|
||||
aria-label="Device display name"
|
||||
className="max-w-48 min-w-0 border-b-2 border-transparent bg-transparent text-sm font-medium text-foreground caret-primary outline-none transition-colors placeholder:text-muted-foreground/70 hover:border-b-primary focus:border-b-primary [field-sizing:content]"
|
||||
/>
|
||||
<div className="relative flex size-4 shrink-0 items-center justify-center">
|
||||
<Loader2
|
||||
className={cn(
|
||||
"absolute size-4 animate-spin text-muted-foreground transition-opacity",
|
||||
status === "saving" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
<Check
|
||||
className={cn(
|
||||
"absolute size-4 text-primary transition-opacity",
|
||||
status === "saved" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
+122
-23
@@ -4,44 +4,106 @@ import { useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { usePathname, useRouter } from "next/navigation";
|
||||
import { useTheme } from "next-themes";
|
||||
import { Menu, Moon, Sun, LogOut } from "lucide-react";
|
||||
import { Moon, Sun, LogOut, Gauge, SlidersHorizontal, ListMusic, Bluetooth, BarChart3 } from "lucide-react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Sheet, SheetContent, SheetTitle, SheetTrigger } from "@/components/ui/sheet";
|
||||
import { Sheet, SheetContent, SheetDescription, SheetTitle } from "@/components/ui/sheet";
|
||||
import { ConnectionStatus } from "./ConnectionStatus";
|
||||
import { BrandMark } from "./BrandMark";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
const LINKS = [
|
||||
{ href: "/", label: "Dashboard" },
|
||||
{ href: "/control", label: "Control" },
|
||||
{ href: "/sessions", label: "Sessions" },
|
||||
{ href: "/stats", label: "Stats" },
|
||||
{ href: "/devices", label: "Devices" },
|
||||
{ href: "/", label: "Dashboard", icon: Gauge },
|
||||
{ href: "/control", label: "Control", icon: SlidersHorizontal },
|
||||
{ href: "/sessions", label: "Sessions", icon: ListMusic },
|
||||
{ href: "/devices", label: "Devices", icon: Bluetooth },
|
||||
{ href: "/stats", label: "Stats", icon: BarChart3 },
|
||||
];
|
||||
|
||||
function isActive(pathname: string, href: string): boolean {
|
||||
return href === "/" ? pathname === "/" : pathname === href || pathname.startsWith(`${href}/`);
|
||||
}
|
||||
|
||||
/** Desktop tab strip - borderless chips; the active tab lights up with a
|
||||
* primary-tinted fill, matching the drawer rows' active treatment. */
|
||||
function NavLinks({ onNavigate }: { onNavigate?: () => void }) {
|
||||
const pathname = usePathname();
|
||||
return (
|
||||
<>
|
||||
{LINKS.map((link) => (
|
||||
{LINKS.map((link) => {
|
||||
const active = isActive(pathname, link.href);
|
||||
return (
|
||||
<Link
|
||||
key={link.href}
|
||||
href={link.href}
|
||||
onClick={onNavigate}
|
||||
className={cn(
|
||||
"border-b-2 px-2.5 py-1.5 text-xs font-medium tracking-wide uppercase transition-colors",
|
||||
pathname === link.href
|
||||
? "border-primary text-foreground"
|
||||
: "border-transparent text-muted-foreground hover:text-foreground",
|
||||
"flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm font-medium transition-colors",
|
||||
active ? "bg-primary/10 text-foreground" : "text-muted-foreground hover:text-foreground",
|
||||
)}
|
||||
>
|
||||
<link.icon className={cn("size-3.5", active && "text-primary")} />
|
||||
{link.label}
|
||||
</Link>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** Drawer rows for the mobile menu - icon + label, styled as tappable
|
||||
* console rows rather than the desktop tab strip's underline treatment. */
|
||||
function MobileNavLinks({ onNavigate }: { onNavigate: () => void }) {
|
||||
const pathname = usePathname();
|
||||
return (
|
||||
<>
|
||||
{LINKS.map((link) => {
|
||||
const active = isActive(pathname, link.href);
|
||||
return (
|
||||
<Link
|
||||
key={link.href}
|
||||
href={link.href}
|
||||
onClick={onNavigate}
|
||||
className={cn(
|
||||
"flex items-center gap-3 rounded-lg px-3 py-3 text-sm font-medium transition-colors",
|
||||
active ? "bg-primary/10 text-foreground" : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",
|
||||
)}
|
||||
>
|
||||
<link.icon className={cn("size-4 shrink-0", active && "text-primary")} />
|
||||
{link.label}
|
||||
</Link>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** Hamburger that morphs into an X - the top/bottom bars rotate into place
|
||||
* and the middle bar collapses, rather than a straight icon swap. */
|
||||
function MenuToggleIcon({ open }: { open: boolean }) {
|
||||
return (
|
||||
<span className="relative flex size-4 shrink-0 flex-col items-center justify-center" aria-hidden>
|
||||
<span
|
||||
className={cn(
|
||||
"absolute h-0.5 w-4 rounded-full bg-current transition-transform duration-300 ease-out motion-reduce:transition-none",
|
||||
open ? "translate-y-0 rotate-45" : "-translate-y-[5px] rotate-0",
|
||||
)}
|
||||
/>
|
||||
<span
|
||||
className={cn(
|
||||
"absolute h-0.5 w-4 rounded-full bg-current transition-all duration-200 ease-out motion-reduce:transition-none",
|
||||
open ? "scale-x-0 opacity-0" : "scale-x-100 opacity-100",
|
||||
)}
|
||||
/>
|
||||
<span
|
||||
className={cn(
|
||||
"absolute h-0.5 w-4 rounded-full bg-current transition-transform duration-300 ease-out motion-reduce:transition-none",
|
||||
open ? "translate-y-0 -rotate-45" : "translate-y-[5px] rotate-0",
|
||||
)}
|
||||
/>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
export function NavBar() {
|
||||
const { theme, setTheme } = useTheme();
|
||||
const router = useRouter();
|
||||
@@ -61,12 +123,14 @@ export function NavBar() {
|
||||
<span className="font-heading text-lg font-semibold">Sexy</span>
|
||||
</Link>
|
||||
|
||||
<nav className="hidden items-center gap-1 md:flex">
|
||||
<nav className="hidden items-center gap-1.5 md:flex">
|
||||
<NavLinks />
|
||||
</nav>
|
||||
|
||||
<div className="ml-auto flex items-center gap-2">
|
||||
<ConnectionStatus />
|
||||
|
||||
<div className="hidden items-center gap-2 md:flex">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
@@ -79,18 +143,53 @@ export function NavBar() {
|
||||
<Button variant="ghost" size="icon" aria-label="Log out" onClick={handleLogout}>
|
||||
<LogOut className="size-4" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
className="md:hidden"
|
||||
aria-label={menuOpen ? "Close menu" : "Open menu"}
|
||||
onClick={() => setMenuOpen((open) => !open)}
|
||||
>
|
||||
<MenuToggleIcon open={menuOpen} />
|
||||
</Button>
|
||||
|
||||
<Sheet open={menuOpen} onOpenChange={setMenuOpen}>
|
||||
<SheetTrigger asChild>
|
||||
<Button variant="ghost" size="icon" className="md:hidden" aria-label="Open menu">
|
||||
<Menu className="size-4" />
|
||||
</Button>
|
||||
</SheetTrigger>
|
||||
<SheetContent side="right" className="w-64">
|
||||
<SheetTitle className="px-4 pt-4">Menu</SheetTitle>
|
||||
<nav className="flex flex-col gap-1 p-4">
|
||||
<NavLinks onNavigate={() => setMenuOpen(false)} />
|
||||
<SheetContent side="right" className="w-72 gap-0 p-0">
|
||||
<div className="flex items-center gap-2 px-4 pt-4 pb-3">
|
||||
<BrandMark size={24} animated />
|
||||
<SheetTitle className="font-heading text-lg font-semibold">Sexy</SheetTitle>
|
||||
</div>
|
||||
<SheetDescription className="px-4 pb-3 text-xs">
|
||||
Jump to another page or manage your session.
|
||||
</SheetDescription>
|
||||
<div className="bp-hairline" />
|
||||
|
||||
<nav className="flex flex-1 flex-col gap-1 p-3">
|
||||
<MobileNavLinks onNavigate={() => setMenuOpen(false)} />
|
||||
</nav>
|
||||
|
||||
<div className="bp-hairline" />
|
||||
<div className="flex flex-col gap-1 p-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setTheme(theme === "dark" ? "light" : "dark")}
|
||||
className="flex items-center gap-3 rounded-lg px-3 py-3 text-sm font-medium text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground"
|
||||
>
|
||||
<Sun className="hidden size-4 dark:block" />
|
||||
<Moon className="block size-4 dark:hidden" />
|
||||
{theme === "dark" ? "Switch to light mode" : "Switch to dark mode"}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void handleLogout()}
|
||||
className="flex items-center gap-3 rounded-lg px-3 py-3 text-sm font-medium text-muted-foreground transition-colors hover:bg-destructive/10 hover:text-destructive"
|
||||
>
|
||||
<LogOut className="size-4" />
|
||||
Log out
|
||||
</button>
|
||||
</div>
|
||||
</SheetContent>
|
||||
</Sheet>
|
||||
</div>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Slider } from "@/components/ui/slider";
|
||||
import { DeviceScanPanel } from "@/components/control/DeviceScanPanel";
|
||||
@@ -11,7 +11,8 @@ import { disconnectAll, getButtplugClientHandle, getDevice, startScanning, stopS
|
||||
import { SessionPlayer, type SessionEventRow } from "@/lib/buttplug/player";
|
||||
import { useButtplugStore } from "@/lib/buttplug/store";
|
||||
import type { ActuatorInfo, ReplayDeviceSlot } from "@/lib/buttplug/types";
|
||||
import { Pause, Play } from "lucide-react";
|
||||
import { Info, Pause, Play } from "lucide-react";
|
||||
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
|
||||
|
||||
interface ReplayDataResponse {
|
||||
session: {
|
||||
@@ -137,18 +138,9 @@ export function ReplayPlayer({ sessionId }: { sessionId: number }) {
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-6">
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle>{data.session.name ?? `Session #${data.session.id}`}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="flex flex-col gap-4">
|
||||
{!player ? (
|
||||
<>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Connect the devices you want to replay onto, then match them to the session's
|
||||
original device slots.
|
||||
</p>
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex flex-wrap items-center gap-3">
|
||||
<DeviceScanPanel scanning={scanning} onScan={() => void startScanning()} onStopScan={() => void stopScanning()} />
|
||||
<Button
|
||||
onClick={async () => {
|
||||
@@ -161,12 +153,29 @@ export function ReplayPlayer({ sessionId }: { sessionId: number }) {
|
||||
}}
|
||||
disabled={connectedDevices.length === 0 || starting}
|
||||
>
|
||||
{starting ? "Starting..." : "Match devices & replay"}
|
||||
{starting ? (
|
||||
"Starting..."
|
||||
) : (
|
||||
<>
|
||||
<Play className="size-3.5" /> Match & replay
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{connectedDevices.length === 0 && (
|
||||
<Alert className="bp-glass">
|
||||
<Info />
|
||||
<AlertTitle>No devices connected yet</AlertTitle>
|
||||
<AlertDescription>
|
||||
Scan to discover nearby toys, then match them to this session's original device slots.
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<div className="flex flex-col gap-3">
|
||||
<Card className="bp-glass">
|
||||
<CardContent className="flex flex-col gap-3">
|
||||
{replayTargets.length > 0 && (
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{replayTargets.map((t) => (
|
||||
@@ -184,7 +193,7 @@ export function ReplayPlayer({ sessionId }: { sessionId: number }) {
|
||||
max={data.session.durationMs}
|
||||
onValueChange={([v]) => player.seek(v)}
|
||||
/>
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||
<span className="bp-readout text-xs text-muted-foreground">
|
||||
{formatTime(elapsedMs)} / {formatTime(data.session.durationMs)}
|
||||
</span>
|
||||
@@ -236,10 +245,9 @@ export function ReplayPlayer({ sessionId }: { sessionId: number }) {
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
<DeviceRemapDialog
|
||||
open={showRemap}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog";
|
||||
import { Trash2 } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
|
||||
export function SessionDeleteButton({ sessionId, sessionName }: { sessionId: number; sessionName: string | null }) {
|
||||
const router = useRouter();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [deleting, setDeleting] = useState(false);
|
||||
|
||||
async function handleDelete() {
|
||||
setDeleting(true);
|
||||
const res = await fetch(`/api/sessions/${sessionId}`, { method: "DELETE" });
|
||||
setDeleting(false);
|
||||
if (res.ok) {
|
||||
toast.success("Session deleted");
|
||||
router.push("/sessions");
|
||||
router.refresh();
|
||||
} else {
|
||||
toast.error("Could not delete session");
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button variant="ghost" size="icon-sm" onClick={() => setOpen(true)} aria-label="Delete session">
|
||||
<Trash2 className="size-4" />
|
||||
</Button>
|
||||
|
||||
<Dialog open={open} onOpenChange={setOpen}>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Delete session?</DialogTitle>
|
||||
<DialogDescription>
|
||||
This permanently deletes{" "}
|
||||
<span className="font-medium text-foreground">{sessionName ?? `Session #${sessionId}`}</span> and all
|
||||
of its recorded events. This can't be undone.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<DialogFooter>
|
||||
<Button variant="ghost" onClick={() => setOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button variant="destructive" onClick={() => void handleDelete()} disabled={deleting}>
|
||||
{deleting ? "Deleting..." : "Delete"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Check, Loader2 } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
const AUTOSAVE_DELAY_MS = 600;
|
||||
|
||||
export function SessionDescriptionEditor({
|
||||
sessionId,
|
||||
initialDescription,
|
||||
}: {
|
||||
sessionId: number;
|
||||
initialDescription: string | null;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const initial = initialDescription ?? "";
|
||||
const [value, setValue] = useState(initial);
|
||||
const [status, setStatus] = useState<"idle" | "saving" | "saved">("idle");
|
||||
const lastSaved = useRef(initial);
|
||||
|
||||
useEffect(() => {
|
||||
// Unlike the session name, an empty description is a valid, saveable
|
||||
// state (it just means "no description"), so no non-empty guard here.
|
||||
if (value === lastSaved.current) return;
|
||||
|
||||
setStatus("saving");
|
||||
const timer = setTimeout(async () => {
|
||||
const res = await fetch(`/api/sessions/${sessionId}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ description: value }),
|
||||
});
|
||||
if (res.ok) {
|
||||
lastSaved.current = value;
|
||||
setStatus("saved");
|
||||
router.refresh();
|
||||
} else {
|
||||
setStatus("idle");
|
||||
toast.error("Could not save description");
|
||||
}
|
||||
}, AUTOSAVE_DELAY_MS);
|
||||
|
||||
return () => clearTimeout(timer);
|
||||
}, [value, sessionId, router]);
|
||||
|
||||
useEffect(() => {
|
||||
if (status !== "saved") return;
|
||||
const timer = setTimeout(() => setStatus("idle"), 1500);
|
||||
return () => clearTimeout(timer);
|
||||
}, [status]);
|
||||
|
||||
return (
|
||||
<div className="mt-1 flex items-start gap-2">
|
||||
<textarea
|
||||
value={value}
|
||||
onChange={(e) => setValue(e.target.value)}
|
||||
placeholder="Add a description..."
|
||||
aria-label="Session description"
|
||||
rows={1}
|
||||
className="max-w-full min-w-0 resize-none border-b-2 border-transparent bg-transparent text-sm text-muted-foreground caret-primary outline-none transition-colors placeholder:text-muted-foreground/60 hover:border-b-primary focus:border-b-primary sm:max-w-xl [field-sizing:content]"
|
||||
/>
|
||||
<div className="relative mt-0.5 flex size-4 shrink-0 items-center justify-center">
|
||||
<Loader2
|
||||
className={cn(
|
||||
"absolute size-4 animate-spin text-muted-foreground transition-opacity",
|
||||
status === "saving" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
<Check
|
||||
className={cn(
|
||||
"absolute size-4 text-primary transition-opacity",
|
||||
status === "saved" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -64,7 +64,29 @@ export function SessionTimelineChart({ timeline }: { timeline: TimelineRow[] })
|
||||
className="bp-readout text-xs"
|
||||
/>
|
||||
<YAxis domain={[0, 100]} tickLine={false} axisLine={false} width={32} className="bp-readout text-xs" />
|
||||
<ChartTooltip content={<ChartTooltipContent />} />
|
||||
<ChartTooltip
|
||||
content={
|
||||
<ChartTooltipContent
|
||||
formatter={(value, name) => {
|
||||
const itemConfig = config[name as string];
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className="h-2.5 w-2.5 shrink-0 rounded-[2px]"
|
||||
style={{ backgroundColor: itemConfig?.color }}
|
||||
/>
|
||||
<div className="flex flex-1 items-center justify-between gap-4 leading-none">
|
||||
<span className="text-muted-foreground">{itemConfig?.label ?? name}</span>
|
||||
<span className="bp-readout font-medium text-foreground">
|
||||
{typeof value === "number" ? value.toLocaleString() : String(value)}
|
||||
</span>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{series.map(([sessionDeviceId]) => (
|
||||
<Area
|
||||
key={sessionDeviceId}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Check, Loader2 } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
const AUTOSAVE_DELAY_MS = 600;
|
||||
|
||||
export function SessionTitleEditor({ sessionId, initialName }: { sessionId: number; initialName: string | null }) {
|
||||
const router = useRouter();
|
||||
const initial = initialName ?? "";
|
||||
const [value, setValue] = useState(initial);
|
||||
const [status, setStatus] = useState<"idle" | "saving" | "saved">("idle");
|
||||
const lastSaved = useRef(initial);
|
||||
|
||||
useEffect(() => {
|
||||
const trimmed = value.trim();
|
||||
if (trimmed.length === 0 || trimmed === lastSaved.current) return;
|
||||
|
||||
setStatus("saving");
|
||||
const timer = setTimeout(async () => {
|
||||
const res = await fetch(`/api/sessions/${sessionId}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ name: trimmed }),
|
||||
});
|
||||
if (res.ok) {
|
||||
lastSaved.current = trimmed;
|
||||
setStatus("saved");
|
||||
router.refresh();
|
||||
} else {
|
||||
setStatus("idle");
|
||||
toast.error("Could not rename session");
|
||||
}
|
||||
}, AUTOSAVE_DELAY_MS);
|
||||
|
||||
return () => clearTimeout(timer);
|
||||
}, [value, sessionId, router]);
|
||||
|
||||
useEffect(() => {
|
||||
if (status !== "saved") return;
|
||||
const timer = setTimeout(() => setStatus("idle"), 1500);
|
||||
return () => clearTimeout(timer);
|
||||
}, [status]);
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
<input
|
||||
value={value}
|
||||
onChange={(e) => setValue(e.target.value)}
|
||||
placeholder={`Session #${sessionId}`}
|
||||
aria-label="Session name"
|
||||
className="max-w-full min-w-0 border-b-2 border-transparent bg-transparent font-heading text-2xl font-semibold text-foreground caret-primary outline-none transition-colors placeholder:text-muted-foreground/70 hover:border-b-primary focus:border-b-primary sm:max-w-xl [field-sizing:content]"
|
||||
/>
|
||||
<div className="relative flex size-4 shrink-0 items-center justify-center">
|
||||
<Loader2
|
||||
className={cn(
|
||||
"absolute size-4 animate-spin text-muted-foreground transition-opacity",
|
||||
status === "saving" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
<Check
|
||||
className={cn(
|
||||
"absolute size-4 text-primary transition-opacity",
|
||||
status === "saved" ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
} from "@/components/ui/dialog";
|
||||
import { Play, Trash2 } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { STATUS_VARIANT } from "@/components/sessions/session-status";
|
||||
|
||||
export interface SessionRow {
|
||||
id: number;
|
||||
@@ -25,12 +26,6 @@ export interface SessionRow {
|
||||
durationMs: number | null;
|
||||
}
|
||||
|
||||
const STATUS_VARIANT = {
|
||||
active: "default",
|
||||
completed: "secondary",
|
||||
aborted: "destructive",
|
||||
} as const;
|
||||
|
||||
function formatDuration(ms: number | null): string {
|
||||
if (ms === null) return "-";
|
||||
const totalSeconds = Math.round(ms / 1000);
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
// Plain data, deliberately kept out of SessionsTable.tsx (a "use client"
|
||||
// module) so server components (e.g. the session detail page) can import it
|
||||
// without pulling a value across the client/server compilation boundary.
|
||||
export const STATUS_VARIANT = {
|
||||
active: "default",
|
||||
completed: "secondary",
|
||||
aborted: "destructive",
|
||||
} as const;
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
|
||||
export interface DeviceUsageRow {
|
||||
@@ -15,13 +15,19 @@ export function DeviceUsageTable({ devices }: { devices: DeviceUsageRow[] }) {
|
||||
if (devices.length === 0) {
|
||||
return (
|
||||
<Card className="bp-glass">
|
||||
<CardContent className="py-6 text-sm text-muted-foreground">No device activity yet.</CardContent>
|
||||
<CardHeader>
|
||||
<CardTitle className="text-base">Device usage</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="text-sm text-muted-foreground">No device activity yet.</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-base">Device usage</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<Table>
|
||||
<TableHeader>
|
||||
|
||||
@@ -5,56 +5,45 @@ export interface SessionsSummary {
|
||||
totalDurationMs: number;
|
||||
avgDurationMs: number;
|
||||
totalReplays: number;
|
||||
durationPerDevice: { deviceId: number; displayName: string | null; bleName: string; totalActiveMs: number }[];
|
||||
}
|
||||
|
||||
function formatHours(ms: number): string {
|
||||
return `${(ms / 3_600_000).toFixed(1)}h`;
|
||||
}
|
||||
|
||||
function formatReplays(count: number): string {
|
||||
return count === 0 ? "-" : `${count}×`;
|
||||
}
|
||||
|
||||
export function SessionsSummaryCards({ summary }: { summary: SessionsSummary }) {
|
||||
return (
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="grid gap-4 sm:grid-cols-3">
|
||||
<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Completed sessions</CardTitle>
|
||||
<CardTitle className="text-sm">Completed sessions</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">{summary.count}</CardContent>
|
||||
</Card>
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Total time</CardTitle>
|
||||
<CardTitle className="text-sm">Total time</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">{formatHours(summary.totalDurationMs)}</CardContent>
|
||||
</Card>
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-sm text-muted-foreground">Avg session length</CardTitle>
|
||||
<CardTitle className="text-sm">Avg session length</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="bp-readout text-3xl">
|
||||
{Math.round(summary.avgDurationMs / 60_000)}m
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
<Card className="bp-glass">
|
||||
<CardContent className="py-3 text-sm text-muted-foreground">Replayed {summary.totalReplays}×</CardContent>
|
||||
</Card>
|
||||
{summary.durationPerDevice.length > 0 && (
|
||||
<Card className="bp-glass">
|
||||
<CardHeader>
|
||||
<CardTitle className="text-base">Duration per device</CardTitle>
|
||||
<CardTitle className="text-sm">Replays</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="flex flex-col gap-2">
|
||||
{summary.durationPerDevice.map((d) => (
|
||||
<div key={d.deviceId} className="flex items-center justify-between text-sm">
|
||||
<span>{d.displayName ?? d.bleName}</span>
|
||||
<span className="text-muted-foreground">{formatHours(d.totalActiveMs)}</span>
|
||||
</div>
|
||||
))}
|
||||
</CardContent>
|
||||
<CardContent className="bp-readout text-3xl">{formatReplays(summary.totalReplays)}</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
import * as React from "react"
|
||||
import { cva, type VariantProps } from "class-variance-authority"
|
||||
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
const alertVariants = cva(
|
||||
"group/alert relative grid w-full gap-0.5 rounded-lg border px-2.5 py-2 text-left text-sm has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pr-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-2 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-4",
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
default: "bg-card text-card-foreground",
|
||||
destructive:
|
||||
"bg-card text-destructive *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
|
||||
},
|
||||
},
|
||||
defaultVariants: {
|
||||
variant: "default",
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
function Alert({
|
||||
className,
|
||||
variant,
|
||||
...props
|
||||
}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
|
||||
return (
|
||||
<div
|
||||
data-slot="alert"
|
||||
role="alert"
|
||||
className={cn(alertVariants({ variant }), className)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
|
||||
return (
|
||||
<div
|
||||
data-slot="alert-title"
|
||||
className={cn(
|
||||
"font-medium group-has-[>svg]/alert:col-start-2 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground",
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function AlertDescription({
|
||||
className,
|
||||
...props
|
||||
}: React.ComponentProps<"div">) {
|
||||
return (
|
||||
<div
|
||||
data-slot="alert-description"
|
||||
className={cn(
|
||||
"text-sm text-balance text-muted-foreground md:text-pretty [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function AlertAction({ className, ...props }: React.ComponentProps<"div">) {
|
||||
return (
|
||||
<div
|
||||
data-slot="alert-action"
|
||||
className={cn("absolute top-2 right-2", className)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export { Alert, AlertTitle, AlertDescription, AlertAction }
|
||||
+1
-12
@@ -15,18 +15,7 @@ export async function getSessionsSummary() {
|
||||
.from(sessions)
|
||||
.where(eq(sessions.status, "completed"));
|
||||
|
||||
const durationPerDevice = await db
|
||||
.select({
|
||||
deviceId: devices.id,
|
||||
displayName: devices.displayName,
|
||||
bleName: devices.bleName,
|
||||
totalActiveMs: sql<number>`coalesce(sum(coalesce(${sessionDevices.disconnectedAt}, ${sessionDevices.connectedAt}) - ${sessionDevices.connectedAt}), 0)`,
|
||||
})
|
||||
.from(sessionDevices)
|
||||
.innerJoin(devices, eq(sessionDevices.deviceId, devices.id))
|
||||
.groupBy(devices.id);
|
||||
|
||||
return { ...totals, durationPerDevice };
|
||||
return totals;
|
||||
}
|
||||
|
||||
export async function getSessionTimeline(sessionId: number, bucketMs = 1000) {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "sexy",
|
||||
"version": "0.6.0",
|
||||
"version": "0.9.4",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
|
||||
Reference in New Issue
Block a user